autonomous-app 0.3.32__py3-none-any.whl → 0.3.34__py3-none-any.whl

autonomous/ai/models/local_model.py

@@ -22,16 +22,11 @@ class LocalAIModel(AutoModel):
     description = StringAttr(default="A Local AI Model using Ollama and Media AI.")
 
     # Config
-    _ollama_url = os.environ.get("OLLAMA_API_BASE", "http://ollama:11434/api")
-    _media_url = os.environ.get("MEDIA_API_BASE", "http://media_ai:5005")
+    _ollama_url = os.environ.get("OLLAMA_API_BASE_URL", "INVALID")
+    _media_url = os.environ.get("MEDIA_API_BASE_URL", "INVALID")
     _text_model = "llama3"
     _json_model = "llama3"
 
-    # DB Connections
-    _mongo_client = pymongo.MongoClient("mongodb://db:27017/")
-    _mongo_db = os.getenv("DB_DB", "default")
-    _redis = redis.Redis(host="cachedb", port=6379, decode_responses=True)
-
     VOICES = {
         "Zephyr": ["female"],
         "Puck": ["male"],
@@ -73,132 +68,70 @@ class LocalAIModel(AutoModel):
         }
         return json.dumps(schema, indent=2)
 
-    def get_embedding(self, text):
-        try:
-            res = requests.post(f"{self._media_url}/embeddings", json={"text": text})
-            res.raise_for_status()
-            return res.json()["embedding"]
-        except Exception as e:
-            log(f"Embedding Error: {e}", _print=True)
-            return []
-
-    def build_hybrid_context(self, prompt, focus_object_id=None):
-        cache_key = f"ctx:{focus_object_id}:{len(prompt) // 50}"
-        cached_ctx = self._redis.get(cache_key)
-        if cached_ctx:
-            return cached_ctx
-
-        context_str = ""
-        # --- PART 1: MONGODB ---
-        if focus_object_id:
-            try:
-                oid = (
-                    ObjectId(focus_object_id)
-                    if isinstance(focus_object_id, str)
-                    else focus_object_id
-                )
-                main_obj = self._mongo_db.objects.find_one({"_id": oid})
-
-                if main_obj:
-                    context_str += "### FOCUS OBJECT ###\n" + prompt
-                    ref_ids = main_obj.get("associations", []) or []
-                    if world_id := main_obj.get("world"):
-                        ref_ids.append(world_id)
-                    ref_ids.extend(main_obj.get("stories", []) or [])
-                    ref_ids.extend(main_obj.get("events", []) or [])
-
-                    if ref_ids:
-                        valid_oids = [
-                            ObjectId(rid) if isinstance(rid, str) else rid
-                            for rid in ref_ids
-                        ]
-                        if valid_oids:
-                            associated_objs = self._mongo_db.objects.find(
-                                {"_id": {"$in": valid_oids}}
-                            )
-                            context_str += "\n### ASSOCIATED REFERENCES ###\n"
-                            for obj in associated_objs:
-                                context_str += f"- {obj}\n"
-                    context_str += "\n"
-            except Exception as e:
-                log(f"Mongo Association Error: {e}", _print=True)
-
-        # --- PART 2: REDIS ---
-        if len(prompt) > 10:
-            vector = self.get_embedding(prompt)
-            if vector:
-                try:
-                    q = "*=>[KNN 2 @vector $blob AS score]"
-                    params = {"blob": np.array(vector, dtype=np.float32).tobytes()}
-                    results = self._redis.ft("search_index").search(
-                        q, query_params=params
-                    )
-                    if results.docs:
-                        context_str += "### RELEVANT LORE ###\n"
-                        for doc in results.docs:
-                            context_str += f"- {doc.content}\n"
-                except Exception:
-                    pass
-
-        self._redis.set(cache_key, context_str, ex=120)
-        return context_str
-
-    def generate_json(self, message, function, additional_instructions="", **kwargs):
-        """
-        UPDATED: Uses correct /api/chat payload structure (messages list)
-        """
+    def generate_json(
+        self, message, function, additional_instructions="", uri="", context={}
+    ):
         schema_str = self._convert_tools_to_json_schema(function)
