autonomous-app 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.10"
+__version__ = "0.3.12"
 
 from dotenv import load_dotenv
 

autonomous/ai/audioagent.py

@@ -1,12 +1,11 @@
 from autonomous import log
 from autonomous.model.autoattr import ReferenceAttr, StringAttr
-from autonomous.model.automodel import AutoModel
+from autonomous.ai.baseagent import BaseAgent
 
 from .models.openai import OpenAIModel
 
 
-class AudioAgent(AutoModel):
-    client = ReferenceAttr(choices=[OpenAIModel])
+class AudioAgent(BaseAgent):
     name = StringAttr(default="audioagent")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating audio files."
@@ -15,18 +14,5 @@ class AudioAgent(AutoModel):
         default="A helpful AI assistant trained to assist with generating audio files."
     )
 
-    _ai_model = OpenAIModel
-
-    def get_client(self):
-        if self.client is None:
-            self.client = self._ai_model(
-                name=self.name,
-                instructions=self.instructions,
-                description=self.description,
-            )
-            self.client.save()
-            self.save()
-        return self.client
-
     def generate(self, prompt, file_path, **kwargs):
         return self.get_client().generate_audio(prompt, file_path, **kwargs)

autonomous/ai/baseagent.py

@@ -5,16 +5,24 @@ from autonomous.model.automodel import AutoModel
 from .models.openai import OpenAIModel
 
 
-# class BaseAgent(AutoModel):
-#     client_model = ReferenceAttr(choices=[OpenAIModel])
-#     _ai_model = OpenAIModel
-
-#     @property
-#     def client(self):
-#         if self.client_model is None:
-#             self.client_model = self._ai_model()
-#             self.save()
-#         return self.client_model
+class BaseAgent(AutoModel):
+    meta = {"abstract": True, "allow_inheritance": True, "strict": False}
+
+    client = ReferenceAttr(choices=[OpenAIModel])
+
+    _ai_model = OpenAIModel
+
+    def get_client(self):
+        if self.client is None:
+            self.client = self._ai_model(
+                name=self.name,
+                instructions=self.instructions,
+                description=self.description,
+            )
+            self.client.save()
+            self.save()
+        return self.client
+
 
 #     def clear_files(self, file_id=None):
 #         return self.client.clear_files(file_id)

autonomous/ai/imageagent.py

@@ -1,11 +1,10 @@
 from autonomous.model.autoattr import ReferenceAttr, StringAttr
 from autonomous.model.automodel import AutoModel
-
+from autonomous.ai.baseagent import BaseAgent
 from .models.openai import OpenAIModel
 
 
-class ImageAgent(AutoModel):
-    client = ReferenceAttr(choices=[OpenAIModel])
+class ImageAgent(BaseAgent):
     name = StringAttr(default="imageagent")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating images."
@@ -14,18 +13,5 @@ class ImageAgent(AutoModel):
         default="A helpful AI assistant trained to assist with generating images."
     )
 
-    _ai_model = OpenAIModel
-
-    def get_client(self):
-        if self.client is None:
-            self.client = self._ai_model(
-                name=self.name,
-                instructions=self.instructions,
-                description=self.description,
-            )
-            self.client.save()
-            self.save()
-        return self.client
-
     def generate(self, prompt, **kwargs):
         return self.get_client().generate_image(prompt, **kwargs)

autonomous/ai/jsonagent.py

@@ -2,12 +2,11 @@ import json
 
 from autonomous.model.autoattr import ReferenceAttr, StringAttr
 from autonomous.model.automodel import AutoModel
-
+from autonomous.ai.baseagent import BaseAgent
 from .models.openai import OpenAIModel
 
 
-class JSONAgent(AutoModel):
-    client = ReferenceAttr(choices=[OpenAIModel])
+class JSONAgent(BaseAgent):
     name = StringAttr(default="jsonagent")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating JSON formatted data."
@@ -16,24 +15,11 @@ class JSONAgent(AutoModel):
         default="A helpful AI assistant trained to assist with generating JSON formatted data."
     )
 
-    _ai_model = OpenAIModel
-
     def clear_files(self, file_id=None):
-        return self.client.clear_files(file_id)
+        return self.get_client().clear_files(file_id)
 
     def attach_file(self, file_contents, filename="dbdata.json"):
