Merge remote-tracking branch 'origin/main' into 250-rating-curve

# Conflicts:
#	src/hydroserverpy/api/services/etl/task.py
#	src/hydroserverpy/etl/loaders/hydroserver_loader.py

Author: daniel-slaugh

setup.cfg

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

src/hydroserverpy/api/services/etl/data_connection.py

@@ -51,10 +51,12 @@ def create(
         transformer_settings: dict = ...,
         loader_type: str = ...,
         loader_settings: dict = ...,
+        uid: Optional[UUID] = None
     ) -> "DataConnection":
         """Create a new data connection."""
 
         body = {
+            "id": normalize_uuid(uid),
             "name": name,
             "type": data_connection_type,
             "workspaceId": normalize_uuid(workspace),

src/hydroserverpy/api/services/etl/orchestration_system.py

@@ -39,10 +39,12 @@ def create(
         name: str,
         orchestration_system_type: str,
         workspace: Optional[Union["Workspace", UUID, str]] = None,
+        uid: Optional[UUID] = None
     ) -> "OrchestrationSystem":
         """Create a new orchestration system."""
 
         body = {
+            "id": normalize_uuid(uid),
             "name": name,
             "type": orchestration_system_type,
             "workspaceId": normalize_uuid(workspace),

src/hydroserverpy/api/services/etl/task.py

@@ -88,10 +88,12 @@ def create(
         interval: Optional[int] = None,
         interval_period: Optional[str] = None,
         mappings: Optional[List[dict]] = None,
+        uid: Optional[UUID] = None,
     ) -> "Task":
         """Create a new ETL task."""
 
         body = {
+            "id": normalize_uuid(uid),
             "name": name,
             "workspaceId": normalize_uuid(workspace),
             "dataConnectionId": normalize_uuid(data_connection),

src/hydroserverpy/api/services/iam/workspace.py

@@ -37,10 +37,17 @@ def list(
             is_associated=is_associated,
         )
 
-    def create(self, name: str, is_private: bool, **_) -> "Workspace":
+    def create(
+        self,
+        name: str,
+        is_private: bool,
+        uid: Optional[UUID] = None,
+        **_
+    ) -> "Workspace":
         """Create a new workspace."""
 
         return super().create(
+            id=normalize_uuid(uid),
             name=name,
             is_private=is_private,
         )

src/hydroserverpy/api/services/sta/datastream.py

@@ -1,6 +1,6 @@
 import json
 import pandas as pd
-from typing import Union, Optional, Literal, List, Dict, IO, TYPE_CHECKING
+from typing import Union, Optional, Literal, List, Dict, Tuple, IO, TYPE_CHECKING
 from uuid import UUID
 from datetime import datetime
 from pydantic.alias_generators import to_camel
@@ -40,6 +40,7 @@ def list(
         sampled_medium: str = ...,
         status: Optional[str] = ...,
         result_type: str = ...,
+        tag: Tuple[str, str] = ...,
         is_private: bool = ...,
         value_count_max: int = ...,
         value_count_min: int = ...,
@@ -69,6 +70,7 @@ def list(
             sampled_medium=sampled_medium,
             status=status,
             result_type=result_type,
+            tag=[f"{tag[0]}:{tag[1]}"] if tag is not ... else tag,
             is_private=is_private,
             value_count_max=value_count_max,
             value_count_min=value_count_min,
@@ -111,10 +113,12 @@ def create(
         result_end_time: Optional[datetime] = None,
         is_private: bool = False,
         is_visible: bool = True,
+        uid: Optional[UUID] = None,
     ) -> "Datastream":
         """Create a new datastream."""
 
         body = {
+            "id": normalize_uuid(uid),
             "name": name,
             "description": description,
             "thingId": normalize_uuid(thing),

src/hydroserverpy/api/services/sta/observed_property.py

@@ -46,10 +46,12 @@ def create(
         observed_property_type: str,
         code: str,
         workspace: Optional[Union["Workspace", UUID, str]] = None,
+        uid: Optional[UUID] = None
     ) -> "ObservedProperty":
         """Create a new observed property."""
 
         body = {
+            "id": normalize_uuid(uid),
             "name": name,
             "definition": definition,
             "description": description,

src/hydroserverpy/api/services/sta/processing_level.py

@@ -42,10 +42,12 @@ def create(
         definition: Optional[str] = None,
         explanation: Optional[str] = None,
         workspace: Optional[Union["Workspace", UUID, str]] = None,
+        uid: Optional[UUID] = None,
     ) -> "ProcessingLevel":
         """Create a new processing level."""
 
         body = {
+            "id": normalize_uuid(uid),
             "code": code,
             "definition": definition,
             "explanation": explanation,

src/hydroserverpy/api/services/sta/result_qualifier.py

@@ -37,10 +37,12 @@ def create(
         code: str,
         description: Optional[str] = None,
         workspace: Optional[Union["Workspace", UUID, str]] = None,
+        uid: Optional[UUID] = None,
     ) -> "ResultQualifier":
         """Create a new result qualifier."""
 
         body = {
+            "id": normalize_uuid(uid),
             "code": code,
             "description": description,
             "workspaceId": normalize_uuid(workspace),

src/hydroserverpy/api/services/sta/sensor.py

@@ -54,10 +54,12 @@ def create(
         method_link: Optional[str] = None,
         method_code: Optional[str] = None,
         workspace: Optional[Union["Workspace", UUID, str]] = None,
+        uid: Optional[UUID] = None
     ) -> "Sensor":
         """Create a new sensor."""
 
         body = {
+            "id": normalize_uuid(uid),
             "name": name,
             "description": description,
             "encodingType": encoding_type,