autonomous-app 0.3.14__py3-none-any.whl → 0.3.16__py3-none-any.whl

autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.14"
+__version__ = "0.3.16"
 
 from dotenv import load_dotenv
 

autonomous/ai/audioagent.py

@@ -1,6 +1,6 @@
 from autonomous import log
-from autonomous.model.autoattr import ReferenceAttr, StringAttr
 from autonomous.ai.baseagent import BaseAgent
+from autonomous.model.autoattr import ReferenceAttr, StringAttr
 
 from .models.openai import OpenAIModel
 
@@ -14,5 +14,5 @@ class AudioAgent(BaseAgent):
         default="A helpful AI assistant trained to assist with generating audio files."
     )
 
-    def generate(self, prompt, file_path, **kwargs):
-        return self.get_client().generate_audio(prompt, file_path, **kwargs)
+    def generate(self, prompt, **kwargs):
+        return self.get_client().generate_audio(prompt, **kwargs)

autonomous/ai/baseagent.py

@@ -12,6 +12,14 @@ class BaseAgent(AutoModel):
 
     _ai_model = OpenAIModel
 
+    def delete(self):
+        if self.client:
+            self.client.delete()
+        return super().delete()
+
+    def get_agent_id(self):
+        return self.get_client().id
+
     def get_client(self):
         if self.client is None:
             self.client = self._ai_model(
@@ -23,9 +31,8 @@ class BaseAgent(AutoModel):
             self.save()
         return self.client
 
+    def clear_files(self, file_id=None):
+        return self.client.clear_files(file_id)
 
-#     def clear_files(self, file_id=None):
-#         return self.client.clear_files(file_id)
-
-#     def attach_file(self, file_contents, filename="dbdata.json"):
-#         return self.client.attach_file(file_contents, filename)
+    def attach_file(self, file_contents, filename="dbdata.json"):
+        return self.client.attach_file(file_contents, filename)

autonomous/ai/models/openai.py

@@ -1,3 +1,4 @@
+import io
 import json
 import os
 import random
@@ -36,6 +37,12 @@ class OpenAIModel(AutoModel):
             self._client = OpenAI(api_key=os.environ.get("OPENAI_KEY"))
         return self._client
 
+    def delete(self):
+        self.clear_files()
+        if self.agent_id:
+            self.client.beta.assistants.delete(self.agent_id)
+        return super().delete()
+
     def clear_agent(self):
         if self.agent_id:
             self.client.beta.assistants.delete(self.agent_id)
@@ -70,18 +77,15 @@ class OpenAIModel(AutoModel):
             self.save()
         return self.agent_id
 
-    def clear_files(self, file_id=None, all=False):
+    def clear_files(self, file_id=None):
         if not file_id:
-            store_files = self.client.files.list().data
-
             for vs in self.client.beta.vector_stores.list().data:
                 try:
                     self.client.beta.vector_stores.delete(vs.id)
                 except openai_NotFoundError:
                     log(f"==== Vector Store {vs.id} not found ====")
-            if all:
-                for sf in store_files:
-                    self.client.files.delete(file_id=sf.id)
+            for sf in self.client.files.list().data:
+                self.client.files.delete(file_id=sf.id)
         else:
             self.client.files.delete(file_id=file_id)
         self.tools.pop("file_search", None)
@@ -92,18 +96,26 @@ class OpenAIModel(AutoModel):
         # Upload the user provided file to OpenAI
         self.tools["file_search"] = {"type": "file_search"}
         # Create a vector store
-        if vs := self.client.beta.vector_stores.list().data:
-            self.vector_store = vs[0].id
-        else:
+        try:
+            if vs := self.client.beta.vector_stores.list().data:
+                self.vector_store = self.client.beta.vector_stores.retrieve(
+                    vector_store_id=vs[0].id
+                ).id
+            else:
+                for sf in self.client.files.list().data:
+                    self.client.files.delete(file_id=sf.id)
+                raise FileNotFoundError("No vector store found")
+        except FileNotFoundError:
             self.vector_store = self.client.beta.vector_stores.create(
-                name="Data Reference",
+                name="World Reference",
                 expires_after={"anchor": "last_active_at", "days": 14},
             ).id
-
+        log(f"==== Vector Store ID: {self.vector_store}====")
+        # Attach File
         file_obj = self.client.files.create(
             file=(filename, file_contents), purpose="assistants"
         )
-
+        log(f"==== FileStore ID: {file_obj.id}====")
         self.client.beta.vector_stores.files.create(
             vector_store_id=self.vector_store,
             file_id=file_obj.id,
@@ -251,8 +263,8 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with o
         if run.status in ["failed", "expired", "canceled"]:
             log(f"==== Error: {run.last_error} ====", _print=True)
             return None
-        log("=================== RUN COMPLETED ===================", _print=True)
-        log(run.status, _print=True)
+        # log("=================== RUN COMPLETED ===================", _print=True)
+        # log(run.status, _print=True)
         if run.status == "completed":
             response = self.client.beta.threads.messages.list(thread_id=thread.id)
             results = response.data[0].content[0].text.value
@@ -260,11 +272,11 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with o
             log(f"====Status: {run.status} Error: {run.last_error} ====", _print=True)
             return None
 
-        log(results, _print=True)
-        log("=================== END REPORT ===================", _print=True)
+        # log(results, _print=True)
+        # log("=================== END REPORT ===================", _print=True)
         return results
 
-    def generate_audio(self, prompt, file_path, **kwargs):
+    def generate_audio(self, prompt, **kwargs):
         voice = kwargs.get("voice") or random.choice(
             ["alloy", "echo", "fable", "onyx", "nova", "shimmer"]
         )
@@ -273,8 +285,9 @@ IMPORTANT: Always use the function 'response' tool to respond to the user with o
             voice=voice,
             input=prompt,
         )
-
-        return response.stream_to_file(file_path)
+        log(response)
+        audio_data = io.BytesIO(response["audio"].encode("utf-8"))
+        return audio_data
 
     def generate_image(self, prompt, **kwargs):
         image = None

autonomous/auth/autoauth.py

@@ -43,14 +43,17 @@ class AutoAuth:
         )
 
     @classmethod
