clear-skies 1.22.7__py3-none-any.whl → 1.22.9__py3-none-any.whl

{clear_skies-1.22.7.dist-info → clear_skies-1.22.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.22.7
+Version: 1.22.9
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT

{clear_skies-1.22.7.dist-info → clear_skies-1.22.9.dist-info}/RECORD

@@ -74,7 +74,7 @@ clearskies/column_types/datetime.py,sha256=xtuZpUC9fA16i1oO80kPIx--8RDPuei9RdsDD
 clearskies/column_types/datetime_micro.py,sha256=ewQSniCc2MmNIyX2XNuNcCIwh5Fpf1HcvpLfzB8lz8g,382
 clearskies/column_types/email.py,sha256=qq0Yo_C3KxUqT68q2HWXocBBR4xwMqjxcIdgZRv218U,584
 clearskies/column_types/float.py,sha256=j8jJeBueSOusPtAFCWgLHYBncfLnqT1U7bh1zcAkYiA,1332
-clearskies/column_types/has_many.py,sha256=hQYV5I-mmC8-u_O225AP_2ylNQONQZ8dAr1P-XjdAO0,7521
+clearskies/column_types/has_many.py,sha256=vcx6QU-LH-4hh_-LNfDBePt80hIFebSpTreGLh86pVc,7681
 clearskies/column_types/has_one.py,sha256=uphIPUuHLwwmhljLMaKKPujR6TYTT7onn-hHUF6S_IY,2230
 clearskies/column_types/integer.py,sha256=dGIluusPmhLRNg7PplOJLbQI2AXojqRBUHt8ekYWNVI,1386
 clearskies/column_types/json.py,sha256=TbZkdwCoZYhbALUxof2jENGfaq2i5TlcyBcmo7XzDGQ,652
@@ -122,7 +122,7 @@ clearskies/di/__init__.py,sha256=T7SgQNny2XAZQPeFkdmp1XxxmEVxtnpcRiGK8YflkwU,304
 clearskies/di/additional_config.py,sha256=PGWV-diJyqlx7WtYr4xV2Uo5W0-f4rmwdPWJRXq6V_8,592
 clearskies/di/additional_config_auto_import.py,sha256=m57IODPbnCAus9iDu3mDp42u4H87oPZvjAlBGoS8uRQ,111
 clearskies/di/di.py,sha256=4ZbOKpchVdl7-MOoKPsU_-AlZivwYCqcY0yaOZ96D0Q,15591
-clearskies/di/standard_dependencies.py,sha256=Qk1bBowoyptJRMYE6yjQR5Ix-DO7FXxIJk4ZdLj0Y6k,4616
+clearskies/di/standard_dependencies.py,sha256=4cxWRjru5uKLW_1IJHKAgVu2cqc9gPcV0vZVm4HQxNg,4764
 clearskies/di/test_module/__init__.py,sha256=7YHQF7JHP0FdI7GdEGANSZ_t1EISQYhUNm1wqOg0NKw,88
 clearskies/di/test_module/another_module/__init__.py,sha256=8SRmHPDepLKGWTUSc1ucDF6U8mJPsNDsBDmBQCpzPWo,35
 clearskies/di/test_module/module_class.py,sha256=I_-wnMuHfbsvti-7d2Z4bXnr6deo__uvww9nds9qrlE,46
@@ -207,7 +207,7 @@ clearskies/tests/simple_api/models/__init__.py,sha256=nUA0W6fgXw_Bxa9CudkaDkC80t
 clearskies/tests/simple_api/models/status.py,sha256=PEhPbaQh5qdUNHp8O0gz91LOLENAEBtqSaHxUPXchaM,699
 clearskies/tests/simple_api/models/user.py,sha256=5_P4Tp1tTdX7PkMJ__epPM5MA7JAeVYGas69vcWloLc,819
 clearskies/tests/simple_api/users_api.py,sha256=KYXCgEofDxHeRdQK67txN5oYUPvxxmB8JTku7L-apk4,2344
-clear_skies-1.22.7.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.22.7.dist-info/METADATA,sha256=pQoYwMvXFjfJ0UXI3x7VVvT3qwZrxBNq71TOc0OJYjs,1817
-clear_skies-1.22.7.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.22.7.dist-info/RECORD,,
+clear_skies-1.22.9.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.22.9.dist-info/METADATA,sha256=jJUINjTnq9DEn8oKxCaaKK6RruZUT0zRkVBJUGo3D0s,1817
+clear_skies-1.22.9.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.22.9.dist-info/RECORD,,

clearskies/column_types/has_many.py

@@ -4,6 +4,7 @@ from collections import OrderedDict
 from ..autodoc.schema import Array as AutoDocArray
 from ..autodoc.schema import Object as AutoDocObject
 from ..autodoc.schema import String as AutoDocString
+from ..functional import validations
 
 
 class HasMany(Column):
@@ -50,7 +51,8 @@ class HasMany(Column):
                 + f"'{model_class.__name__}'"
             )
         self.validate_models_class(configuration["child_models_class"])
