clear-skies 1.22.4__py3-none-any.whl → 1.22.6__py3-none-any.whl

{clear_skies-1.22.4.dist-info → clear_skies-1.22.6.dist-info}/METADATA

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

{clear_skies-1.22.4.dist-info → clear_skies-1.22.6.dist-info}/RECORD

@@ -45,9 +45,9 @@ clearskies/autodoc/schema/number.py,sha256=aw1UcA2fdgWL8ao8mbpgd5DgI50c9hli9U8GJ
 clearskies/autodoc/schema/object.py,sha256=GJ5zLw2CzhezQiNuIhVgRyk0esXqfHD5fxZrcn3tUow,383
 clearskies/autodoc/schema/password.py,sha256=Ptj8OeddAL4h69KWqZ6ubZ2awR13xdDIrNe2N0T1jic,196
 clearskies/autodoc/schema/string.py,sha256=oxZPCxYYhWnNHdbtwD3QuniStbj8XbBBpDTFXgPR1VU,244
-clearskies/backends/__init__.py,sha256=IqIpTNdA0U14wFNBkotwc9kZr_mMw3ry8LnldOZ0HLs,755
+clearskies/backends/__init__.py,sha256=ATNzuDYREx-VBWemPmG95FR8EzO2X0--7tkErUuF9Qc,832
 clearskies/backends/api_backend.py,sha256=PQyT00pMtZZUQhfWySzVbXZ2GpycO93CRKVOmUFeo10,15073
-clearskies/backends/api_get_only_backend.py,sha256=OWXdoaSaF5fWb7GN1OgkGED3edKfoeOBMHc8bKtm2ig,3885
+clearskies/backends/api_get_only_backend.py,sha256=KfFF72l31KBK--90lIkDqE5gcTnolSkShUqNaaWZ_gc,1690
 clearskies/backends/backend.py,sha256=fkL-De0MUdzcS2JG_spSUQZIVL9oRFvaL6SP26JPpcI,7399
 clearskies/backends/cursor_backend.py,sha256=VntlPS6z6bnZOC3XRJ-WFf5gK3pFUhH_qJpnZn8hl9U,11278
 clearskies/backends/example_backend.py,sha256=jVpv0LZpNUEJGko0XqioLkHmZHbCW6M4YyNvzKlZcDw,1413
@@ -58,7 +58,7 @@ clearskies/backends/restful_api_advanced_search_backend.py,sha256=kBHO7wO_b24pkD
 clearskies/backends/secrets_backend.py,sha256=4lzrgdL_O_pgCT5HknV2gotFgp9GzjQ5_2n0-4H4kvs,2204
 clearskies/binding_config.py,sha256=bF8LBNEgJacwKCqToAtDqN9hv5omzU7zt_4qB9KPtE0,457
 clearskies/column_types/__init__.py,sha256=wofhLfyW00I6tb6o9DMsMx7j9hlbbqefhDzWfw0Row0,4731
-clearskies/column_types/audit.py,sha256=2YcrZVVElpOUdmxYTQ_6CshL1HVou6fz65dOOs_b8Gw,9659
+clearskies/column_types/audit.py,sha256=K908Gv2GBt8LOsAqz7RLCpyByeLoq1gFT7EOcMAnkQ8,9676
 clearskies/column_types/belongs_to.py,sha256=E7Wi84vr2PnNw7TBCoZa8jkpwiJhO-iQmZ_ekq26kTs,12206
 clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR51AUkQ,1878
 clearskies/column_types/category_tree.py,sha256=kPx0fNTJxHaaEI_-0JxQ7NBcV2bYgUDGmtf1wmTqoEg,13172
@@ -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=z1tco_KWLr8WqKk5X8HJwdfjxpT2WwWNb5hgwDHM2fU,7432
+clearskies/column_types/has_many.py,sha256=hQYV5I-mmC8-u_O225AP_2ylNQONQZ8dAr1P-XjdAO0,7521
 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
@@ -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.4.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.22.4.dist-info/METADATA,sha256=SZGajdsDaEFzGlXfxCh-KswybzLFf5Z2SCrl4r0TqKY,1817
-clear_skies-1.22.4.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.22.4.dist-info/RECORD,,
+clear_skies-1.22.6.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.22.6.dist-info/METADATA,sha256=T5O-efftiQQCctIXwnfYcXY82tA06-pZkXWSk-I5zAQ,1817
+clear_skies-1.22.6.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.22.6.dist-info/RECORD,,

clearskies/backends/__init__.py

@@ -1,5 +1,6 @@
 from .. import binding_config
 from .api_backend import ApiBackend
+from .api_get_only_backend import ApiGetOnlyBackend
 from .backend import Backend
 from .cursor_backend import CursorBackend
 from .example_backend import ExampleBackend
