hydroserverpy 1.3.0b1__py3-none-any.whl → 1.3.0b3__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → hydroserverpy-1.3.0b3.dist-info}/METADATA

@@ -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.dist-info → hydroserverpy-1.3.0b3.dist-info}/RECORD

@@ -5,10 +5,10 @@ hydroserverpy/api/utils.py,sha256=1RUglpvegBZOcu9BEExxsAzaGOyu4tdUk2JyiBEbzxI,49
 hydroserverpy/api/models/__init__.py,sha256=NLq95t1oC2co5aqVYSw9Pq0RAsLHnLjNq1tsgbMepTg,773
 hydroserverpy/api/models/base.py,sha256=mQZbanDg9t2GN9mOR_XOOtAfYF7AkY0fBZ6fHat6NRs,6944
 hydroserverpy/api/models/etl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hydroserverpy/api/models/etl/data_archive.py,sha256=Im8kPXQIaJDti3d0vDD-amcdeT3rOUR24cugVH_nUL4,2607
-hydroserverpy/api/models/etl/data_source.py,sha256=inzpHvDWampn0acjmzwyBXA9fujhwTXOZoh1f5VaAfE,3953
+hydroserverpy/api/models/etl/data_archive.py,sha256=rnmD_FQ1yjJ0KPBigylAQ3uQ6QBppJtBopJK4oCPLSo,2613
+hydroserverpy/api/models/etl/data_source.py,sha256=4s5JfpF00Heir9T1oc_KAUdI3z5Jj8ce8R56KqQqm5A,3959
 hydroserverpy/api/models/etl/orchestration_configuration.py,sha256=ElSrgi7ioFZJFJg6aGogW5ZZk7fA17y4p--yWwiOhZ0,1367
-hydroserverpy/api/models/etl/orchestration_system.py,sha256=bGqLKVsnKNbPBam1rUo_JdnKa8jVj611ltMfGHCR2d4,2048
+hydroserverpy/api/models/etl/orchestration_system.py,sha256=5wdGsXCMqHfE3--zG-3WAPAVPNMPIx99y-7UUhdCink,2060
 hydroserverpy/api/models/iam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydroserverpy/api/models/iam/account.py,sha256=7COk_CPYFlthg1uFWTBlJESfnuqMW90TSjZoIcBb-_8,439
 hydroserverpy/api/models/iam/apikey.py,sha256=Z4iXg_K056naT3ogwc5wzyNnRpxHkOCz0lk-Gim4eL8,3146
@@ -16,13 +16,13 @@ hydroserverpy/api/models/iam/collaborator.py,sha256=w1D72PsiwmdgFVNlkNV3TPjMR6lx
 hydroserverpy/api/models/iam/role.py,sha256=zYTzMwnnpelZHP0uPg3vZqWqcpSROqrJ58bVkpFeTEQ,1092
 hydroserverpy/api/models/iam/workspace.py,sha256=hB4W8b_cC9WhBmwGHX_VfDjqriniQgvc2BKz_j9Gh0U,8884
 hydroserverpy/api/models/sta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hydroserverpy/api/models/sta/datastream.py,sha256=x23-SQLbDCvt-NxhpMxwKsok8-AQ7F8YHnXR9CFzH2k,8730
+hydroserverpy/api/models/sta/datastream.py,sha256=1JILQUZAipxGLHY8zVPRQzXZTq5ktTVWK7dPcvTjjZY,8736
 hydroserverpy/api/models/sta/observation.py,sha256=oIqm4I98rnN7cAVL6tcWBXluC6qIfO1h4WhwP7R9LXs,3641
 hydroserverpy/api/models/sta/observed_property.py,sha256=KpeU8mn0U-e6iBQh34YewSBEC4fY88sJr30B8O6kiXQ,1204
 hydroserverpy/api/models/sta/processing_level.py,sha256=OQKc3pxi6ST36O7qEmLPA6ALXpuUXW2ADhR7XX-CaBk,1080
 hydroserverpy/api/models/sta/result_qualifier.py,sha256=kenPF1B11Q5aa3c7mnHcmMmSQMziWNyiYxGK1Il4Df8,1012
 hydroserverpy/api/models/sta/sensor.py,sha256=rOuMZAcqgSYr-ZHm66EbnoXx_6-UZLeeQXZv59AHIAY,1559
