hydroserverpy 0.2.0__py3-none-any.whl → 0.2.3__py3-none-any.whl

hydroserverpy/__init__.py

@@ -1,13 +1,19 @@
-from hydroserverpy.main import HydroServer
-from hydroserverpy.schemas.things import ThingPostBody
-from hydroserverpy.schemas.observed_properties import ObservedPropertyPostBody
-from hydroserverpy.schemas.units import UnitPostBody
-from hydroserverpy.schemas.datastreams import DatastreamPostBody
+from .main import HydroServer
+from .schemas.things import ThingPostBody
+from .schemas.sensors import SensorPostBody
+from .schemas.observed_properties import ObservedPropertyPostBody
+from .schemas.units import UnitPostBody
+from .schemas.processing_levels import ProcessingLevelPostBody
+from .schemas.result_qualifiers import ResultQualifierPostBody
+from .schemas.datastreams import DatastreamPostBody
 
 __all__ = [
     "HydroServer",
     "ThingPostBody",
+    "SensorPostBody",
     "ObservedPropertyPostBody",
     "UnitPostBody",
+    "ProcessingLevelPostBody",
+    "ResultQualifierPostBody",
     "DatastreamPostBody"
 ]

hydroserverpy/etl.py

@@ -5,10 +5,10 @@ import croniter
 from typing import IO, List
 from datetime import datetime, timezone, timedelta
 from dateutil.parser import isoparse
-from hydroserverpy.schemas.data_sources import DataSourceGetResponse
-from hydroserverpy.schemas.datastreams import DatastreamGetResponse
-from hydroserverpy.exceptions import HeaderParsingError, TimestampParsingError
-from hydroserverpy.schemas.data_sources import DataSourcePatchBody
+from .schemas.data_sources import DataSourceGetResponse
+from .schemas.datastreams import DatastreamGetResponse
+from .exceptions import HeaderParsingError, TimestampParsingError
+from .schemas.data_sources import DataSourcePatchBody
 
 logger = logging.getLogger('hydroserver_etl')
 logger.addHandler(logging.NullHandler())
@@ -137,7 +137,7 @@ class HydroServerETL:
 
         try:
             self._timestamp_column_index = row.index(self._data_source.timestamp_column) \
-                if not self._data_source.timestamp_column.isdigit() \
+                if isinstance(self._data_source.timestamp_column, str) \
                 else int(self._data_source.timestamp_column) - 1
             if self._timestamp_column_index > len(row):
                 raise ValueError
@@ -151,6 +151,7 @@ class HydroServerETL:
                     max(self._datastream_column_indexes.values()) > len(row):
                 raise ValueError
         except ValueError as e:
+            logger.error(f'Failed to load data from data source: "{self._data_source.name}"')
             raise HeaderParsingError(str(e)) from e
 
     def _parse_row_timestamp(self, row: List[str]) -> datetime:
