clear-skies 1.22.25__tar.gz → 1.22.27__tar.gz

{clear_skies-1.22.25 → clear_skies-1.22.27}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: clear-skies
-Version: 1.22.25
+Version: 1.22.27
 Summary: A framework for building backends in the cloud
-Home-page: https://github.com/cmancone/clearskies
 License: MIT
 Author: Conor Mancone
 Author-email: cmancone@gmail.com
@@ -27,7 +26,7 @@ Requires-Dist: jose (>=1.0.0,<2.0.0) ; extra == "jose"
 Requires-Dist: jwcrypto (>=1.5.6,<2.0.0) ; extra == "jwcrypto"
 Requires-Dist: pymysql (>=1.1.0,<2.0.0) ; extra == "mysql"
 Requires-Dist: requests (>=2.31.0,<3.0.0)
-Requires-Dist: typing-extensions (>=4.12.0,<5.0.0) ; python_version >= "3.10" and python_version < "3.11"
+Requires-Dist: typing-extensions (>=4.12.0,<5.0.0) ; python_version == "3.10"
 Project-URL: Repository, https://github.com/cmancone/clearskies
 Description-Content-Type: text/markdown
 

{clear_skies-1.22.25 → clear_skies-1.22.27}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies"
-version = "1.22.25"
+version = "1.22.27"
 description = "A framework for building backends in the cloud"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

{clear_skies-1.22.25 → clear_skies-1.22.27}/src/clearskies/authentication/__init__.py

@@ -13,7 +13,7 @@ def public():
 
 
 def secret_bearer(**kwargs):
-    return BindingConfig(SecretBearer, **kwargs)
+    return BindingConfig(SecretBearerAuth, **kwargs)
 
 
 def auth0_jwks(**kwargs):

{clear_skies-1.22.25 → clear_skies-1.22.27}/src/clearskies/di/di.py

@@ -138,8 +138,6 @@ class DI:
             return instance
         elif type(thing) == str:
             return self.build_from_name(thing, context=context, cache=cache)
-        elif callable(thing):
-            raise ValueError("build received a callable: you probably want to call di.call_function()")
 
         # if we got here then our thing is already and object of some sort and doesn't need anything further
         return thing

{clear_skies-1.22.25 → clear_skies-1.22.27}/src/clearskies/handlers/update.py

@@ -55,11 +55,8 @@ class Update(Write):
         if authorization and hasattr(authorization, "filter_models"):
             models = authorization.filter_models(models, input_output.get_authorization_data(), input_output)
         model = models.first()
-        if not model.exists:
-            if self._configuration.get("upsert"):
-                input_data[id_column_name] = model_id
-            else:
-                return self.error(input_output, "Not Found", 404)
+        if not model.exists and not self._configuration.get("upsert"):
+            return self.error(input_output, "Not Found", 404)
         if model.exists and "id" in input_data:
             del input_data["id"]
 
@@ -69,6 +66,11 @@ class Update(Write):
         }
         if input_errors:
             raise InputError(input_errors)
+
+        # if we're doing the update part of an upsert, then we have to provide the expected model id
+        if not model.exists:
+            input_data[id_column_name] = model_id
+
         model.save(input_data, columns=self._get_writeable_columns())
 
         return self.success(input_output, self._model_as_json(model, input_output))