hydroserverpy 2.0.0b4__tar.gz → 2.0.0b5__tar.gz

{hydroserverpy-2.0.0b4/src/hydroserverpy.egg-info → hydroserverpy-2.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydroserverpy
-Version: 2.0.0b4
+Version: 2.0.0b5
 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.0b4 → hydroserverpy-2.0.0b5}/setup.cfg

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

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/models/sta/datastream.py

@@ -172,7 +172,7 @@ class Datastream(HydroServerBaseModel):
         sortby: List[str] = ...,
         phenomenon_time_max: datetime = ...,
         phenomenon_time_min: datetime = ...,
-        result_qualifier_code: str = ...,
+        result_qualifiers: str = ...,
         fetch_all: bool = False,
     ) -> pd.DataFrame:
         """Retrieve the observations for this datastream."""
@@ -184,7 +184,7 @@ class Datastream(HydroServerBaseModel):
             sortby=sortby,
             phenomenon_time_max=phenomenon_time_max,
             phenomenon_time_min=phenomenon_time_min,
-            result_qualifier_code=result_qualifier_code,
+            result_qualifiers=result_qualifiers,
             fetch_all=fetch_all
         )
 

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/models/sta/monitoring_site.py

@@ -17,9 +17,7 @@ class MonitoringSite(HydroServerBaseModel):
     is_private: bool
     latitude: float = Field(..., ge=-90, le=90)
     longitude: float = Field(..., ge=-180, le=180)
-    elevation_m: Optional[float] = Field(
-        None, ge=-99999, le=99999, alias="elevation_m"
-    )
+    elevation_m: Optional[float] = Field(None, ge=-99999, le=99999)
     elevation_datum: Optional[str] = Field(
         None, max_length=255
     )

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/models/sta/observation.py

@@ -52,7 +52,7 @@ class ObservationCollection:
         )
         self.datastream = datastream
 
-    COLUMNS = ("phenomenon_time", "result", "result_qualifier_codes")
+    COLUMNS = ("phenomenon_time", "result", "result_qualifiers")
 
     @classmethod
     def _columns(cls, groups: list) -> dict[str, list]:

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/services/base.py

@@ -3,6 +3,7 @@ import uuid
 from typing import TYPE_CHECKING, Type, List, Union
 from datetime import datetime
 from hydroserverpy.api.models.base import HydroServerBaseModel, HydroServerCollection
+from pydantic.alias_generators import to_camel
 from hydroserverpy.api.utils import sortby_to_camel
 
 if TYPE_CHECKING:
@@ -26,7 +27,7 @@ class HydroServerBaseService:
         kwargs = {
             k: v for k, v in kwargs.items() if v is not ...
         }
-        params = kwargs.copy()
+        params = {to_camel(k): v for k, v in kwargs.items()}
         params.update({
             "offset": offset,
             "limit": limit,

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/services/etl/task.py

@@ -141,10 +141,10 @@ class TaskService(HydroServerBaseService):
             "limit": limit,
             "sortby": [sortby_to_camel(o) for o in sortby] if sortby is not ... else sortby,
             "status": status,
-            "started_at_min": started_at_min,
-            "started_at_max": started_at_max,
-            "finished_at_min": finished_at_min,
-            "finished_at_max": finished_at_max,
+            "startedAtMin": started_at_min,
+            "startedAtMax": started_at_max,
+            "finishedAtMin": finished_at_min,
+            "finishedAtMax": finished_at_max,
         }
         params = {k: v for k, v in params.items() if v is not ...}
 

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/services/monitoring/task.py

@@ -137,10 +137,10 @@ class MonitoringTaskService(HydroServerBaseService):
             "limit": limit,
             "sortby": [sortby_to_camel(o) for o in sortby] if sortby is not ... else sortby,
             "status": status,
-            "started_at_min": started_at_min,
-            "started_at_max": started_at_max,
-            "finished_at_min": finished_at_min,
-            "finished_at_max": finished_at_max,
+            "startedAtMin": started_at_min,
+            "startedAtMax": started_at_max,
+            "finishedAtMin": finished_at_min,
+            "finishedAtMax": finished_at_max,
         }
         params = {k: v for k, v in params.items() if v is not ...}
 

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/services/products/task.py

@@ -137,10 +137,10 @@ class DataProductTaskService(HydroServerBaseService):
             "limit": limit,
             "sortby": [sortby_to_camel(o) for o in sortby] if sortby is not ... else sortby,
             "status": status,
