autonomous-app 0.2.10__py3-none-any.whl → 0.2.12__py3-none-any.whl

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

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

@@ -1,4 +1,4 @@
-autonomous/__init__.py,sha256=6Gx0yWtceijOFZrDoqiDnCCUt7YhMRrM0fd-orCa4-g,87
+autonomous/__init__.py,sha256=BzYOmRUM9f7I1t1IHSyAmpOQVI0y31idB2XhOMKZOa8,87
 autonomous/cli.py,sha256=z4AaGeWNW_uBLFAHng0J_lfS9v3fXemK1PeT85u4Eo4,42
 autonomous/logger.py,sha256=hDX3gvbcWiGPvA8pfarih3xHS4aHG_NuNkF8PQfq_pM,1844
 autonomous/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,9 +15,9 @@ autonomous/errors/__init__.py,sha256=OruWG9IkAF4LN-OAo5c2K9Dnds4oZFJJQHKaXbQaWnA
 autonomous/errors/danglingreferenceerror.py,sha256=obfNjpn2vsyK4ak-UuuwFTMVzecs1SaeFPshOvnukS8,275
 autonomous/model/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 autonomous/model/autoattribute.py,sha256=q09cORKC6-LpoZ3Ez-lRkd5kxuSFQrB2nA2f9_8k2c8,588
-autonomous/model/automodel.py,sha256=dkeBWG5oPqFDBpm_aLfPJ0EvxQHQQ1VFSIItAfbSGNQ,11853
+autonomous/model/automodel.py,sha256=Z8iDZB7frSV_lQ09HL-l0ff0_ePEuPwjLzWnpbdCsJw,12391
 autonomous/model/orm.py,sha256=IJrbp15RmBgF61vLsqcS_VdnAnw9736sLW75_xFYE9Y,2521
-autonomous/model/serializer.py,sha256=EnjyS-aWFTt1aDtEavR2xAmNGTX75cekTovohBfPhb0,2939
+autonomous/model/serializer.py,sha256=0nfmw4-QNP-ozL4IVbgQyfPRF2i0-uG9pQZwgEPYuxU,3026
 autonomous/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autonomous/storage/imagestorage.py,sha256=WOBvnpW3VhvliT2pXtaD_Msh1XEAVxqEBELblsvfdtA,3970
 autonomous/storage/localstorage.py,sha256=FzrR6O9mMGAZt5dDgqzkeOQVfGRXCygR0kksz2MPpwE,2286
@@ -29,8 +29,8 @@ autonomous/storage/version_control/GHVersionControl.py,sha256=VIhVRxe6gJgozFWyhy
 autonomous/storage/version_control/__init__.py,sha256=tP0bAWYl1RwBRi62HsIidmgyqHuSlCUqwGuKUKKRugc,117
 autonomous/tasks/__init__.py,sha256=pn7iZ14MhcHUdzcLkfkd4-45wgPP0tXahAz_cFgb_Tg,32
 autonomous/tasks/autotask.py,sha256=_WQ8w1LyV2FVJ0Ct0FoF9q1W8ClXfS57-omnBb0LNWE,4910
-autonomous_app-0.2.10.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
-autonomous_app-0.2.10.dist-info/METADATA,sha256=TwXgcegPilBX155OpzKZ25S9gJSryHQtSeQ1Yh1-K4s,4229
-autonomous_app-0.2.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-autonomous_app-0.2.10.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
-autonomous_app-0.2.10.dist-info/RECORD,,
+autonomous_app-0.2.12.dist-info/LICENSE,sha256=-PHHSuDRkodHo3PEdMkDtoIdmLAOomMq6lsLaOetU8g,1076
+autonomous_app-0.2.12.dist-info/METADATA,sha256=u1xqcKoYi57wSBGPC41kUVgQ_bTq9wpcroh8mulvE7w,4229
+autonomous_app-0.2.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+autonomous_app-0.2.12.dist-info/top_level.txt,sha256=ZyxWWDdbvZekF3UFunxl4BQsVDb_FOW3eTn0vun_jb4,11
+autonomous_app-0.2.12.dist-info/RECORD,,