autonomous-app 0.3.26__py3-none-any.whl → 0.3.28__py3-none-any.whl

autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.26"
+__version__ = "0.3.28"
 
 from dotenv import load_dotenv
 

autonomous/ai/jsonagent.py

@@ -1,8 +1,9 @@
 import json
 
+from autonomous.ai.baseagent import BaseAgent
 from autonomous.model.autoattr import ReferenceAttr, StringAttr
 from autonomous.model.automodel import AutoModel
-from autonomous.ai.baseagent import BaseAgent
+
 from .models.openai import OpenAIModel
 
 
@@ -15,12 +16,15 @@ class JSONAgent(BaseAgent):
         default="A helpful AI assistant trained to assist with generating JSON formatted data."
     )
 
-    def generate(self, messages, function, additional_instructions=""):
+    def generate(self, messages, function, additional_instructions="", **kwargs):
         result = self.get_client().generate_json(
-            messages, function, additional_instructions
+            messages, function, additional_instructions, **kwargs
         )
         if isinstance(result, str):
             result = json.loads(result)
         elif not isinstance(result, dict):
             raise ValueError(f"Invalid JSON response from AI model.\n\n{result}")
         return result
+
+    def upload(self, file):
+        return self.get_client().upload(file=file)

autonomous/ai/models/gemini.py

@@ -1,10 +1,13 @@
 import io
 import os
 import random
+import re
+import time
 import wave
 
 from google import genai
 from google.genai import types
+from google.genai.types import Part
 from pydub import AudioSegment
 
 from autonomous import log
@@ -20,7 +23,18 @@ class GeminiAIModel(AutoModel):
     _json_model = "gemini-3-pro-preview"
     _stt_model = "gemini-3-pro-preview"
     _tts_model = "gemini-2.5-flash-preview-tts"
+
+    messages = ListAttr(StringAttr(default=[]))
+    name = StringAttr(default="agent")
+    instructions = StringAttr(
+        default="You are highly skilled AI trained to assist with various tasks."
+    )
+    description = StringAttr(
+        default="A helpful AI assistant trained to assist with various tasks."
+    )
+
     MAX_FILES = 14
+    MAX_SUMMARY_TOKEN_LENGTH = 10000
     VOICES = {
         "Zephyr": ["female"],
         "Puck": ["male"],
@@ -54,15 +68,6 @@ class GeminiAIModel(AutoModel):
         "Sulafar": ["female"],
     }
 
-    messages = ListAttr(StringAttr(default=[]))
-    name = StringAttr(default="agent")
-    instructions = StringAttr(
-        default="You are highly skilled AI trained to assist with various tasks."
-    )
-    description = StringAttr(
-        default="A helpful AI assistant trained to assist with various tasks."
-    )
-
     @property
     def client(self):
         if not self._client:
@@ -106,13 +111,60 @@ class GeminiAIModel(AutoModel):
         buffer.seek(0)
         return buffer
 
-    def generate_json(self, message, function, additional_instructions=""):
+    def _add_files(self, file_list):
+        existing_files = self.client.files.list()
+        log(f"Existing files: {[f.display_name for f in existing_files]}", _print=True)
+        for f in existing_files:
+            # Delete old files (older than 10 minutes)
+            age_seconds = (
+                (time.time() - f.update_time.timestamp())
+                if f.update_time
+                else (time.time() - f.create_time.timestamp())
+            )
+            log(age_seconds, _print=True)
+            if age_seconds > 900:
+                result = self.client.files.delete(name=f.name)
+                log(f"Deleting old version of {f.name}: {result}", _print=True)
+        file_refs = []
+        for file_dict in file_list:
+            fn = file_dict["name"]
+            fileobj = file_dict["file"]
+            log(f"Uploading new {fn}...", _print=True)
+            uploaded_file = self.client.files.upload(
+                file=fileobj.name,
+                config={"mime_type": "application/json", "display_name": fn},
+            )
+            # 4. Wait for processing (Usually instant for JSON, critical for Video/PDF)
+
+            # This ensures the file is 'ACTIVE' before you use it in a prompt.
+            while uploaded_file.state.name == "PROCESSING":
+                time.sleep(1)
+                uploaded_file = self.client.get_file(uploaded_file.name)
+            file_refs.append(uploaded_file)
+            return file_refs
+
+    def upload(self, file):
+        return self._add_files([file])
+
+    def generate_json(self, message, function, additional_instructions="", **kwargs):
         # The API call must use the 'tools' parameter instead of 'response_json_schema'
         function_definition = self._add_function(function)
 
