clear-skies 1.21.3__py3-none-any.whl → 1.22.0__py3-none-any.whl

{clear_skies-1.21.3.dist-info → clear_skies-1.22.0.dist-info}/METADATA

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

{clear_skies-1.21.3.dist-info → clear_skies-1.22.0.dist-info}/RECORD

@@ -45,14 +45,14 @@ clearskies/autodoc/schema/object.py,sha256=GJ5zLw2CzhezQiNuIhVgRyk0esXqfHD5fxZrc
 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/api_backend.py,sha256=vcGYub4G3jLLstTDkMMnZkID9JQz-qHmKNapgde4gSc,8875
+clearskies/backends/api_backend.py,sha256=PQyT00pMtZZUQhfWySzVbXZ2GpycO93CRKVOmUFeo10,15073
 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
 clearskies/backends/file_backend.py,sha256=tByQdOX1pf6r9-6vRDqOnQ8teRYo0bEWk589qrg598w,1752
 clearskies/backends/json_backend.py,sha256=uDBqkekQadBm0BMoCVuzSPRB-5SjMTCDSAbuIqqwkF8,180
 clearskies/backends/memory_backend.py,sha256=6Ts_NtP9S_QisvpNcQKO0CUqhCRAuL3d5LZYPvSgXW4,20837
-clearskies/backends/restful_api_advanced_search_backend.py,sha256=uiR4SEKhLNmczYJEAkVMIdPWxQc4YWSp-_WzcSL7DEo,5480
+clearskies/backends/restful_api_advanced_search_backend.py,sha256=kBHO7wO_b24pkDXGWbGe0-5efQkkXjP6NQ3EaHC9V-k,3716
 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
@@ -120,7 +120,7 @@ clearskies/di/__init__.py,sha256=T7SgQNny2XAZQPeFkdmp1XxxmEVxtnpcRiGK8YflkwU,304
 clearskies/di/additional_config.py,sha256=jdoS_HWC0MAabori3WwLRAG1i5YKZmQfQ1o0hCoxsPs,526
 clearskies/di/additional_config_auto_import.py,sha256=m57IODPbnCAus9iDu3mDp42u4H87oPZvjAlBGoS8uRQ,111
 clearskies/di/di.py,sha256=g0U0PI73eNp0mkGH3KUN1fmqNic5eEUK-_IB8hQh-Kg,15511
-clearskies/di/standard_dependencies.py,sha256=NW8tNZ2Punwq70XaH_e9IhmQ7ggsFFvum8ymwinoD7U,4522
+clearskies/di/standard_dependencies.py,sha256=Qk1bBowoyptJRMYE6yjQR5Ix-DO7FXxIJk4ZdLj0Y6k,4616
 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
@@ -182,7 +182,7 @@ clearskies/mocks/__init__.py,sha256=T68OUB9gGCX0WoisGzsY3Bt2cCFX7ILHKPqi6XKTJM0,
 clearskies/mocks/input_output.py,sha256=2wD5GbUyVSkXcBg1GTZ-Oz9VzcYxNHfTlmZAODW-7CI,3898
 clearskies/mocks/models.py,sha256=DCzsnMddBvPoBA8JwwbSOhzY7enQWrosgeYD4gx2deI,5124
 clearskies/model.py,sha256=N5el03awXEfTBfhqjS3Yuc6ozMjATs7cMLs_IoZNuaE,13511
-clearskies/models.py,sha256=1H5Vohv1U4avN5_YHqULzc7ynZDRytmZ56x775xWTIo,13038
+clearskies/models.py,sha256=XlNeCu6tGhyAzJ-z9cOX9PXusogljLqgZACtFiL-RnM,13037
 clearskies/secrets/__init__.py,sha256=ctTmA_etV9G_5U21APWENI1HvThrBS4DidGWRtEDHQs,1053
 clearskies/secrets/additional_configs/__init__.py,sha256=cFCrbtKF5nuR061S2y1iKZp349x-y8Srdwe3VZbfSFU,1119
 clearskies/secrets/additional_configs/mysql_connection_dynamic_producer.py,sha256=fOt2eOrVtQXhnK05XuSfWw9GoX6klxXLisJcFT0ycAE,2562
@@ -205,7 +205,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.21.3.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.21.3.dist-info/METADATA,sha256=tV9vLb2zbcNwdE9QlBah3O39Kec5D4im3eO4dowTkTI,1817
-clear_skies-1.21.3.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.21.3.dist-info/RECORD,,
+clear_skies-1.22.0.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.22.0.dist-info/METADATA,sha256=a0Q4D5KWAlqhWVBabYpHGsj6ZNUClL8Ce1eBaXFE03g,1817
+clear_skies-1.22.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.22.0.dist-info/RECORD,,

