wizata-dsapi 2.2.0.dev3__tar.gz → 2.2.0.dev5__tar.gz

{wizata_dsapi-2.2.0.dev3 → wizata_dsapi-2.2.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 2.2.0.dev3
+Version: 2.2.0.dev5
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

{wizata_dsapi-2.2.0.dev3 → wizata_dsapi-2.2.0.dev5}/wizata_dsapi/request.py

@@ -644,6 +644,17 @@ class Request(ApiDto):
 
         return query
 
+    @staticmethod
+    def _object(value, section: str) -> dict:
+        """
+        A section of the body that must be a JSON object. Anything else is the caller's
+        mistake, refused as a ValueError naming it (the DS API answers 400) - it used to
+        reach ``.keys()`` and fail as an AttributeError, answered 500.
+        """
+        if not isinstance(value, dict):
+            raise ValueError(f"'{section}' must be an object, got {type(value).__name__}: {value!r}"[:300])
+        return value
+
     def from_json(self, json_data):
         if "id" in json_data.keys():
             self.request_id = uuid.UUID(json_data["id"])
@@ -654,6 +665,7 @@ class Request(ApiDto):
         datapoints = []
         if "equipments_list" in json_data.keys():
             for equipment in json_data["equipments_list"]:
+                self._object(equipment, "equipments_list")
                 if "datapoints" not in equipment.keys():
                     raise KeyError("no 'datapoints' have been provided for equipment with id '" +
                                    str(equipment["id"]) + "'")
@@ -674,6 +686,7 @@ class Request(ApiDto):
             self._datapoints = []
 
         if "timeframe" in json_data.keys():
+            self._object(json_data["timeframe"], "timeframe")
             if "start" not in json_data["timeframe"].keys():
                 raise KeyError("No 'start time' have been selected, please set it up and re-try.")
 
@@ -695,6 +708,7 @@ class Request(ApiDto):
 
         if "aggregations" not in json_data.keys():
             raise KeyError("No 'aggregations' have been selected, please set it up and re-try.")
+        self._object(json_data["aggregations"], "aggregations")
 
         if "agg_method" not in json_data["aggregations"].keys():
             self.aggregation = None
@@ -751,7 +765,7 @@ class Request(ApiDto):
             self.null = json_data["null"]
 
         if "target_feat" in json_data.keys():
-            self.target_feat = json_data["target_feat"]
+            self.target_feat = self._object(json_data["target_feat"], "target_feat")
             if "sensor" not in self.target_feat.keys():
                 raise KeyError("No 'sensor' have been declared inside the target feature, this is a technical error.")
             if "operator" not in self.target_feat.keys():

wizata_dsapi-2.2.0.dev5/wizata_dsapi/version.py

@@ -0,0 +1 @@
+__version__ = "2.2.0.dev5"

{wizata_dsapi-2.2.0.dev3 → wizata_dsapi-2.2.0.dev5}/wizata_dsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizata_dsapi
-Version: 2.2.0.dev3
+Version: 2.2.0.dev5
 Summary: Wizata Data Science Toolkit
 Author: Wizata S.A.
 Author-email: info@wizata.com

wizata_dsapi-2.2.0.dev3/wizata_dsapi/version.py

@@ -1 +0,0 @@
-__version__ = "2.2.0.dev3"