hydroserverpy 1.4.1__tar.gz → 1.5.0__tar.gz

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydroserverpy
-Version: 1.4.1
+Version: 1.5.0
 Summary: A Python client for managing HydroServer data
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
@@ -8,8 +8,8 @@ License-File: LICENSE
 Requires-Dist: requests>=2
 Requires-Dist: pydantic>=2.6
 Requires-Dist: pydantic[email]>=2.6
-Requires-Dist: pandas>=2.2
-Requires-Dist: numpy>=2.0
+Requires-Dist: pandas>=2.1
+Requires-Dist: numpy>=1.22.4
 Requires-Dist: pyyaml>=5
 Requires-Dist: simplejson>=3
 Requires-Dist: crontab>=1

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = hydroserverpy
-version = 1.4.1
+version = 1.5.0
 description = A Python client for managing HydroServer data
 long_description_content_type = text/markdown
 long_description = file: README.md
@@ -15,8 +15,8 @@ install_requires =
 	requests >= 2
 	pydantic >= 2.6
 	pydantic[email] >= 2.6
-	pandas >= 2.2
-	numpy >= 2.0
+	pandas >= 2.1
+	numpy >= 1.22.4
 	pyyaml >= 5
 	simplejson >= 3
 	crontab >= 1

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/src/hydroserverpy/api/models/etl/etl_configuration.py

@@ -74,7 +74,7 @@ class Timestamp(BaseModel):
     timezone: Optional[Union[FixedOffsetTimezone, str]] = Field(None, alias="timezone")
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
     @field_validator("timezone")
     def check_timezone(cls, timezone_value, info):
@@ -96,7 +96,7 @@ class RunTimePlaceholder(BaseModel):
     timestamp: Timestamp
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 PlaceholderVariable = Annotated[
@@ -114,7 +114,7 @@ class BaseExtractor(BaseModel):
     )
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 class HTTPExtractor(BaseExtractor):
@@ -140,7 +140,7 @@ class JSONTransformer(BaseTransformer):
     jmespath: str = Field(..., alias="JMESPath")
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 class CSVTransformer(BaseTransformer):
@@ -151,7 +151,7 @@ class CSVTransformer(BaseTransformer):
     identifier_type: IdentifierType = Field(..., alias="identifierType")
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 TransformerConfig = Union[JSONTransformer, CSVTransformer]
@@ -173,7 +173,7 @@ class ExpressionDataTransformation(BaseModel):
     expression: str
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 class LookupTableDataTransformation(BaseModel):
@@ -181,7 +181,7 @@ class LookupTableDataTransformation(BaseModel):
     lookup_table_id: str = Field(..., alias="lookupTableId")
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 DataTransformation = Union[ExpressionDataTransformation, LookupTableDataTransformation]
@@ -194,7 +194,7 @@ class MappingPath(BaseModel):
     )
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 class SourceTargetMapping(BaseModel):
@@ -202,7 +202,7 @@ class SourceTargetMapping(BaseModel):
     paths: List[MappingPath] = Field(default_factory=list)
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 class Payload(BaseModel):
@@ -213,7 +213,7 @@ class Payload(BaseModel):
     )
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True
 
 
 class EtlConfiguration(BaseModel):

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/src/hydroserverpy/api/models/etl/schedule.py

@@ -13,4 +13,4 @@ class Schedule(BaseModel):
     end_time: Optional[datetime] = Field(None, alias="endTime")
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/src/hydroserverpy/api/models/etl/status.py

@@ -11,4 +11,4 @@ class Status(BaseModel):
     next_run: Optional[datetime] = Field(None, alias="nextRun")
 
     class Config:
-        allow_population_by_field_name = True
+        populate_by_name = True

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/src/hydroserverpy/api/models/sta/datastream.py

@@ -194,6 +194,7 @@ class Datastream(HydroServerBaseModel):
         order_by: List[str] = ...,
         phenomenon_time_max: datetime = ...,
         phenomenon_time_min: datetime = ...,
