clear-skies 1.18.6__py3-none-any.whl → 1.18.8__py3-none-any.whl

{clear_skies-1.18.6.dist-info → clear_skies-1.18.8.dist-info}/METADATA

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

{clear_skies-1.18.6.dist-info → clear_skies-1.18.8.dist-info}/RECORD

@@ -61,7 +61,7 @@ clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR5
 clearskies/column_types/category_tree.py,sha256=PgNmzZPyqYS5NADH_QTCxLvDXZFxzv5ESKTkvPrrLXo,9140
 clearskies/column_types/column.py,sha256=TCGqtsCEYJr6BHs-PS1yFoUHGIwcx5oTujytNkTAcrk,13243
 clearskies/column_types/created.py,sha256=R8P3egUb7JEHoU_NtbmN9OIwBUHQ0XFi1GoAb5RpSkI,339
-clearskies/column_types/created_by_authorization_data.py,sha256=TBcALV3uchur2Aq9JCRCAihjZrZKc95VZJSIYgY3Ve0,557
+clearskies/column_types/created_by_authorization_data.py,sha256=--1w1TOSo2CMwrpn6Y_iorl2RTqLgG8MbR8k27qreew,1108
 clearskies/column_types/created_by_ip.py,sha256=wwCUoEwHEVGN89x4xP7NJ6QR85Aum6v3JmxofoQrqtg,395
 clearskies/column_types/created_by_user_agent.py,sha256=sSYDRrqSjsCwcYlhF_s9NO-iDww3PaH6aO2ATp_SKGQ,419
 clearskies/column_types/datetime.py,sha256=MuVaeI6FMgevTdgv6djZjlHogs72TC1HTuYdw_6MF2M,3824
@@ -121,7 +121,7 @@ clearskies/functional/string.py,sha256=Jmz8G9PW41THIRfDT2WXtRk3yzJG3Zt4DKH6X2C2p
 clearskies/functional/validations.py,sha256=f1fTQ4rdFZouxoovAPg-YAgf0Q0QNpKEzxWWL7EFUHI,645
 clearskies/handlers/__init__.py,sha256=YIQeKkkFhXwn7Rcc7Qllh2RGkKB0nDjt1nwowqEuJ3E,968
 clearskies/handlers/advanced_search.py,sha256=aB6DaMIsms6luVPQLhPwV9sBTOyh4ip_gi-0l_52YLE,12934
-clearskies/handlers/base.py,sha256=K_6-HupAAjmVb9pusjit0aRM3VtF63YCLMT4a_ZKM2Q,22888
+clearskies/handlers/base.py,sha256=6_glA2SDJHH03NnL1XLmlyMqRf_bWYVzCwrMy-vo5Qk,22890
 clearskies/handlers/callable.py,sha256=RxDPBuk1socPQvPhuKhCiidhAnXXLdSdG0sVtNAmi8c,8001
 clearskies/handlers/create.py,sha256=xj_hVYma2sKDK5Vq_R9wo8f0ZXfGlXTkYU71AMyKF2U,1232
 clearskies/handlers/crud_by_method.py,sha256=BOkPX-LUvQrbRLSbyTfRh4c8nPF51dZEXSKOl7m9ZYA,435
@@ -140,12 +140,12 @@ clearskies/handlers/list.py,sha256=f17wbS1gVopTTzV9rwmEb7KjHnoiwercENZbXJDwChI,2
 clearskies/handlers/mygrations.py,sha256=4iKpJKooqgNtAURwMl_FgsXUt8OYOaG_TY1OV1llQxY,2759
 clearskies/handlers/request_method_routing.py,sha256=DgPEz3tgbaUkXHsOriPbIctfSf4Gm4NxfRdVulH91Kg,1636
 clearskies/handlers/restful_api.py,sha256=1rJ2REX1sTAdbqaRuCclP375agrho4zNNQx6hXGa4nQ,9258