@@ -163,7 +164,7 @@ class HydroServerETL:
         """
 
         try:
-            if self._data_source.timestamp_format == 'iso':
+            if self._data_source.timestamp_format == 'iso' or self._data_source.timestamp_format is None:
                 timestamp = isoparse(
                     row[self._timestamp_column_index]
                 )
@@ -188,6 +189,7 @@ class HydroServerETL:
                         ).tzinfo
                     )
                 except ValueError as e:
+                    logger.error(f'Failed to load data from data source: "{self._data_source.name}"')
                     raise TimestampParsingError(str(e)) from e
 
         return timestamp
@@ -214,7 +216,7 @@ class HydroServerETL:
                     f'Loading observations from ' +
                     f'{observations[0]["phenomenon_time"].strftime("%Y-%m-%dT%H:%M:%S%z")} to ' +
                     f'{observations[-1]["phenomenon_time"].strftime("%Y-%m-%dT%H:%M:%S%z")} for datastream: ' +
-                    f'{str(datastream_id)}.'
+                    f'{str(datastream_id)} in data source "{self._data_source.name}".'
                 )
 
                 data_array_value = getattr(fsc.model, 'ext').data_array_value.DataArrayValue()
@@ -250,7 +252,8 @@ class HydroServerETL:
                     f'Skipping observations POST request from ' +
                     f'{observations[0]["phenomenon_time"].strftime("%Y-%m-%dT%H:%M:%S%z")} to ' +
                     f'{observations[-1]["phenomenon_time"].strftime("%Y-%m-%dT%H:%M:%S%z")} for datastream: ' +
-                    f'{str(datastream_id)}, due to previous failed POST request.'
+                    f'{str(datastream_id)} in data source "{self._data_source.name}",' +
+                    f'due to previous failed POST request.'
                 )
 
         self._observations = {}

hydroserverpy/schemas/datastreams.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import Union
+from typing import Union, Literal, Optional
 from uuid import UUID
 from datetime import datetime
 from hydroserverpy.utils import allow_partial
@@ -33,8 +33,10 @@ class DatastreamFields(BaseModel):
     observed_property_id: UUID = Field(..., alias='observedPropertyId')
     processing_level_id: UUID = Field(..., alias='processingLevelId')
     unit_id: UUID = Field(..., alias='unitId')
-    time_aggregation_interval_units_id: UUID = Field(..., alias='timeAggregationIntervalUnitsId')
-    intended_time_spacing_units_id: UUID = Field(None, alias='intendedTimeSpacingUnitsId')
+    time_aggregation_interval_units: Literal['seconds', 'minutes', 'hours', 'days'] = \
+        Field(..., alias='timeAggregationIntervalUnits')
+    intended_time_spacing_units: Optional[Literal['seconds', 'minutes', 'hours', 'days']] = \
+        Field(None, alias='intendedTimeSpacingUnits')
 
 
 class DatastreamGetResponse(DatastreamFields, DatastreamID):
@@ -44,7 +46,9 @@ class DatastreamGetResponse(DatastreamFields, DatastreamID):
 
 
 class DatastreamPostBody(DatastreamFields):
-    pass
+
+    class Config:
+        allow_population_by_field_name = True
 
 
 @allow_partial

hydroserverpy/schemas/observed_properties.py

@@ -18,7 +18,7 @@ class ObservedPropertyFields(BaseModel):
 
 
 class ObservedPropertyGetResponse(ObservedPropertyFields, ObservedPropertyID):
-    owner: Optional[UserFields]
+    owner: Optional[str]
 
     class Config:
         allow_population_by_field_name = True

hydroserverpy/schemas/processing_levels.py

@@ -1,8 +1,8 @@
 from pydantic import BaseModel
 from uuid import UUID
 from typing import Optional
-from hydroserverpy.utils import allow_partial
-from hydroserverpy.schemas.users import UserFields
+from ..utils import allow_partial
+from ..schemas.users import UserFields
 
 
 class ProcessingLevelID(BaseModel):
@@ -16,14 +16,16 @@ class ProcessingLevelFields(BaseModel):
 
 
 class ProcessingLevelGetResponse(ProcessingLevelFields, ProcessingLevelID):
-    owner: Optional[UserFields]
+    owner: Optional[str]
 
     class Config:
         allow_population_by_field_name = True
 
 
 class ProcessingLevelPostBody(ProcessingLevelFields):
-    pass
+
+    class Config:
+        allow_population_by_field_name = True
 
 
 @allow_partial

hydroserverpy/schemas/result_qualifiers.py

@@ -1,8 +1,8 @@
 from pydantic import BaseModel
 from uuid import UUID
 from typing import Optional
-from hydroserverpy.utils import allow_partial
-from hydroserverpy.schemas.users import UserFields
+from ..utils import allow_partial
+from ..schemas.users import UserFields
 
 
 class ResultQualifierID(BaseModel):
@@ -15,14 +15,16 @@ class ResultQualifierFields(BaseModel):
 
 
 class ResultQualifierGetResponse(ResultQualifierFields, ResultQualifierID):
-    owner: Optional[UserFields]
+    owner: Optional[str]
 
     class Config:
         allow_population_by_field_name = True
 
 
 class ResultQualifierPostBody(ResultQualifierFields):
-    pass
+
+    class Config:
+        allow_population_by_field_name = True
 
 
 @allow_partial

hydroserverpy/schemas/sensors.py

@@ -22,14 +22,16 @@ class SensorFields(BaseModel):
 
 
 class SensorGetResponse(SensorFields, SensorID):
-    owner: Optional[UserFields]
+    owner: Optional[str]
 
     class Config:
         allow_population_by_field_name = True
 
 
 class SensorPostBody(SensorFields):
-    pass
+
+    class Config:
+        allow_population_by_field_name = True
 
 
 @allow_partial

hydroserverpy/schemas/units.py

@@ -17,7 +17,7 @@ class UnitFields(BaseModel):
 
 
 class UnitGetResponse(UnitFields, UnitID):
-    owner: Optional[UserFields]
+    owner: Optional[str]
 
     class Config:
         allow_population_by_field_name = True

{hydroserverpy-0.2.0.dist-info → hydroserverpy-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hydroserverpy
-Version: 0.2.0
+Version: 0.2.3
 License-File: LICENSE
 Requires-Dist: requests >=2
 Requires-Dist: pydantic <2.0.0,>=1.6

{hydroserverpy-0.2.0.dist-info → hydroserverpy-0.2.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
-hydroserverpy/__init__.py,sha256=qD1hfLj901nRrIG4LsXJWUD8rqVPuQ1X93BtO3iS5Ts,427
-hydroserverpy/etl.py,sha256=KCF2PUjPMtA8WRl-eibck7og2Kf4JZk_AfSZlkJK4g0,12927
+hydroserverpy/__init__.py,sha256=iZcBLrXpuWr7SYUIgIT3ngDKcI63LgfRNCwCIiv_CW4,616
+hydroserverpy/etl.py,sha256=3cczra-7m1WxdHXm3yZO3hlz-OkWUJdQkA8mdhF8bi0,13229
 hydroserverpy/exceptions.py,sha256=0UY8YUlNepG0y6FfH36hJyR1bOhwYHSZIdUSSMTg7GA,314
 hydroserverpy/main.py,sha256=UD8l4wFvJbLWA07r0kR5tYPW3dnD7OCQoB4PJVpHkeo,1421
 hydroserverpy/models.py,sha256=IxQrSEHM344Bn6qtwjGFdY7bqyH_-lc8TJggVqDsvdg,8174
@@ -19,17 +19,17 @@ hydroserverpy/components/users.py,sha256=jpZ6TGOImK_j3ghwTFoAxpD9WMBG9DzIC0vcsb2
 hydroserverpy/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydroserverpy/schemas/data_loaders.py,sha256=5YIXryh1LaVgjRetruyZHvBivsCS1XqOnT6lbcMCIMg,459
 hydroserverpy/schemas/data_sources.py,sha256=cYnhKUaKqirhJjxo9niSgtOdokv98Fah635rOywosAE,2053
-hydroserverpy/schemas/datastreams.py,sha256=3Halcwi2LzrMvtGTUT0RXXuvM6OeO8WSY1p2t4-h2e0,2087
-hydroserverpy/schemas/observed_properties.py,sha256=RquFsIadC2pyuCNGXDDxfOrftJ_lZII2WqKrPI6Xf-M,705
-hydroserverpy/schemas/processing_levels.py,sha256=ghdVzxfCQxrEKe8kik4jF4fmaKgrn0s4ndYFRakF_Y0,661
-hydroserverpy/schemas/result_qualifiers.py,sha256=T143dxl3PWqPlZNy8x_vOEOAkZ34k4CAwVGgKUSINiY,627
-hydroserverpy/schemas/sensors.py,sha256=84smNzc_0bJi2finQrWnDgvXMJGo6hS_CPu-4wjayKk,869
+hydroserverpy/schemas/datastreams.py,sha256=wOY3O8UBLjfJXlVJI18rkcPNFApGDteKmFGsCbCv4s4,2266
+hydroserverpy/schemas/observed_properties.py,sha256=-DpFuo4UYY5dx7mAxRSyN6EqjHGp9-CT5AapzSOE2RQ,698
+hydroserverpy/schemas/processing_levels.py,sha256=MWy7fRIP-hDJtjwmSB1PK27agx9U2UFpjhl5lrYMIHA,686
+hydroserverpy/schemas/result_qualifiers.py,sha256=m2OfJHefO1jFfRqV-Klgv6b50jOM0X1UtNCrSon3Znc,652
+hydroserverpy/schemas/sensors.py,sha256=mUilTxc61zkrL2GULhJTO-q3P58Rkh2leHyCSZl1-Ug,918
 hydroserverpy/schemas/things.py,sha256=kolNbZ-JxNcIK3uNXBCNy7k1BTDbTpjlHa3v_YPrQvU,3359
-hydroserverpy/schemas/units.py,sha256=nno8mbzETzmRkAt88vKimoAAIdzaH1-2G6hcphOogg4,557
+hydroserverpy/schemas/units.py,sha256=_28zmCz9TDuNfHa4Ycj1RKkxwUB_J832NSWIO3cBK9k,550
 hydroserverpy/schemas/users.py,sha256=TauiaArJ4LVjAKq80KvjKjxex5DAwQekc_nDXHyaU3U,675
-hydroserverpy-0.2.0.dist-info/LICENSE,sha256=xVqFxDw3QOEJukakL7gQCqIMTQ1dlSCTo6Oc1otNW80,1508
-hydroserverpy-0.2.0.dist-info/METADATA,sha256=4QLA03R9syUdBhZfLC2_K2AMitiVRg8CLvgLTvSDzVQ,419
-hydroserverpy-0.2.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-hydroserverpy-0.2.0.dist-info/top_level.txt,sha256=Zf37hrncXLOYvXhgCrf5mZdeq81G9fShdE2LfYbtb7w,14
-hydroserverpy-0.2.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-hydroserverpy-0.2.0.dist-info/RECORD,,
+hydroserverpy-0.2.3.dist-info/LICENSE,sha256=xVqFxDw3QOEJukakL7gQCqIMTQ1dlSCTo6Oc1otNW80,1508
+hydroserverpy-0.2.3.dist-info/METADATA,sha256=M7f0ECACJA2u6EVhnGJseeEyhbHw7HtqQ6S3zO-lIZY,419
+hydroserverpy-0.2.3.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+hydroserverpy-0.2.3.dist-info/top_level.txt,sha256=Zf37hrncXLOYvXhgCrf5mZdeq81G9fShdE2LfYbtb7w,14
+hydroserverpy-0.2.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+hydroserverpy-0.2.3.dist-info/RECORD,,

{hydroserverpy-0.2.0.dist-info → hydroserverpy-0.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any