hydroserverpy 1.3.0b3__py3-none-any.whl → 1.3.1__py3-none-any.whl

hydroserverpy/etl_csv/hydroserver_etl_csv.py

@@ -216,11 +216,11 @@ class HydroServerETLCSV:
         """
 
         try:
-            timestamp_format = (self._data_source.settings["transformer"].get("timestampFormat") or
-                                self._data_source.settings["transformer"].get("timestamp", {}).get("format"))
+            timestamp_format = self._data_source.settings["transformer"]["timestamp"]["format"]
             if timestamp_format == "custom":
                 timestamp = datetime.strptime(
-                    row[self._timestamp_column_index], timestamp_format,
+                    row[self._timestamp_column_index],
+                    self._data_source.settings["transformer"]["timestamp"]["customFormat"],
                 )
             else:
                 timestamp = isoparse(row[self._timestamp_column_index])
@@ -228,11 +228,7 @@ class HydroServerETLCSV:
             raise TimestampParsingError(str(e)) from e
 
         if timestamp.tzinfo is None:
-            timestamp_offset = self._data_source.settings["transformer"].get(
-                "timestampOffset"
-            ) or self._data_source.settings["transformer"].get(
-                "timestamp", {}
-            ).get("offset")
+            timestamp_offset = self._data_source.settings["transformer"]["timestamp"]["timezone"]
             if not timestamp_offset or timestamp_offset.endswith(
                 "0000"
             ):

{hydroserverpy-1.3.0b3.dist-info → hydroserverpy-1.3.1.dist-info}/METADATA

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

{hydroserverpy-1.3.0b3.dist-info → hydroserverpy-1.3.1.dist-info}/RECORD

@@ -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=uco-FFOPk8oA4R4iWLEtcdKUT6EWa7r5h1_BWPjANjo,14359
+hydroserverpy/etl_csv/hydroserver_etl_csv.py,sha256=zZDIpbBTUdm4-9G3gJ8F_IqsLvP5wtGvr4Xy6_5K3tQ,14181
 hydroserverpy/quality/__init__.py,sha256=GGBMkFSXciJLYrbV-NraFrj_mXWCy_GTcy9KKrKXU4c,84
 hydroserverpy/quality/service.py,sha256=U02UfLKVmFvr5ySiH0n0JYzUIabq5uprrHIiwcqBlqY,13879
-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,,
+hydroserverpy-1.3.1.dist-info/licenses/LICENSE,sha256=xVqFxDw3QOEJukakL7gQCqIMTQ1dlSCTo6Oc1otNW80,1508
+hydroserverpy-1.3.1.dist-info/METADATA,sha256=7p10qFkxjJqbUJglmqEF300RygoDzFsvpHFU0f9STEw,530
+hydroserverpy-1.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hydroserverpy-1.3.1.dist-info/top_level.txt,sha256=Zf37hrncXLOYvXhgCrf5mZdeq81G9fShdE2LfYbtb7w,14
+hydroserverpy-1.3.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+hydroserverpy-1.3.1.dist-info/RECORD,,