autonomous-app 0.3.18__py3-none-any.whl → 0.3.19__py3-none-any.whl

autonomous/model/automodel.py

@@ -1,4 +1,3 @@
-import importlib
 import os
 import urllib.parse
 from datetime import datetime
@@ -25,13 +24,13 @@ class AutoModel(Document):
     last_updated = DateTimeField(default=datetime.now)
 
     def __eq__(self, other):
-        return self.pk == other.pk if other else False
+        return str(self.pk) == str(other.pk) if other else False
 
     def __lt__(self, other):
-        return self.pk < other.pk if other else False
+        return str(self.pk) < str(other.pk) if other else False
 
     def __gt__(self, other):
-        return not (self.pk < other.pk) if other else False
+        return not (str(self.pk) < str(other.pk)) if other else False
 
     def __le__(self, other):
         return self < other or self == other
@@ -88,21 +87,39 @@ class AutoModel(Document):
             f"{self.__module__}.{self._class_name}" if qualified else self._class_name
         )
 
+    @classmethod
+    def get_model(cls, model, pk=None):
+        try:
+            Model = cls.load_model(model)
+        except ValueError:
+            Model = None
+        return Model.get(pk) if Model and pk else Model
+
     @classmethod
     def load_model(cls, model):
         if not isinstance(model, str):
             return model
 
         subclasses = AutoModel.__subclasses__()
+        visited_subclasses = []
         while subclasses:
+            # log(subclasses, _print=True)
             subclass = subclasses.pop()
             if "_meta" in subclass.__dict__ and not subclass._meta.get("abstract"):
+                # log(f"Checking {subclass.__name__}", _print=True)
                 if subclass.__name__.lower() == model.lower():
                     return subclass
-                elif subclass not in subclasses:
-                    subclasses += [subclass]
+            if subclass not in visited_subclasses:
+                subclasses += subclass.__subclasses__()
+                visited_subclasses += [subclass]
         raise ValueError(f"Model {model} not found")
 
+    @classmethod
+    def get_model(cls, model, pk=None):
+        # log(model, pk)
+        Model = cls.load_model(model)
+        return Model.get(pk) if Model and pk else Model
+
     @classmethod
     def get(cls, pk):
         """
@@ -123,16 +140,21 @@ class AutoModel(Document):
         elif isinstance(pk, dict) and "$oid" in pk:
             pk = bson.ObjectId(pk["$oid"])
         try:
-            return cls.objects.get(id=pk)
+            # log(pk, type(pk))
+            result = cls.objects.get(id=pk)
+            # log(result)
         except cls.DoesNotExist as e:
             log(f"Model {cls.__name__} with pk {pk} not found : {e}")
             return None
         except ValidationError as e:
+            # traceback.print_stack(limit=5)
             log(f"Model Validation failure {cls.__name__} [{pk}]: {e}")
             return None
         except Exception as e:
             log(f"Error getting model {cls.__name__} with pk {pk}: {e}", _print=True)
             raise e
+        else:
+            return result
 
     @classmethod
     def random(cls):
@@ -223,7 +245,6 @@ class AutoModel(Document):
         Returns:
             int: The primary key (pk) of the saved model.
         """
-        # log(self.to_json())
         obj = super().save()
         self.pk = obj.pk
         return self.pk

