autonomous-app 0.3.48__py3-none-any.whl → 0.3.50__py3-none-any.whl

autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.48"
+__version__ = "0.3.50"
 
 from dotenv import load_dotenv
 

autonomous/ai/audioagent.py

@@ -8,7 +8,7 @@ from autonomous.model.autoattr import StringAttr
 class AudioAgent(BaseAgent):
     name = StringAttr(default="audioagent")
 
-    provider = StringAttr(default="gemini")
+    provider = StringAttr(default="local")
 
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating audio files."

autonomous/ai/models/local_model.py

@@ -4,6 +4,7 @@ import os
 import random
 
 import requests
+from PIL import Image
 from pydub import AudioSegment
 
 from autonomous import log
@@ -23,10 +24,36 @@ class LocalAIModel(AutoModel):
     _text_model = "llama3"
     _json_model = "llama3"
 
-    # ... VOICES dictionary ... (Keep existing voices)
     VOICES = {
         "Zephyr": ["female"],
-        # ... (keep all your voices) ...
+        "Puck": ["male"],
+        "Charon": ["male"],
+        "Kore": ["female"],
+        "Fenrir": ["non-binary"],
+        "Leda": ["female"],
+        "Orus": ["male"],
+        "Aoede": ["female"],
+        "Callirhoe": ["female"],
+        "Autonoe": ["female"],
+        "Enceladus": ["male"],
+        "Iapetus": ["male"],
+        "Umbriel": ["male"],
+        "Algieba": ["male"],
+        "Despina": ["female"],
+        "Erinome": ["female"],
+        "Algenib": ["male"],
+        "Rasalgethi": ["non-binary"],
+        "Laomedeia": ["female"],
+        "Achernar": ["female"],
+        "Alnilam": ["male"],
+        "Schedar": ["male"],
+        "Gacrux": ["female"],
+        "Pulcherrima": ["non-binary"],
+        "Achird": ["male"],
+        "Zubenelgenubi": ["male"],
+        "Vindemiatrix": ["female"],
+        "Sadachbia": ["male"],
+        "Sadaltager": ["male"],
         "Sulafar": ["female"],
     }
 
@@ -119,7 +146,7 @@ class LocalAIModel(AutoModel):
             },
         }
 
-        # log("==== LocalAI JSON Payload ====", payload, _print=True)
+        log("==== LocalAI JSON Payload ====", payload, _print=True)
 
         result_text = ""
         try:
@@ -139,7 +166,7 @@ class LocalAIModel(AutoModel):
             ):
                 params = result_dict.pop("parameters")
                 result_dict.update(params)
-
+            log("==== LocalAI JSON Result ====", result_dict, _print=True)
             return result_dict
 
         except Exception as e:
@@ -218,11 +245,21 @@ class LocalAIModel(AutoModel):
             files = {"file": ("audio.mp3", f_obj, "audio/mpeg")}
             response = requests.post(f"{self._media_url}/transcribe", files=files)
             response.raise_for_status()
+            log(f"Transcription response: {response.json()}", _print=True)
             return response.json().get("text", "")
         except Exception as e:
             log(f"STT Error: {e}", _print=True)
             return ""
 
