autonomous-app 0.3.39__py3-none-any.whl → 0.3.40__py3-none-any.whl

autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.39"
+__version__ = "0.3.40"
 
 from dotenv import load_dotenv
 

autonomous/ai/jsonagent.py

@@ -18,13 +18,11 @@ class JSONAgent(BaseAgent):
         default="A helpful AI assistant trained to assist with generating JSON formatted data."
     )
 
-    def generate(
-        self, message, function, additional_instructions="", uri="", context=""
-    ):
+    def generate(self, message, function, system_prompt="", uri="", context=""):
         result = self.get_client(
             os.environ.get("JSON_AI_AGENT", self.provider)
         ).generate_json(
-            message, function, additional_instructions, uri=uri, context=context
+            message, function, system_prompt=system_prompt, uri=uri, context=context
         )
         if isinstance(result, str):
             try:

autonomous/ai/models/local_model.py

@@ -75,32 +75,48 @@ class LocalAIModel(AutoModel):
         return text.strip()
 
     def generate_json(
-        self, message, function, additional_instructions="", uri="", context={}
+        self,
+        message,
+        function=None,
+        system_prompt=None,
+        uri="",
+        context={},
     ):
-        schema_str = self._convert_tools_to_json_schema(function)
-
-        # 1. Improved System Prompt
-        # We explicitly warn about nested quotes, which is the #1 killer of complex JSON
-        full_system_prompt = (
-            f"{self.instructions}. {additional_instructions}\n"
-            f"You are a strict JSON generator. Output ONLY a valid JSON object matching this schema:\n"
-            f"{schema_str}\n"
-            f"IMPORTANT RULES:\n"
-            f"1. Do not include markdown formatting or explanations.\n"
-            f"2. DOUBLE CHECK nested quotes inside strings. Escape them properly.\n"
-            f"3. Ensure all arrays and objects are closed.\n"
-        )
+        # 1. Determine System Prompt Strategy
+        if system_prompt:
+            # STRATEGY A: Custom System Prompt (Highest Priority)
+            full_system_prompt = system_prompt
+        elif function:
+            # STRATEGY B: Strict Schema Enforcement (Default)
+            schema_str = self._convert_tools_to_json_schema(function)
+
+            full_system_prompt = (
+                f"{self.instructions}.\n"
+                f"You are a strict JSON generator. Output ONLY a valid JSON object matching this schema:\n"
+                f"{schema_str}\n"
+                f"IMPORTANT RULES:\n"
+                f"1. Do not include markdown formatting or explanations.\n"
+                f"2. DOUBLE CHECK nested quotes inside strings. Escape them properly.\n"
+                f"3. Ensure all arrays and objects are closed.\n"
+            )
+        else:
+            # STRATEGY C: Fallback
+            full_system_prompt = (
+                f"{self.instructions}.\n"
+                f"You are a strict JSON generator. Output valid JSON."
+            )
 
+        # 2. Add Context (Applies to all strategies)
         if context:
             full_system_prompt += (
                 f"\n\n### GROUND TRUTH CONTEXT ###\n"
                 f"Adhere strictly to this context:\n"
                 f"{json.dumps(context, indent=2)}"
             )
-        elif uri:
+        if uri:
             full_system_prompt += f"Use the following URI for reference: {uri}"
 
-        # 3. Payload with INCREASED CONTEXT and LOWER TEMPERATURE
+        # 3. Payload Construction
         payload = {
             "model": self._json_model,
             "messages": [
@@ -111,30 +127,28 @@ class LocalAIModel(AutoModel):
             "stream": False,
             "keep_alive": "24h",
             "options": {
-                "num_ctx": 8192,  # <--- Prevents cutoff on large schemas
-                "temperature": 0.8,  # <--- INCREASED from 0.2 to 0.8 for creativity
-                "top_p": 0.9,  # <--- Adds nuance to word choice
-                "repeat_penalty": 1.1,  # <--- Prevents it from saying "rust" 5 times
+                "num_ctx": 8192,
+                "temperature": 0.8,  # Keep high for creativity
+                "top_p": 0.9,
+                "repeat_penalty": 1.1,
             },
         }
 
         log("==== LocalAI JSON Payload ====", payload, _print=True)
+
         result_text = ""
         try:
-            # print(f"==== {self._ollama_url}: LocalAI JSON Payload ====")
             response = requests.post(f"{self._ollama_url}/chat", json=payload)
             log(response)
             response.raise_for_status()
 
             result_text = response.json().get("message", {}).get("content", "{}")
 
-            # Clean
+            # Clean & Parse
             clean_text = self._clean_json_response(result_text)
-
-            # Parse
             result_dict = json.loads(clean_text)
 
-            # Unwrap
+            # Unwrap (Handle cases where model wraps in 'parameters' key)
             if "parameters" in result_dict and isinstance(
                 result_dict["parameters"], dict
             ):
@@ -144,15 +158,12 @@ class LocalAIModel(AutoModel):
             return result_dict
 
         except Exception as e:
-            # If it fails, print the RAW text so you can see WHERE it broke.
             log(f"==== LocalAI JSON Error: {e} ====", _print=True)
             if result_text:
                 log(
                     f"--- FAILED RAW OUTPUT ---\n{result_text}\n-----------------------",
                     _print=True,
                 )
-
-            # Returning empty prevents the whole app from dying on one bad generation.
             return {}
 
     def generate_text(self, message, additional_instructions="", uri="", context={}):

{autonomous_app-0.3.39.dist-info → autonomous_app-0.3.40.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
-autonomous/__init__.py,sha256=q_VjpmLkH8iiS1RkA2Lz2bc4RrMxOIWaOGNgqo7YkTE,95
+autonomous/__init__.py,sha256=wctZMLFlIhnHGpW9CgIwEUymYQdUxRVESGOAinyM10M,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=aZ25eEdze8S060-a4S0k319tgyl2aDTUa8dJu07mXn0,1092
 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/jsonagent.py,sha256=DNfZHMVCfc5nrkWJm2OebTYDkBwm_ZCeVWGIFGjB_Cg,1208
 autonomous/ai/textagent.py,sha256=0y2Hvb9pup1OnsA51hGPcD8yllZOZtztDLQvCNYABaw,1043
 autonomous/ai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/ai/models/gemini.py,sha256=eu48gywNFpUFaqBt-4MFX2oRM5IED9rUTgtavM_HRG0,14468
-autonomous/ai/models/local_model.py,sha256=JbU_BC-7qqgF8hsuk-7S3l2CsxUFc-wsL1a8ID2AdNY,12068
+autonomous/ai/models/local_model.py,sha256=OagrbF6WkWKmmGf1oBmdAt4VBRLzvk6Gj-xoV9HdwLs,12152
 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
@@ -55,7 +55,7 @@ autonomous/taskrunner/__init__.py,sha256=ughX-QfWBas5W3aB2SiF887SWJ3Dzc2X43Yxtmp
 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.39.dist-info/METADATA,sha256=9rRFFf_IvOxHp4PHGlYyac6GbeVVYViT5614cANQvwE,3024
-autonomous_app-0.3.39.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-autonomous_app-0.3.39.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.39.dist-info/RECORD,,
+autonomous_app-0.3.40.dist-info/METADATA,sha256=kT_NvMRU_Mac8iEZ49Lo2YkETd5y9abW5A24e_1JjWE,3024
+autonomous_app-0.3.40.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+autonomous_app-0.3.40.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.3.40.dist-info/RECORD,,