autonomous-app 0.3.5__tar.gz → 0.3.7__tar.gz

{autonomous_app-0.3.5 → autonomous_app-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.3.5
+Version: 0.3.7
 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.5 → autonomous_app-0.3.7}/src/autonomous/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.5"
+__version__ = "0.3.7"
 
 from dotenv import load_dotenv
 

autonomous_app-0.3.7/src/autonomous/ai/baseagent.py

@@ -0,0 +1,23 @@
+from autonomous import log
+from autonomous.model.autoattr import ReferenceAttr
+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
+
+#     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)

{autonomous_app-0.3.5 → autonomous_app-0.3.7}/src/autonomous/ai/jsonagent.py

@@ -18,6 +18,12 @@ class JSONAgent(AutoModel):
 
     _ai_model = OpenAIModel
 
+    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 get_client(self):
         if self.client is None:
             self.client = self._ai_model(

{autonomous_app-0.3.5 → autonomous_app-0.3.7}/src/autonomous/ai/textagent.py

@@ -17,6 +17,12 @@ class TextAgent(AutoModel):
 
     _ai_model = OpenAIModel
 
+    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 get_client(self):
         if self.client is None:
             self.client = self._ai_model(

{autonomous_app-0.3.5 → autonomous_app-0.3.7}/src/autonomous/db/base/fields.py

@@ -173,11 +173,8 @@ class BaseField:
 
         # Get value from document instance if available
         result = instance._data.get(self.name)
-        if not result:
-            if self.default is not None:
-                result = self.default
-                if callable(result):
-                    result = result()
+        if result is None and self.default is not None:
+            result = self.default() if callable(self.default) else self.default
         return result
 
     def __set__(self, instance, value):

{autonomous_app-0.3.5 → autonomous_app-0.3.7}/src/autonomous/model/autoattr.py

@@ -22,6 +22,9 @@ class StringAttr(StringField):
 
 class IntAttr(IntField):
     pass
+    # def __set__(self, instance, owner):
+    #     results = super().__get__(instance, owner)
+    #     return results
 
 
 class FloatAttr(FloatField):

{autonomous_app-0.3.5 → autonomous_app-0.3.7}/src/autonomous_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.3.5
+Version: 0.3.7
 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.5 → autonomous_app-0.3.7}/src/autonomous_app.egg-info/SOURCES.txt

@@ -8,9 +8,9 @@ src/autonomous/cli.py
 src/autonomous/logger.py
 src/autonomous/ai/__init__.py
 src/autonomous/ai/audioagent.py
+src/autonomous/ai/baseagent.py
 src/autonomous/ai/imageagent.py
 src/autonomous/ai/jsonagent.py
-src/autonomous/ai/oaiagent.py
 src/autonomous/ai/textagent.py
 src/autonomous/ai/models/__init__.py
 src/autonomous/ai/models/openai.py

autonomous_app-0.3.5/src/autonomous/ai/oaiagent.py

@@ -1,40 +0,0 @@
-from autonomous import log
-from autonomous.model.autoattr import ReferenceAttr
-from autonomous.model.automodel import AutoModel
-
-from .models.openai import OpenAIModel
-
-
-class OAIAgent(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
-
-    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 generate(self, messages, function=None, additional_instructions=""):
-        if function is None:
-            return self.client.generate_text(messages, additional_instructions)
-        else:
-            return self.client.generate_json(
-                messages, function, additional_instructions
-            )
-
-    def generate_audio(self, prompt, file_path, **kwargs):
-        return self.client.generate_audio(self, file_path, **kwargs)
-
-    def generate_image(self, prompt, **kwargs):
-        return self.client.generate_image(prompt, **kwargs)
-
-    def summarize_text(self, text, primer=""):
-        return self.client.generate_image(text, primer)