hydroserverpy 0.5.0b4__tar.gz → 1.0.0__tar.gz

{hydroserverpy-0.5.0b4/src/hydroserverpy.egg-info → hydroserverpy-1.0.0}/PKG-INFO

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

{hydroserverpy-0.5.0b4 → hydroserverpy-1.0.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = hydroserverpy
-version = 0.5.0b4
+version = v1.0.0
 
 [options]
 package_dir = 

{hydroserverpy-0.5.0b4 → hydroserverpy-1.0.0}/src/hydroserverpy/api/models/sta/datastream.py

@@ -320,3 +320,23 @@ class Datastream(HydroServerModel, DatastreamFields):
             uid=self.uid,
             observations=observations,
         )
+
+    # TODO: Find a better long-term solution for this issue.
+    def sync_phenomenon_end_time(self):
+        """Ensures the phenomenon_end_time field matches the actual end time of the observations."""
+
+        response = self._connection.request(
+            "get", f"/api/data/datastreams/{str(self.uid)}/observations",
+            params={
+                "order": "desc",
+                "page": 1,
+                "page_size": 1
+            }
+        ).json()
+
+        if len(response["phenomenon_time"]) > 0:
+            self.phenomenon_end_time = datetime.fromisoformat(response["phenomenon_time"][0])
+        else:
+            self.phenomenon_end_time = None
+
+        self.save()

{hydroserverpy-0.5.0b4 → hydroserverpy-1.0.0}/src/hydroserverpy/etl_csv/hydroserver_etl_csv.py

@@ -52,7 +52,7 @@ class HydroServerETLCSV:
         self._file_header_error = False
         self._file_timestamp_error = False
 
-        self._chunk_size = 10000
+        self._chunk_size = 1000
         self._observations = {}
 
     def run(self):
@@ -125,6 +125,9 @@ class HydroServerETLCSV:
         timestamp = self._parse_row_timestamp(row)
 
         for datastream in self._datastreams.values():
+            if index == self._data_source.settings["transformer"]["dataStartRow"]:
+                datastream.sync_phenomenon_end_time()
+
             if str(datastream.uid) not in self._datastream_start_row_indexes.keys():
                 if (
                     not datastream.phenomenon_end_time
@@ -296,8 +299,9 @@ class HydroServerETLCSV:
                         uid=datastream_id,
                         observations=observations_df,
                     )
-                except HTTPError:
+                except HTTPError as e:
                     failed_datastreams.append(datastream_id)
+                    logger.error(f"Failed to POST observations to datastream: {str(datastream_id)} - {e}")
 
             elif datastream_id in self._failed_datastreams:
                 logger.info(

{hydroserverpy-0.5.0b4 → hydroserverpy-1.0.0/src/hydroserverpy.egg-info}/PKG-INFO

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