-clearskies/handlers/routing.py,sha256=tHJHNbszas2txUZiKl0xi2kB2x3Sjx6H8lLouoAWp4Y,3078
+clearskies/handlers/routing.py,sha256=uWKWcEaiHVqfDebPkQVuG9AS8pOixW31wW0yIQ-25Aw,3079
 clearskies/handlers/schema_helper.py,sha256=62644USvFlZu_6tT7rb-k6t_5J3Q0uZsJwP5KREk_WM,4961
 clearskies/handlers/simple_routing.py,sha256=8T4eKLIurZO3ZdIPgi-0pypQp_X4BKkbet_Ymba5br4,9332
-clearskies/handlers/simple_routing_route.py,sha256=C-dDLubkUnAazxAcXoyGxMX4g24Iwz7wX5rf5T8T8kU,7376
+clearskies/handlers/simple_routing_route.py,sha256=bdJh1Py6FhWU8kO_9au0rkjbRUXhafPInskg2tOfnVU,8609
 clearskies/handlers/simple_search.py,sha256=hZ0rMfhS-BB6LTpdl0I53pEUBgbgIwtXvcW_8ZEOZOs,6003
-clearskies/handlers/update.py,sha256=GAtkZpim6YI-XvtJ4qm-fwlz7gHYbUMCfvsfdD0_RSo,3799
+clearskies/handlers/update.py,sha256=VCZkoID7i5VHq78fkIpjbRdXQ4Z3IuXEE5dfC8z4RZI,4088
 clearskies/handlers/write.py,sha256=VduGtjnFMQOvo3l0t-tUP4PExPJ9JEpuziHsquF08rE,9344
 clearskies/input_outputs/__init__.py,sha256=mQWL-u41FRTrPGuHe8FhLmcHjAEaUxjFwUf7RgDcbAs,182
 clearskies/input_outputs/cli.py,sha256=snIfLFakIqDXm-AXVN6qes0tZsg2IM7T1riFzDdHlMM,6254
@@ -163,7 +163,7 @@ clearskies/input_requirements/unique.py,sha256=gpbm9uoXcy8WCHsuWqAotwockbjDfJOWi
 clearskies/mocks/__init__.py,sha256=T68OUB9gGCX0WoisGzsY3Bt2cCFX7ILHKPqi6XKTJM0,113
 clearskies/mocks/input_output.py,sha256=2wD5GbUyVSkXcBg1GTZ-Oz9VzcYxNHfTlmZAODW-7CI,3898
 clearskies/mocks/models.py,sha256=DCzsnMddBvPoBA8JwwbSOhzY7enQWrosgeYD4gx2deI,5124
-clearskies/model.py,sha256=vUZ5lCDmZqvt11YC-ii15MdbftBM1Koz_JJ-KonjCdA,12691
+clearskies/model.py,sha256=lXs5NcdR6gsK6ztH9W7Slulkw03a-3q5R8w3ht5ilYQ,12856
 clearskies/models.py,sha256=Oh1dDPg-IDIEt54oXVvKBBmksBYtStyw6Uu5fOfCs6E,12232
 clearskies/secrets/__init__.py,sha256=ctTmA_etV9G_5U21APWENI1HvThrBS4DidGWRtEDHQs,1053
 clearskies/secrets/additional_configs/__init__.py,sha256=cFCrbtKF5nuR061S2y1iKZp349x-y8Srdwe3VZbfSFU,1119
@@ -187,7 +187,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.18.6.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.18.6.dist-info/METADATA,sha256=IANeVgA5OpkPdBPEyGwYZ4guJj5xuhiaqp_-4HUBGb0,1366
-clear_skies-1.18.6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-clear_skies-1.18.6.dist-info/RECORD,,
+clear_skies-1.18.8.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.18.8.dist-info/METADATA,sha256=C2EEmkDNduNK0DI7pww5bcCHX0oEzAkNBn4S3F3FsJQ,1366
+clear_skies-1.18.8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+clear_skies-1.18.8.dist-info/RECORD,,

clearskies/column_types/created_by_authorization_data.py

@@ -18,4 +18,9 @@ class CreatedByAuthorizationData(String):
             return data
 
         authorization_data = self.di.build("input_output", cache=True).get_authorization_data()