-    def current_user(cls):
+    def current_user(cls, pk=None):
         """
         Returns the current user.
         """
+        if pk:
+            user = cls.user_class.get(pk)
+        elif session.get("user"):
+            user = cls.user_class.from_json(session["user"])
+        else:
+            user = None
 
-        user = (
-            cls.user_class.from_json(session["user"]) if session.get("user") else None
-        )
         if not user or user.state != "authenticated":
             user = cls.user_class.get_guest()
         return user

autonomous/auth/user.py

@@ -42,13 +42,13 @@ class AutoUser(AutoModel):
         log(email, user)
         if not user:
             log(f"Creating new user for {email}")
-            # user = cls(name=name, email=email)
-
+            user = cls(name=name, email=email)
         # parse user_info into a user object
         user.name = name
         user.email = email
         user.last_login = datetime.now()
         user.state = "authenticated"
+        user.role = "user"
         user.save()
         return user
 

autonomous/model/automodel.py

@@ -90,11 +90,15 @@ class AutoModel(Document):
 
     @classmethod
     def load_model(cls, model):
-        module_name, model = (
-            model.rsplit(".", 1) if "." in model else (f"models.{model.lower()}", model)
-        )
-        module = importlib.import_module(module_name)
-        return getattr(module, model)
+        subclasses = AutoModel.__subclasses__()
+        while subclasses:
+            subclass = subclasses.pop()
+            if "_meta" in subclass.__dict__ and not subclass._meta.get("abstract"):
+                if subclass.__name__.lower() == model.lower():
+                    return subclass
+                elif subclass not in subclasses:
+                    subclasses += [subclass]
+        raise ValueError(f"Model {model} not found")
 
     @classmethod
     def get(cls, pk):

{autonomous_app-0.3.14.dist-info → autonomous_app-0.3.16.dist-info}/METADATA

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

@@ -1,24 +1,24 @@
-autonomous/__init__.py,sha256=7i7VOwi4YnOQBuNgsmWO7MQVIwP3xyjWL4yOYapssN8,95
+autonomous/__init__.py,sha256=_Imheob6ygUp8AAQctaaAImaCjsiK2EzHfEPRC2jstI,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=Vqh_1YxfZ1T7sU27BR06d_d618heA0mRlOa0440_NHs,635
-autonomous/ai/baseagent.py,sha256=NE3OjDqu2e9Wy-cQEzzQoHPUrtFo__WPpPAN0v3zOxs,905
+autonomous/ai/audioagent.py,sha256=PlDNOdYKJxsqWbql0aAv_F7dS0piBeZV3nuKKZ0-hAI,613
+autonomous/ai/baseagent.py,sha256=gXOdfAWokEf3P7z2jQlbHmwSZohvXfdapZfkoLz6HuQ,1073
 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=Hp_uC_dJys5UGQG2jt3_nk9SKkbwhZofGaoBOil1tXU,11861
