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

autonomous/__init__.py

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

autonomous/ai/models/local_model.py

@@ -2,13 +2,8 @@ import io
 import json
 import os
 import random
-import re
 
-import numpy as np
-import pymongo
-import redis
 import requests
-from bson.objectid import ObjectId
 from pydub import AudioSegment
 
 from autonomous import log
@@ -44,17 +39,39 @@ class LocalAIModel(AutoModel):
         return json.dumps(schema, indent=2)
 
     def _clean_json_response(self, text):
-        """Helper to strip markdown artifacts from JSON responses."""
+        """
+        Robust cleaner for Llama 3 outputs.
+        It handles markdown blocks, chatter before/after, and malformed endings.
+        """
         text = text.strip()
-        # Remove ```json ... ``` or just ``` ... ``` wrapper
-        if text.startswith("```"):
-            # Find the first newline to skip the language tag (e.g., "json")
-            first_newline = text.find("\n")
-            if first_newline != -1:
-                text = text[first_newline + 1 :]
-            # Remove the closing backticks
-            if text.endswith("```"):
-                text = text[:-3]
+
+        # 1. Strip Markdown Code Blocks (```json ... ```)
+        if "```" in text:
+            import re
+
+            # Regex to capture content inside ```json ... ``` or just ``` ... ```
+            # flags=re.DOTALL allows . to match newlines
+            pattern = r"```(?:json)?\s*(\{.*?\})\s*```"
+            match = re.search(pattern, text, re.DOTALL)
+            if match:
+                text = match.group(1)
+            else:
+                # Fallback: simple finding if regex fails due to weird chars
+                start = text.find("```")
+                end = text.rfind("```")
+                # Adjust start to skip the "json" part if present
+                first_newline = text.find("\n", start)
+                if first_newline != -1 and first_newline < end:
+                    text = text[first_newline:end]
+
+        # 2. Heuristic extraction: Find the first '{' and the last '}'
+        # This fixes cases where Llama says "Here is the JSON: { ... }"
+        start_idx = text.find("{")
+        end_idx = text.rfind("}")
+
+        if start_idx != -1 and end_idx != -1:
+            text = text[start_idx : end_idx + 1]
+
         return text.strip()
 
     def generate_json(
@@ -62,51 +79,62 @@ class LocalAIModel(AutoModel):
     ):
         schema_str = self._convert_tools_to_json_schema(function)
 
-        # 1. Base System Prompt with Context Anchoring
+        # 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: Do not include markdown formatting (like ```json), introductions, or explanations.\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"
         )
 
         if context:
             full_system_prompt += (
                 f"\n\n### GROUND TRUTH CONTEXT ###\n"
-                f"You must strictly adhere to the following context. "
-                f"If this context contradicts your internal knowledge (e.g., physics, facts), "
-                f"YOU MUST FOLLOW THE CONTEXT.\n"
+                f"Adhere strictly to this context:\n"
                 f"{json.dumps(context, indent=2)}"
             )
         elif uri:
             full_system_prompt += f"Use the following URI for reference: {uri}"
 
-        # 3. Send to Ollama with JSON Mode
+        # 3. Payload with INCREASED CONTEXT and LOWER TEMPERATURE
         payload = {
             "model": self._json_model,
             "messages": [
                 {"role": "system", "content": full_system_prompt},
                 {"role": "user", "content": message},
             ],
-            "format": "json",  # <--- CRITICAL: Forces valid JSON output
+            "format": "json",
             "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
+            },
         }
 
+        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 up potential markdown artifacts
+            # Clean
             clean_text = self._clean_json_response(result_text)
 
             # Parse
             result_dict = json.loads(clean_text)
 
-            # Unwrap if the model nested it inside "parameters" (common Llama quirk)
+            # Unwrap
             if "parameters" in result_dict and isinstance(
                 result_dict["parameters"], dict
             ):
@@ -116,8 +144,16 @@ 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)
-            raise e
+            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={}):
         # 1. Base System Prompt
@@ -208,6 +244,27 @@ class LocalAIModel(AutoModel):
             log(f"TTS Error: {e}", _print=True)
             return None
 
+    # ... inside LocalAIModel class ...
+
+    def _get_dimensions(self, aspect_ratio):
+        """
+        Maps abstract aspect ratios to optimal SDXL resolutions.
+        SDXL performs best at ~1024x1024 total pixels.
+        """
+        resolutions = {
+            "1:1": (1024, 1024),
+            "3:4": (896, 1152),
+            "4:3": (1152, 896),
+            "16:9": (1216, 832),
+            "2K": (2048, 1080),
+            "4K": (3840, 2160),
+            "9:16": (832, 1216),
+            "3:2": (1216, 832),
+            "2:3": (832, 1216),
+        }
+        # Default to 1:1 (1024x1024) if unknown
+        return resolutions.get(aspect_ratio, (1024, 1024))
+
     def generate_image(
         self,
         prompt,
@@ -216,32 +273,55 @@ class LocalAIModel(AutoModel):
         aspect_ratio="3:4",
         image_size="2K",
     ):
+        # 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
+
+        # 2. Resolution Calculation
+        width, height = self._get_dimensions(aspect_ratio)
+
+        # 3. Construct Payload
+        # We send both the abstract params (for logging/metadata)
+        # and the concrete pixels (for the engine).
+        data = {
+            "prompt": prompt,
+            "negative_prompt": negative_prompt,
+            "aspect_ratio": aspect_ratio,
+            "width": width,  # <--- Calculated Pixel Width
+            "height": height,  # <--- Calculated Pixel Height
+        }
+
         try:
-            data = {"prompt": prompt, "negative_prompt": negative_prompt}
+            # Handle Files (Dict -> List of Tuples for requests)
             img_files = {}
-            if files:
+            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")
+
+            # Send Request
+            if img_files:
                 response = requests.post(
                     f"{self._media_url}/generate-image", data=data, files=img_files
                 )
             else:
                 response = requests.post(f"{self._media_url}/generate-image", data=data)
+
             response.raise_for_status()
             return response.content
+
         except Exception as e:
             log(f"Image Gen Error: {e}", _print=True)
             return None
-
-    def list_voices(self, filters=[]):
-        if not filters:
-            return list(self.VOICES.keys())
-        voices = []
-        for voice, attribs in self.VOICES.items():
-            if any(f.lower() in attribs for f in filters):
-                voices.append(voice)
-        return voices

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

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

@@ -1,4 +1,4 @@
-autonomous/__init__.py,sha256=Y2FQQrtDQSpcFBuNs_0bheHgw0K4d8HBaU-hbKw1cu4,95
+autonomous/__init__.py,sha256=q_VjpmLkH8iiS1RkA2Lz2bc4RrMxOIWaOGNgqo7YkTE,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
@@ -9,7 +9,7 @@ autonomous/ai/jsonagent.py,sha256=OZeQthp5WOSCV6pmbPfPQRjARkvbK5lk7A0QTEPUrUk,12
 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=m_rEs1BtBhzbmNTdYnyxxOiRNkoBaapk3dwl1QPtB-I,9038
+autonomous/ai/models/local_model.py,sha256=JbU_BC-7qqgF8hsuk-7S3l2CsxUFc-wsL1a8ID2AdNY,12068
 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.37.dist-info/METADATA,sha256=Y3_569_vKq8_ZOmsy2zHYbq0ynllStrQKQaZ-ZFDufg,3024
-autonomous_app-0.3.37.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-autonomous_app-0.3.37.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.37.dist-info/RECORD,,
+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,,