{autonomous_app-0.3.18.dist-info → autonomous_app-0.3.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: autonomous-app
-Version: 0.3.18
+Version: 0.3.19
 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
@@ -35,6 +35,7 @@ Requires-Dist: Flask
 Requires-Dist: setuptools
 Requires-Dist: python-dotenv
 Requires-Dist: blinker
+Requires-Dist: pymongo
 Requires-Dist: PyGithub
 Requires-Dist: pygit2
 Requires-Dist: pillow
@@ -44,9 +45,13 @@ Requires-Dist: requests
 Requires-Dist: gunicorn
 Requires-Dist: Authlib
 Requires-Dist: rq
+Requires-Dist: ollama
 Requires-Dist: openai>=1.42
+Requires-Dist: google-genai
 Requires-Dist: dateparser
 Requires-Dist: python-slugify
+Requires-Dist: pydub
+Dynamic: license-file
 
 # Autonomous
 

{autonomous_app-0.3.18.dist-info → autonomous_app-0.3.19.dist-info}/RECORD

@@ -1,14 +1,18 @@
-autonomous/__init__.py,sha256=1pYiGqqSX2X8kVRPUaevzeWWPs21MIOrdfy-91-Nrkg,95
+autonomous/__init__.py,sha256=hNX5Dchz3TzAIocmN3NtQ2u4NwhcJ-nOjEGkDdAY_yc,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=PlDNOdYKJxsqWbql0aAv_F7dS0piBeZV3nuKKZ0-hAI,613
-autonomous/ai/baseagent.py,sha256=gXOdfAWokEf3P7z2jQlbHmwSZohvXfdapZfkoLz6HuQ,1073
+autonomous/ai/audioagent.py,sha256=Y5tz5IwHgFu3oZkOGrGiHCyMCFHrLi353ZROBTxfZjk,730
+autonomous/ai/baseagent.py,sha256=HYCqC4HmK5afNMunmTkhRE8O0OaONl2GxXnISkdOM58,1094
 autonomous/ai/imageagent.py,sha256=bIOrgg_CM-rgfyLme7V9vPqP8WKVMIAVoB2E9lLtIRk,521
-autonomous/ai/jsonagent.py,sha256=wlTULEBlrAAb8ELMxik1b7YOgHD4ARmbWLUWc5pgxB8,1197
-autonomous/ai/textagent.py,sha256=8iVuY-cSJsJgyWKrpCoj46c0MIsB13PFPNYdxSyqlKI,1096
+autonomous/ai/jsonagent.py,sha256=a_l4HyyVRj3FB6py_P1xdc4Bj9uNI1YmJrWQXAksIvs,964
+autonomous/ai/textagent.py,sha256=wI1-VC9zscKYyxYBg4pZ0ZyNJ5ZvKkLfWsIY1vJFChk,863
 autonomous/ai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autonomous/ai/models/openai.py,sha256=ih02eSWWDNPpbmIlc49HB8xHpZcEKi_GnbIEHhUlvaA,12448
+autonomous/ai/models/aws.py,sha256=bGDjnGTm350zOqor9IsICzUkBUN2bubGI_ZssQuSXIw,12715
+autonomous/ai/models/deepseek.py,sha256=fkoi-hJp60yFlZ9Cb9PdUrmNSErYltQ5ezkUI75llXc,2734
+autonomous/ai/models/gemini.py,sha256=FCW7urSGtrc3Q_VgCcbfca2g4nUwA4T_MMfMxWjcUzQ,8473
+autonomous/ai/models/local.py,sha256=fkoi-hJp60yFlZ9Cb9PdUrmNSErYltQ5ezkUI75llXc,2734
+autonomous/ai/models/openai.py,sha256=2-LttCm6woGklaLbs1H5LjlbfM-7leDwGmC9vksSqW4,13135
 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
@@ -26,7 +30,7 @@ autonomous/db/context_managers.py,sha256=_nH2ajCL8Xy90AuB2rKaryR4iF8Q8ksU3Nei_mZ
 autonomous/db/dereference.py,sha256=EgbpPCXtDZqD_ZuY1Wd4o3ltRy8qEo3C5yRh5_c9fLE,12776
 autonomous/db/document.py,sha256=oZKdTaoqwv9fCHiv450rIxgINASQF3J9FzIsUOUXHhw,44428
 autonomous/db/errors.py,sha256=_QeCotid1kmr7_W0QyH6NUrwwYN9eced_yyyiop0Xlw,4108
-autonomous/db/fields.py,sha256=YMeXO5C8hiWKrknmQtaWOKDF-b1pMVEvCnlZrjMBamE,93568
+autonomous/db/fields.py,sha256=dp7mhnqhZNgM7pP50KS_yX9JK4DfbfSPmswWEV5Zh58,93549
 autonomous/db/mongodb_support.py,sha256=u0X-zpqTIZZP8o2-IDyKRKHL8ALLhvW1VSGtK3fLyos,626
 autonomous/db/pymongo_support.py,sha256=UEZ4RHAGb_t1nuMUAJXMNs0vdH3dutxAH5mwFCmG6jI,2951
 autonomous/db/signals.py,sha256=BM-M4hh4SrTbV9bZVIEWTG8mxgKn9Lo2rC7owLJz4yQ,1791
@@ -38,23 +42,23 @@ autonomous/db/base/fields.py,sha256=NorRXWR_NAJ1D2XkuICfEB6tM977-AaboYl3R2uSy8E,
 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
-autonomous/db/queryset/base.py,sha256=RjxzR55i7pfj9yntMZ_dSTbXp0Ik6HA57tdQFCWXXk8,76103
+autonomous/db/queryset/base.py,sha256=unJiIEwh7dtZblYeLHCvq6QkXm8CYsm09bMnPkNJUYc,76040
 autonomous/db/queryset/field_list.py,sha256=qY50kgMYzloZXrOXnWT0PS_fBJCoThSioRvW9-HmhYA,2964
 autonomous/db/queryset/manager.py,sha256=fXu95TlGChdJWTRA4OnY_Ik25JzezJ2_qPqmH78xJsY,2238
-autonomous/db/queryset/queryset.py,sha256=Xvt1q7Olij9STbJkHm6dKrUIrgyJeY_uwJOYE9WUZvk,5942
-autonomous/db/queryset/transform.py,sha256=UhBdDxYR_bWH0ECnaSw9g9YMwgWRZtsRl_q6PkqO9eY,19615
+autonomous/db/queryset/queryset.py,sha256=SRLYWAQUXgcfNzeMPiH5Mm4WZIemHTNQ24y2EIisNQU,5969
+autonomous/db/queryset/transform.py,sha256=IIZKf_io60zPTIwJ5KcPcrJOOOOjD2yQU7coYClL1Iw,19461
 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=YNye6Iay6zZF8upNCAmrShQjotZhtAuYBV7v_dgRRyk,7627
+autonomous/model/autoattr.py,sha256=FUnQrw65CcZumYiTsQ7U6G6UDGqbeekka-cjz6Sfchc,2675
+autonomous/model/automodel.py,sha256=ltCBs_1H6qL3Igx9nFqAeTcQq2DzLcADHxLOd_DF3hQ,8358
 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.18.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
-autonomous_app-0.3.18.dist-info/METADATA,sha256=4pBmaY1mtfqdPWXwq47l0f_iwtfjcPefoLn_XM7ZFjA,4189
-autonomous_app-0.3.18.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-autonomous_app-0.3.18.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.3.18.dist-info/RECORD,,
+autonomous_app-0.3.19.dist-info/licenses/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
+autonomous_app-0.3.19.dist-info/METADATA,sha256=U3zEdOwuCe2me-SLKY5zh_6EhldjaYqm1atT2QkHo1Y,4305
+autonomous_app-0.3.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+autonomous_app-0.3.19.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.3.19.dist-info/RECORD,,

{autonomous_app-0.3.18.dist-info → autonomous_app-0.3.19.dist-info}/WHEEL

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