clear-skies 1.18.3__py3-none-any.whl → 1.18.5__py3-none-any.whl

{clear_skies-1.18.3.dist-info → clear_skies-1.18.5.dist-info}/METADATA

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

{clear_skies-1.18.3.dist-info → clear_skies-1.18.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 clearskies/__init__.py,sha256=Iz_VxSgiqM6VtGXoUsB_yVKFy_uWvcf071w803wJ8EE,832
 clearskies/application.py,sha256=_gYGIUGdVE5fAS9dwxRZ1gDpDjqGo7-twVt_VxI6XVE,966
-clearskies/authentication/__init__.py,sha256=ECabu1CGu9mbQU7gZRVjm0x1xSBzL3iAn5be14Kwt3c,647
-clearskies/authentication/auth0_jwks.py,sha256=PorhN4pFnBm-7CfnjJB2b24d0oNTRQEb1rR4ENIrVwc,4470
+clearskies/authentication/__init__.py,sha256=sAU6m9c8cJECfLa-hY-BxsSk5FVLb5Dvphb5u6AmULA,710
+clearskies/authentication/auth0_jwks.py,sha256=bzqNaEoG_iPndwttRXuaKpgkDtgOCLAooyifl0I0ACI,4447
 clearskies/authentication/auth_exception.py,sha256=8Tay3Sim2K8vAZ6ldisSJyRyN0cwX7iyGHwfglSKW_A,41
 clearskies/authentication/authorization.py,sha256=eLzBrXMNr1gYoIBZTd8I6uH3R0CfMMjhvimkJt4Amrs,601
 clearskies/authentication/jwks.py,sha256=JsBG4U7eGoKO75CV6J39d91lrVWtjVn6n8fN9RpCYEc,2811
@@ -59,12 +59,12 @@ clearskies/column_types/audit.py,sha256=meDFV0s4u9i6UojN5f6EQk_kh-nGP8xPscCRa2Nd
 clearskies/column_types/belongs_to.py,sha256=dWY5AYgvn4ZDgsKVnILbQKCiYrJNOb-FBuzl--DkZas,10827
 clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR51AUkQ,1878
 clearskies/column_types/category_tree.py,sha256=PgNmzZPyqYS5NADH_QTCxLvDXZFxzv5ESKTkvPrrLXo,9140
-clearskies/column_types/column.py,sha256=DOtwIWYrDyC6ya_QOAc2Ef-tlHbcfJsy3xrXafRPwNE,13082
+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_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=4q0422jpBiOjHnUx1V8dgguHgpiFEtOeqdzoALkvfMg,1862
+clearskies/column_types/datetime.py,sha256=MuVaeI6FMgevTdgv6djZjlHogs72TC1HTuYdw_6MF2M,3824
 clearskies/column_types/email.py,sha256=KjnncTdacaFWFSNItNRhUm9euyWhKck0Y6rHT5NqPIM,408
 clearskies/column_types/float.py,sha256=j8jJeBueSOusPtAFCWgLHYBncfLnqT1U7bh1zcAkYiA,1332
 clearskies/column_types/has_many.py,sha256=Z4oM1g2dQx6H9171c52FLC41nLryCOKmh51I75mYmmY,5895
@@ -76,7 +76,7 @@ clearskies/column_types/select.py,sha256=1oBslTJ_7QCjlFeEcwJVRL-ED4sXwCESVFRAOon
 clearskies/column_types/string.py,sha256=XbHC31TmlW0k86cvdVJBDyowU8Xis6Te6R0rPLXgLpI,863
 clearskies/column_types/updated.py,sha256=ZAHTHZtKbZQE_JwZ2wMwAUSr4PUYNscy8SwzZGko8hU,290
 clearskies/column_types/uuid.py,sha256=pA6Cd-1QSRuUpz0PxWAGRdG01hW7bpIicOhhJvAvDkQ,711
-clearskies/columns.py,sha256=2xbzWy2EP-hdjoeu5P7Q2WVEQnbfmMd4EYYg_n-2nL4,5551
+clearskies/columns.py,sha256=3PgLopL1l20vVWaUqOJkwXMr06a-gFHEsbExfOWVB4I,5925
 clearskies/condition_parser.py,sha256=ZMXWbHH5jnPo1-mRIo_uU4IzYNllXiOu9rsD7Ab2A-A,6452
 clearskies/contexts/__init__.py,sha256=wKNK-SKuAEf7aJ3qX6UUzIbUfJIBSIHCI7cLXZTGGC0,179
 clearskies/contexts/bash.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -122,7 +122,7 @@ clearskies/handlers/__init__.py,sha256=YIQeKkkFhXwn7Rcc7Qllh2RGkKB0nDjt1nwowqEuJ
 clearskies/handlers/advanced_search.py,sha256=aB6DaMIsms6luVPQLhPwV9sBTOyh4ip_gi-0l_52YLE,12934
 clearskies/handlers/base.py,sha256=K_6-HupAAjmVb9pusjit0aRM3VtF63YCLMT4a_ZKM2Q,22888
 clearskies/handlers/callable.py,sha256=RxDPBuk1socPQvPhuKhCiidhAnXXLdSdG0sVtNAmi8c,8001
-clearskies/handlers/create.py,sha256=VQWg4CeSDmtFPL8Hk-evhQvlBSX85iOH-IlRoIs0OhU,1209
+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
 clearskies/handlers/delete.py,sha256=nXzEuOPI6GEvuiqA5baO2iNEjETsGqNXfRDRj-C1nhc,2247
@@ -134,7 +134,7 @@ clearskies/handlers/exceptions/input_error.py,sha256=kmEVv9LNIalLKD9GF-olsD39Z94
 clearskies/handlers/exceptions/not_found.py,sha256=xThOXiMfyYBaI2bhfOhpVoZ_vdw1hU8A_HxHenPqHzo,96
 clearskies/handlers/get.py,sha256=GHXlhXiuewu9E54RsCo7BPyFXQ7m5tCyiAPHIgb8Qok,6820
 clearskies/handlers/health_check.py,sha256=m6H3psUql-I7hZao3fsxjrZnCjFJZ1ROTF-41g8Syww,2078
-clearskies/handlers/input_processing.py,sha256=gqzub2xvYMo9SiQq6kGfA6YhxYKfrPA3K8FGqT4bnqA,3670
+clearskies/handlers/input_processing.py,sha256=edtG6NQJZCte0Nq-j7SUMzp6vxgIIbLxeUGscWOALAs,3814
 clearskies/handlers/list.py,sha256=f17wbS1gVopTTzV9rwmEb7KjHnoiwercENZbXJDwChI,23133
 clearskies/handlers/mygrations.py,sha256=4iKpJKooqgNtAURwMl_FgsXUt8OYOaG_TY1OV1llQxY,2759
 clearskies/handlers/request_method_routing.py,sha256=DgPEz3tgbaUkXHsOriPbIctfSf4Gm4NxfRdVulH91Kg,1636
@@ -144,7 +144,7 @@ clearskies/handlers/schema_helper.py,sha256=62644USvFlZu_6tT7rb-k6t_5J3Q0uZsJwP5
 clearskies/handlers/simple_routing.py,sha256=8T4eKLIurZO3ZdIPgi-0pypQp_X4BKkbet_Ymba5br4,9332
 clearskies/handlers/simple_routing_route.py,sha256=C-dDLubkUnAazxAcXoyGxMX4g24Iwz7wX5rf5T8T8kU,7376
 clearskies/handlers/simple_search.py,sha256=hZ0rMfhS-BB6LTpdl0I53pEUBgbgIwtXvcW_8ZEOZOs,6003
-clearskies/handlers/update.py,sha256=gcpEZgWWVcfuALMaU4Qk7wc4fYDmiKQBSy9aSzwgVwA,3776
+clearskies/handlers/update.py,sha256=GAtkZpim6YI-XvtJ4qm-fwlz7gHYbUMCfvsfdD0_RSo,3799
 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
@@ -162,7 +162,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=pJ_0zj3A8OwLHe132BSz79Qae-M6IchnkkTaHAVp_0s,12249
+clearskies/model.py,sha256=vUZ5lCDmZqvt11YC-ii15MdbftBM1Koz_JJ-KonjCdA,12691
 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
@@ -186,7 +186,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.3.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.18.3.dist-info/METADATA,sha256=jq8wQWIbrWlHpNR2XDYWBOYTsKjjDHtRktENhzFP6zQ,1366
-clear_skies-1.18.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-clear_skies-1.18.3.dist-info/RECORD,,
+clear_skies-1.18.5.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.18.5.dist-info/METADATA,sha256=L1nHAatrWlhUOyMtNjmOI9TzuYBN3T6RHtRhDEdRItg,1366
+clear_skies-1.18.5.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+clear_skies-1.18.5.dist-info/RECORD,,

clearskies/authentication/__init__.py

@@ -26,8 +26,12 @@ __all__ = [
     "Authorization",
     "BindingConfig",
     "public",
+    "Public",
     "secret_bearer",
+    "SecretBearer",
     "auth0_jwks",
+    "Auth0JWKS",
     "authorization",
     "jwks",
+    "JWKS",
 ]

clearskies/authentication/auth0_jwks.py

@@ -15,7 +15,6 @@ class Auth0JWKS:
     _jwks_fetched = None
     _algorithms = None
     _audience = None
-    _jwt_claims = None
     _documentation_security_name = None
 
     def __init__(self, environment, requests, jose_jwt):

clearskies/column_types/column.py

@@ -214,6 +214,12 @@ class Column(ABC):
         if on_change_actions and model.was_changed(self.name):
             self.execute_actions(on_change_actions, model)
 
+    def values_match(self, value_1, value_2):
+        """
+        Compares two values to see if they are the same
+        """
+        return value_1 == value_2
+
     def pre_delete(self, model):
         """
         Make any changes needed to the data before starting the delete process

clearskies/column_types/datetime.py

@@ -49,3 +49,44 @@ class DateTime(Column):
         if not value.tzinfo:
             return "date is missing timezone information"
         return ""
+
+    def values_match(self, value_1, value_2):
+        """
+        Compares two values to see if they are the same
+        """
+        # in this function we deal with data directly out of the backend, so our date is likely
+        # to be string-ified and we want to look for default (e.g. null) values in string form.
+        if type(value_1) == str and "0000-00-00" in value_1:
+            value_1 = None
+        if type(value_2) == str and "0000-00-00" in value_2:
+            value_2 = None
+        number_values = 0
+        if value_1:
+            number_values += 1
+        if value_2:
+            number_values += 1
+        if number_values == 0:
+            return True
+        if number_values == 1:
+            return False
+
+        if type(value_1) == str:
+            value_1 = dateparser.parse(value_1)
+        if type(value_2) == str:
+            value_2 = dateparser.parse(value_2)
+
+        # we need to make sure we're comparing in the same timezones.  For our purposes, a difference in timezone
+        # is fine as long as they represent the same time (e.g. 16:00EST == 20:00UTC).  For python, same time in different
+        # timezones is treated as different datetime objects.
+        if value_1.tzinfo is not None and value_2.tzinfo is not None:
+            value_1 = value_1.astimezone(value_2.tzinfo)
+
+        # two times can be the same but if one is datetime-aware and one is not, python will treat them as not equal.
+        # we want to treat such times as being the same.  Therefore, check for equality but ignore the timezone.
+        for to_check in ["year", "month", "day", "hour", "minute", "second", "microsecond"]:
+            if getattr(value_1, to_check) != getattr(value_2, to_check):
+                return False
+
+        # and since we already converted the timezones to match (or one has a timezone and one doesn't), we're good to go.
+        # if we passed the above loop then the times are the same.
+        return True

clearskies/columns.py

@@ -17,18 +17,23 @@ class Columns:
             if name in columns:
                 raise ValueError(f"Duplicate column '{name}' found for model '{model_class.__name__}'")
             column_overrides = overrides[name] if (overrides is not None and name in overrides) else {}
-            configuration = {
-                **configuration,
-                **column_overrides,
-                "input_requirements": self._resolve_input_requirements(
-                    self._merge_input_requirements(
-                        configuration.get("input_requirements"),
-                        column_overrides.get("input_requirements"),
+            # if the overrides changes the class then we need to completely replace the column definition
+            # with what is in the overrides.
+            if "class" in column_overrides and id(column_overrides["class"]) != id(configuration["class"]):
+                configuration = column_overrides
+            else:
+                configuration = {
+                    **configuration,
+                    **column_overrides,
+                    "input_requirements": self._resolve_input_requirements(
+                        self._merge_input_requirements(
+                            configuration.get("input_requirements"),
+                            column_overrides.get("input_requirements"),
+                        ),
+                        name,
+                        model_class.__name__,
                     ),
-                    name,
-                    model_class.__name__,
-                ),
-            }
+                }
             columns[name] = self.build_column(name, configuration, model_class)
 
         # overrides can add columns too - need to handle those separately

clearskies/handlers/create.py

@@ -23,7 +23,7 @@ class Create(Write):
         if input_errors:
             self._logging.debug("Request rejected due to input errors: " + json.dumps(input_errors))
             raise InputError(input_errors)
-        model.save(input_data)
+        model.save(input_data, columns=self._columns)
 
         return self.success(input_output, self._model_as_json(model, input_output))
 

clearskies/handlers/input_processing.py

@@ -9,11 +9,13 @@ class InputProcessing:
     def _get_writeable_columns(self):
         if self._writeable_columns is None:
             self._writeable_columns = self._get_rw_columns("writeable")
+            additional_columns = OrderedDict()
             for column in self._writeable_columns.values():
                 more_columns = column.additional_write_columns(is_create=self._is_create)
-                # do it one-at-a-time so we don't lose our OrderedDict
                 for additional_column_name, additional_column in more_columns.items():
-                    self._writeable_columns[additional_column_name] = additional_column
+                    additional_columns[additional_column_name] = additional_column
+            for additional_column_name, additional_column in additional_columns.items():
+                self._writeable_columns[additional_column_name] = additional_column
         return self._writeable_columns
 
     def _extra_column_errors(self, input_data):

clearskies/handlers/update.py

@@ -58,7 +58,7 @@ class Update(Write):
         }
         if input_errors:
             raise InputError(input_errors)
-        model.save(input_data)
+        model.save(input_data, columns=self._columns)
 
         return self.success(input_output, self._model_as_json(model, input_output))
 

clearskies/model.py

@@ -10,6 +10,7 @@ class Model(Models):
     _configured_columns = None
     _data = None
     _previous_data = None
+    _touched_columns = None
     _transformed = None
     id_column_name = "id"
 
@@ -18,6 +19,7 @@ class Model(Models):
         self._transformed = {}
         self._data = {}
         self._previous_data = None
+        self._touched_columns = None
 
     def model_class(self):
         """
@@ -120,7 +122,7 @@ class Model(Models):
     def data(self, data):
         self._data = {} if data is None else data
 
-    def save(self, data):
+    def save(self, data, columns=None):
         """
         Save data to the database and update the model!
 
@@ -128,7 +130,8 @@ class Model(Models):
         """
         if not len(data):
             raise ValueError("You have to pass in something to save!")
-        columns = self.columns()
+        if columns is None:
+            columns = self.columns()
 
         old_data = self.data
         data = self.columns_pre_save(data, columns)
@@ -150,6 +153,7 @@ class Model(Models):
         self.data = new_data
         self._transformed = {}
         self._previous_data = old_data
+        self._touched_columns = list(data.keys())
 
         self.columns_save_finished(columns)
         self.save_finished()
@@ -190,9 +194,11 @@ class Model(Models):
         """Returns True/False to denote if a column was changed in the last save"""
         if self._previous_data is None:
             raise ValueError("was_changed was called before a save was finished - you must save something first")
+        if key not in self._touched_columns:
+            return False
 
-        has_old_value = key in self._previous_data
-        has_new_value = key in self._data
+        has_old_value = bool(self._previous_data.get(key))
+        has_new_value = bool(self._data.get(key))
 
         if has_new_value != has_old_value:
             return True
@@ -200,7 +206,12 @@ class Model(Models):
         if not has_old_value:
             return False
 
-        return self.__getattr__(key) != self._previous_data[key]
+        columns = self.columns()
+        new_value = self.__getattr__(key)
+        old_value = self._previous_data[key]
+        if key not in columns:
+            return old_value != new_value
+        return not columns[key].values_match(old_value, new_value)
 
     def previous_value(self, key):
         return self.get_transformed_from_data(key, self._previous_data, cache=False, check_providers=False, silent=True)