-        return self.client.attach_file(file_contents, filename)
-
-    def get_client(self):
-        if self.client is None:
-            self.client = self._ai_model(
-                name=self.name,
-                instructions=self.instructions,
-                description=self.description,
-            )
-            self.client.save()
-            self.save()
-        return self.client
+        return self.get_client().attach_file(file_contents, filename)
 
     def generate(self, messages, function, additional_instructions=""):
         result = self.get_client().generate_json(

autonomous/ai/models/openai.py

@@ -55,7 +55,11 @@ class OpenAIModel(AutoModel):
         self.save()
 
     def _get_agent_id(self):
-        if not self.agent_id or not self.client.beta.assistants.retrieve(self.agent_id):
+        try:
+            self.client.beta.assistants.retrieve(self.agent_id)
+        except (ValueError, openai.NotFoundError) as e:
+            log(f"{e} -- no agent found, creating a new one")
+            self.clear_files()
             agent = self.client.beta.assistants.create(
                 instructions=self.instructions,
                 description=self.description,
@@ -183,7 +187,7 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with o
                 ]:
                     running_job = False
 
-            except openai.error.BadRequestError as e:
+            except openai.BadRequestError as e:
                 # Handle specific bad request errors
                 error_message = e.json_body.get("error", {}).get("message", "")
                 if "already has an active run" in error_message:
@@ -226,6 +230,7 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with o
             return results
 
     def generate_text(self, messages, additional_instructions=""):
+        self._get_agent_id()
         formatted_messages = self._format_messages(messages)
         thread = self.client.beta.threads.create(messages=formatted_messages)
 

autonomous/ai/textagent.py

@@ -1,12 +1,11 @@
 from autonomous import log
 from autonomous.model.autoattr import ReferenceAttr, StringAttr
 from autonomous.model.automodel import AutoModel
-
+from autonomous.ai.baseagent import BaseAgent
 from .models.openai import OpenAIModel
 
 
-class TextAgent(AutoModel):
-    client = ReferenceAttr(choices=[OpenAIModel])
+class TextAgent(BaseAgent):
     name = StringAttr(default="textagent")
     instructions = StringAttr(
         default="You are highly skilled AI trained to assist with generating text according to the given requirements."
@@ -15,24 +14,11 @@ class TextAgent(AutoModel):
         default="A helpful AI assistant trained to assist with generating text according to the given requirements."
     )
 
-    _ai_model = OpenAIModel
-
     def clear_files(self, file_id=None):
-        return self.client.clear_files(file_id)
+        return self.get_client().clear_files(file_id)
 
     def attach_file(self, file_contents, filename="dbdata.json"):
-        return self.client.attach_file(file_contents, filename)
-
-    def get_client(self):
-        if self.client is None:
-            self.client = self._ai_model(
-                name=self.name,
-                instructions=self.instructions,
-                description=self.description,
-            )
-            self.client.save()
-            self.save()
-        return self.client
+        return self.get_client().attach_file(file_contents, filename)
 
     def summarize_text(self, text, primer=""):
         return self.get_client().summarize_text(text, primer)

{autonomous_app-0.3.10.dist-info → autonomous_app-0.3.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.3.10
+Version: 0.3.12
 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.3.10.dist-info → autonomous_app-0.3.12.dist-info}/RECORD

@@ -1,14 +1,14 @@
-autonomous/__init__.py,sha256=Dn8prVUFGQKGuSuYkNWrQJsqwV_BmZ_P6N4aCquBaiQ,95
+autonomous/__init__.py,sha256=2rwDeIVlTfGQ45s-_BP-NdOVIh_CTLdQf8DODjIum_k,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=uZEhJ8_ctEvzshxJewaGdw-gh2Ts8lIcEysh0rlL62w,1040
-autonomous/ai/baseagent.py,sha256=Wfo0n0M9_eCSb9s0QbFelDlANH-o1lgZiRXZf7VeOP0,710
-autonomous/ai/imageagent.py,sha256=Y3n4OFD-UC9lSg1j-U9wRnyLLaRl0LjibHbriJwYF2c,981
-autonomous/ai/jsonagent.py,sha256=gJVFFKuH6yBiSG0U1WBCyjDeT7kCvW3bxeU6TpkhPLM,1542
-autonomous/ai/textagent.py,sha256=bi9v5pawylY6p43wYoaAEs-qyMOskFBnR21-_lJo7Aw,1441
+autonomous/ai/audioagent.py,sha256=Vqh_1YxfZ1T7sU27BR06d_d618heA0mRlOa0440_NHs,635
+autonomous/ai/baseagent.py,sha256=NE3OjDqu2e9Wy-cQEzzQoHPUrtFo__WPpPAN0v3zOxs,905
+autonomous/ai/imageagent.py,sha256=Tn02Hk7WX53pqvK-2Xd2xOuyHKaNuAS_yr7lRdct3rc,624
+autonomous/ai/jsonagent.py,sha256=wlTULEBlrAAb8ELMxik1b7YOgHD4ARmbWLUWc5pgxB8,1197
+autonomous/ai/textagent.py,sha256=8iVuY-cSJsJgyWKrpCoj46c0MIsB13PFPNYdxSyqlKI,1096
 autonomous/ai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autonomous/ai/models/openai.py,sha256=npavtBRWaxZuO3EtdFK1pm64wporJcTb_JDdxhMyhPI,11732
+autonomous/ai/models/openai.py,sha256=PkpzLmObi5UpfRGSukW43SC75mGBppbCrEn9StfiYI8,11892
 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,8 +53,8 @@ autonomous/storage/localstorage.py,sha256=FzrR6O9mMGAZt5dDgqzkeOQVfGRXCygR0kksz2
 autonomous/tasks/__init__.py,sha256=pn7iZ14MhcHUdzcLkfkd4-45wgPP0tXahAz_cFgb_Tg,32
 autonomous/tasks/autotask.py,sha256=aK5iapDhgcAic3F5ZYMAhNKJkOepj8yWwbMizKDzUwQ,4153
 autonomous/utils/markdown.py,sha256=tf8vlHARiQO1X_aGbqlYozzP_TbdiDRT9EEP6aFRQo0,2153
-autonomous_app-0.3.10.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
-autonomous_app-0.3.10.dist-info/METADATA,sha256=upj_wHgFA1y662oLqs3zquNMJSymw6Do_XgLXAK6WVM,4189
-autonomous_app-0.3.10.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-autonomous_app-0.3.10.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.10.dist-info/RECORD,,
+autonomous_app-0.3.12.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
+autonomous_app-0.3.12.dist-info/METADATA,sha256=p9ild9SgNIw5NmIJUnAwJGSCM39XFFIEfNyCyXMHymE,4189
+autonomous_app-0.3.12.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+autonomous_app-0.3.12.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.3.12.dist-info/RECORD,,