+        result_qualifier_code: str = ...,
         fetch_all: bool = False,
     ) -> pd.DataFrame:
         """Retrieve the observations for this datastream."""
@@ -205,18 +206,21 @@ class Datastream(HydroServerBaseModel):
             order_by=order_by,
             phenomenon_time_max=phenomenon_time_max,
             phenomenon_time_min=phenomenon_time_min,
+            result_qualifier_code=result_qualifier_code,
             fetch_all=fetch_all
         )
 
     def load_observations(
         self,
         observations: pd.DataFrame,
+        mode: str = "insert"
     ) -> None:
         """Load a DataFrame of observations to the datastream."""
 
         return self.client.datastreams.load_observations(
             uid=self.uid,
             observations=observations,
+            mode=mode
         )
 
     def delete_observations(

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/src/hydroserverpy/api/models/sta/observation.py

@@ -38,7 +38,9 @@ class ObservationCollection:
             data = response.json()
             self.dataframe = pd.DataFrame({to_snake(k): v for k, v in data.items()})
             if "phenomenon_time" in self.dataframe.columns:
-                self.dataframe["phenomenon_time"] = pd.to_datetime(self.dataframe["phenomenon_time"], utc=True)
+                self.dataframe["phenomenon_time"] = pd.to_datetime(
+                    self.dataframe["phenomenon_time"], utc=True, format="ISO8601"
+                )
         else:
             self.dataframe = pd.DataFrame()
 

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/src/hydroserverpy/api/services/sta/datastream.py

@@ -220,6 +220,7 @@ class DatastreamService(HydroServerBaseService):
         order_by: List[str] = ...,
         phenomenon_time_max: datetime = ...,
         phenomenon_time_min: datetime = ...,
+        result_qualifier_code: str = ...,
         fetch_all: bool = False,
     ) -> ObservationCollection:
         """Retrieve observations of a datastream."""
@@ -230,6 +231,7 @@ class DatastreamService(HydroServerBaseService):
             "order_by": ",".join(order_by) if order_by is not ... else order_by,
             "phenomenon_time_max": phenomenon_time_max,
             "phenomenon_time_min": phenomenon_time_min,
+            "result_qualifier_code": result_qualifier_code,
             "format": "column"
         }
         params = {
@@ -256,12 +258,13 @@ class DatastreamService(HydroServerBaseService):
         self,
         uid: Union[UUID, str],
         observations: pd.DataFrame,
+        mode: str = "insert"
     ) -> None:
         """Load observations to a datastream."""
 
         path = f"/{self.client.base_route}/{self.model.get_route()}/{str(uid)}/observations/bulk-create"
         headers = {"Content-type": "application/json"}
-        params = {"mode": "insert"}
+        params = {"mode": mode}
         body = {
             "fields": [to_camel(col) for col in observations.columns.tolist()],
             "data": observations.values.tolist()

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/src/hydroserverpy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydroserverpy
-Version: 1.4.1
+Version: 1.5.0
 Summary: A Python client for managing HydroServer data
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
@@ -8,8 +8,8 @@ License-File: LICENSE
 Requires-Dist: requests>=2
 Requires-Dist: pydantic>=2.6
 Requires-Dist: pydantic[email]>=2.6
-Requires-Dist: pandas>=2.2
-Requires-Dist: numpy>=2.0
+Requires-Dist: pandas>=2.1
+Requires-Dist: numpy>=1.22.4
 Requires-Dist: pyyaml>=5
 Requires-Dist: simplejson>=3
 Requires-Dist: crontab>=1

{hydroserverpy-1.4.1 → hydroserverpy-1.5.0}/src/hydroserverpy.egg-info/requires.txt

@@ -1,8 +1,8 @@
 requests>=2
 pydantic>=2.6
 pydantic[email]>=2.6
-pandas>=2.2
-numpy>=2.0
+pandas>=2.1
+numpy>=1.22.4
 pyyaml>=5
 simplejson>=3
 crontab>=1