clear-skies 1.22.16__tar.gz → 1.22.17__tar.gz

{clear_skies-1.22.16 → clear_skies-1.22.17}/PKG-INFO

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

{clear_skies-1.22.16 → clear_skies-1.22.17}/pyproject.toml

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

{clear_skies-1.22.16 → clear_skies-1.22.17}/src/clearskies/input_outputs/cli.py

@@ -79,10 +79,10 @@ class CLI:
     def get_request_method(self):
         return self._request_method if self._request_method else "GET"
 
-    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
@@ -126,7 +126,7 @@ class CLI:
             # in the _get_json_body method
         return self._cached_body
 
-    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
@@ -134,7 +134,7 @@ class CLI:
         # 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