+        contents = [message]
+        if uri := kwargs.get("uri"):
+            contents.append(
+                Part.from_uri(
+                    file_uri=uri,
+                    mime_type="application/json",
+                ),
+            )
+
+        if files := kwargs.get("files"):
+            contents += self._add_files(files)
+
         response = self.client.models.generate_content(
             model=self._json_model,
-            contents=message,
+            contents=contents,
             config=types.GenerateContentConfig(
                 system_instruction=f"{self.instructions}.{additional_instructions}",
                 tools=[types.Tool(function_declarations=[function_definition])],
@@ -140,36 +192,61 @@ class GeminiAIModel(AutoModel):
             log(f"==== Failed to parse ToolCall response: {e} ====")
             return {}
 
-    def generate_text(self, message, additional_instructions=""):
+    def generate_text(self, message, additional_instructions="", **kwargs):
+        contents = [message]
+        if uri := kwargs.get("uri"):
+            contents.append(
+                Part.from_uri(
+                    file_uri=uri,
+                    mime_type="application/json",
+                ),
+            )
+
+        if files := kwargs.get("files"):
+            contents += self._add_files(files)
+
         response = self.client.models.generate_content(
             model=self._text_model,
             config=types.GenerateContentConfig(
                 system_instruction=f"{self.instructions}.{additional_instructions}",
             ),
-            contents=message,
+            contents=contents,
         )
 
         # log(results, _print=True)
         # log("=================== END REPORT ===================", _print=True)
         return response.text
 
-    def summarize_text(self, text, primer=""):
+    def summarize_text(self, text, primer="", **kwargs):
         primer = primer or self.instructions
-        response = self.client.models.generate_content(
-            model=self._summary_model,
-            config=types.GenerateContentConfig(
-                system_instruction=f"{primer}",
-            ),
-            contents=text,
-        )
-        log(response)
-        try:
-            result = response.candidates[0].content.parts[0].text
-        except Exception as e:
-            log(f"{type(e)}:{e}\n\n Unable to generate content ====")
-            return None
 
-        return result
+        updated_prompt_list = []
+        # Find all words in the prompt
+        words = re.findall(r"\w+", text)
+        # Split the words into chunks
+        for i in range(0, len(words), self.MAX_SUMMARY_TOKEN_LENGTH):
+            # Join a chunk of words and add to the list
+            updated_prompt_list.append(
+                " ".join(words[i : i + self.MAX_SUMMARY_TOKEN_LENGTH])
+            )
+
+        full_summary = ""
+        for p in updated_prompt_list:
+            response = self.client.models.generate_content(
+                model=self._summary_model,
+                config=types.GenerateContentConfig(
+                    system_instruction=f"{primer}",
+                ),
+                contents=text,
+            )
+            try:
+                summary = response.candidates[0].content.parts[0].text
+            except Exception as e:
+                log(f"{type(e)}:{e}\n\n Unable to generate content ====", _print=True)
+                break
+            else:
+                full_summary += summary + "\n"
+        return summary
 
     def generate_audio_text(
         self, audio_file, prompt="Transcribe this audio clip", **kwargs
@@ -292,8 +369,8 @@ class GeminiAIModel(AutoModel):
                     ),
                 ),
             )
-            # log(response, _print=True)
-            # log(response.candidates, _print=True)
+            log(response, _print=True)
+            log(response.candidates, _print=True)
             image_parts = [
                 part.inline_data.data
                 for part in response.candidates[0].content.parts

autonomous/ai/textagent.py

@@ -1,7 +1,8 @@
 from autonomous import log
+from autonomous.ai.baseagent import BaseAgent
 from autonomous.model.autoattr import ReferenceAttr, StringAttr
 from autonomous.model.automodel import AutoModel
-from autonomous.ai.baseagent import BaseAgent
+
 from .models.openai import OpenAIModel
 
 
@@ -14,8 +15,10 @@ class TextAgent(BaseAgent):
         default="A helpful AI assistant trained to assist with generating text according to the given requirements."
     )
 
-    def summarize_text(self, text, primer=""):
-        return self.get_client().summarize_text(text, primer)
+    def summarize_text(self, text, primer="", **kwargs):
+        return self.get_client().summarize_text(text, primer, **kwargs)
 
-    def generate(self, messages, additional_instructions=""):
-        return self.get_client().generate_text(messages, additional_instructions)
+    def generate(self, messages, additional_instructions="", **kwargs):
+        return self.get_client().generate_text(
+            messages, additional_instructions, **kwargs
+        )

