autonomous-app 0.2.10__tar.gz → 0.2.12__tar.gz

{autonomous_app-0.2.10 → autonomous_app-0.2.12}/PKG-INFO

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

@@ -1,4 +1,4 @@
-__version__ = "0.2.10"
+__version__ = "0.2.12"
 
 from .logger import log
 from .model.automodel import AutoModel

{autonomous_app-0.2.10 → autonomous_app-0.2.12}/src/autonomous/model/automodel.py

@@ -20,11 +20,16 @@ class DelayedModel:
         assert model
         assert pk
         module_name, class_name = model.rsplit(".", 1)
-        module = importlib.import_module(module_name)
-        model = getattr(module, class_name)
-        object.__setattr__(self, "_delayed_model", model)
-        object.__setattr__(self, "_delayed_pk", pk)
-        object.__setattr__(self, "_delayed_obj", None)
+        try:
+            module = importlib.import_module(module_name)
+        except ModuleNotFoundError as e:
+            log(e)
+            raise DanglingReferenceError(model, pk, None)
+        else:
+            model = getattr(module, class_name)
+            object.__setattr__(self, "_delayed_model", model)
+            object.__setattr__(self, "_delayed_pk", pk)
+            object.__setattr__(self, "_delayed_obj", None)
 
     def _instance(self):
         #### DO NOT TO ANY LOGGING IN THIS METHOD; IT CAUSES INFINITE RECURSION ####
@@ -137,28 +142,38 @@ class AutoModel(ABC):
                     super().__setattr__(name, result)
 
             elif isinstance(obj, list):
+                results = []
+                scrubbed = False
                 for i, item in enumerate(obj):
                     if isinstance(item, DelayedModel):
                         try:
                             result = item._instance()
                         except DanglingReferenceError as e:
                             log(e)
-                            obj[i] = None
-                            self.save()
+                            scrubbed = True
                         else:
-                            obj[i] = result
+                            results.append(result)
+                if scrubbed:
+                    super().__setattr__(name, results)
+                    obj = results
+                    self.save()
 
             elif isinstance(obj, dict):
+                results = {}
+                scrubbed = False
                 for key, item in obj.items():
                     if isinstance(item, DelayedModel):
                         try:
                             result = item._instance()
                         except DanglingReferenceError as e:
                             log(e)
-                            obj[key] = None
-                            self.save()
+                            scrubbed = True
                         else:
-                            obj[key] = result
+                            results[key] = result
+                    if scrubbed:
+                        super().__setattr__(name, results)
+                        obj = results
+                        self.save()
         return obj
 
     def __str__(self) -> str:

{autonomous_app-0.2.10 → autonomous_app-0.2.12}/src/autonomous/model/serializer.py

@@ -91,6 +91,9 @@ class AutoDecoder:
             if not obj["pk"]:
                 raise KeyError
             return DelayedModel(obj["_automodel"], obj["pk"])
+        except DanglingReferenceError as e:
+            log(e)
+            return None
         except KeyError:
             log(
                 "AutoModel",

{autonomous_app-0.2.10 → autonomous_app-0.2.12}/src/autonomous_app.egg-info/PKG-INFO

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