clear-skies 1.19.24__py3-none-any.whl → 1.19.26__py3-none-any.whl

{clear_skies-1.19.24.dist-info → clear_skies-1.19.26.dist-info}/METADATA

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

{clear_skies-1.19.24.dist-info → clear_skies-1.19.26.dist-info}/RECORD

@@ -128,7 +128,7 @@ clearskies/functional/validations.py,sha256=f1fTQ4rdFZouxoovAPg-YAgf0Q0QNpKEzxWW
 clearskies/handlers/__init__.py,sha256=9tH0zk4g7Mt22opD1NlynqXwwMX2DHzLmAVihZsJsfU,1011
 clearskies/handlers/advanced_search.py,sha256=UbWDntGAGD5NM61yKEws5MfG0Xy3K_fn-i-X9FG-mKs,13746
 clearskies/handlers/base.py,sha256=aFRm5R6oDJWO4TTxz9BusxuDF3aH_-QVGJUP9atNzLc,22787
-clearskies/handlers/callable.py,sha256=2pVMwllttNui4R5vlLpufPehAPL_ksh-5eBrUprNv8U,8113
+clearskies/handlers/callable.py,sha256=SLgCln-6jvZJjmBOlxrnRXamICM_Wj3zY5Uah4_Wutg,8269
 clearskies/handlers/create.py,sha256=xj_hVYma2sKDK5Vq_R9wo8f0ZXfGlXTkYU71AMyKF2U,1232
 clearskies/handlers/crud_by_method.py,sha256=BOkPX-LUvQrbRLSbyTfRh4c8nPF51dZEXSKOl7m9ZYA,435
 clearskies/handlers/database_connector.py,sha256=XLF_Y3aYnjDtOVP_MOtT5mbI3lHR8S-viOxPiqEAamE,1050
@@ -148,7 +148,7 @@ clearskies/handlers/request_method_routing.py,sha256=DgPEz3tgbaUkXHsOriPbIctfSf4
 clearskies/handlers/restful_api.py,sha256=1rJ2REX1sTAdbqaRuCclP375agrho4zNNQx6hXGa4nQ,9258
 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=KpOSQK2_tTwrPblDmxAUpX-Fqts_Or_MLWGKOOkJnoo,9403
+clearskies/handlers/simple_routing.py,sha256=xMVfBas51pZOP8xvDmeH6L-iO6CGIrICyT5yUYceJOs,9550
 clearskies/handlers/simple_routing_route.py,sha256=3U3dixEKuf-Xo88RQGH_grm1x79-px6idt1-xaLUSiY,8953
 clearskies/handlers/simple_search.py,sha256=bSfq8rzdqkBj-dTGUBSZ1EkfjzUWHID7mKD2xEf8VzQ,6165
 clearskies/handlers/update.py,sha256=rx8HW87Pfh95e_9nEfKKnxfkh2HBlCUdYqVwljtXiJ8,4116
@@ -160,7 +160,7 @@ clearskies/input_outputs/exceptions/cli_input_error.py,sha256=kOFU8aLTLmeTL_AKDs
 clearskies/input_outputs/exceptions/cli_not_found.py,sha256=JBBuZA9ZwdkPhd3a0qaGgEPQrxh1fehy4R3ZaV2gWXU,39
 clearskies/input_outputs/input_output.py,sha256=vYKn9SE5erS4LuOhhAsXqaOEsGXwZ1NJ4v85KN1Xg6A,4501
 clearskies/input_outputs/wsgi.py,sha256=9p82eJP5FUAI6jbIojvydG3_9gncX7vcUACQMyRN9x4,3142
-clearskies/input_requirements/__init__.py,sha256=vIqm8KDiomQSxT7WjogFi1yOOrsVrNMb5GKlfw5USNk,1836
+clearskies/input_requirements/__init__.py,sha256=cciSC614VlYsCeTBX69ZCBU6QByT8NNlzWu_n2SVieY,2106
 clearskies/input_requirements/after.py,sha256=TXy8bIVz_77a8oJuohPwoM5E--AOVWsOSjjh5PpA2Ys,1544
 clearskies/input_requirements/before.py,sha256=iLg-Hub9iW2eP19s5fkPrA9TCT_-DTm5KoxgA8ho0-k,1547
 clearskies/input_requirements/in_the_future_at_least.py,sha256=PLVp_2Yv-1ScKnajlc9hjG7qYZhadKXHNTkRP7WKUdo,739
