autonomous-app 0.2.18__tar.gz → 0.2.20__tar.gz

{autonomous_app-0.2.18 → autonomous_app-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.2.18
+Version: 0.2.20
 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>
 License: MIT License

{autonomous_app-0.2.18 → autonomous_app-0.2.20}/src/autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.18"
+__version__ = "0.2.20"
 
 from .logger import log
 from .model.automodel import AutoModel

{autonomous_app-0.2.18 → autonomous_app-0.2.20}/src/autonomous/ai/oaiagent.py

@@ -130,6 +130,7 @@ class OAIAgent(AutoModel):
             thread_id=thread.id,
             assistant_id=self.agent_id,
             additional_instructions=_instructions_addition,
+            parallel_tool_calls=False,
         )
 
         while run.status in ["queued", "in_progress"]:
@@ -139,27 +140,37 @@ class OAIAgent(AutoModel):
             )
             time.sleep(0.5)
             log(f"==== Job Status: {run.status} ====")
+            print(f"==== Job Status: {run.status} ====")
 
         if run.status in ["failed", "expired", "canceled"]:
             log(f"==== Error: {run.last_error} ====")
+            print(f"==== Error: {run.last_error} ====")
             return None
-
+        print("=================== RUN COMPLETED ===================")
+        print(run.status)
         if run.status == "completed":
             response = self.client.beta.threads.messages.list(thread_id=thread.id)
-            result = response.data[0].content[0].text.value
+            results = response.data[0].content[0].text.value
         elif run.status == "requires_action":
             results = run.required_action.submit_tool_outputs.tool_calls[
                 0
             ].function.arguments
-            result = results[results.find("{") : results.rfind("}") + 1]
-            try:
-                result = json.loads(result, strict=False)
-            except Exception:
-                log(f"==== Invalid JSON:\n{result}")
         else:
             log(f"====Status: {run.status} Error: {run.last_error} ====")
+            print(f"====Status: {run.status} Error: {run.last_error} ====")
             return None
-        return result
+
+        if function:
+            results = results[results.find("{") : results.rfind("}") + 1]
+            try:
+                results = json.loads(results, strict=False)
+            except Exception:
+                print(f"==== Invalid JSON:\n{results}")
+                log(f"==== Invalid JSON:\n{results}")
+
+        print(results)
+        print("=================== END REPORT ===================")
+        return results
 
     def generate_audio(self, prompt, file_path, **kwargs):
         voice = kwargs.get("voice") or random.choice(

{autonomous_app-0.2.18 → autonomous_app-0.2.20}/src/autonomous/logger.py

@@ -28,6 +28,8 @@ class Logger:
         level = os.environ.get("LOG_LEVEL") or self.logger.level
         self.logger.setLevel(log_levels.get(level, "DEBUG"))
         self.enabled = True
+        if not os.path.exists("logs"):
+            os.makedirs("logs")
         self.logfile = "logs/current_run_error_log.log"
         self.logarchive = (
             f"logs/error_log-{datetime.datetime.now().strftime('%Y-%m-%d')}.log"

{autonomous_app-0.2.18 → autonomous_app-0.2.20}/src/autonomous/model/automodel.py

@@ -2,7 +2,6 @@
 # default : Optional[str] = "value"  # for default values
 import copy
 import importlib
-import json
 from abc import ABC
 from datetime import datetime
 
@@ -119,12 +118,18 @@ class AutoModel(ABC):
                 v = v.default
             setattr(obj, k, result.get(k, copy.deepcopy(v)))
         obj.pk = pk
+        for key, val in list(kwargs.items()):
+            if (
+                getattr(cls, key, None)
+                and getattr(cls, key).fset
+                and f"_{key}" in cls.attributes
+            ):
+                kwargs[f"_{key}"] = kwargs.pop(key)
         obj.__dict__ |= kwargs
         # breakpoint()
         obj.__dict__ = AutoDecoder.decode(obj.__dict__)
         obj._automodel = obj.model_name(qualified=True)
         obj.last_updated = datetime.now()
-
         return obj
 
     def __getattribute__(self, name):
@@ -249,20 +254,24 @@ class AutoModel(ABC):
                 val = getattr(self, key)
                 if vattr.type == "TEXT":
                     if not isinstance(val, str):
-                        raise TypeError(f"Value must be a string, not {type(val)}")
+                        raise TypeError(
+                            f"{key} value must be a string, not {type(val)}"
+                        )
                 elif vattr.type == "NUMERIC":
                     if not isinstance(val, (int, float)):
-                        raise TypeError(f"Value must be a number, not {type(val)}")
+                        raise TypeError(
+                            f"{key} value must be a number, not {type(val)}"
+                        )
                 elif vattr.type == "MODEL":
                     # log(isinstance(val, (AutoModel, DelayedModel)), type(val))
                     if val is not None and not isinstance(
                         val, (AutoModel, DelayedModel)
                     ):
                         raise TypeError(
-                            f"Value must be an AutoModel or None, not {type(val)}"
+                            f"{key} value must be an AutoModel or None, not {type(val)}"
                         )
                 else:
-                    raise ValueError(f"Invalid type {self.type}")
+                    raise ValueError(f"{key}: Invalid type {self.type}")
 
                 if vattr.required and val is None:
                     raise ValueError(f"{key} is required")

{autonomous_app-0.2.18 → autonomous_app-0.2.20}/src/autonomous_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.2.18
+Version: 0.2.20
 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>
 License: MIT License