-        focus_pk = kwargs.get("focus_object")
-        world_context = self.build_hybrid_context(message, focus_object_id=focus_pk)
-
+        # 1. Base System Prompt
         full_system_prompt = (
             f"{self.instructions}. {additional_instructions}\n"
             f"You must respond strictly with a valid JSON object matching this schema:\n"
             f"{schema_str}\n"
             f"Do not include markdown formatting or explanations."
-            f"You must strictly adhere to the following context:\n"
-            f"{world_context}"
+            f"You must strictly adhere to the following context:\n {json.dumps(context, indent=2)}"
+            if context
+            else f"Use the following URI for reference: {uri}"
+            if uri
+            else ""
         )
 
-        # FIX: Using 'messages' instead of 'prompt'/'system'
+        # 3. Send to Ollama
         payload = {
-            "model": "llama3",
+            "model": self._json_model,
             "messages": [
                 {"role": "system", "content": full_system_prompt},
                 {"role": "user", "content": message},
             ],
-            "format": "json",
             "stream": False,
             "keep_alive": "24h",
         }
 
         try:
+            print(
+                f"==== {self._ollama_url}:  LocalAI JSON Payload: {json.dumps(payload, indent=2)} ===="
+            )
             response = requests.post(f"{self._ollama_url}/chat", json=payload)
             response.raise_for_status()
 
             # FIX: Chat API returns 'message' -> 'content'
             result_text = response.json().get("message", {}).get("content", "{}")
-            return json.loads(result_text)
+            # If the tool returns a wrapper, unwrap it!
+            result_dict = json.loads(result_text)
+            if "parameters" in result_dict and isinstance(
+                result_dict["parameters"], dict
+            ):
+                params = result_dict.pop("parameters")
+                result_dict.update(params)
+            return result_dict
 
         except Exception as e:
             log(f"==== LocalAI JSON Error: {e} ====", _print=True)
             return {}
 
-    def generate_text(self, message, additional_instructions="", **kwargs):
-        """
-        UPDATED: Uses correct /api/chat payload structure
-        """
-        focus_pk = kwargs.get("focus_object")
-        world_context = self.build_hybrid_context(message, focus_object_id=focus_pk)
-
+    def generate_text(self, message, additional_instructions="", uri="", context={}):
+        # 1. Base System Prompt
         full_system_prompt = (
             f"{self.instructions}. {additional_instructions}\n"
-            f"You must strictly adhere to the following context:\n"
-            f"{world_context}"
+            f"You must strictly adhere to the following context:\n {json.dumps(context, indent=2)}"
+            if context
+            else f"Use the following URI for reference: {uri}"
+            if uri
+            else ""
         )
 