@@ -168,7 +168,9 @@ clearskies/input_requirements/in_the_future_at_most.py,sha256=L5Oz47KAHv5WL6Nu2v
 clearskies/input_requirements/in_the_past_at_least.py,sha256=ES0SgtADHcu7HZDdvIFyD9vpYTnrd4hBi03OShqUZg4,735
 clearskies/input_requirements/in_the_past_at_most.py,sha256=hvhn_K1X4f7pbpFhjavR6Mu48JhhYcEIUx44YWfa_7E,733
 clearskies/input_requirements/maximum_length.py,sha256=7hdGVq914BtZQwiGOLOU-t5QTDNQtCPT4TOnYTUo3Wo,689
+clearskies/input_requirements/maximum_value.py,sha256=R9xyup70a3migJdUKmflpZnQMHShcCqyibOewh78D84,663
 clearskies/input_requirements/minimum_length.py,sha256=qSpLjNBu6AKRoBZi3jvCMYKsHwsknbkUk86C8CMIOEU,987
+clearskies/input_requirements/minimum_value.py,sha256=PNZShiy_cFjwoRejjZmN_INp7EtmzmX1RQp3JfyYBMg,664
 clearskies/input_requirements/required.py,sha256=luYP527YPkQIVNVPhnNztOI0UxO67gNqn3FiLBId1YE,1133
 clearskies/input_requirements/requirement.py,sha256=5wUywAvbEQPh9tpfwWX3gdi4dwI-Xs9ePyC30qvwPaQ,584
 clearskies/input_requirements/time_delta.py,sha256=lqajxGEp2zZB_Rk-dG8eWgpljbuph1yqZMuylYRYJKs,1247
@@ -176,7 +178,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=lXs5NcdR6gsK6ztH9W7Slulkw03a-3q5R8w3ht5ilYQ,12856
+clearskies/model.py,sha256=6H6eGQqMBz22bWu20N4xy7XPa1qYgfvNWik5cXH2DZg,13137
 clearskies/models.py,sha256=lKZM2WXIPcziApee_4Iwabcd5xb4gexxKN71PTiQuOY,12332
 clearskies/secrets/__init__.py,sha256=ctTmA_etV9G_5U21APWENI1HvThrBS4DidGWRtEDHQs,1053
 clearskies/secrets/additional_configs/__init__.py,sha256=cFCrbtKF5nuR061S2y1iKZp349x-y8Srdwe3VZbfSFU,1119
@@ -200,7 +202,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.19.24.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.19.24.dist-info/METADATA,sha256=eGI0jca4nmoK_VD4ADFjcJoGIDMMxOkauHWj7p2anL8,1712
-clear_skies-1.19.24.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.19.24.dist-info/RECORD,,
+clear_skies-1.19.26.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.19.26.dist-info/METADATA,sha256=7D3m8KlUwjEfQoW2lEAaKTUgJW2-wlLkS_Qd0pCJ3qQ,1712
+clear_skies-1.19.26.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+clear_skies-1.19.26.dist-info/RECORD,,

clearskies/handlers/callable.py

@@ -47,16 +47,18 @@ class Callable(Base, SchemaHelper):
                     return self.input_errors(input_output, input_errors)
                 response = self._di.call_function(
                     self.configuration("callable"),
-                    request_data=request_data,
                     **input_output.routing_data(),
                     **input_output.context_specifics(),
+                    request_data=request_data,
+                    authorization_data=input_output.get_authorization_data(),
                 )
             else:
                 response = self._di.call_function(
                     self.configuration("callable"),
-                    request_data=self.request_data(input_output, required=False),
                     **input_output.routing_data(),
                     **input_output.context_specifics(),
+                    request_data=self.request_data(input_output, required=False),
+                    authorization_data=input_output.get_authorization_data(),
                 )
             if response:
                 return self.success(input_output, response)