clearskies/backends/api_backend.py

@@ -3,6 +3,7 @@ from typing import Any, Callable, Dict, List, Tuple
 from ..autodoc.schema import Integer as AutoDocInteger
 from .. import model
 from ..column_types import JSON, DateTime
+import re
 
 
 class ApiBackend(Backend):
@@ -34,6 +35,36 @@ class ApiBackend(Backend):
         self.url = url
         self._auth = auth
 
+    def records_url(self, configuration: Dict[str, Any]) -> str:
+        return self.url
+
+    def count_url(self, configuration: Dict[str, Any]) -> str:
+        return self.records_url(configuration)
+
+    def delete_url(self, id: str, model: model.Model) -> str:
+        return self.url
+
+    def update_url(self, id: str, model: model.Model) -> str:
+        return self.url
+
+    def create_url(self, data: Dict[str, Any], model: model.Model) -> str:
+        return self.url
+
+    def records_method(self, configuration: Dict[str, Any]) -> str:
+        return "GET"
+
+    def count_method(self, configuration: Dict[str, Any]) -> str:
+        return "GET"
+
+    def delete_method(self, id: str, model: model.Model) -> str:
+        return "DELETE"
+
+    def update_method(self, id: str, model: model.Model) -> str:
+        return "PATCH"
+
+    def create_method(self, data: Dict[str, Any], model: model.Model) -> str:
+        return "POST"
+
     def update(self, id, data, model):
         [url, method, json_data, headers] = self._build_update_request(id, data, model)
         response = self._execute_request(url, method, json=json_data, headers=headers)
@@ -42,7 +73,8 @@ class ApiBackend(Backend):
         return self._map_update_response(response.json())
 
     def _build_update_request(self, id, data, model):
-        return [self.url, "PATCH", data, {}]
+        (url, data) = self._finalize_url_and_data(self.update_url(id, model), data)
+        return [url, self.update_method(id, model), data, {}]
 
     def _map_update_response(self, json):
         if not "data" in json:
@@ -55,7 +87,8 @@ class ApiBackend(Backend):
         return self._map_create_response(response.json())
 
     def _build_create_request(self, data, model):
-        return [self.url, "POST", data, {}]
+        (url, data) = self._finalize_url_and_data(self.create_url(data, model), data)
+        return [url, self.create_method(data, model), data, {}]
 
     def _map_create_response(self, json):
         if not "data" in json:
@@ -68,7 +101,9 @@ class ApiBackend(Backend):
         return self._validate_delete_response(response.json())
 
     def _build_delete_request(self, id, model):
-        return [self.url, "DELETE", {model.id_column_name: id}, {}]
+        data = model.data
+        (url, data) = self._finalize_url_and_data(self.delete_url(id, model), data)
+        return [url, self.delete_method(id, model), {model.id_column_name: id}, {}]
 
     def _validate_delete_response(self, json):
         if "status" not in json:
@@ -82,7 +117,13 @@ class ApiBackend(Backend):
         return self._map_count_response(response.json())
 
     def _build_count_request(self, configuration):
-        return [self.url, "GET", {**{"count_only": True}, **self._as_post_data(configuration)}, {}]
+        (url, configuration) = self._finalize_url_and_configuration(self.count_url(configuration), configuration)
+        return [
+            url,
+            self.count_method(configuration),
+            {**{"count_only": True}, **self._as_post_data(configuration)},
+            {},
+        ]
 
     def _map_count_response(self, json):
         if not "total_matches" in json:
@@ -102,7 +143,8 @@ class ApiBackend(Backend):
         return records
 
     def _build_records_request(self, configuration):
-        return [self.url, "GET", self._as_post_data(configuration), {}]
+        (url, configuration) = self._finalize_url_and_configuration(self.records_url(configuration), configuration)
+        return [url, self.records_method(configuration), self._as_post_data(configuration), {}]
 
     def _map_records_response(self, json):
         if not "data" in json:
@@ -224,3 +266,85 @@ class ApiBackend(Backend):
             )
             return {**backend_data, **{column.name: as_date}}
         return column.to_backend(backend_data)