+        # 3. Send to Ollama
         payload = {
-            "model": "llama3",
+            "model": self._text_model,
             "messages": [
                 {"role": "system", "content": full_system_prompt},
                 {"role": "user", "content": message},
@@ -216,7 +149,7 @@ class LocalAIModel(AutoModel):
             log(f"==== LocalAI Text Error: {e} ====", _print=True)
             return "Error generating text."
 
-    def summarize_text(self, text, primer="", **kwargs):
+    def summarize_text(self, text, primer=""):
         primer = primer or "Summarize the following text concisely."
         max_chars = 12000
         chunks = [text[i : i + max_chars] for i in range(0, len(text), max_chars)]
@@ -238,7 +171,7 @@ class LocalAIModel(AutoModel):
 
         return full_summary
 
-    def generate_audio_text(self, audio_file, prompt="", **kwargs):
+    def generate_transcription(self, audio_file, prompt=""):
         try:
             if isinstance(audio_file, bytes):
                 f_obj = io.BytesIO(audio_file)
@@ -252,7 +185,7 @@ class LocalAIModel(AutoModel):
             log(f"STT Error: {e}", _print=True)
             return ""
 
-    def generate_audio(self, prompt, voice=None, **kwargs):
+    def generate_audio(self, prompt, voice=None):
         voice = voice or random.choice(list(self.VOICES.keys()))
         try:
             payload = {"text": prompt, "voice": voice}
@@ -267,21 +200,26 @@ class LocalAIModel(AutoModel):
             log(f"TTS Error: {e}", _print=True)
             return None
 
-    def generate_image(self, prompt, negative_prompt="", **kwargs):
+    def generate_image(
+        self,
+        prompt,
+        negative_prompt="",
+        files=None,
+        aspect_ratio="3:4",
+        image_size="2K",
+    ):
         try:
             data = {"prompt": prompt, "negative_prompt": negative_prompt}
-            files = {}
-            if kwargs.get("files"):
-                for fn, f_bytes in kwargs.get("files").items():
+            img_files = {}
+            if files:
+                for fn, f_bytes in files.items():
                     if isinstance(f_bytes, bytes):
                         file_obj = io.BytesIO(f_bytes)
                     else:
                         file_obj = f_bytes
-                    files["file"] = (fn, file_obj, "image/png")
-                    break
-            if files:
+                    img_files["file"] = (fn, file_obj, "image/png")
                 response = requests.post(
-                    f"{self._media_url}/generate-image", data=data, files=files
+                    f"{self._media_url}/generate-image", data=data, files=img_files
                 )
             else:
                 response = requests.post(f"{self._media_url}/generate-image", data=data)

autonomous/ai/textagent.py

@@ -1,13 +1,15 @@
+import os
+
 from autonomous import log
 from autonomous.ai.baseagent import BaseAgent
-from autonomous.model.autoattr import ReferenceAttr, StringAttr
-from autonomous.model.automodel import AutoModel
-
-from .models.openai import OpenAIModel
+from autonomous.model.autoattr import StringAttr
 
 
 class TextAgent(BaseAgent):
     name = StringAttr(default="textagent")
+
+    # Force this agent to use Gemini
+    provider = StringAttr(default="gemini")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating text according to the given requirements."
     )
@@ -15,10 +17,12 @@ 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="", **kwargs):
-        return self.get_client().summarize_text(text, primer, **kwargs)
+    def summarize_text(self, text, primer=""):
+        return self.get_client(
+            os.environ.get("SUMMARY_AI_AGENT", self.provider)
+        ).summarize_text(text, primer=primer)
 
-    def generate(self, messages, additional_instructions="", **kwargs):
-        return self.get_client().generate_text(
-            messages, additional_instructions, **kwargs
-        )
+    def generate(self, message, additional_instructions="", uri="", context=""):
+        return self.get_client(
+            os.environ.get("TEXT_AI_AGENT", self.provider)
+        ).generate_text(message, additional_instructions, uri=uri, context=context)

autonomous/db/db_sync.py

@@ -9,18 +9,19 @@ import pymongo
 import redis
 import requests
 
+from autonomous.taskrunner.autotasks import AutoTasks, TaskPriority
+
 # CONFIGURATION
 db_host = os.getenv("DB_HOST", "db")
 db_port = os.getenv("DB_PORT", 27017)
 password = urllib.parse.quote_plus(str(os.getenv("DB_PASSWORD")))
 username = urllib.parse.quote_plus(str(os.getenv("DB_USERNAME")))
-MEDIA_URL = "http://media_ai_internal:5005"
-REDIS_HOST = os.getenv("REDIS_HOST", "cachedb")
 MONGO_URI = f"mongodb://{username}:{password}@{db_host}:{db_port}/?authSource=admin"
-
+MEDIA_URL = os.getenv("MEDIA_API_BASE_URL", "http://media_ai:5005")
+REDIS_HOST = os.getenv("REDIS_HOST", "cachedb")
+REDIS_PORT = int(os.getenv("REDIS_PORT", 6379))
 # DB SETUP