+autonomous/ai/models/openai.py,sha256=r9eVwN6dMCeO28JcX46Hbdpd00ZLZlT7xXcrXQ4p4Ss,12499
 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
 autonomous/apis/version_control/GHVersionControl.py,sha256=VIhVRxe6gJgozFWyhyKIu4spgSJI-GChiVJudnSyggI,196
 autonomous/apis/version_control/__init__.py,sha256=tP0bAWYl1RwBRi62HsIidmgyqHuSlCUqwGuKUKKRugc,117
 autonomous/auth/__init__.py,sha256=IW5tQ8VYwHIbDfMYA0wYgx4PprwcjUWV4EoIJ8HTlMU,161
-autonomous/auth/autoauth.py,sha256=6GFs8xikCvPYXZ29bbc5baf603QvnE8tZQIIrAfTziY,3624
+autonomous/auth/autoauth.py,sha256=OizuMhmFjNzmsUijIbjGcQ5FxzVeoy9-NMFsx_TDsOE,3709
 autonomous/auth/github.py,sha256=dHf84bJdV9rXGcvRLzWCPW9CvuA-VEmqYi_QQFwd2kY,886
 autonomous/auth/google.py,sha256=cHmqbyNEPTKipc3WkYcD1XPOyqcWEFW0Ks4qJYmGvPw,1049
-autonomous/auth/user.py,sha256=t8R7KsHp-QK3B_OS5ERSnQ4P8Tnhjehhmdqp5gcKxuU,2702
+autonomous/auth/user.py,sha256=1yDu04yNSURzBzok6C5Dn-_mv0fGefvjrxj9ikCktqY,2726
 autonomous/db/__init__.py,sha256=9frkXJrl_OUemUQteXCTPqC8ECyxjE91Gi2mgTq26Fw,1159
 autonomous/db/common.py,sha256=BUN2x_XuQBRFcq54TGPx4yLMLJdgytdbIt07QWr4CSM,2551
 autonomous/db/connection.py,sha256=j_-eMre4ade9Y8GejJcMbQQiSEimL4j2vIQxaXViKxI,17754
@@ -46,15 +46,15 @@ autonomous/db/queryset/transform.py,sha256=UhBdDxYR_bWH0ECnaSw9g9YMwgWRZtsRl_q6P
 autonomous/db/queryset/visitor.py,sha256=AN09lR6hWYUlKJC7G1sktvnWy5hrFnpoQhi58bOXbA4,5470
 autonomous/model/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 autonomous/model/autoattr.py,sha256=eqO3QE17EMRzLvtF74gXefeK1I2N-w6uScpibdChVOw,2254
-autonomous/model/automodel.py,sha256=_D7s02MUEllJZX3ubpHARlWK8__3CEBT7YCQcypkkhQ,7340
+autonomous/model/automodel.py,sha256=k3_15qciSlEjXRa_izWUJRIvP5d-cHVU07kK-NX2A2Q,7562
 autonomous/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/storage/imagestorage.py,sha256=SmBjBNBlP1ZEjxdOnGVzCHZhbEhMKTUQC2TbpWbejDE,6168
 autonomous/storage/localstorage.py,sha256=FzrR6O9mMGAZt5dDgqzkeOQVfGRXCygR0kksz2MPpwE,2286
 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.14.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
-autonomous_app-0.3.14.dist-info/METADATA,sha256=xyWQXlkU9NSkrFLPtVebnufmO6sQgOfdfz1RqditWNM,4189
-autonomous_app-0.3.14.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-autonomous_app-0.3.14.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.14.dist-info/RECORD,,
+autonomous_app-0.3.16.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
+autonomous_app-0.3.16.dist-info/METADATA,sha256=2oaPtvX0a-wB_rnQ_sK9sasVoq11DkZNFMhEsds-6Sc,4189
+autonomous_app-0.3.16.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+autonomous_app-0.3.16.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.3.16.dist-info/RECORD,,

{autonomous_app-0.3.14.dist-info → autonomous_app-0.3.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any