-hydroserverpy/api/models/sta/thing.py,sha256=qJSZyIVEFUu4R4MUsW50FOvyFjTZ4-7vESt2N6KnYDA,4102
+hydroserverpy/api/models/sta/thing.py,sha256=c7nOvMcnNZ18pr9oOgArnUK4Ei8UgZjXORaaoeemTW8,4108
 hydroserverpy/api/models/sta/unit.py,sha256=H_0HyE5-ni1lglaORSaaxF0c6ZreroeQgN4JcMynkTQ,1094
 hydroserverpy/api/services/__init__.py,sha256=Nb7rc1Zt8kpRElgFdWPdcyUDrtm7XdJDgzes90EzNKQ,566
 hydroserverpy/api/services/base.py,sha256=f7CoQ1m-pdgVwqJsdvE7vcannw-3i7yJgBMI4eHZxAQ,3725
@@ -34,7 +34,7 @@ hydroserverpy/api/services/iam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 hydroserverpy/api/services/iam/role.py,sha256=PV0odC_lL9kV3ggrTjAUEMTo0WNUzv4AeMHNAXlkbN8,1137
 hydroserverpy/api/services/iam/workspace.py,sha256=V4ter_XJQocdXB-11IRdL5jzVmXdtOHlbAuqw42bEks,7995
 hydroserverpy/api/services/sta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hydroserverpy/api/services/sta/datastream.py,sha256=FLi3mblfDH5F0QkD-JjlCWdc6_UU5oLWiYYpW24it9Q,11471
+hydroserverpy/api/services/sta/datastream.py,sha256=Cnse8etWeWmRF3g5NG4Wmok0_11ZVq46p269QX2yhJ4,11450
 hydroserverpy/api/services/sta/observed_property.py,sha256=hKoTXRhoJSveR7S9KuokUowadhS3b1VFE-VqCnMRbvU,2516
 hydroserverpy/api/services/sta/processing_level.py,sha256=d5ReGxX193NsYW18k1RWPPIBoEsDPc6LVerDAD_UBvs,2175
 hydroserverpy/api/services/sta/result_qualifier.py,sha256=gkgofUqzGXgdkyAvK9RW_dyTn1MPxpd99jdcn7zpWHM,1783
@@ -59,12 +59,12 @@ hydroserverpy/etl/transformers/csv_transformer.py,sha256=0kWfRKPwiGxCNZ87Q4SiBlf
 hydroserverpy/etl/transformers/json_transformer.py,sha256=R7tSyDB4Wn1snP75ctbEDMaMCdjyhPnMzN_W2VV3Mv4,1506
 hydroserverpy/etl_csv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydroserverpy/etl_csv/exceptions.py,sha256=0UY8YUlNepG0y6FfH36hJyR1bOhwYHSZIdUSSMTg7GA,314
-hydroserverpy/etl_csv/hydroserver_etl_csv.py,sha256=wRKGE05wuvS5B2KvwC_n4Ej2AtPIzGuHVmmHtn8zAjg,14551
+hydroserverpy/etl_csv/hydroserver_etl_csv.py,sha256=uco-FFOPk8oA4R4iWLEtcdKUT6EWa7r5h1_BWPjANjo,14359
 hydroserverpy/quality/__init__.py,sha256=GGBMkFSXciJLYrbV-NraFrj_mXWCy_GTcy9KKrKXU4c,84
 hydroserverpy/quality/service.py,sha256=U02UfLKVmFvr5ySiH0n0JYzUIabq5uprrHIiwcqBlqY,13879
-hydroserverpy-1.3.0b1.dist-info/licenses/LICENSE,sha256=xVqFxDw3QOEJukakL7gQCqIMTQ1dlSCTo6Oc1otNW80,1508
-hydroserverpy-1.3.0b1.dist-info/METADATA,sha256=G9DDWvDUQqLIPOdaBu3mnfEH1WaGqA3qHOKUJPoroA8,532
-hydroserverpy-1.3.0b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hydroserverpy-1.3.0b1.dist-info/top_level.txt,sha256=Zf37hrncXLOYvXhgCrf5mZdeq81G9fShdE2LfYbtb7w,14
-hydroserverpy-1.3.0b1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-hydroserverpy-1.3.0b1.dist-info/RECORD,,
+hydroserverpy-1.3.0b3.dist-info/licenses/LICENSE,sha256=xVqFxDw3QOEJukakL7gQCqIMTQ1dlSCTo6Oc1otNW80,1508
+hydroserverpy-1.3.0b3.dist-info/METADATA,sha256=LfvAvRE5JhA_W9ePceuUCiYMuWsl44b_PdlR3woCe8E,532
+hydroserverpy-1.3.0b3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hydroserverpy-1.3.0b3.dist-info/top_level.txt,sha256=Zf37hrncXLOYvXhgCrf5mZdeq81G9fShdE2LfYbtb7w,14
+hydroserverpy-1.3.0b3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+hydroserverpy-1.3.0b3.dist-info/RECORD,,