clearskies/handlers/simple_routing.py

@@ -157,6 +157,8 @@ class SimpleRouting(Base):
                     "Each route must specify the handler configuration via 'handler_config' key, "
                     + f"but 'handler_config' was missing for route #{i+1}"
                 )
+            if route_config.get("authentication"):
+                authentication = self._di.build(route_config.get("authentication"), cache=True)
             route = SimpleRoutingRoute(self._di)
             route.configure(
                 route_config["handler_class"],

clearskies/input_requirements/__init__.py

@@ -4,7 +4,9 @@ from .after import After
 from .before import Before
 from ..binding_config import BindingConfig
 from .minimum_length import MinimumLength
+from .minimum_value import MinimumValue
 from .maximum_length import MaximumLength
+from .maximum_value import MaximumValue
 from .required import Required
 from .requirement import Requirement
 from .unique import Unique
@@ -27,10 +29,18 @@ def minimum_length(minimum_length: int):
     return BindingConfig(MinimumLength, minimum_length)
 
 
+def minimum_value(minimum_value: int):
+    return BindingConfig(MinimumValue, minimum_value)
+
+
 def maximum_length(maximum_length: int):
     return BindingConfig(MaximumLength, maximum_length)
 
 
+def maximum_value(maximum_value: int):
+    return BindingConfig(MaximumValue, maximum_value)
+
+
 def required():
     return BindingConfig(Required)
 

clearskies/input_requirements/maximum_value.py

@@ -0,0 +1,19 @@
+from .requirement import Requirement
+
+
+class MaximumValue(Requirement):
+    maximum_value = None
+
+    def configure(self, maximum_value):
+        if type(maximum_value) != int:
+            raise ValueError(
+                f"Maximum value must be an int to use the MaximumValue class for column '{self.column_name}'"
+            )
+        self.maximum_value = maximum_value
+
+    def check(self, model, data):
+        if self.column_name not in data or not data[self.column_name]:
+            return ""
+        if int(data[self.column_name]) <= self.maximum_value:
+            return ""
+        return f"'{self.column_name}' must be at most {self.maximum_value}."

clearskies/input_requirements/minimum_value.py

@@ -0,0 +1,19 @@
+from .requirement import Requirement
+
+
+class MinimumValue(Requirement):
+    minimum_value = None
+
+    def configure(self, minimum_value):
+        if type(minimum_value) != int:
+            raise ValueError(
+                f"Minimum value must be an int to use the MinimumValue class for column '{self.column_name}'"
+            )
+        self.minimum_value = minimum_value
+
+    def check(self, model, data):
+        if self.column_name not in data or not data[self.column_name]:
+            return ""
+        if int(data[self.column_name]) >= self.minimum_value:
+            return ""
+        return f"'{self.column_name}' must be at least {self.minimum_value}."

clearskies/model.py

@@ -141,7 +141,7 @@ class Model(Models):
         if data is None:
             raise ValueError("pre_save forgot to return the data array!")
 
-        to_save = self.columns_to_backend(data, save_columns)
+        [to_save, temporary_data] = 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)
@@ -149,6 +149,12 @@ class Model(Models):
             new_data = self._backend.create(to_save, self)
         id = self._backend.column_from_backend(save_columns[self.id_column_name], new_data[self.id_column_name])
 
+        # if we had any temporary columns add them back in
+        new_data = {
+            **temporary_data,
+            **new_data,
+        }
+
         data = self.columns_post_save(data, id, save_columns)
         self.post_save(data, id)
 
@@ -254,8 +260,10 @@ class Model(Models):
 
     def columns_to_backend(self, data, columns):
         backend_data = {**data}
+        temporary_data = {}
         for column in columns.values():
             if column.is_temporary and column.name in backend_data:
+                temporary_data[column.name] = backend_data[column.name]
                 del backend_data[column.name]
                 continue
 
@@ -265,7 +273,7 @@ class Model(Models):
                     f"Column {column.name} of type {column.__class__.__name__} did not return any data for to_database"
                 )
 
-        return backend_data
+        return [backend_data, temporary_data]
 
     def to_backend(self, data, columns):
         return data