-        configuration["parent_id_column_name"] = model_class.id_column_name
+        if not configuration.get("parent_id_column_name"):
+            configuration["parent_id_column_name"] = model_class.id_column_name
 
         # if readable_child_columns is set then load up the child models/columns now, because we'll need it in the
         # _check_configuration step, but we don't want to load it there because we can't save it back into the config
@@ -120,7 +122,22 @@ class HasMany(Column):
     def provide(self, data, column_name):
         foreign_column_name = self.config("foreign_column_name")
         id_column_name = self.config("parent_id_column_name")
-        return self.child_models.where(f"{foreign_column_name}={data[id_column_name]}")
+        children = self.child_models.where(f"{foreign_column_name}={data[id_column_name]}")
+
+        wheres = self.config("where", silent=True)
+        if not wheres:
+            return children
+
+        for index, where in enumerate(wheres):
+            if callable(where):
+                children = self.di.call_function(where, model=children, children=children, parent_data=data)
+                if not validations.is_model(children):
+                    raise ValueError(
+                        f"Configuration error for column '{self.name}' in model '{self.model_class.__name__}': when 'where' is a callable, it must return a models class, but when the callable in where entry #{index+1} was called, it did not return the models class"
+                    )
+            else:
+                children = children.where(where)
+        return children
 
     def to_json(self, model):
         children = []
@@ -142,21 +159,7 @@ class HasMany(Column):
 
     @property
     def child_models(self):
-        children = self.di.build(self.config("child_models_class"), cache=True)
-        wheres = self.config("where", silent=True)
-        if not wheres:
-            return children
-
-        for index, where in enumerate(wheres):
-            if callable(where):
-                children = self.di.call_function(where, model=children)
-                if not children:
-                    raise ValueError(
-                        f"Configuration error for column '{self.name}' in model '{self.model_class.__name__}': when 'where' is a callable, it must return a models class, but when the callable in where entry #{index+1} was called, it did not return the models class"
-                    )
-            else:
-                children = children.where(where)
-        return children
+        return self.di.build(self.config("child_models_class"), cache=True)
 
     def documentation(self, name=None, example=None, value=None):
         columns = self.get_child_columns()

clearskies/di/standard_dependencies.py

@@ -123,7 +123,9 @@ class StandardDependencies(DI):
         return datetime.datetime.now(datetime.timezone.utc)
 
     def provide_input_output(self):
-        raise AttributeError("The dependency injector requested an InputOutput but none has been configured")
+        raise AttributeError(
+            "The dependency injector requested an InputOutput but none has been configured.  Alternatively, if you directly called `di.build('input_output')` then try again with `di.build('input_output', cache=True)`"
+        )
 
     def provide_authentication(self):
         raise AttributeError("The dependency injector requested an Authenticaiton method but none has been configured")