-        return {**data, self.name: authorization_data.get(self.config("authorization_data_key_name"), "N/A")}
+        # data comes last so that it can override the info in the authorization data.  This seems counter-intuitive,
+        # but is important.  You would think that you *don't* want the data from the authorization data to be
+        # overridden (since this is mainly used for logging), but the trouble is that there are a variety of use-cases
+        # where the application must provide the audit data.  Examples include registration and login.  In these
+        # cases, authorization data will be empty, and must be provided by the applicaiton.
+        return {self.name: authorization_data.get(self.config("authorization_data_key_name"), "N/A"), **data}

clearskies/handlers/base.py

@@ -48,7 +48,7 @@ class Base(ABC):
                 raise KeyError(f"Attempt to set unknown configuration setting '{key}' for handler '{class_name}'")
 
         self._check_configuration(configuration)
-        self._configuration = self._finalize_configuration(self.apply_default_configuation(configuration))
+        self._configuration = self._finalize_configuration(self.apply_default_configuration(configuration))
 
     def _check_configuration(self, configuration):
         if not "authentication" in configuration:
@@ -113,7 +113,7 @@ class Base(ABC):
                 f"Configuration error for handler '{self.__class__.__name__}': if provided, base_url must be a string"
             )
 
-    def apply_default_configuation(self, configuration):
+    def apply_default_configuration(self, configuration):
         return {
             **self._global_configuration_defaults,
             **self._configuration_defaults,

clearskies/handlers/routing.py

@@ -56,7 +56,7 @@ class Routing(Base):
                 raise KeyError(f"Attempt to set unknown configuration setting '{key}' for handler '{class_name}'")
 
         self._check_configuration(configuration)
-        self._configuration = self._finalize_configuration(self.apply_default_configuation(configuration))
+        self._configuration = self._finalize_configuration(self.apply_default_configuration(configuration))
 
     def _check_configuration(self, configuration):
         super()._check_configuration(configuration)

clearskies/handlers/simple_routing_route.py

@@ -1,9 +1,13 @@
+import logging
 import urllib.parse
 import re
+import json
 from ..autodoc.request import URLPath
 from ..autodoc.schema import String
 from . import simple_routing
 
+logger = logging.getLogger(__name__)
+
 
 class SimpleRoutingRoute:
     _di = None
@@ -91,26 +95,45 @@ class SimpleRoutingRoute:
         to understand if there was no route match at all.
         """
         # if we're routing to a simple router then defer to it
+        incoming = f"Incoming request: [{request_method}] {full_path}.  Check against route with url '{self._path}' "
+        if not self._methods:
+            incoming += " configured for any method except OPTIONS"
+        elif isinstance(self._methods, str):
+            incoming += f" with method '{self._methods}'"
+        else:
+            incoming += " with any of the following methods: " + ", ".join(self._methods)
         if self._routes_to_simple_routing:
             return self._handler.can_handle(full_path, request_method, is_cors=is_cors)
         # If we're routing for CORS then ignore the request method (since it won't match)
         if not is_cors and self._methods is not None and request_method not in self._methods:
+            logger.debug(
+                f"{incoming} Skipped because this route is not specifically configured for CORS, and this is an OPTIONS request."
+            )
             return None
         if self._resource_paths:
-            return self._resource_path_match(full_path, self._path_parts, self._resource_paths)
+            results = self._resource_path_match(full_path, self._path_parts, self._resource_paths)
+            if not results:
+                logger.debug(f"{incoming} Not a match.")
+            else:
+                logger.debug(f"{incoming} Matched and extracted route data: " + json.dumps(results))
+            return results
         if self._path is not None:
             full_path = full_path.strip("/")
             my_path = self._path.strip("/")
             my_path_length = len(my_path)
             full_path_length = len(full_path)
             if my_path_length > full_path_length:
+                logger.debug(f"{incoming} Not a match. I'm too long to bother checking.")
                 return None
             if full_path[:my_path_length] != my_path:
+                logger.debug(f"{incoming} Not a match.  Our prefixes just don't match.")
                 return None
             # make sure we don't get confused by partial matches.  `user` should match `user/` and `user/5`,
             # but it shouldn't match `users/`
             if full_path_length > my_path_length and full_path[my_path_length] != "/":
+                logger.debug(f"{incoming} Not a match.  I only partially matched the URL but not as a sub-directory.")
                 return None
+        logger.debug(f"{incoming} Match!")
         return {}
 
     def _resource_path_match(self, requested_path, path_parts, resource_paths):

clearskies/handlers/update.py

@@ -12,6 +12,7 @@ class Update(Write):
         "model": None,
         "model_class": None,
         "columns": None,
+        "column_overrides": None,
         "writeable_columns": None,
         "readable_columns": None,
         "where": [],
@@ -19,15 +20,19 @@ class Update(Write):
         "include_id_in_path": False,
     }
 
-    def handle(self, input_output):
-        input_data = self.request_data(input_output)
+    def get_model_id(self, input_output, input_data):
         routing_data = input_output.routing_data()
         if self.id_column_name in routing_data:
-            model_id = routing_data[self.id_column_name]
-        elif "id" in routing_data:
-            model_id = routing_data["id"]
-        else:
-            raise ValueError("I didn't receive the ID in my routing data.  I am probably misconfigured.")
+            return routing_data[self.id_column_name]
+        if "id" in routing_data:
+            return routing_data["id"]
+        raise ValueError("I didn't receive the ID in my routing data.  I am probably misconfigured.")
+
+    def handle(self, input_output):
+        input_data = self.request_data(input_output)
+        model_id = self.get_model_id(input_output, input_data)
+        if not model_id:
+            return self.error(input_output, "Not Found", 404)
         id_column_name = self.id_column_name
         models = self._model.where(f"{id_column_name}={model_id}")
         for where in self.configuration("where"):
@@ -42,6 +47,7 @@ class Update(Write):
             input_output.routing_data(),
             input_output.get_authorization_data(),
             input_output,
+            overrides=self.configuration("column_overrides"),
         )
         authorization = self._configuration.get("authorization", None)
         if authorization and hasattr(authorization, "filter_models"):
@@ -58,7 +64,7 @@ class Update(Write):
         }
         if input_errors:
             raise InputError(input_errors)
-        model.save(input_data, columns=self._columns)
+        model.save(input_data, columns=self._get_writeable_columns())
 
         return self.success(input_output, self._model_as_json(model, input_output))
 

clearskies/model.py

@@ -130,24 +130,26 @@ class Model(Models):
         """
         if not len(data):
             raise ValueError("You have to pass in something to save!")
-        if columns is None:
-            columns = self.columns()
+        save_columns = self.columns()
+        if columns is not None:
+            for column in columns.values():
+                save_columns[column.name] = column
 
         old_data = self.data
-        data = self.columns_pre_save(data, columns)
+        data = self.columns_pre_save(data, save_columns)
         data = self.pre_save(data)
         if data is None:
             raise ValueError("pre_save forgot to return the data array!")
 
-        to_save = self.columns_to_backend(data, columns)
-        to_save = self.to_backend(to_save, columns)
+        to_save = self.columns_to_backend(data, save_columns)
+        to_save = self.to_backend(to_save, save_columns)
         if self.exists:
             new_data = self._backend.update(self._data[self.id_column_name], to_save, self)
         else:
             new_data = self._backend.create(to_save, self)
-        id = self._backend.column_from_backend(columns[self.id_column_name], new_data[self.id_column_name])
+        id = self._backend.column_from_backend(save_columns[self.id_column_name], new_data[self.id_column_name])
 
-        data = self.columns_post_save(data, id, columns)
+        data = self.columns_post_save(data, id, save_columns)
         self.post_save(data, id)
 
         self.data = new_data
@@ -155,7 +157,7 @@ class Model(Models):
         self._previous_data = old_data
         self._touched_columns = list(data.keys())
 
-        self.columns_save_finished(columns)
+        self.columns_save_finished(save_columns)
         self.save_finished()
 
         return True
@@ -332,10 +334,10 @@ class Model(Models):
         """
         pass
 
-    def where_for_request(self, models, routing_data, authorization_data, input_output):
+    def where_for_request(self, models, routing_data, authorization_data, input_output, overrides=None):
         """
         A hook to automatically apply filtering whenever the model makes an appearance in a get/update/list/search handler.
         """
-        for column in self.columns().values():
+        for column in self.columns(overrides=overrides).values():
             models = column.where_for_request(models, routing_data, authorization_data, input_output)
         return models