hydroserverpy 2.0.0b2__tar.gz → 2.0.0b3__tar.gz

{hydroserverpy-2.0.0b2/src/hydroserverpy.egg-info → hydroserverpy-2.0.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydroserverpy
-Version: 2.0.0b2
+Version: 2.0.0b3
 Summary: A Python client for managing HydroServer data
 Home-page: https://github.com/hydroserver2/hydroserver/tree/main/packages/hydroserverpy
 Author: Kenneth Lippold

{hydroserverpy-2.0.0b2 → hydroserverpy-2.0.0b3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = hydroserverpy
-version = 2.0.0b2
+version = 2.0.0b3
 description = A Python client for managing HydroServer data
 long_description = file: README.md
 long_description_content_type = text/markdown

hydroserverpy-2.0.0b3/src/hydroserverpy/api/models/etl/mapping.py

@@ -0,0 +1,14 @@
+import uuid
+from pydantic import AliasChoices, AliasPath, BaseModel, ConfigDict, Field
+from pydantic.alias_generators import to_camel
+
+
+class EtlMapping(BaseModel):
+    source_identifier: str
+    target_datastream_id: uuid.UUID = Field(
+        validation_alias=AliasChoices(
+            "targetDatastreamId", AliasPath("targetDatastream", "id")
+        )
+    )
+
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)

{hydroserverpy-2.0.0b2 → hydroserverpy-2.0.0b3}/src/hydroserverpy/api/models/etl/task.py

@@ -1,7 +1,7 @@
 import uuid
 from datetime import datetime
 from typing import Any, ClassVar, Dict, List, Literal, Optional, Union, TYPE_CHECKING
-from pydantic import Field, AliasPath
+from pydantic import AliasChoices, Field, AliasPath
 from ..base import HydroServerBaseModel
 from ..orchestration.run import TaskRun
 from .mapping import EtlMapping
@@ -15,7 +15,11 @@ class EtlTask(HydroServerBaseModel):
     name: str
     description: Optional[str] = None
     task_variables: Dict[str, Any] = Field(default_factory=dict)
-    data_connection_id: uuid.UUID
+    data_connection_id: uuid.UUID = Field(
+        validation_alias=AliasChoices(
+            "dataConnectionId", AliasPath("dataConnection", "id")
+        )
+    )
     enabled: Optional[bool] = Field(None, validation_alias=AliasPath("schedule", "enabled"))
     start_time: Optional[datetime] = Field(None, validation_alias=AliasPath("schedule", "startTime"))
     crontab: Optional[str] = Field(None, validation_alias=AliasPath("schedule", "crontab"))
@@ -41,6 +45,7 @@ class EtlTask(HydroServerBaseModel):
         if not self.uid:
             raise AttributeError("Data cannot be saved: UID is not set.")
 
+        mappings = self.mappings
         saved_resource = self.service.update(
             self.uid,
             name=self.name,
@@ -48,7 +53,7 @@ class EtlTask(HydroServerBaseModel):
             task_variables=self.task_variables,
             mappings=[
                 {"source_identifier": m.source_identifier, "target_datastream_id": str(m.target_datastream_id)}
-                for m in self.mappings
+                for m in mappings
             ],
             crontab=self.crontab,
             interval=self.interval,
@@ -56,6 +61,7 @@ class EtlTask(HydroServerBaseModel):
             start_time=self.start_time,
             enabled=self.enabled,
         )
+        saved_resource.mappings = mappings
         self._server_data = saved_resource.dict(by_alias=False).copy()
         self.__dict__.update(saved_resource.__dict__)
 

{hydroserverpy-2.0.0b2 → hydroserverpy-2.0.0b3}/src/hydroserverpy/api/services/etl/task.py

@@ -36,6 +36,7 @@ class TaskService(HydroServerBaseService):
             page_size=page_size,
             order_by=order_by,
             fetch_all=fetch_all,
+            expand_related=True,
             workspace_id=normalize_uuid(workspace),
             data_connection_id=normalize_uuid(data_connection),
             latest_run_status=latest_run_status,
@@ -45,6 +46,16 @@ class TaskService(HydroServerBaseService):
             latest_run_finished_at_max=latest_run_finished_at_max,
         )
 
+    def get(self, uid: Union[UUID, str]) -> EtlTask:
+        """Fetch a single ETL task."""
+
+        path = f"/{self.client.base_route}/{self.model.get_route()}/{str(uid)}"
+        response = self.client.request("get", path, params={"expand_related": True}).json()
+
+        return self.model(
+            client=self.client, uid=UUID(str(response.pop("id"))), **response
+        )
+
     def create(
         self,
         name: str,

{hydroserverpy-2.0.0b2 → hydroserverpy-2.0.0b3}/src/hydroserverpy/etl/loaders/hydroserver.py

@@ -132,9 +132,11 @@ class HydroServerLoader(Loader):
                     )
                     continue
 
+            upload_df = target_df.rename(columns={"timestamp": "phenomenon_time", "value": "result"})
+
             for start_idx in range(0, observations_to_load, self.chunk_size):
                 end_idx = min(start_idx + self.chunk_size, observations_to_load)
-                chunk = target_df.iloc[start_idx:end_idx]
+                chunk = upload_df.iloc[start_idx:end_idx]
 
                 try:
                     self.client.datastreams.load_observations(

{hydroserverpy-2.0.0b2 → hydroserverpy-2.0.0b3/src/hydroserverpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydroserverpy
-Version: 2.0.0b2
+Version: 2.0.0b3
 Summary: A Python client for managing HydroServer data
 Home-page: https://github.com/hydroserver2/hydroserver/tree/main/packages/hydroserverpy
 Author: Kenneth Lippold

hydroserverpy-2.0.0b2/src/hydroserverpy/api/models/etl/mapping.py

@@ -1,10 +0,0 @@
-import uuid
-from pydantic import BaseModel, ConfigDict
-from pydantic.alias_generators import to_camel
-
-
-class EtlMapping(BaseModel):
-    source_identifier: str
-    target_datastream_id: uuid.UUID
-
-    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)