clear-skies 1.22.14__py3-none-any.whl → 1.22.16__py3-none-any.whl

{clear_skies-1.22.14.dist-info → clear_skies-1.22.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies
-Version: 1.22.14
+Version: 1.22.16
 Summary: A framework for building backends in the cloud
 Home-page: https://github.com/cmancone/clearskies
 License: MIT
@@ -13,6 +13,8 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Provides-Extra: jose
 Provides-Extra: jwcrypto

{clear_skies-1.22.14.dist-info → clear_skies-1.22.16.dist-info}/RECORD

@@ -61,7 +61,7 @@ clearskies/column_types/__init__.py,sha256=wofhLfyW00I6tb6o9DMsMx7j9hlbbqefhDzWf
 clearskies/column_types/audit.py,sha256=K908Gv2GBt8LOsAqz7RLCpyByeLoq1gFT7EOcMAnkQ8,9676
 clearskies/column_types/belongs_to.py,sha256=E7Wi84vr2PnNw7TBCoZa8jkpwiJhO-iQmZ_ekq26kTs,12206
 clearskies/column_types/boolean.py,sha256=1yyM1CUfgD84pPE65c1OP1Qjf_J0Z45hjPrDR51AUkQ,1878
-clearskies/column_types/category_tree.py,sha256=kPx0fNTJxHaaEI_-0JxQ7NBcV2bYgUDGmtf1wmTqoEg,13172
+clearskies/column_types/category_tree.py,sha256=EZ2GxYPsvB-tfIaLFPwcZKGmlvZvBYk2GBUOWXOPdKo,13173
 clearskies/column_types/column.py,sha256=ftuDFswjk-KE9Frxo1rhgkjr4sjSjnUc5ZtfNrnGLIc,15530
 clearskies/column_types/created.py,sha256=LIWSzPJ9rbHuk1u53pNvKtVCOG9y9XCn-mEEsSi97Zc,649
 clearskies/column_types/created_by_authorization_data.py,sha256=--1w1TOSo2CMwrpn6Y_iorl2RTqLgG8MbR8k27qreew,1108
@@ -133,7 +133,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=wwAoiWFhT331FOS0Q8Ci0jBURq_-tSt8zqYXSJWZ3FI,8281
+clearskies/handlers/callable.py,sha256=wmPhfeORfsXKxZyj1ECH9xw0BeSIxOKjsi9UsWXWQs4,8388
 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
@@ -163,7 +163,7 @@ clearskies/input_outputs/cli.py,sha256=DCoSHn2fd7cwi4-3eZU_M0-Txk85PQNB1x6D_B50f
 clearskies/input_outputs/exceptions/__init__.py,sha256=bc5Tc1XBZnqA1fKbk7pk5hyx102vqx3sDE19E03xGk4,82
 clearskies/input_outputs/exceptions/cli_input_error.py,sha256=kOFU8aLTLmeTL_AKDshxMu8_ufildg6p8ndhE1xHfb0,41
 clearskies/input_outputs/exceptions/cli_not_found.py,sha256=JBBuZA9ZwdkPhd3a0qaGgEPQrxh1fehy4R3ZaV2gWXU,39
-clearskies/input_outputs/input_output.py,sha256=vYKn9SE5erS4LuOhhAsXqaOEsGXwZ1NJ4v85KN1Xg6A,4501
+clearskies/input_outputs/input_output.py,sha256=TyhiHfPzQzjN9lW6hCnrGil-_M_vlICn7uVZvEPFwZI,4666
 clearskies/input_outputs/wsgi.py,sha256=9p82eJP5FUAI6jbIojvydG3_9gncX7vcUACQMyRN9x4,3142
 clearskies/input_requirements/__init__.py,sha256=cciSC614VlYsCeTBX69ZCBU6QByT8NNlzWu_n2SVieY,2106
 clearskies/input_requirements/after.py,sha256=TXy8bIVz_77a8oJuohPwoM5E--AOVWsOSjjh5PpA2Ys,1544
@@ -207,7 +207,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.22.14.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies-1.22.14.dist-info/METADATA,sha256=Ey8U1MgrMOUsApI4SQkcweBbit8Fh8aeGRkbCwwD2pg,1818
-clear_skies-1.22.14.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-clear_skies-1.22.14.dist-info/RECORD,,
+clear_skies-1.22.16.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies-1.22.16.dist-info/METADATA,sha256=CxzPQbb-JBnBFmMTlnk9Q_tX1u3uuXiJgvy2TCbi9BU,1920
+clear_skies-1.22.16.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+clear_skies-1.22.16.dist-info/RECORD,,

{clear_skies-1.22.14.dist-info → clear_skies-1.22.16.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.7.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any

clearskies/column_types/category_tree.py

@@ -180,7 +180,7 @@ class CategoryTree(BelongsTo):
         return data
 
     def force_tree_update(self, model):
-        self.update_tree_table(model, model.get(self.id_column_name), model.__getattr__(self.name))
+        self.update_tree_table(model, model.get(model.id_column_name), model.__getattr__(self.name))
 
     def update_tree_table(self, model, child_id, direct_parent_id):
         tree_models = self.tree_models

clearskies/handlers/callable.py

@@ -29,6 +29,7 @@ class Callable(Base, SchemaHelper):
         "writeable_columns": None,
         "doc_model_name": "",
         "doc_response_data_schema": None,
+        "allow_non_json_bodies": False,
     }
 
     def __init__(self, di):
@@ -97,7 +98,7 @@ class Callable(Base, SchemaHelper):
 
     def request_data(self, input_output, required=True):
         if not self.configuration("schema"):
-            return input_output.request_data(required=required)
+            return input_output.request_data(required=required, allow_non_json_bodies=self.configuration("allow_non_json_bodies"))
         # we have to map from internal names to external names, because case mapping
         # isn't always one-to-one, so we want to do it exactly the same way that the documentation
         # is built.

clearskies/input_outputs/input_output.py

@@ -69,15 +69,15 @@ class InputOutput(ABC):
         else:
             self._routing_data[key] = value
 
-    def request_data(self, required=True):
-        request_data = self.json_body(False)
+    def request_data(self, required=True, allow_non_json_bodies=False):
+        request_data = self.json_body(False, allow_non_json_bodies=allow_non_json_bodies)
         if not request_data:
-            if self.has_body():
+            if self.has_body() and not allow_non_json_bodies:
                 raise ClientError("Request body was not valid JSON")
             request_data = {}
         return request_data
 
-    def json_body(self, required=True):
+    def json_body(self, required=True, allow_non_json_bodies=False):
         json = self._get_json_body()
         # if we get None then either the body was not JSON or was empty.
         # If it is required then we have an exception either way.  If it is not required
@@ -85,7 +85,7 @@ class InputOutput(ABC):
         # if json is None and there is an actual request body.  If json is none, the body is empty,
         # and it was not required, then we can just return None
         if json is None:
-            if required or self.has_body():
+            if required or (self.has_body() and not allow_non_json_bodies):
                 raise ClientError("Request body was not valid JSON")
         return json