autonomous-app 0.3.39__tar.gz → 0.3.41__tar.gz

{autonomous_app-0.3.39 → autonomous_app-0.3.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autonomous-app
-Version: 0.3.39
+Version: 0.3.41
 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 → autonomous_app-0.3.41}/src/autonomous/__init__.py

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

{autonomous_app-0.3.39 → autonomous_app-0.3.41}/src/autonomous/ai/imageagent.py

@@ -21,8 +21,7 @@ class ImageAgent(BaseAgent):
         self,
         prompt,
         negative_prompt="",
-        aspect_ratio="3:4",
-        image_size="2K",
+        aspect_ratio="2KPortrait",
         files=None,
     ):
         return self.get_client(
@@ -31,6 +30,5 @@ class ImageAgent(BaseAgent):
             prompt,
             aspect_ratio=aspect_ratio,
             negative_prompt=negative_prompt,
-            image_size=image_size,
             files=files,
         )

{autonomous_app-0.3.39 → autonomous_app-0.3.41}/src/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_app-0.3.39 → autonomous_app-0.3.41}/src/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={}):
@@ -257,7 +268,9 @@ class LocalAIModel(AutoModel):
             "4:3": (1152, 896),
             "16:9": (1216, 832),
             "2K": (2048, 1080),
+            "2KPortrait": (1080, 2048),
             "4K": (3840, 2160),
+            "4KPortrait": (2160, 3840),
             "9:16": (832, 1216),
             "3:2": (1216, 832),
             "2:3": (832, 1216),
@@ -266,25 +279,20 @@ class LocalAIModel(AutoModel):
         return resolutions.get(aspect_ratio, (1024, 1024))
 
     def generate_image(
-        self,
-        prompt,
-        negative_prompt="",
-        files=None,
-        aspect_ratio="3:4",
-        image_size="2K",
+        self, prompt, negative_prompt="", files=None, aspect_ratio="2KPortrait"
     ):
-        # 1. CLIP Token Limit Fix (Auto-Summarize)
-        if len(prompt) > 300:
-            log("⚠️ Prompt exceeds CLIP limit. rewriting...", _print=True)
-            summary_instruction = (
-                "Convert the description into a comma-separated Stable Diffusion prompt. "
-                "Keep visual elements and style. Under 50 words."
-            )
-            new_prompt = self.generate_text(
-                message=prompt, additional_instructions=summary_instruction, context={}
-            )
-            if new_prompt and len(new_prompt) > 10:
-                prompt = new_prompt
+        # # 1. CLIP Token Limit Fix (Auto-Summarize)
+        # if len(prompt) > 800:
+        #     log("⚠️ Prompt exceeds CLIP limit. rewriting...", _print=True)
+        #     summary_instruction = (
+        #         "Convert the description into a comma-separated Stable Diffusion prompt. "
+        #         "Keep visual elements and style. Under 50 words."
+        #     )
+        #     new_prompt = self.generate_text(
+        #         message=prompt, additional_instructions=summary_instruction, context={}
+        #     )
+        #     if new_prompt and len(new_prompt) > 10:
+        #         prompt = new_prompt
 
         # 2. Resolution Calculation
         width, height = self._get_dimensions(aspect_ratio)
@@ -301,25 +309,28 @@ class LocalAIModel(AutoModel):
         }
 
         try:
-            # Handle Files (Dict -> List of Tuples for requests)
-            img_files = {}
+            # Handle Files (Corrected List Logic)
+            # requests.post expects a list of tuples for multiple files with same key
+            files_list = []
             if files and isinstance(files, dict):
                 for fn, f_bytes in files.items():
                     if isinstance(f_bytes, bytes):
                         file_obj = io.BytesIO(f_bytes)
                     else:
                         file_obj = f_bytes
-                    img_files["file"] = (fn, file_obj, "image/png")
+                    # Appending to list instead of overwriting dict key
+                    files_list.append(("files", (fn, file_obj, "image/png")))
 
             # Send Request
-            if img_files:
+            if files_list:
                 response = requests.post(
-                    f"{self._media_url}/generate-image", data=data, files=img_files
+                    f"{self._media_url}/generate-image", data=data, files=files_list
                 )
             else:
                 response = requests.post(f"{self._media_url}/generate-image", data=data)
 
             response.raise_for_status()
+            log("==== LocalAI Image Payload ====", data, _print=True)
             return response.content
 
         except Exception as e:

{autonomous_app-0.3.39 → autonomous_app-0.3.41}/src/autonomous_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autonomous-app
-Version: 0.3.39
+Version: 0.3.41
 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