autonomous-app 0.3.5__py3-none-any.whl → 0.3.7__py3-none-any.whl

autonomous/__init__.py

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

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/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/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/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/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.dist-info → autonomous_app-0.3.7.dist-info}/METADATA

@@ -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.dist-info → autonomous_app-0.3.7.dist-info}/RECORD

@@ -1,12 +1,12 @@
-autonomous/__init__.py,sha256=Ie-rGZ4SZXAODsPeZELvNjjOd3RVllgErbeckM7K81E,94
+autonomous/__init__.py,sha256=pleIcLkUDNA-NOZk7I3dSRYprDCQkeFqjZX0QCG3fbM,94
 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=P5HGuN7r7whgryZ2oCvSRY7jQlq0FdDK3-DtdnUG_N0,1321
-autonomous/ai/oaiagent.py,sha256=Zrd4iijGfkFsF1Dbhhj0SeHoezec3kae8CrFrZQeqXQ,1346
-autonomous/ai/textagent.py,sha256=pYzuoE7ENsxXjTSoVRMGvy7KQK0cS50SlWpY-1r7PiY,1220
+autonomous/ai/jsonagent.py,sha256=gJVFFKuH6yBiSG0U1WBCyjDeT7kCvW3bxeU6TpkhPLM,1542
+autonomous/ai/textagent.py,sha256=bi9v5pawylY6p43wYoaAEs-qyMOskFBnR21-_lJo7Aw,1441
 autonomous/ai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/ai/models/openai.py,sha256=npavtBRWaxZuO3EtdFK1pm64wporJcTb_JDdxhMyhPI,11732
 autonomous/apis/version_control/GHCallbacks.py,sha256=AyiUlYfV5JePi11GVyqYyXoj5UTbPKzS-HRRI94rjJo,1069
@@ -34,7 +34,7 @@ autonomous/db/base/__init__.py,sha256=qbVw-SlbJxlWu8UoPLQcwyRQ7Oso0r3aUit6Jqpoz4
 autonomous/db/base/common.py,sha256=YjvDGwmn-QoRplL9Xx2q3eUXEetgo3YureIGxbR36Y8,1540
 autonomous/db/base/datastructures.py,sha256=fcgWe2JsfzTK3jbku3Teh0Iwvn5U5EhCpyeh9xr8bZ0,15850
 autonomous/db/base/document.py,sha256=OM7CeJFZbxha6yKMiMCrHOlTELfOXusqJ8i6FjdFd0c,46652
-autonomous/db/base/fields.py,sha256=o5XSMYm3NnpU5uw1hvqFFAZHcmJJwWxgwB_hq4sHkPI,29096
+autonomous/db/base/fields.py,sha256=6hz8w5rrP-piE4Ox_g99Z8rIluqyTgetLngvdhjIgL0,29055
 autonomous/db/base/metaclasses.py,sha256=GVvJYcCxaW1ltEqyH4oNvT_srckEXDSHOtHVU_TAN70,18138
 autonomous/db/base/utils.py,sha256=MH4FuEwh-5IcIinwNTkyTs-PqQLyyiMctcYMsNP85qk,617
 autonomous/db/queryset/__init__.py,sha256=XT3__0BJCvQIQj3S_Mp7mPxNBkfdvXkdw56cg2gc86o,756
@@ -45,7 +45,7 @@ autonomous/db/queryset/queryset.py,sha256=Xvt1q7Olij9STbJkHm6dKrUIrgyJeY_uwJOYE9
 autonomous/db/queryset/transform.py,sha256=UhBdDxYR_bWH0ECnaSw9g9YMwgWRZtsRl_q6PkqO9eY,19615
 autonomous/db/queryset/visitor.py,sha256=AN09lR6hWYUlKJC7G1sktvnWy5hrFnpoQhi58bOXbA4,5470
 autonomous/model/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-autonomous/model/autoattr.py,sha256=o9KmWnqC33tvG-K2wGY3fwgd9FFIm5ivlRkMGqWqTIs,2132
+autonomous/model/autoattr.py,sha256=ncDSV5gFWqgLKzstYxndQWlM911_gxwzPuf74M-UfFk,2252
 autonomous/model/automodel.py,sha256=Q5S84TsIXZT4r0AFQS6OQm4oRIMPWWfuUhD0i5gsm7s,6809
 autonomous/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/storage/imagestorage.py,sha256=SmBjBNBlP1ZEjxdOnGVzCHZhbEhMKTUQC2TbpWbejDE,6168
@@ -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.5.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
-autonomous_app-0.3.5.dist-info/METADATA,sha256=kytfTSGcjr-XpafI0e0EHlS5vYvv2GBP3_r4Degu-_Y,4188
-autonomous_app-0.3.5.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-autonomous_app-0.3.5.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.5.dist-info/RECORD,,
+autonomous_app-0.3.7.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
+autonomous_app-0.3.7.dist-info/METADATA,sha256=2J4B5989B5ELoWYz0nL9dzRuQquwq1WLhgcZBTpy0GY,4188
+autonomous_app-0.3.7.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+autonomous_app-0.3.7.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.3.7.dist-info/RECORD,,

{autonomous_app-0.3.5.dist-info → autonomous_app-0.3.7.dist-info}/WHEEL

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

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)