-            "started_at_min": started_at_min,
-            "started_at_max": started_at_max,
-            "finished_at_min": finished_at_min,
-            "finished_at_max": finished_at_max,
+            "startedAtMin": started_at_min,
+            "startedAtMax": started_at_max,
+            "finishedAtMin": finished_at_min,
+            "finishedAtMax": finished_at_max,
         }
         params = {k: v for k, v in params.items() if v is not ...}
 

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/services/products/transformation.py

@@ -42,15 +42,15 @@ class DataProductTransformationService:
         output_datastream: Optional[Union[UUID, str]] = None,
         input_datastream: Optional[Union[UUID, str]] = None,
     ) -> List[dict]:
-        params = {"transformation_type": transformation_type}
+        params = {"transformationType": transformation_type}
         if task_id is not None:
-            params["task_id"] = normalize_uuid(task_id)
+            params["taskId"] = normalize_uuid(task_id)
         if workspace_id is not None:
-            params["workspace_id"] = normalize_uuid(workspace_id)
+            params["workspaceId"] = normalize_uuid(workspace_id)
         if output_datastream is not None:
-            params["output_datastream_id"] = normalize_uuid(output_datastream)
+            params["outputDatastreamId"] = normalize_uuid(output_datastream)
         if input_datastream is not None:
-            params["input_datastream_id"] = normalize_uuid(input_datastream)
+            params["inputDatastreamId"] = normalize_uuid(input_datastream)
 
         response = self.client.request("get", self._route(), params=params)
 

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/services/sta/datastream.py

@@ -5,7 +5,7 @@ from uuid import UUID
 from datetime import datetime
 from pydantic.alias_generators import to_camel
 from hydroserverpy.api.models import Datastream, ObservationCollection
-from hydroserverpy.api.utils import normalize_uuid, build_datetime_interval
+from hydroserverpy.api.utils import normalize_uuid, build_datetime_interval, sortby_to_camel
 from ..base import HydroServerBaseService
 
 if TYPE_CHECKING:
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
     )
 
 COLUMN_PROFILE = "https://hydroserver.org/profiles/observations/column"
-LOADABLE_OBSERVATION_PROPERTIES = ("phenomenonTime", "result", "resultQualifierCodes")
+LOADABLE_OBSERVATION_PROPERTIES = ("phenomenonTime", "result", "resultQualifiers")
 READ_ONLY_OBSERVATION_PROPERTIES = ("id", "workspaceId", "datastreamId")
 
 
@@ -82,6 +82,7 @@ class DatastreamService(HydroServerBaseService):
         collection.filters.update({
             k: v
             for k, v in {
+                "tag": tag,
                 "phenomenon_time_max": phenomenon_time_max,
                 "phenomenon_time_min": phenomenon_time_min,
             }.items()
@@ -229,18 +230,18 @@ class DatastreamService(HydroServerBaseService):
         sortby: List[str] = ...,
         phenomenon_time_max: datetime = ...,
         phenomenon_time_min: datetime = ...,
-        result_qualifier_code: str = ...,
+        result_qualifiers: str = ...,
         fetch_all: bool = False,
     ) -> ObservationCollection:
         """Retrieve observations of a datastream."""
 
         params = {
-            "datastream_id": str(uid),
+            "datastreamId": str(uid),
             "offset": offset,
             "limit": limit,
-            "sortby": ",".join(sortby) if sortby is not ... else sortby,
+            "sortby": ",".join(sortby_to_camel(o) for o in sortby) if sortby is not ... else sortby,
             "datetime": build_datetime_interval(phenomenon_time_min, phenomenon_time_max),
-            "result_qualifier_code": result_qualifier_code,
+            "resultQualifiers": result_qualifiers,
             "profile": COLUMN_PROFILE,
             "properties": ",".join(LOADABLE_OBSERVATION_PROPERTIES),
         }
@@ -262,7 +263,7 @@ class DatastreamService(HydroServerBaseService):
                 for k, v in {
                     "phenomenon_time_max": phenomenon_time_max,
                     "phenomenon_time_min": phenomenon_time_min,
-                    "result_qualifier_code": result_qualifier_code,
+                    "result_qualifiers": result_qualifiers,
                 }.items()
                 if v is not ...
             },

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5}/src/hydroserverpy/api/services/sta/monitoring_site.py