+
+    def _finalize_url_and_data(self, url: str, data: Dict[str, Any]) -> Tuple[str, Dict[str, Any]]:
+        (url, used_columns) = self._finalize_url(url, data, model)
+        for used_column in used_columns:
+            del data[used_column]
+        return (url, data)
+
+    def _finalize_url_and_configuration(self, url: str, configuration: Dict[str, Any]) -> Tuple[str, Dict[str, Any]]:
+        # we need to convert the wheres in the configuration to a dictionary of key/values, but
+        # *only* for cases where we have performed an equals search.
+        filters_by_equals = {}
+        index_lookup = {}
+        for index, where in enumerate(configuration["wheres"]):
+            if where["operator"] != "=":
+                continue
+            filters_by_equals[where["column"]] = where["values"][0]
+            index_lookup[where["column"]] = index
+
+        # always call _finalize_url, even if we don't have any search columns,
+        # because if there are placeholders in the URL but we don't have any values,
+        # then we need to throw an exception.
+        (url, used_columns) = self._finalize_url(url, filters_by_equals, model)
+        # we need to remove the used entries from the wheres but in doing so we start at the end
+        # of the array so our indexes stay valid.
+        to_delete = [index_lookup[used_column] for used_column in used_columns]
+        to_delete.sort(reverse=True)
+        for index_to_delete in to_delete:
+            del configuration["wheres"][index_to_delete]
+
+        return (url, configuration)
+
+    def _finalize_url(self, url: str, data: Dict[str, Any], model: model.Models) -> Tuple[str, List[str]]:
+        """
+        This function is what gives support for placeholders in URLs.  We support two formats:
+
+         1. /some/path/{some_field}/blah
+         2. /some/path/:some_field/blah
+
+        The url comes from the `my_url` function, which (by default) is just self.url.  You can
+        always extend `my_url` to pull the URL from something else (the `model.table_name()` for instance).
+
+        You would then:
+
+        ```
+        models.where("some_field=some_value")
+        ```
+
+        and when the API backend makes the call it will then build the appropriate URL.  Naturally,
+        you'll want to add a corresponding column to your model, otherwise the model will complain
+        that "some_field is not an allowed column in model class 'BLAH'" (since all search columns
+        used in a `where` query go through strict input validation).
+        """
+        # many Snyk API calls require a resource id in the URL.  Let's check if that is the case here,
+        # and if so, get  it out of the query configuration
+        used_columns = []
+        resource_references = self._find_resource_references_in_url(url)
+        for resource_reference in resource_references:
+            resource_name = resource_reference["name"]
+            placeholder = resource_reference["placeholder"]
+            if not data.get(resource_name):
+                raise ValueError(
+                    f"Error building a request with {self.__class__.__name__}: my url, '{url}', has a URL resource named '{resource_name}' but a request was made without providing a value for this resource.  All URL parameters are implicitly required.  Also note that only where clauses with an 'equals' operator will be used when providing search terms for the URL.  So, make sure you add an appropriate: `models.where('{resource_name}=some_value')` search when using the corresponding models class.  Alternatively, if executing a create/delete/update operation, make sure the model and/or save has a value for this column"
+                )
+
+            url = url.replace(placeholder, str(data.get(resource_name)))
+            used_columns.append(resource_name)
+        return (url, used_columns)
+
+    def _find_resource_references_in_url(self, url: str) -> list[str]:
+        if not url:
+            return []
+        # To help with the regexp matching, it helps if the URL both starts and ends with a "/".
+        # We don't need to modify the URL at all - we just need it for our matching, so it's fine
+        # that our changes aren't propogated back to the calling function.
+        if url[-1] != "/":
+            url += "/"
+        if url[0] != "/":
+            url = f"/{url}"
+        return [
+            *[{"name": reference, "placeholder": "{" + reference + "}"} for reference in re.findall(r"{(\w+)}", url)],
+            *[{"name": reference, "placeholder": f":{reference}"} for reference in re.findall(r"/:([^/]+)/", url)],
+        ]

clearskies/backends/restful_api_advanced_search_backend.py

@@ -1,5 +1,6 @@
 from .api_backend import ApiBackend
 from typing import Any, Callable, Dict, List, Tuple
+from .. import model
 from ..autodoc.schema import Integer as AutoDocInteger
 
 
@@ -30,67 +31,39 @@ class RestfulApiAdvancedSearchBackend(ApiBackend):
     def configure(self, auth=None):
         self._auth = auth
 
-    def update(self, id, data, model):
-        [url, method, json_data, headers] = self._build_update_request(id, data, model)
-        response = self._execute_request(url, method, json=json_data, headers=headers)
-        if not response.content:
-            return {**model.data, **data}
-        return self._map_update_response(response.json())
+    def records_url(self, configuration: Dict[str, Any]) -> str:
+        return configuration["table_name"].rstrip("/") + "/search"
 
