Rating curves to be on Thing

Author: daniel-slaugh

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

@@ -1,4 +1,4 @@
-from typing import List, Union, Optional, ClassVar, TYPE_CHECKING, IO, Dict, Any
+from typing import List, Union, Optional, ClassVar, TYPE_CHECKING
 from uuid import UUID
 from datetime import datetime
 from pydantic import Field, EmailStr, AliasPath
@@ -52,7 +52,6 @@ def __init__(self, client: "HydroServer", **data):
         self._orchestrationsystems = None
         self._dataconnections = None
         self._tasks = None
-        self._file_attachments = None
 
     @classmethod
     def get_route(cls):
@@ -184,17 +183,6 @@ def tasks(self) -> List["Task"]:
 
         return self._tasks
 
-    @property
-    def file_attachments(self) -> List[Dict[str, Any]]:
-        """Workspace-level file attachments."""
-
-        if self._file_attachments is None:
-            self._file_attachments = self.client.workspaces.list_file_attachments(
-                uid=self.uid
-            )
-
-        return self._file_attachments
-
     def create_api_key(
         self,
         role: Union["Role", UUID, str],
@@ -290,62 +278,6 @@ def remove_collaborator(self, email: EmailStr) -> None:
         self.client.workspaces.remove_collaborator(uid=self.uid, email=email)
         self._collaborators = None
 
-    def get_file_attachments(
-        self, attachment_type: Optional[str] = None
-    ) -> List[Dict[str, Any]]:
-        """List file attachments associated with this workspace."""
-
-        self._file_attachments = self.client.workspaces.list_file_attachments(
-            uid=self.uid, attachment_type=attachment_type
-        )
-        return self._file_attachments
-
-    def add_file_attachment(
-        self,
-        file: IO[bytes],
-        attachment_type: str,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-    ) -> Dict[str, Any]:
-        """Add a workspace file attachment."""
-
-        response = self.client.workspaces.add_file_attachment(
-            uid=self.uid,
-            file=file,
-            attachment_type=attachment_type,
-            name=name,
-            description=description,
-        )
-        self._file_attachments = None
-        return response
-
-    def update_file_attachment(
-        self,
-        file_attachment_id: Union[UUID, str],
-        attachment_type: str = ...,
-        name: str = ...,
-        description: Optional[str] = ...,
-    ) -> Dict[str, Any]:
-        """Update metadata for a workspace file attachment."""
-
-        response = self.client.workspaces.update_file_attachment(
-            uid=self.uid,
-            file_attachment_id=file_attachment_id,
-            attachment_type=attachment_type,
-            name=name,
-            description=description,
-        )
-        self._file_attachments = None
-        return response
-
-    def delete_file_attachment(self, file_attachment_id: Union[UUID, str]) -> None:
-        """Delete a workspace file attachment."""
-
-        self.client.workspaces.delete_file_attachment(
-            uid=self.uid, file_attachment_id=file_attachment_id
-        )
-        self._file_attachments = None
-
     def transfer_ownership(self, email: EmailStr) -> None:
         """Transfer ownership of this workspace to another HydroServer user."""
 

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

@@ -1,5 +1,5 @@
 import json
-from typing import TYPE_CHECKING, Union, List, Tuple, Optional, IO, Dict, Any
+from typing import TYPE_CHECKING, Optional, Union, List, Tuple
 from pydantic import EmailStr
 from uuid import UUID
 from datetime import datetime
@@ -160,98 +160,6 @@ def create_api_key(
             client=self.client, **response
         ), response["key"]
 
-    @staticmethod
-    def _normalize_file_attachment(payload: dict) -> Dict[str, Any]:
-        return {
-            "id": payload.get("id"),
-            "type": payload.get("type"),
-            "name": payload.get("name"),
-            "description": payload.get("description", ""),
-            "content_type": payload.get("contentType")
-            or payload.get("content_type")
-            or "",
-            "size_bytes": payload.get("sizeBytes") or payload.get("size_bytes") or 0,
-            "link": payload.get("link"),
-            "created_at": payload.get("createdAt") or payload.get("created_at"),
-            "updated_at": payload.get("updatedAt") or payload.get("updated_at"),
-        }
-
-    def list_file_attachments(
-        self, uid: Union[UUID, str], attachment_type: Optional[str] = None
-    ) -> List[Dict[str, Any]]:
-        """List file attachments associated with a workspace."""
-
-        path = f"/{self.client.base_route}/{self.model.get_route()}/{str(uid)}/file-attachments"
-        params = {"type": attachment_type} if attachment_type else None
-        response = self.client.request("get", path, params=params).json()
-        if not isinstance(response, list):
-            return []
-        return [
-            self._normalize_file_attachment(item)
-            for item in response
-            if isinstance(item, dict)
-        ]
-
-    def add_file_attachment(
-        self,
-        uid: Union[UUID, str],
-        file: IO[bytes],
-        attachment_type: str,
-        name: Optional[str] = None,
-        description: Optional[str] = None,
-    ) -> Dict[str, Any]:
-        """Add a file attachment to a workspace."""
-
-        path = f"/{self.client.base_route}/{self.model.get_route()}/{str(uid)}/file-attachments"
-        data = {"type": attachment_type}
-        if name is not None:
-            data["name"] = name
-        if description is not None:
-            data["description"] = description
-
-        response = self.client.request("post", path, data=data, files={"file": file}).json()
-        return self._normalize_file_attachment(response)
-
-    def update_file_attachment(
-        self,
-        uid: Union[UUID, str],
-        file_attachment_id: Union[UUID, str],
-        attachment_type: str = ...,
-        name: str = ...,
-        description: Optional[str] = ...,
-    ) -> Dict[str, Any]:
-        """Update workspace file attachment metadata."""
-
-        path = (
-            f"/{self.client.base_route}/{self.model.get_route()}/"
-            f"{str(uid)}/file-attachments/{str(file_attachment_id)}"
-        )
-        body = {
-            "type": attachment_type,
-            "name": name,
-            "description": description,
-        }
-        body = {k: v for k, v in body.items() if v is not ...}
-        headers = {"Content-type": "application/json"}
-        response = self.client.request(
-            "patch",
-            path,
-            headers=headers,
-            data=json.dumps(body, default=self.default_serializer),
-        ).json()
-        return self._normalize_file_attachment(response)
-
-    def delete_file_attachment(
-        self, uid: Union[UUID, str], file_attachment_id: Union[UUID, str]
-    ) -> None:
-        """Delete a file attachment from a workspace."""
-
-        path = (
-            f"/{self.client.base_route}/{self.model.get_route()}/"
-            f"{str(uid)}/file-attachments/{str(file_attachment_id)}"
-        )
-        self.client.request("delete", path)
-
     def update_api_key(
         self,
         uid: Union[UUID, str],

src/hydroserverpy/etl/transformers/base.py

@@ -202,7 +202,7 @@ def needs_datastreams(self) -> bool:
     def apply_rating_curve(
         values: Union[pd.Series, np.ndarray, List[float]], rating_curve_url: str
     ) -> pd.Series:
-        """Apply a rating curve to numeric values using linear interpolation."""
+        """Apply a rating curve using linear interpolation with endpoint clamping."""
 
         source = (
             values
@@ -221,8 +221,8 @@ def apply_rating_curve(
                 source_values[finite_mask],
                 lookup_input,
                 lookup_output,
-                left=np.nan,
-                right=np.nan,
+                left=lookup_output[0],
+                right=lookup_output[-1],
             )
 
         return pd.Series(transformed, index=source.index, dtype="float64")