clear-skies 1.22.1__tar.gz → 1.22.2__tar.gz

{clear_skies-1.22.1 → clear_skies-1.22.2}/PKG-INFO

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

{clear_skies-1.22.1 → clear_skies-1.22.2}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies"
-version = "1.22.1"
+version = "1.22.2"
 description = "A framework for building backends in the cloud"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

{clear_skies-1.22.1 → clear_skies-1.22.2}/src/clearskies/column_types/belongs_to.py

@@ -34,6 +34,7 @@ class BelongsTo(String):
         "model_column_name",
         "readable_parent_columns",
         "join_type",
+        "where",
     ]
 
     def __init__(self, di):
@@ -43,6 +44,7 @@ class BelongsTo(String):
         super()._check_configuration(configuration)
         self.validate_models_class(configuration["parent_models_class"])
 
+        error_prefix = f"Configuration error for '{self.name}' in '{self.model_class.__name__}':"
         if not configuration.get("model_column_name") and self.name[-3:] != "_id":
             raise ValueError(
                 f"Invalid name for column '{self.name}' in '{self.model_class.__name__}' - "
@@ -50,19 +52,14 @@ class BelongsTo(String):
                 + "that the parent model can be fetched from."
             )
         if configuration.get("model_column_name") and type(configuration.get("model_column_name")) != str:
-            raise ValueError(
-                f"Configuration error for '{self.name}' in '{self.model_class.__name__}': 'model_column_name' must be a string."
-            )
+            raise ValueError(f"{error_prefix} 'model_column_name' must be a string.")
 
         join_type = configuration.get("join_type")
         if join_type and join_type.upper() not in ["LEFT", "INNER"]:
-            raise ValueError(
-                f"Configuration error for '{self.name}' in '{self.model_class.__name__}': join_type must be INNER or LEFT"
-            )
+            raise ValueError(f"{error_prefix} join_type must be INNER or LEFT")
 
         if configuration.get("readable_parent_columns"):
             parent_columns = self.di.build(configuration["parent_models_class"], cache=True).raw_columns_configuration()
-            error_prefix = f"Configuration error for '{self.name}' in '{self.model_class.__name__}':"
             readable_parent_columns = configuration["readable_parent_columns"]
             if not hasattr(readable_parent_columns, "__iter__"):
                 raise ValueError(
@@ -81,6 +78,19 @@ class BelongsTo(String):
                         + "column does not exist in the model class."
                     )
 
+        wheres = configuration.get("where")
+        if wheres:
+            if not isinstance(wheres, list):
+                raise ValueError(
+                    f"{error_prefix} 'where' must be a list of where conditions or callables that return where conditions"
+                )
+            for index, where in enumerate(wheres):
+                if callable(where) or isinstance(where, str):
+                    continue
+                raise ValueError(
+                    f"{error_prefix} 'where' must be a list of where conditions or callables that return where conditions, but the item in entry #${index+1} was neither a string nor a callable"
+                )
+
     def _finalize_configuration(self, configuration):
         return {
             **super()._finalize_configuration(configuration),
@@ -89,6 +99,7 @@ class BelongsTo(String):
                 if configuration.get("model_column_name")
                 else self.name[:-3],
                 "join_type": configuration.get("join_type", "INNER").upper(),
+                "where": configuration.get("where", []),
             },
         }
 
@@ -149,7 +160,17 @@ class BelongsTo(String):
 
     @property
     def parent_models(self):
-        return self.di.build(self.config("parent_models_class"), cache=True)
+        parents = self.di.build(self.config("parent_models_class"), cache=True)
+        for where in self.config("where"):
+            if callable(where):
+                parents = self.di.call_function(where, model=parents)
+                if not parents:
+                    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:
+                parents = parents.where(where)
+        return parents
 
     @property
     def parent_columns(self):

{clear_skies-1.22.1 → clear_skies-1.22.2}/src/clearskies/column_types/has_many.py

@@ -27,6 +27,7 @@ class HasMany(Column):
         "is_readable",
         "readable_child_columns",
         "parent_id_column_name",
+        "where",
     ]
 
     def __init__(self, di):
@@ -63,9 +64,10 @@ class HasMany(Column):
 
     def _check_configuration(self, configuration):
         super()._check_configuration(configuration)
+        error_prefix = f"Configuration error for '{self.name}' in '{self.model_class.__name__}':"
+
         if configuration.get("is_readable"):
             child_columns = self.di.build(configuration["child_models_class"], cache=True).raw_columns_configuration()
-            error_prefix = f"Configuration error for '{self.name}' in '{self.model_class.__name__}':"
             if not "readable_child_columns" in configuration:
                 raise ValueError(f"{error_prefix} must provide 'readable_child_columns' if is_readable is set")
             readable_child_columns = configuration["readable_child_columns"]
@@ -86,6 +88,19 @@ class HasMany(Column):
                         + "column does not exist in the model class."
                     )
 
+        wheres = configuration.get("where")
+        if wheres:
+            if not isinstance(wheres, list):
+                raise ValueError(
+                    f"{error_prefix} 'where' must be a list of where conditions or callables that return where conditions"
+                )
+            for index, where in enumerate(wheres):
+                if callable(where) or isinstance(where, str):
+                    continue
+                raise ValueError(
+                    f"{error_prefix} 'where' must be a list of where conditions or callables that return where conditions, but the item in entry #${index+1} was neither a string nor a callable"
+                )
+
     def get_child_columns(self):
         if "child_columns" not in self.configuration:
             self.configuration["child_columns"] = self.child_models.columns()
@@ -119,7 +134,17 @@ class HasMany(Column):
 
     @property
     def child_models(self):
-        return self.di.build(self.config("child_models_class"), cache=True)
+        children = self.di.build(self.config("child_models_class"), cache=True)
+        for index, where in enumerate(self.config("where")):
+            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
 
     def documentation(self, name=None, example=None, value=None):
         columns = self.get_child_columns()