{autonomous_app-0.3.26.dist-info → autonomous_app-0.3.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autonomous-app
-Version: 0.3.26
+Version: 0.3.28
 Summary: Containerized application framework built on Flask with additional libraries and tools for rapid development of web applications.
 Author-email: Steven A Moore <samoore@binghamton.edu>
 Project-URL: homepage, https://github.com/Sallenmoore/autonomous

{autonomous_app-0.3.26.dist-info → autonomous_app-0.3.28.dist-info}/RECORD

@@ -1,16 +1,16 @@
-autonomous/__init__.py,sha256=eHK_4nSf5khgoBM8Apv6KPdX96gXt_nvOhMDeZTQiAs,95
+autonomous/__init__.py,sha256=cf_i1xIW4gWRL34z5iRAHqNKq4XELsusys3f4hdY1sQ,95
 autonomous/cli.py,sha256=z4AaGeWNW_uBLFAHng0J_lfS9v3fXemK1PeT85u4Eo4,42
 autonomous/logger.py,sha256=NQtgEaTWNAWfLSgqSP7ksXj1GpOuCgoUV711kSMm-WA,2022
 autonomous/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/ai/audioagent.py,sha256=SvPLzKgqUnrkcsR7y93aURSrStIrryuntQMPS1SzUXw,1033
 autonomous/ai/baseagent.py,sha256=HYCqC4HmK5afNMunmTkhRE8O0OaONl2GxXnISkdOM58,1094
 autonomous/ai/imageagent.py,sha256=bIOrgg_CM-rgfyLme7V9vPqP8WKVMIAVoB2E9lLtIRk,521
-autonomous/ai/jsonagent.py,sha256=a_l4HyyVRj3FB6py_P1xdc4Bj9uNI1YmJrWQXAksIvs,964
-autonomous/ai/textagent.py,sha256=wI1-VC9zscKYyxYBg4pZ0ZyNJ5ZvKkLfWsIY1vJFChk,863
+autonomous/ai/jsonagent.py,sha256=VQGhK0RFo0H_eVH9dAyf4_lp-RIpdgH988joLoKjm94,1065
+autonomous/ai/textagent.py,sha256=1yM1aMvws64PocvG_L-POMDKjxq2JDuGqgc3haUHybU,926
 autonomous/ai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/ai/models/aws.py,sha256=bGDjnGTm350zOqor9IsICzUkBUN2bubGI_ZssQuSXIw,12715
 autonomous/ai/models/deepseek.py,sha256=fkoi-hJp60yFlZ9Cb9PdUrmNSErYltQ5ezkUI75llXc,2734
-autonomous/ai/models/gemini.py,sha256=lqTNcpU7Z1Go2juSEDDJQnRQXET0XERDgZ5ZXTpqoYI,11369
+autonomous/ai/models/gemini.py,sha256=jrTMbh8SAdzzz27elOhs82iwjyutYcy8fvTOSdW-GFQ,14247
 autonomous/ai/models/local.py,sha256=fkoi-hJp60yFlZ9Cb9PdUrmNSErYltQ5ezkUI75llXc,2734
 autonomous/ai/models/openai.py,sha256=2-LttCm6woGklaLbs1H5LjlbfM-7leDwGmC9vksSqW4,13135
 autonomous/apis/version_control/GHCallbacks.py,sha256=AyiUlYfV5JePi11GVyqYyXoj5UTbPKzS-HRRI94rjJo,1069
@@ -57,7 +57,7 @@ autonomous/storage/localstorage.py,sha256=FzrR6O9mMGAZt5dDgqzkeOQVfGRXCygR0kksz2
 autonomous/tasks/__init__.py,sha256=pn7iZ14MhcHUdzcLkfkd4-45wgPP0tXahAz_cFgb_Tg,32
 autonomous/tasks/autotask.py,sha256=aK5iapDhgcAic3F5ZYMAhNKJkOepj8yWwbMizKDzUwQ,4153
 autonomous/utils/markdown.py,sha256=tf8vlHARiQO1X_aGbqlYozzP_TbdiDRT9EEP6aFRQo0,2153
-autonomous_app-0.3.26.dist-info/METADATA,sha256=L5ATWHM6-Znc6E-iK3cr5IYwuJ8d3HhBHb3byk8U9DE,3015
-autonomous_app-0.3.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-autonomous_app-0.3.26.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.26.dist-info/RECORD,,
+autonomous_app-0.3.28.dist-info/METADATA,sha256=HgUXCoGnskzg9FAnSZwfEGXB-5l1Rksw0XTMnGp6bBk,3015
+autonomous_app-0.3.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+autonomous_app-0.3.28.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.3.28.dist-info/RECORD,,