-    def _build_update_request(self, id, data, model):
-        url = model.table_name().rstrip("/")
-        return [f"{url}/{id}", "PATCH", data, {}]
+    def delete_url(self, id: str, model: model.Model) -> str:
+        table_name = model.table_name().rstrip("/")
+        return f"{table_name}/{id}"
 
-    def _map_update_response(self, json):
-        if not "data" in json:
-            raise ValueError("Unexpected API response to update request")
-        return json["data"]
+    def update_url(self, id: str, model: model.Model) -> str:
+        table_name = model.table_name().rstrip("/")
+        return f"{table_name}/{id}"
 
-    def create(self, data, model):
-        [url, method, json_data, headers] = self._build_create_request(data, model)
-        response = self._execute_request(url, method, json=json_data, headers=headers)
-        return self._map_create_response(response.json())
+    def create_url(self, data: Dict[str, Any], model: model.Model) -> str:
+        return model.table_name().rstrip("/")
 
-    def _build_create_request(self, data, model):
-        return [model.table_name().rstrip("/"), "POST", data, {}]
+    def records_method(self, configuration: Dict[str, Any]) -> str:
+        return "POST"
 
-    def _map_create_response(self, json):
-        if not "data" in json:
-            raise ValueError("Unexpected API response to create request")
-        return json["data"]
-
-    def delete(self, id, model):
-        [url, method, json_data, headers] = self._build_delete_request(id, model)
-        response = self._execute_request(url, method, json=json_data, headers=headers)
-        return self._validate_delete_response(response.json())
+    def count_method(self, configuration: Dict[str, Any]) -> str:
+        return "POST"
 
     def _build_delete_request(self, id, model):
-        url = model.table_name().rstrip("/")
-        return [f"{url}/{id}", "DELETE", {}, {}]
-
-    def _validate_delete_response(self, json):
-        if "status" not in json:
-            raise ValueError("Unexpected response to delete API request")
-        return json["status"] == "success"
-
-    def count(self, configuration, model):
-        configuration = self._check_query_configuration(configuration)
-        [url, method, json_data, headers] = self._build_count_request(configuration, model)
-        response = self._execute_request(url, method, json=json_data, headers=headers)
-        return self._map_count_response(response.json())
+        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, model):
-        url = model.table_name().rstrip("/") + "/search"
-        return [url, "POST", {**{"count_only": True}, **self._as_post_data(configuration, model)}, {}]
-
-    def _map_count_response(self, json):
-        if not "total_matches" in json:
-            raise ValueError("Unexpected API response when executing count request")
-        return json["total_matches"]
+    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, model)
+        [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"]:
@@ -99,37 +72,29 @@ class RestfulApiAdvancedSearchBackend(ApiBackend):
                     next_page_data[key] = value
         return records
 
-    def _build_records_request(self, configuration, model):
-        url = model.table_name().rstrip("/") + "/search"
-        return [url, "POST", self._as_post_data(configuration, model), {}]
-
-    def _map_records_response(self, json):
-        if not "data" in json:
-            raise ValueError("Unexpected response from records request")
-        return json["data"]
-
-    def _as_post_data(self, configuration, model):
+    def _as_post_data(self, configuration):
         data = {
-            "where": list(map(lambda where: self._where_for_post(where, model), configuration["wheres"])),
+            "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, model):
+    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, model, where["values"][0]),
+            "value": self.normalize_outgoing_value(where, columns, where["values"][0]),
         }
 
-    def normalize_outgoing_value(self, where, model, value):
+    def normalize_outgoing_value(self, where, columns, value):
         column_name = where["column"]
-        columns = model.columns()
         if where.get("table") or column_name not in columns:
             return value
         normalized_data = self.column_to_backend(columns[column_name], {column_name: value})

clearskies/di/standard_dependencies.py

@@ -143,4 +143,7 @@ class StandardDependencies(DI):
         """Set the default timezone."""
         import datetime
 
-        return datetime.UTC
+        try:
+            return datetime.UTC
+        except AttributeError as e:
+            return datetime.timezone.utc

clearskies/models.py

@@ -81,7 +81,7 @@ class Models(ABC, ConditionParser):
             "selects": self.query_selects,
             "select_all": self.query_select_all,
             "table_name": self.get_table_name(),
-            "model_columns": self._model_columns,
+            "model_columns": self.model_columns,
         }
 
     @query_configuration.setter