-r = redis.Redis(host=REDIS_HOST, port=6379, decode_responses=True)
-
+r = redis.Redis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)
 mongo = pymongo.MongoClient(MONGO_URI)
 db = mongo[os.getenv("DB_DB")]
 # connect(host=f"mongodb://{username}:{password}@{host}:{port}/{dbname}?authSource=admin")
@@ -111,8 +112,6 @@ def request_indexing(object_id, collection_name):
     MUST BE FAST. NO SLEEPING HERE.
     """
     print("Requesting Indexing...")
-    # Import your Queue Wrapper
-    from autonomous.tasks.autotask import AutoTasks
 
     # Initialize the Task Runner
     task_runner = AutoTasks()
@@ -133,7 +132,7 @@ def request_indexing(object_id, collection_name):
             object_id=str_id,
             collection_name=collection_name,
             token=current_token,
-            priority=TaskPriority.LOW
+            priority=TaskPriority.LOW,
         )
         return True
     except Exception as e:

autonomous/taskrunner/__init__.py

@@ -0,0 +1 @@
+from .autotasks import AutoTasks, TaskPriority

{autonomous_app-0.3.32.dist-info → autonomous_app-0.3.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autonomous-app
-Version: 0.3.32
+Version: 0.3.34
 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.32.dist-info → autonomous_app-0.3.34.dist-info}/RECORD

@@ -1,18 +1,15 @@
-autonomous/__init__.py,sha256=o0OBgjtEx3l3_EWwzavqnwIF8TyTqfqpMo9MyaB2SOY,95
+autonomous/__init__.py,sha256=vMMIVR0EbFnjlGGd4iXpgSCJ6zFYv6GjJenp8hJ1aQA,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=d6OYOk8LGHlDPNcqDmEX2PpWeerl-bIBL73IZ_T78oU,880
-autonomous/ai/imageagent.py,sha256=bIOrgg_CM-rgfyLme7V9vPqP8WKVMIAVoB2E9lLtIRk,521
-autonomous/ai/jsonagent.py,sha256=VQGhK0RFo0H_eVH9dAyf4_lp-RIpdgH988joLoKjm94,1065
-autonomous/ai/textagent.py,sha256=1yM1aMvws64PocvG_L-POMDKjxq2JDuGqgc3haUHybU,926
+autonomous/ai/audioagent.py,sha256=HEXhqMTNaVZdpok0frhvHhSFQ1q1od-HTeuDpeXdzag,1131
+autonomous/ai/baseagent.py,sha256=icOPygr1NdH64u1ZYbwHHywYIY1ZtaLY9HtfNmUbx4k,4702
+autonomous/ai/imageagent.py,sha256=yN-Qv1QSBsFvw0fVXLVqdh_3cveRETJGILgeBI3GRoc,955
+autonomous/ai/jsonagent.py,sha256=OZeQthp5WOSCV6pmbPfPQRjARkvbK5lk7A0QTEPUrUk,1228
+autonomous/ai/textagent.py,sha256=0y2Hvb9pup1OnsA51hGPcD8yllZOZtztDLQvCNYABaw,1043
 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=jrTMbh8SAdzzz27elOhs82iwjyutYcy8fvTOSdW-GFQ,14247
-autonomous/ai/models/local_model.py,sha256=jWLTHBLb-6GtrMeDNctUTucX7HFZfla5NsfGfFsNPJ0,11297
-autonomous/ai/models/openai.py,sha256=2-LttCm6woGklaLbs1H5LjlbfM-7leDwGmC9vksSqW4,13135
+autonomous/ai/models/gemini.py,sha256=eu48gywNFpUFaqBt-4MFX2oRM5IED9rUTgtavM_HRG0,14468
+autonomous/ai/models/local_model.py,sha256=VXLtEFM3QrL6wdVxORF0ZHP1gl3_FHiEC3MRgv5WNQA,8526
 autonomous/apis/version_control/GHCallbacks.py,sha256=AyiUlYfV5JePi11GVyqYyXoj5UTbPKzS-HRRI94rjJo,1069
 autonomous/apis/version_control/GHOrganization.py,sha256=mi2livdsGurKiifbvuLwiFbdDzL77IlEfhwEa-tG77I,1155
 autonomous/apis/version_control/GHRepo.py,sha256=hTFHMkxSbSlVELfh8S6mq6ijkIKPRQO-Q5775ZjRKD4,4622
@@ -27,7 +24,7 @@ autonomous/db/__init__.py,sha256=2mNynmYV0I_J3-W4Aw1cojAQrHf4aHZT1Ow9xUdmM18,115
 autonomous/db/common.py,sha256=BUN2x_XuQBRFcq54TGPx4yLMLJdgytdbIt07QWr4CSM,2551
 autonomous/db/connection.py,sha256=j_-eMre4ade9Y8GejJcMbQQiSEimL4j2vIQxaXViKxI,17754
 autonomous/db/context_managers.py,sha256=_nH2ajCL8Xy90AuB2rKaryR4iF8Q8ksU3Nei_mZj-DE,9918
-autonomous/db/db_sync.py,sha256=o_7Fw-6eL-Wco-ktSFneq2CRQNuOneO1f4YzgOa4Wcs,4346
+autonomous/db/db_sync.py,sha256=Njs589pJ2QFuxQkr85O_U1tDCNezqupJ945Ubpgqmbc,4408
 autonomous/db/dereference.py,sha256=EgbpPCXtDZqD_ZuY1Wd4o3ltRy8qEo3C5yRh5_c9fLE,12776
 autonomous/db/document.py,sha256=oZKdTaoqwv9fCHiv450rIxgINASQF3J9FzIsUOUXHhw,44428
 autonomous/db/errors.py,sha256=_QeCotid1kmr7_W0QyH6NUrwwYN9eced_yyyiop0Xlw,4108
@@ -54,11 +51,11 @@ autonomous/model/automodel.py,sha256=9QE9_m6oW7kgZc-eIzzRA9Ib-RkX4fpmHRjl7ns_pwg
 autonomous/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/storage/imagestorage.py,sha256=SmBjBNBlP1ZEjxdOnGVzCHZhbEhMKTUQC2TbpWbejDE,6168
 autonomous/storage/localstorage.py,sha256=FzrR6O9mMGAZt5dDgqzkeOQVfGRXCygR0kksz2MPpwE,2286
-autonomous/tasks/__init__.py,sha256=pn7iZ14MhcHUdzcLkfkd4-45wgPP0tXahAz_cFgb_Tg,32
-autonomous/tasks/autotask.py,sha256=2zRaqHYqfdlgC_BQm6B6D2svN1ukyWeJJHwweZFHVoo,2616
-autonomous/tasks/task_router.py,sha256=W09HtRUuhwlnGxM5w4l6Hzw6mfS6L4ljWiMzD3ZVFeU,601
+autonomous/taskrunner/__init__.py,sha256=ughX-QfWBas5W3aB2SiF887SWJ3Dzc2X43Yxtmpl43k,47
+autonomous/taskrunner/autotasks.py,sha256=2zRaqHYqfdlgC_BQm6B6D2svN1ukyWeJJHwweZFHVoo,2616
+autonomous/taskrunner/task_router.py,sha256=W09HtRUuhwlnGxM5w4l6Hzw6mfS6L4ljWiMzD3ZVFeU,601
 autonomous/utils/markdown.py,sha256=tf8vlHARiQO1X_aGbqlYozzP_TbdiDRT9EEP6aFRQo0,2153
-autonomous_app-0.3.32.dist-info/METADATA,sha256=d3w42OsH0w0u6PpAY8ADR1SJSeLsee0f-UbbfieVWfE,3024
-autonomous_app-0.3.32.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-autonomous_app-0.3.32.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.32.dist-info/RECORD,,
+autonomous_app-0.3.34.dist-info/METADATA,sha256=Ct1XM2RK9Z2yCNTDGtRKpPxqD1u_Srtjq_JO1YcWDP4,3024
+autonomous_app-0.3.34.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+autonomous_app-0.3.34.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.3.34.dist-info/RECORD,,