+    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
+
     def generate_audio(
         self,
         prompt,
@@ -242,64 +279,60 @@ 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.
+        Returns a tuple: ((base_w, base_h), (target_w, target_h))
+
+        1. base_*: The resolution sent to SDXL (approx 1024x1024).
+        2. target_*: The final resolution to resize/upscale to.
         """
-        resolutions = {
+        # Standard SDXL buckets (approx 1MP)
+        # We use these for the initial generation to ensure good composition.
+        sdxl_base = {
             "1:1": (1024, 1024),
-            "3:4": (896, 1152),
-            "4:3": (1152, 896),
-            "16:9": (1216, 832),
-            "2K": (2048, 1080),
-            "2KPortrait": (1080, 2048),
-            "Portrait": (1080, 2048),
-            "4K": (3840, 2160),
-            "Landscape": (3840, 2160),
-            "4KPortrait": (2160, 3840),
-            "9:16": (832, 1216),
-            "3:2": (1216, 832),
-            "2:3": (832, 1216),
+            "Portrait": (896, 1152),  # 3:4
+            "Landscape": (1216, 832),  # 3:2 or 16:9 approx
         }
-        # Default to 1:1 (1024x1024) if unknown
-        return resolutions.get(aspect_ratio, (1024, 1024))
+
+        # The Logic: Define the target, map it to the closest SDXL base
+        # Format: "Key": ((Base_W, Base_H), (Target_W, Target_H))
+        resolutions = {
+            # Standard
+            "1:1": ((832, 832), (1024, 1024)),
+            "3:4": ((832, 1152), (1664, 2304)),
+            "4:3": ((1152, 832), (2304, 1664)),
+            # High Res (The logic changes here)
+            "16:9": ((1216, 832), (2048, 1152)),
+            "9:16": ((832, 1216), (1152, 2048)),
+            # 2K Tier
+            "2K": ((1216, 832), (2048, 1152)),  # Base is 1216x832 -> Upscale to 2K
+            "2KPortrait": ((832, 1216), (1152, 2048)),
+            # 4K Tier (The generated image will be upscaled ~3x)
+            "4K": ((1216, 832), (3840, 2160)),
+            "4KPortrait": ((832, 1216), (2160, 3840)),
+        }
+
+        # Default to 1:1 if unknown
+        return resolutions.get(aspect_ratio, ((832, 832), (1024, 1024)))
 
     def generate_image(
         self, prompt, negative_prompt="", files=None, aspect_ratio="2KPortrait"
     ):
-        # # 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)
-
-        # 3. Construct Payload
-        # We send both the abstract params (for logging/metadata)
-        # and the concrete pixels (for the engine).
+        # 1. Resolution Calculation
+        (base_w, base_h), (target_w, target_h) = self._get_dimensions(aspect_ratio)
+
+        # 2. Construct Base Generation Payload
+        # We tell the AI to generate the smaller, stable size first.
         data = {
             "prompt": prompt,
             "negative_prompt": negative_prompt,
             "aspect_ratio": aspect_ratio,
-            "width": width,  # <--- Calculated Pixel Width
-            "height": height,  # <--- Calculated Pixel Height
+            "width": base_w,
+            "height": base_h,
         }
 
         try:
-            # Handle Files (Corrected List Logic)
-            # requests.post expects a list of tuples for multiple files with same key
+            # Handle Input Files (for Img2Img)
             files_list = []
             if files and isinstance(files, dict):
                 for fn, f_bytes in files.items():
@@ -307,20 +340,45 @@ class LocalAIModel(AutoModel):
                         file_obj = io.BytesIO(f_bytes)
                     else:
                         file_obj = f_bytes
-                    # Appending to list instead of overwriting dict key
                     files_list.append(("files", (fn, file_obj, "image/png")))
 
-            # Send Request
+            # 3. Step 1: Generate Base Image
+            url = f"{self._media_url}/generate-image"
             if files_list:
-                response = requests.post(
-                    f"{self._media_url}/generate-image", data=data, files=files_list
-                )
+                response = requests.post(url, data=data, files=files_list)
             else:
-                response = requests.post(f"{self._media_url}/generate-image", data=data)
+                response = requests.post(url, data=data)
 
             response.raise_for_status()
-            log("==== LocalAI Image Payload ====", data, _print=True)
-            return response.content
+            image_content = response.content
+
+            # 4. Step 2: Upscale (If necessary)
+            if (base_w, base_h) != (target_w, target_h):
+                log(
+                    f"Requesting AI Upscale: {base_w}x{base_h} -> {target_w}x{target_h}...",
+                    _print=True,
+                )
+
+                # Prepare payload for the /upscale route
+                upscale_data = {
+                    "prompt": prompt,  # Reuse prompt to guide texture generation
+                    "width": target_w,  # Explicitly tell server the target size
+                    "height": target_h,
+                }
+
+                # Send the image we just generated back to the server as a file
+                upscale_files = {
+                    "file": ("generated.png", io.BytesIO(image_content), "image/png")
+                }
+
+                upscale_response = requests.post(
+                    f"{self._media_url}/upscale", data=upscale_data, files=upscale_files
+                )
+                upscale_response.raise_for_status()
+                image_content = upscale_response.content
+
+            log("==== LocalAI Image Generation Complete ====", data, _print=True)
+            return image_content
 
         except Exception as e:
             log(f"Image Gen Error: {e}", _print=True)

autonomous/ai/models/mock_model.py

@@ -38,15 +38,7 @@ class MockAIModel(AutoModel):
         log(f"⚡ [MOCK] Generating JSON for prompt: {message[:50]}...", _print=True)
 
         # 1. Default Mock Object
-        mock_response = {
-            "name": "The Mockingbird Tavern",
-            "description": "A glitchy, holographic tavern that only exists in offline mode. The ale tastes like static.",
-            "backstory": "Created by a developer at 30,000 feet, this tavern serves as a placeholder for real content. It was built on the ruins of a NullReferenceException.",
-            "appearance": "Wireframe walls with textures that haven't loaded yet.",
-            "secrets": "If you look closely at the bartender, you can see he is just a looping IF statement.",
-            "tags": ["offline", "dev-mode", "test"],
-            "type": "Location",
-        }
+        mock_response = {}
 
         # 2. Heuristic: If the user provided a context with 'name', use it.
         # This makes the mock feel slightly responsive.

autonomous/taskrunner/autotasks.py

@@ -1,15 +1,18 @@
 import os
 from enum import Enum
+
 from redis import Redis
 from rq import Queue
 from rq.job import Job
 
+
 # 1. Define Priorities clearly
 class TaskPriority(Enum):
     HIGH = "high"
     DEFAULT = "default"
     LOW = "low"
 
+
 class AutoTask:
     def __init__(self, job):
         self.job = job
@@ -28,9 +31,10 @@ class AutoTask:
             "id": self.id,
             "return_value": self.job.result,
             "status": self.status,
-            "error": self.job.exc_info
+            "error": self.job.exc_info,
         }
 
+
 class AutoTasks:
     _connection = None
     # We remove the single 'queue' class attribute because we now have multiple
@@ -76,12 +80,7 @@ class AutoTasks:
         q = self._get_queue(queue_name)
 
         # 4. Enqueue
-        job = q.enqueue(
-            func,
-            args=args,
-            kwargs=kwargs,
-            job_timeout=job_timeout
-        )
+        job = q.enqueue(func, args=args, kwargs=kwargs, job_timeout=job_timeout)
 
         return AutoTask(job)
 
@@ -90,4 +89,41 @@ class AutoTasks:
             job = Job.fetch(job_id, connection=AutoTasks._connection)
             return AutoTask(job)
         except Exception:
-            return None
+            return None
+
+    def get_tasks(self):
+
+        high_queue = Queue("high", connection=self._connection)
+        default_queue = Queue("default", connection=self._connection)
+        low_queue = Queue("low", connection=self._connection)
+
+        registries = {
+            "started": [
+                high_queue.started_job_registry,
+                default_queue.started_job_registry,
+                low_queue.started_job_registry,
+            ],
+            "finished": [
+                high_queue.finished_job_registry,
+                default_queue.finished_job_registry,
+                low_queue.finished_job_registry,
+            ],
+            "failed": [
+                high_queue.failed_job_registry,
+                default_queue.failed_job_registry,
+                low_queue.failed_job_registry,
+            ],
+            "queued": [high_queue, default_queue, low_queue],
+        }
+
+        tasks = {}
+        for status, regs in registries.items():
+            all_job_ids = []
+            for reg in regs:
+                all_job_ids.extend(reg.get_job_ids())
+            # Use a set to remove duplicate job_ids if a job is in multiple registries
+            unique_job_ids = sorted(list(set(all_job_ids)), reverse=True)
+            jobs = Job.fetch_many(unique_job_ids, connection=self._connection)
+            # Filter out None values in case a job expired between fetch and get
+            tasks[status] = [job for job in jobs if job]
+        return tasks

{autonomous_app-0.3.48.dist-info → autonomous_app-0.3.50.dist-info}/METADATA

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

@@ -1,16 +1,16 @@
-autonomous/__init__.py,sha256=5NSHkTcQ1Im9Xo5O3r5nNTJr-fjzyglGsXdHD9FPF8Q,95
+autonomous/__init__.py,sha256=Bfx9V4lwColWq8lzS8MH_02fwl8OseyZms6DSENLM_g,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/audioagent.py,sha256=6gMcmLrEuMdbjd9NnwzVmxeToFqXQ6ppAQCRWMcmg_Y,1091
 autonomous/ai/baseagent.py,sha256=icOPygr1NdH64u1ZYbwHHywYIY1ZtaLY9HtfNmUbx4k,4702
 autonomous/ai/imageagent.py,sha256=1RT7OYTnRUo3q5k5w83A3cOh3hXUlrx0jRkg0YJSgZ0,900
 autonomous/ai/jsonagent.py,sha256=NpF-bJXolTBeW9xVdeEfdNwzdlaaRMjFwo_s-d9ApLM,1166
 autonomous/ai/textagent.py,sha256=0y2Hvb9pup1OnsA51hGPcD8yllZOZtztDLQvCNYABaw,1043
 autonomous/ai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/ai/models/gemini.py,sha256=JtMw1RatDuTtDaVe5sp_t-nOdWbGvJzljWHhNh9o3yk,13107
-autonomous/ai/models/local_model.py,sha256=-2-b_W2tvjgMMI15u9Y83olOgbnyp847zR9GKIOrbYs,12064
-autonomous/ai/models/mock_model.py,sha256=fjIThcfOuZYj6mWEQZJg8fIwGABKRR3j5WVjh6hgnPY,3694
+autonomous/ai/models/local_model.py,sha256=o2C7hrSrOyXgDqzYl1AX0cdoPCICfk_pAGm65OQDbtg,14197
+autonomous/ai/models/mock_model.py,sha256=IT4ip821ZewDOFbHrAFJ3Ks_OUIN-Z0lEF6oGs5j4WU,3061
 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
@@ -53,10 +53,10 @@ autonomous/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 autonomous/storage/imagestorage.py,sha256=SmBjBNBlP1ZEjxdOnGVzCHZhbEhMKTUQC2TbpWbejDE,6168
 autonomous/storage/localstorage.py,sha256=FzrR6O9mMGAZt5dDgqzkeOQVfGRXCygR0kksz2MPpwE,2286
 autonomous/taskrunner/__init__.py,sha256=ughX-QfWBas5W3aB2SiF887SWJ3Dzc2X43Yxtmpl43k,47
-autonomous/taskrunner/autotasks.py,sha256=2zRaqHYqfdlgC_BQm6B6D2svN1ukyWeJJHwweZFHVoo,2616
+autonomous/taskrunner/autotasks.py,sha256=smrWEGBE9QLpLco4ydOFi_gVcFp1mVxfQioACL2FBA8,4029
 autonomous/taskrunner/task_router.py,sha256=W09HtRUuhwlnGxM5w4l6Hzw6mfS6L4ljWiMzD3ZVFeU,601
 autonomous/utils/markdown.py,sha256=tf8vlHARiQO1X_aGbqlYozzP_TbdiDRT9EEP6aFRQo0,2153
-autonomous_app-0.3.48.dist-info/METADATA,sha256=jfU8tlq0YqBXvWsTgyqSHF70JTqS3el1X7jG2BdPCJM,3024
-autonomous_app-0.3.48.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-autonomous_app-0.3.48.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.48.dist-info/RECORD,,
+autonomous_app-0.3.50.dist-info/METADATA,sha256=g_6i1h0xP6Ee-izUtTmz2-nyAEPBI9pIVwSDGmiGG-s,3024
+autonomous_app-0.3.50.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+autonomous_app-0.3.50.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.3.50.dist-info/RECORD,,