@@ -32,7 +32,7 @@ class MonitoringSiteService(HydroServerBaseService):
     ) -> List["MonitoringSite"]:
         """Fetch a collection of monitoring_sites."""
 
-        return super().list(
+        collection = super().list(
             offset=offset,
             limit=limit,
             sortby=sortby,
@@ -44,9 +44,17 @@ class MonitoringSiteService(HydroServerBaseService):
             type=type,
             tag=[f"{tag[0]}:{tag[1]}"] if tag is not ... else tag,
             is_private=is_private,
-            fetch_all=fetch_all,
+            fetch_all=False,
         )
 
+        if tag is not ...:
+            collection.filters["tag"] = tag
+
+        if fetch_all is True:
+            collection = collection.fetch_all()
+
+        return collection
+
     def create(
         self,
         workspace: Union["Workspace", UUID, str],
@@ -79,7 +87,7 @@ class MonitoringSiteService(HydroServerBaseService):
             "workspaceId": normalize_uuid(workspace),
             "latitude": latitude,
             "longitude": longitude,
-            "elevation_m": elevation_m,
+            "elevationM": elevation_m,
             "elevationDatum": elevation_datum,
             "adminArea1": admin_area_1,
             "adminArea2": admin_area_2,
@@ -118,7 +126,7 @@ class MonitoringSiteService(HydroServerBaseService):
             "dataDisclaimer": data_disclaimer,
             "latitude": latitude,
             "longitude": longitude,
-            "elevation_m": elevation_m,
+            "elevationM": elevation_m,
             "elevationDatum": elevation_datum,
             "adminArea1": admin_area_1,
             "adminArea2": admin_area_2,

{hydroserverpy-2.0.0b4 → hydroserverpy-2.0.0b5/src/hydroserverpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydroserverpy
-Version: 2.0.0b4
+Version: 2.0.0b5
 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.0b4 → hydroserverpy-2.0.0b5}/tests/test_api_client.py

@@ -136,13 +136,13 @@ def test_hydroserver_encodes_boolean_query_params_in_lowercase(fake_session_fact
     hs.request(
         "get",
         "/api/ogc/collections/workspaces/items",
-        params={"is_private": True, "is_associated": False, "workspace_id": ["a", "null"], "limit": 5},
+        params={"isPrivate": True, "isAssociated": False, "workspaceId": ["a", "null"], "limit": 5},
     )
 
     assert fake_session_factory[0].last_kwargs["params"] == {
-        "is_private": "true",
-        "is_associated": "false",
-        "workspace_id": ["a", "null"],
+        "isPrivate": "true",
+        "isAssociated": "false",
+        "workspaceId": ["a", "null"],
         "limit": 5,
     }
 
@@ -158,8 +158,8 @@ def test_workspace_list_sends_lowercase_booleans(fake_session_factory):
     url = requests.Request(
         "GET", "https://example.com", params=fake_session_factory[0].last_kwargs["params"]
     ).prepare().url
-    assert "is_private=true" in url
-    assert "is_associated=false" in url
+    assert "isPrivate=true" in url
+    assert "isAssociated=false" in url
 
 
 RUN_ID = "01a0e94d-307f-7347-8f40-66fb0327d09e"
@@ -180,3 +180,22 @@ def test_task_trigger_and_get_run_unwrap_the_item_envelope(fake_session_factory,
     assert str(triggered.id) == RUN_ID
     assert triggered.status == "PENDING"
     assert str(fetched.id) == RUN_ID
+
+
+def test_list_sends_camel_case_params_and_keeps_public_filter_names(fake_session_factory):
+    hs = client_module.HydroServer(host="https://example.com", apikey="hs_test_api_key")
+    fake_session_factory[0].queue(
+        "get", FakeResponse(content=b'{"data": [], "meta": {"limit": 100, "offset": 0, "totalCount": 0}}')
+    )
+
+    collection = hs.datastreams.list(
+        workspace="00000000-0000-0000-0000-000000000001", is_private=False, tag=("river", "green")
+    )
+
+    params = fake_session_factory[0].last_kwargs["params"]
+    assert params["workspaceId"] == "00000000-0000-0000-0000-000000000001"
+    assert params["isPrivate"] == "false"
+    assert params["tag"] == ["river:green"]
+    assert not any("_" in key for key in params)
+    assert collection.filters["workspace"] == "00000000-0000-0000-0000-000000000001"
+    assert collection.filters["tag"] == ("river", "green")