hydroserverpy 1.3.0b1__tar.gz → 1.3.0b3__tar.gz

{hydroserverpy-1.3.0b1/src/hydroserverpy.egg-info → hydroserverpy-1.3.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydroserverpy
-Version: 1.3.0b1
+Version: 1.3.0b3
 Requires-Python: <4,>=3.9
 License-File: LICENSE
 Requires-Dist: requests>=2

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = hydroserverpy
-version = 1.3.0b1
+version = 1.3.0b3
 
 [options]
 package_dir = 

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3}/src/hydroserverpy/api/models/etl/data_archive.py

@@ -58,7 +58,7 @@ class DataArchive(
         """The datastreams this data archive provides data for."""
 
         if self._datastreams is None:
-            self._datastreams = self.client.datastreams.list(data_archive=self.uid, fetch_all=True)
+            self._datastreams = self.client.datastreams.list(data_archive=self.uid, fetch_all=True).items
 
         return self._datastreams
 

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3}/src/hydroserverpy/api/models/etl/data_source.py

@@ -61,7 +61,7 @@ class DataSource(
         """The datastreams this data source provides data for."""
 
         if self._datastreams is None:
-            self._datastreams = self.client.datastreams.list(data_source=self.uid, fetch_all=True)
+            self._datastreams = self.client.datastreams.list(data_source=self.uid, fetch_all=True).items
 
         return self._datastreams
 

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3}/src/hydroserverpy/api/models/etl/orchestration_system.py

@@ -47,7 +47,7 @@ class OrchestrationSystem(HydroServerBaseModel):
         if self._datasources is None:
             self._datasources = self.client.datasources.list(
                 orchestration_system=self.uid, fetch_all=True
-            )
+            ).items
 
         return self._datasources
 
@@ -58,6 +58,6 @@ class OrchestrationSystem(HydroServerBaseModel):
         if self._dataarchives is None:
             self._dataarchives = self.client.dataarchives.list(
                 orchestration_system=self.uid, fetch_all=True
-            )
+            ).items
 
         return self._dataarchives

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3}/src/hydroserverpy/api/models/sta/datastream.py

@@ -183,7 +183,7 @@ class Datastream(HydroServerBaseModel):
         """The data archives of this datastream."""
 
         if self._data_archives is None:
-            self._data_archives = self.client.dataarchives.list(datastream=self.uid, fetch_all=True)
+            self._data_archives = self.client.dataarchives.list(datastream=self.uid, fetch_all=True).items
 
         return self._data_archives
 

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3}/src/hydroserverpy/api/models/sta/thing.py

@@ -66,7 +66,7 @@ class Thing(HydroServerBaseModel):
         """The datastreams collected at this thing."""
 
         if self._datastreams is None:
-            self._datastreams = self.client.datastreams.list(thing=self.uid, fetch_all=True)
+            self._datastreams = self.client.datastreams.list(thing=self.uid, fetch_all=True).items
 
         return self._datastreams
 

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3}/src/hydroserverpy/api/services/sta/datastream.py

@@ -267,8 +267,6 @@ class DatastreamService(HydroServerBaseService):
             "data": observations.values.tolist()
         }
 
-        print(body)
-
         self.client.request(
             "post", path, headers=headers, params=params, data=json.dumps(body, default=self.default_serializer)
         )

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3}/src/hydroserverpy/etl_csv/hydroserver_etl_csv.py

@@ -179,12 +179,12 @@ class HydroServerETLCSV:
         """
 
         try:
+            timestamp_key = (self._data_source.settings["transformer"].get("timestampKey") or
+                             self._data_source.settings["transformer"]["timestamp"]["key"])
             self._timestamp_column_index = (
-                row.index(self._data_source.settings["transformer"]["timestampKey"])
-                if isinstance(
-                    self._data_source.settings["transformer"]["timestampKey"], str
-                )
-                else int(self._data_source.settings["transformer"]["timestampKey"]) - 1
+                row.index(timestamp_key)
+                if isinstance(timestamp_key, str)
+                else int(timestamp_key) - 1
             )
             if self._timestamp_column_index > len(row):
                 raise ValueError
@@ -216,26 +216,24 @@ class HydroServerETLCSV:
         """
 
         try:
-            if (
-                self._data_source.settings["transformer"].get("timestampFormat") in ["utc", "constant", "ISO8601"]
-                or self._data_source.settings["transformer"].get("timestampFormat")
-                is None
-            ):
-                timestamp = isoparse(row[self._timestamp_column_index])
-            else:
+            timestamp_format = (self._data_source.settings["transformer"].get("timestampFormat") or
+                                self._data_source.settings["transformer"].get("timestamp", {}).get("format"))
+            if timestamp_format == "custom":
                 timestamp = datetime.strptime(
-                    row[self._timestamp_column_index],
-                    self._data_source.settings["transformer"].get("timestampFormat"),
+                    row[self._timestamp_column_index], timestamp_format,
                 )
+            else:
+                timestamp = isoparse(row[self._timestamp_column_index])
         except ValueError as e:
             raise TimestampParsingError(str(e)) from e
 
         if timestamp.tzinfo is None:
-            if not self._data_source.settings["transformer"].get(
+            timestamp_offset = self._data_source.settings["transformer"].get(
                 "timestampOffset"
             ) or self._data_source.settings["transformer"].get(
-                "timestampOffset"
-            ).endswith(
+                "timestamp", {}
+            ).get("offset")
+            if not timestamp_offset or timestamp_offset.endswith(
                 "0000"
             ):
                 timestamp = timestamp.replace(tzinfo=timezone.utc)
@@ -243,13 +241,9 @@ class HydroServerETLCSV:
                 try:
                     timestamp = timestamp.replace(
                         tzinfo=datetime.strptime(
-                            self._data_source.settings["transformer"].get(
-                                "timestampOffset"
-                            )[:-2]
+                            timestamp_offset[:-2]
                             + ":"
-                            + self._data_source.settings["transformer"].get(
-                                "timestampOffset"
-                            )[3:],
+                            + timestamp_offset[3:],
                             "%z",
                         ).tzinfo
                     )

{hydroserverpy-1.3.0b1 → hydroserverpy-1.3.0b3/src/hydroserverpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydroserverpy
-Version: 1.3.0b1
+Version: 1.3.0b3
 Requires-Python: <4,>=3.9
 License-File: LICENSE
 Requires-Dist: requests>=2