autonomous-app 0.3.3__tar.gz → 0.3.4__tar.gz

{autonomous_app-0.3.3 → autonomous_app-0.3.4}/PKG-INFO

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

@@ -1,4 +1,4 @@
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 
 from dotenv import load_dotenv
 

{autonomous_app-0.3.3 → autonomous_app-0.3.4}/src/autonomous/db/base/fields.py

@@ -338,12 +338,15 @@ class ComplexBaseField(BaseField):
     @staticmethod
     def _lazy_load_refs(instance, name, ref_values, *, max_depth):
         _dereference = _import_class("DeReference")()
+        # log("_lazy_load_refs", _dereference)
+        # MARK: PROBLEM
         documents = _dereference(
             ref_values,
             max_depth=max_depth,
             instance=instance,
             name=name,
         )
+
         return documents
 
     def __set__(self, instance, value):
@@ -365,14 +368,14 @@ class ComplexBaseField(BaseField):
             # Document class being used rather than a document object
             return self
 
-        ReferenceField = _import_class("ReferenceField")
+        # ReferenceField = _import_class("ReferenceField")
         GenericReferenceField = _import_class("GenericReferenceField")
         # EmbeddedDocumentListField = _import_class("EmbeddedDocumentListField")
 
         auto_dereference = instance._fields[self.name]._auto_dereference
         dereference = auto_dereference and (
-            self.field is None
-            or isinstance(self.field, (GenericReferenceField, ReferenceField))
+            self.field is None or isinstance(self.field, GenericReferenceField)
+            # or isinstance(self.field, (GenericReferenceField, ReferenceField))
         )
 
         if (
@@ -382,11 +385,9 @@ class ComplexBaseField(BaseField):
             and not getattr(instance._data[self.name], "_dereferenced", False)
         ):
             ref_values = instance._data.get(self.name)
-            # log(f"Lazy loading refs for {self.name}: {ref_values}")
             instance._data[self.name] = self._lazy_load_refs(
                 ref_values=ref_values, instance=instance, name=self.name, max_depth=1
             )
-            # log(f"Lazy loading results: {instance._data[self.name]}")
             if hasattr(instance._data[self.name], "_dereferenced"):
                 instance._data[self.name]._dereferenced = True
         value = super().__get__(instance, owner)
@@ -416,7 +417,6 @@ class ComplexBaseField(BaseField):
             )
             value._dereferenced = True
             instance._data[self.name] = value
-        # log(f"Value: {value}")
         return value
 
     def to_python(self, value):

{autonomous_app-0.3.3 → autonomous_app-0.3.4}/src/autonomous/db/dereference.py

@@ -13,7 +13,7 @@ from autonomous.db.connection import get_db
 from autonomous.db.document import Document, EmbeddedDocument
 from autonomous.db.fields import (
     DictField,
-    GenericReferenceField,
+    # GenericReferenceField,
     ListField,
     MapField,
     ReferenceField,
@@ -180,7 +180,6 @@ class DeReference:
                 refs = [
                     dbref for dbref in dbrefs if (collection, dbref) not in object_map
                 ]
-                # log(doc_type)
                 if isinstance(doc_type, Document):
                     references = doc_type._get_db()[collection].find(
                         {"_id": {"$in": refs}}
@@ -225,9 +224,14 @@ class DeReference:
 
         if isinstance(items, (dict, SON)):
             if "_ref" in items:
-                return self.object_map.get(
-                    (items["_ref"].collection, items["_ref"].id), items
+                # MARK: Changed this to remove deleted references
+                # result = self.object_map.get(
+                #     (items["_ref"].collection, items["_ref"].id), items
+                # )
+                result = self.object_map.get(
+                    (items["_ref"].collection, items["_ref"].id)
                 )
+                return result
             elif "_cls" in items:
                 doc = get_document(items["_cls"])._from_son(items)
                 _cls = doc._data.pop("_cls", None)

{autonomous_app-0.3.3 → autonomous_app-0.3.4}/src/autonomous/db/fields.py

@@ -36,7 +36,8 @@ from autonomous.db.base import (
     get_document,
 )
 from autonomous.db.base.utils import LazyRegexCompiler
-from autonomous.db.common import _import_class
+
+# from autonomous.db.common import _import_class
 from autonomous.db.connection import DEFAULT_CONNECTION_NAME, get_db
 from autonomous.db.document import Document, EmbeddedDocument
 from autonomous.db.errors import (
@@ -927,15 +928,14 @@ class ListField(ComplexBaseField):
         if instance is None:
             # Document class being used rather than a document object
             return self
-        value = instance._data.get(self.name)
-        LazyReferenceField = _import_class("LazyReferenceField")
-        GenericLazyReferenceField = _import_class("GenericLazyReferenceField")
-        if (
-            isinstance(self.field, (LazyReferenceField, GenericLazyReferenceField))
-            and value
-        ):
-            instance._data[self.name] = [self.field.build_lazyref(x) for x in value]
-
+        # value = instance._data.get(self.name)
+        # LazyReferenceField = _import_class("LazyReferenceField")
+        # GenericLazyReferenceField = _import_class("GenericLazyReferenceField")
+        # if (
+        #     isinstance(self.field, (LazyReferenceField, GenericLazyReferenceField))
+        #     and value
+        # ):
+        #     instance._data[self.name] = [self.field.build_lazyref(x) for x in value]
         return super().__get__(instance, owner)
 
     def validate(self, value):

{autonomous_app-0.3.3 → autonomous_app-0.3.4}/src/autonomous/db/queryset/base.py

@@ -12,6 +12,7 @@ from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference
 from pymongo.read_concern import ReadConcern
 
+from autonomous import log
 from autonomous.db import signals
 from autonomous.db.base import get_document
 from autonomous.db.common import _import_class
@@ -785,7 +786,6 @@ class BaseQuerySet:
                     doc,
                     _auto_dereference=self._auto_dereference,
                 )
-
         return doc_map
 
     def none(self):

{autonomous_app-0.3.3 → autonomous_app-0.3.4}/src/autonomous/model/autoattr.py

@@ -8,7 +8,6 @@ from autonomous.db.fields import (
     EnumField,
     FileField,
     FloatField,
-    GenericLazyReferenceField,
     GenericReferenceField,
     ImageField,
     IntField,
@@ -59,51 +58,27 @@ class ReferenceAttr(GenericReferenceField):
         return result
 
 
-# class ReferenceAttr(GenericLazyReferenceField):
-#     def __get__(self, instance, owner):
-#         try:
-#             result = super().__get__(instance, owner)
-#         except DoesNotExist as e:
-#             log(f"ReferenceAttr Error: {e}")
-#             return None
-#         return result.fetch() if result and result.pk else result
-
-# except DoesNotExist:
-# If the document doesn't exist, return None
-#    return None
-
-# def validate(self, value):
-#     if value is not None and not self.required:
-#         super().validate(value)
-
-
 class ListAttr(ListField):
-    # pass
     def __get__(self, instance, owner):
-        # log(instance, owner)
         results = super().__get__(instance, owner) or []
-        # print(self.name, self.field, owner, results)
         if isinstance(self.field, ReferenceAttr):
             i = 0
             while i < len(results):
                 try:
                     if not results[i]:
-                        log(f"Removing Object: {results[i]}")
+                        # log(f"Removing Object: {results[i]}")
                         results.pop(i)
                     else:
                         i += 1
                 except DoesNotExist:
                     results.pop(i)
-                    log(f"Object Not Found: {results[i]}")
-        # log(results)
+                    # log(f"Object Not Found: {results[i]}")
         return results
 
 
 class DictAttr(DictField):
     def __get__(self, instance, owner):
-        # log(instance, owner)
         results = super().__get__(instance, owner) or {}
-        # log(self.name, self.field, owner, results)
         for key, lazy_obj in results.items():
             try:
                 if hasattr(lazy_obj, "fetch"):

{autonomous_app-0.3.3 → autonomous_app-0.3.4}/src/autonomous/model/automodel.py

@@ -54,15 +54,16 @@ class AutoModel(Document):
     def _auto_post_init(cls, sender, document, **kwargs):
         sender.auto_post_init(sender, document, **kwargs)
 
-    @classmethod
-    def model_name(cls, qualified=False):
+    def model_name(self, qualified=False):
         """
         Get the fully qualified name of this model.
 
         Returns:
             str: The fully qualified name of this model.
         """
-        return f"{cls.__module__}.{cls.__name__}" if qualified else cls.__name__
+        return (
+            f"{self.__module__}.{self._class_name}" if qualified else self._class_name
+        )
 
     @classmethod
     def load_model(cls, model):

{autonomous_app-0.3.3 → autonomous_app-0.3.4}/src/autonomous_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: autonomous-app
-Version: 0.3.3
+Version: 0.3.4
 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