autonomous-app 0.3.8__tar.gz → 0.3.9__tar.gz

{autonomous_app-0.3.8 → autonomous_app-0.3.9}/PKG-INFO

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

@@ -1,4 +1,4 @@
-__version__ = "0.3.8"
+__version__ = "0.3.9"
 
 from dotenv import load_dotenv
 

{autonomous_app-0.3.8 → autonomous_app-0.3.9}/src/autonomous/db/base/fields.py

@@ -259,12 +259,6 @@ class BaseField:
             # next(iter) is useful for sets
             choice_list = [k for k, _ in choice_list]
 
-        # log(
-        #     value,
-        #     type(value),
-        #     choice_list,
-        #     value in choice_list,
-        # )
         # Choices which are other types of Documents
         if isinstance(value, (Document, EmbeddedDocument)):
             if not any(isinstance(value, c) for c in choice_list):
@@ -273,6 +267,7 @@ class BaseField:
         else:
             values = value if isinstance(value, (list, tuple)) else [value]
             if len(set(values) - set(choice_list)):
+                raise Exception(f"Value must be one of {choice_list}, not {value}")
                 self.error("Value must be one of %s" % str(choice_list))
 
     def _validate(self, value, **kwargs):

{autonomous_app-0.3.8 → autonomous_app-0.3.9}/src/autonomous/db/document.py

@@ -417,7 +417,6 @@ class Document(BaseDocument, metaclass=TopLevelDocumentMetaclass):
         if self._meta.get("abstract"):
             raise InvalidDocumentError("Cannot save an abstract document.")
         signals.pre_save.send(self.__class__, document=self, **signal_kwargs)
-
         if validate:
             self.validate(clean=clean)
 

{autonomous_app-0.3.8 → autonomous_app-0.3.9}/src/autonomous/db/fields.py

@@ -1483,21 +1483,22 @@ class GenericReferenceField(BaseField):
                     )
 
     def _validate_choices(self, value):
-        # log(value, self.null)
         if not value and self.null:
             return
         elif isinstance(value, dict):
             # If the field has not been dereferenced, it is still a dict
             # of class and DBRef
-            value = value.get("_cls")
-        elif isinstance(value, Document):
+            # value = value.get("_cls")
+            try:
+                value = self._lazy_load_ref(
+                    get_document(value.get("_cls")), value.get("_ref")
+                )
+            except DoesNotExist:
+                log(f"{value} DoesNotExist")
+                return
+
+        if isinstance(value, Document):
             mro = [cls.__name__ for cls in value.__class__.mro()]
-            # log(
-            #     value,
-            #     mro,
-            #     self.choices,
-            #     _print=True,
-            # )
             base_value = None
             for choice in self.choices:
                 if choice in mro:
@@ -1510,19 +1511,8 @@ class GenericReferenceField(BaseField):
                     f"Invalid Model Type. Must be or derive from on of: {self.choices}, not: {value} for attribute {self.name}"
                 )
         else:
-            # log(
-            #     value,
-            #     type(value),
-            #     "!!!! Need to update to this !!!!",
-            #     _print=True,
-            # )
             value = value.__class__.__name__
-        # log(
-        #     value,
-        #     self.choices,
-        #     type(value),
-        #     _print=True,
-        # )
+        # log(value, type(value))
         super()._validate_choices(value)
 
     @staticmethod
@@ -1543,6 +1533,7 @@ class GenericReferenceField(BaseField):
         auto_dereference = instance._fields[self.name]._auto_dereference
         if auto_dereference and isinstance(value, dict) and "_cls" in value:
             doc_cls = get_document(value["_cls"])
+            log(self.name, value, doc_cls)
             instance._data[self.name] = self._lazy_load_ref(doc_cls, value["_ref"])
 
         return super().__get__(instance, owner)

{autonomous_app-0.3.8 → autonomous_app-0.3.9}/src/autonomous/model/autoattr.py

@@ -56,7 +56,7 @@ class ReferenceAttr(GenericReferenceField):
         try:
             result = super().__get__(instance, owner)
         except DoesNotExist as e:
-            log(f"ReferenceAttr Error: {e}")
+            # log(f"ReferenceAttr Error: {e}")
             return None
         return result
 

{autonomous_app-0.3.8 → autonomous_app-0.3.9}/src/autonomous_app.egg-info/PKG-INFO

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