@@ -16,6 +17,7 @@ def example_backend(data):
 
 __all__ = [
     "ApiBackend",
+    "ApiGetOnlyBackend",
     "Backend",
     "CursorBackend",
     "ExampleBackend",

clearskies/backends/api_get_only_backend.py

@@ -1,6 +1,5 @@
 from .api_backend import ApiBackend
-from typing import Any, Callable, Dict, List, Tuple
-from .. import model
+from typing import Any, Dict
 
 
 class ApiGetOnlyBackend(ApiBackend):
@@ -18,84 +17,32 @@ class ApiGetOnlyBackend(ApiBackend):
     def __init__(self, requests):
         self._requests = requests
 
-    def configure(self, auth=None, origin=None, id_column_name="id"):
+    def configure(self, auth=None, origin="", id_column_name="id"):
         self._auth = auth
         self._origin = origin
         self._id_column_name = id_column_name
 
     def records_url(self, configuration):
+        if not len(configuration["wheres"]):
+            raise ValueError(
+                f"When using the {self.__class__.__name__} backend, you must search the model by the id column.  A records request was executed but no search conditions were found."
+            )
         record_id = None
         for where in configuration["wheres"]:
-            if where["column"] == "id":
+            if where["column"] == self._id_column_name:
                 record_id = where["values"][0]
-        if record_id:
-            return self.auth_origin + configuration["table_name"].strip("/") + f"/{record_id}"
-        return self.auth_origin + configuration["table_name"].strip("/") + "/search"
+        if not record_id:
+            raise ValueError(
+                f"When using  the {self.__class__.__name__} backend, you must search by the id column ('{self._id_column_name}').  A records request was executed but there was no condition set for the '{self._id_column_name}' column"
+            )
 
-    def delete_url(self, id: str, model: model.Model) -> str:
-        table_name = model.table_name().rstrip("/")
-        return f"{table_name}/{id}"
-
-    def update_url(self, id: str, model: model.Model) -> str:
-        table_name = model.table_name().rstrip("/")
-        return f"{table_name}/{id}"
-
-    def create_url(self, data: Dict[str, Any], model: model.Model) -> str:
-        return model.table_name().rstrip("/")
+        return self._origin + configuration["table_name"].strip("/") + f"/{record_id}"
 
     def records_method(self, configuration: Dict[str, Any]) -> str:
-        return "POST"
-
-    def count_method(self, configuration: Dict[str, Any]) -> str:
-        return "POST"
-
-    def _build_delete_request(self, id, model):
-        data = model.data
-        (url, data) = self._finalize_url_and_data(self.delete_url(id, model), data)
-        return [url, self.delete_method(id, model), {}, {}]
-
-    def _build_count_request(self, configuration):
-        [url, method, json_data, headers] = super()._build_count_request(configuration)
-        json_data["count_only"] = True
-        return [url, method, json_data, headers]
-
-    def records(self, configuration, model, next_page_data={}):
-        configuration = self._check_query_configuration(configuration)
-        [url, method, json_data, headers] = self._build_records_request(configuration)
-        response = self._execute_request(url, method, json=json_data, headers=headers).json()
-        records = self._map_records_response(response)
-        for next_page_key in ["nextPage", "NextPage", "next_page"]:
-            if response.get("pagination", {}).get(next_page_key):
-                for key, value in response["pagination"][next_page_key].items():
-                    next_page_data[key] = value
-        return records
-
-    def _as_post_data(self, configuration):
-        data = {
-            "where": list(
-                map(lambda where: self._where_for_post(where, configuration["model_columns"]), configuration["wheres"])
-            ),
-            "sort": configuration["sorts"],
-            "start": configuration["pagination"].get("start", 0),
-            "limit": configuration["limit"],
-        }
-        return {key: value for (key, value) in data.items() if value}
-
-    def _where_for_post(self, where, columns):
-        prefix = ""
-        if where.get("table"):
-            prefix = where["table"] + "."
-        return {
-            "column": prefix + where["column"],
-            "operator": where["operator"],
-            "value": self.normalize_outgoing_value(where, columns, where["values"][0]),
-        }
+        return "GET"
 
-    def normalize_outgoing_value(self, where, columns, value):
-        column_name = where["column"]
-        if where.get("table") or column_name not in columns:
-            return value
-        normalized_data = self.column_to_backend(columns[column_name], {column_name: value})
-        if column_name in normalized_data:
-            return normalized_data[column_name]
-        return value
+    def _map_records_response(self, json):
+        response = super()._map_records_response(json)
+        if isinstance(response, dict):
+            return [response]
+        return response

clearskies/column_types/audit.py

@@ -49,6 +49,7 @@ class Audit(has_many.HasMany):
         "readable_child_columns",
         "parent_class_name",
         "parent_id_column_name",
+        "where",
     ]
 
     def __init__(self, di):

clearskies/column_types/has_many.py

@@ -143,7 +143,11 @@ class HasMany(Column):
     @property
     def child_models(self):
         children = self.di.build(self.config("child_models_class"), cache=True)
-        for index, where in enumerate(self.config("where")):
+        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: