datarobot-genai 0.2.29__py3-none-any.whl → 0.2.34__py3-none-any.whl

datarobot_genai/drmcp/tools/clients/gdrive.py

@@ -20,6 +20,7 @@ import logging
 import uuid
 from typing import Annotated
 from typing import Any
+from typing import Literal
 
 import httpx
 from datarobot.auth.datarobot.exceptions import OAuthServiceClientErr
@@ -33,7 +34,17 @@ from datarobot_genai.drmcp.core.auth import get_access_token
 
 logger = logging.getLogger(__name__)
 
-SUPPORTED_FIELDS = {"id", "name", "size", "mimeType", "webViewLink", "createdTime", "modifiedTime"}
+SUPPORTED_FIELDS = {
+    "id",
+    "name",
+    "size",
+    "mimeType",
+    "webViewLink",
+    "createdTime",
+    "modifiedTime",
+    "starred",
+    "trashed",
+}
 SUPPORTED_FIELDS_STR = ",".join(SUPPORTED_FIELDS)
 DEFAULT_FIELDS = f"nextPageToken,files({SUPPORTED_FIELDS_STR})"
 GOOGLE_DRIVE_FOLDER_MIME = "application/vnd.google-apps.folder"
@@ -119,6 +130,8 @@ class GoogleDriveFile(BaseModel):
     web_view_link: Annotated[str | None, Field(alias="webViewLink")] = None
     created_time: Annotated[str | None, Field(alias="createdTime")] = None
     modified_time: Annotated[str | None, Field(alias="modifiedTime")] = None
+    starred: bool | None = None
+    trashed: bool | None = None
 
     model_config = ConfigDict(populate_by_name=True)
 
@@ -133,8 +146,31 @@ class GoogleDriveFile(BaseModel):
             web_view_link=data.get("webViewLink"),
             created_time=data.get("createdTime"),
             modified_time=data.get("modifiedTime"),
+            starred=data.get("starred"),
+            trashed=data.get("trashed"),
         )
 
+    def as_flat_dict(self) -> dict[str, Any]:
+        """Return a flat dictionary representation of the file."""
+        result: dict[str, Any] = {
+            "id": self.id,
+            "name": self.name,
+            "mimeType": self.mime_type,
+        }
+        if self.size is not None:
+            result["size"] = self.size
+        if self.web_view_link is not None:
+            result["webViewLink"] = self.web_view_link
+        if self.created_time is not None:
+            result["createdTime"] = self.created_time
+        if self.modified_time is not None:
+            result["modifiedTime"] = self.modified_time
+        if self.starred is not None:
+            result["starred"] = self.starred
+        if self.trashed is not None:
+            result["trashed"] = self.trashed
+        return result
+
 
 class PaginatedResult(BaseModel):
     """Result of a paginated API call."""
@@ -440,6 +476,66 @@ class GoogleDriveClient:
         response.raise_for_status()
         return GoogleDriveFile.from_api_response(response.json())
 
+    async def update_file_metadata(
+        self,
+        file_id: str,
+        new_name: str | None = None,
+        starred: bool | None = None,
+        trashed: bool | None = None,
+    ) -> GoogleDriveFile:
+        """Update file metadata in Google Drive.
+
+        Args:
+            file_id: The ID of the file to update.
+            new_name: A new name to rename the file. Must not be empty or whitespace.
+            starred: Set to True to star the file or False to unstar it.
+            trashed: Set to True to trash the file or False to restore it.
+
+        Returns
+        -------
+            GoogleDriveFile with updated metadata.
+
+        Raises
+        ------
+            GoogleDriveError: If no update fields are provided, file is not found,
+                             access is denied, or the request is invalid.
+        """
+        if new_name is None and starred is None and trashed is None:
+            raise GoogleDriveError(
+                "At least one of new_name, starred, or trashed must be provided."
+            )
+
+        if new_name is not None and not new_name.strip():
+            raise GoogleDriveError("new_name cannot be empty or whitespace.")
+
+        body: dict[str, Any] = {}
+        if new_name is not None:
+            body["name"] = new_name
+        if starred is not None:
+            body["starred"] = starred
+        if trashed is not None:
+            body["trashed"] = trashed
+
+        response = await self._client.patch(
+            f"/{file_id}",
+            json=body,
+            params={"fields": SUPPORTED_FIELDS_STR, "supportsAllDrives": "true"},
+        )
+
+        if response.status_code == 404:
+            raise GoogleDriveError(f"File with ID '{file_id}' not found.")
+        if response.status_code == 403:
+            raise GoogleDriveError(
+                f"Permission denied: you don't have permission to update file '{file_id}'."
+            )
+        if response.status_code == 400:
+            raise GoogleDriveError("Bad request: invalid parameters for file update.")
+        if response.status_code == 429:
+            raise GoogleDriveError("Rate limit exceeded. Please try again later.")
+
+        response.raise_for_status()
+        return GoogleDriveFile.from_api_response(response.json())
+
     async def _export_workspace_file(self, file_id: str, export_mime_type: str) -> str:
         """Export a Google Workspace file to the specified format.
 
@@ -726,6 +822,96 @@ class GoogleDriveClient:
             headers={"Content-Type": f"multipart/related; boundary={boundary}"},
         )
 
+    async def manage_access(
+        self,
+        *,
+        file_id: str,
+        action: Literal["add", "update", "remove"],
+        role: Literal["reader", "commenter", "writer", "fileOrganizer", "organizer", "owner"]
+        | None = None,
+        email_address: str | None = None,
+        permission_id: str | None = None,
+        transfer_ownership: bool = False,
+    ) -> str:
+        """Manage access permissions for a Google Drive file or folder.
+
+        Adds, updates, or removes sharing permissions on an existing Google Drive
+        file or folder using the Google Drive Permissions API.
+
+        This method supports granting access to users or groups, changing access
+        roles, and revoking permissions. Ownership transfer is supported for files
+        in "My Drive" when explicitly requested.
+
+        Args:
+            file_id: The ID of the Google Drive file or folder whose permissions
+                are being managed.
+            action: The permission operation to perform.
+            role: The access role to assign or update. Valid values include
+                Required for "add" and "update" actions.
+            email_address: The email address of the user or group to grant access to.
+                Required for the "add" action.
+            permission_id: The ID of the permission to update or remove.
+                Required for "update" and "remove" actions.
+            transfer_ownership: Whether to transfer ownership of the file.
+                Only applicable when action="update" and role="owner".
+
+        Returns
+        -------
+            Permission id.
+            For "add" its newly added permission.
+            For "update"/"remove" its previous permission.
+
+        Raises
+        ------
+            GoogleDriveError: If the permission operation fails (invalid arguments,
+                insufficient permissions, resource not found, ownership transfer
+                not allowed, rate limited, etc.).
+        """
+        if not file_id.strip():
+            raise GoogleDriveError("Argument validation error: 'file_id' cannot be empty.")
+
+        if action == "add" and not email_address:
+            raise GoogleDriveError("'email_address' is required for action 'add'.")
+
+        if action in ("update", "remove") and not permission_id:
+            raise GoogleDriveError("'permission_id' is required for action 'update' or 'remove'.")
+
+        if action != "remove" and not role:
+            raise GoogleDriveError("'role' is required for action 'add' or 'update'.")
+
+        if action == "add":
+            response = await self._client.post(
+                url=f"/{file_id}/permissions",
+                json={
+                    "type": "user",
+                    "role": role,
+                    "emailAddress": email_address,
+                },
+                params={"sendNotificationEmail": False, "supportsAllDrives": True},
+            )
+
+        elif action == "update":
+            response = await self._client.patch(
+                url=f"/{file_id}/permissions/{permission_id}",
+                json={"role": role},
+                params={"transferOwnership": transfer_ownership, "supportsAllDrives": True},
+            )
+
+        elif action == "remove":
+            response = await self._client.delete(url=f"/{file_id}/permissions/{permission_id}")
+
+        else:
+            raise GoogleDriveError(f"Invalid action '{action}'")
+
+        if response.status_code not in (200, 201, 204):
+            raise GoogleDriveError(f"Drive API error {response.status_code}: {response.text}")
+
+        if action == "add":
+            return response.json()["id"]
+
+        # Cannot be null here because of above validators
+        return permission_id  # type: ignore
+
     async def __aenter__(self) -> "GoogleDriveClient":
         """Async context manager entry."""
         return self

datarobot_genai/drmcp/tools/gdrive/tools.py

@@ -16,6 +16,7 @@
 
 import logging
 from typing import Annotated
+from typing import Literal
 
 from fastmcp.exceptions import ToolError
 from fastmcp.tools.tool import ToolResult
@@ -33,7 +34,9 @@ from datarobot_genai.drmcp.tools.clients.gdrive import get_gdrive_access_token
 logger = logging.getLogger(__name__)
 
 
-@dr_mcp_tool(tags={"google", "gdrive", "list", "search", "files", "find", "contents"})
+@dr_mcp_tool(
+    tags={"google", "gdrive", "list", "search", "files", "find", "contents"}, enabled=False
+)
 async def gdrive_find_contents(
     *,
     page_size: Annotated[
@@ -164,7 +167,6 @@ async def gdrive_read_content(
             f"An unexpected error occurred while reading Google Drive file content: {str(e)}"
         )
 
-    # Provide helpful context about the conversion
     export_info = ""
     if file_content.was_exported:
         export_info = f" (exported from {file_content.original_mime_type})"
@@ -252,7 +254,6 @@ async def gdrive_create_file(
         logger.error(f"Unexpected error creating Google Drive file: {e}")
         raise ToolError(f"An unexpected error occurred while creating Google Drive file: {str(e)}")
 
-    # Build response message
     file_type = "folder" if mime_type == GOOGLE_DRIVE_FOLDER_MIME else "file"
     content_info = ""
     if initial_content and mime_type != GOOGLE_DRIVE_FOLDER_MIME:
@@ -260,11 +261,186 @@ async def gdrive_create_file(
 
     return ToolResult(
         content=f"Successfully created {file_type} '{created_file.name}'{content_info}.",
-        structured_content={
-            "id": created_file.id,
-            "name": created_file.name,
-            "mimeType": created_file.mime_type,
-            "webViewLink": created_file.web_view_link,
-            "createdTime": created_file.created_time,
-        },
+        structured_content=created_file.as_flat_dict(),
     )
+
+
+@dr_mcp_tool(
+    tags={"google", "gdrive", "update", "metadata", "rename", "star", "trash"}, enabled=False
+)
+async def gdrive_update_metadata(
+    *,
+    file_id: Annotated[str, "The ID of the file or folder to update."],
+    new_name: Annotated[str | None, "A new name to rename the file."] = None,
+    starred: Annotated[bool | None, "Set to True to star the file or False to unstar it."] = None,
+    trash: Annotated[bool | None, "Set to True to trash the file or False to restore it."] = None,
+) -> ToolResult:
+    """
+    Update non-content metadata fields of a Google Drive file or folder.
+
+    This tool allows you to:
+    - Rename files and folders by setting new_name
+    - Star or unstar files (per-user preference) with starred
+    - Move files to trash or restore them with trash
+
+    Usage:
+        - Rename: gdrive_update_metadata(file_id="1ABC...", new_name="New Name.txt")
+        - Star: gdrive_update_metadata(file_id="1ABC...", starred=True)
+        - Unstar: gdrive_update_metadata(file_id="1ABC...", starred=False)
+        - Trash: gdrive_update_metadata(file_id="1ABC...", trash=True)
+        - Restore: gdrive_update_metadata(file_id="1ABC...", trash=False)
+        - Multiple: gdrive_update_metadata(file_id="1ABC...", new_name="New.txt", starred=True)
+
+    Note:
+        - At least one of new_name, starred, or trash must be provided.
+        - Starring is per-user: starring a shared file only affects your view.
+        - Trashing a folder trashes all contents recursively.
+        - Trashing requires permissions (owner for My Drive, organizer for Shared Drives).
+    """
+    if not file_id or not file_id.strip():
+        raise ToolError("Argument validation error: 'file_id' cannot be empty.")
+
+    if new_name is None and starred is None and trash is None:
+        raise ToolError(
+            "Argument validation error: at least one of 'new_name', 'starred', or 'trash' "
+            "must be provided."
+        )
+
+    if new_name is not None and not new_name.strip():
+        raise ToolError("Argument validation error: 'new_name' cannot be empty or whitespace.")
+
+    access_token = await get_gdrive_access_token()
+    if isinstance(access_token, ToolError):
+        raise access_token
+
+    try:
+        async with GoogleDriveClient(access_token) as client:
+            updated_file = await client.update_file_metadata(
+                file_id=file_id,
+                new_name=new_name,
+                starred=starred,
+                trashed=trash,
+            )
+    except GoogleDriveError as e:
+        logger.error(f"Google Drive error updating file metadata: {e}")
+        raise ToolError(str(e))
+    except Exception as e:
+        logger.error(f"Unexpected error updating Google Drive file metadata: {e}")
+        raise ToolError(
+            f"An unexpected error occurred while updating Google Drive file metadata: {str(e)}"
+        )
+
+    changes: list[str] = []
+    if new_name is not None:
+        changes.append(f"renamed to '{new_name}'")
+    if starred is True:
+        changes.append("starred")
+    elif starred is False:
+        changes.append("unstarred")
+    if trash is True:
+        changes.append("moved to trash")
+    elif trash is False:
+        changes.append("restored from trash")
+
+    changes_description = ", ".join(changes)
+
+    return ToolResult(
+        content=f"Successfully updated file '{updated_file.name}': {changes_description}.",
+        structured_content=updated_file.as_flat_dict(),
+    )
+
+
+@dr_mcp_tool(tags={"google", "gdrive", "manage", "access", "acl"})
+async def gdrive_manage_access(
+    *,
+    file_id: Annotated[str, "The ID of the file or folder."],
+    action: Annotated[Literal["add", "update", "remove"], "The operation to perform."],
+    role: Annotated[
+        Literal["reader", "commenter", "writer", "fileOrganizer", "organizer", "owner"] | None,
+        "The access level.",
+    ] = None,
+    email_address: Annotated[
+        str | None, "The email of the user or group (required for 'add')."
+    ] = None,
+    permission_id: Annotated[
+        str | None, "The specific permission ID (required for 'update' or 'remove')."
+    ] = None,
+    transfer_ownership: Annotated[
+        bool, "Whether to transfer ownership (only for 'update' to 'owner' role)."
+    ] = False,
+) -> ToolResult:
+    """
+    Consolidated tool for sharing files and managing permissions.
+    Pushes all logic to the Google Drive API permissions resource (create, update, delete).
+
+    Usage:
+        - Add role: gdrive_manage_access(
+            file_id="SomeFileId",
+            action="add",
+            role="reader",
+            email_address="dummy@user.com"
+          )
+        - Update role: gdrive_manage_access(
+            file_id="SomeFileId",
+            action="update",
+            role="reader",
+            permission_id="SomePermissionId"
+          )
+        - Remove permission: gdrive_manage_access(
+            file_id="SomeFileId",
+            action="remove",
+            permission_id="SomePermissionId"
+          )
+    """
+    if not file_id or not file_id.strip():
+        raise ToolError("Argument validation error: 'file_id' cannot be empty.")
+
+    if action == "add" and not email_address:
+        raise ToolError("'email_address' is required for action 'add'.")
+
+    if action in ("update", "remove") and not permission_id:
+        raise ToolError("'permission_id' is required for action 'update' or 'remove'.")
+
+    if action != "remove" and not role:
+        raise ToolError("'role' is required for action 'add' or 'update'.")
+
+    access_token = await get_gdrive_access_token()
+    if isinstance(access_token, ToolError):
+        raise access_token
+
+    try:
+        async with GoogleDriveClient(access_token) as client:
+            permission_id = await client.manage_access(
+                file_id=file_id,
+                action=action,
+                role=role,
+                email_address=email_address,
+                permission_id=permission_id,
+                transfer_ownership=transfer_ownership,
+            )
+    except GoogleDriveError as e:
+        logger.error(f"Google Drive permission operation failed: {e}")
+        raise ToolError(str(e))
+    except Exception as e:
+        logger.error(f"Unexpected error changing permissions for Google Drive file {file_id}: {e}")
+        raise ToolError(
+            f"Unexpected error changing permissions for Google Drive file {file_id}: {str(e)}"
+        )
+
+    # Build response
+    structured_content = {"affectedFileId": file_id}
+    if action == "add":
+        content = (
+            f"Successfully added role '{role}' for '{email_address}' for gdrive file '{file_id}'. "
+            f"New permission id '{permission_id}'."
+        )
+        structured_content["newPermissionId"] = permission_id
+    elif action == "update":
+        content = (
+            f"Successfully updated role '{role}' (permission '{permission_id}') "
+            f"for gdrive file '{file_id}'."
+        )
+    else:  # action == "remove":
+        content = f"Successfully removed permission '{permission_id}' for gdrive file '{file_id}'."
+
+    return ToolResult(content=content, structured_content=structured_content)

datarobot_genai/drmcp/tools/predictive/data.py

@@ -35,9 +35,9 @@ async def upload_dataset_to_ai_catalog(
 ) -> ToolError | ToolResult:
     """Upload a dataset to the DataRobot AI Catalog / Data Registry."""
     if not file_path and not file_url:
-        return ToolError("Either file_path or file_url must be provided.")
+        raise ToolError("Either file_path or file_url must be provided.")
     if file_path and file_url:
-        return ToolError("Please provide either file_path or file_url, not both.")
+        raise ToolError("Please provide either file_path or file_url, not both.")
 
     # Get client
     client = get_sdk_client()
@@ -47,17 +47,17 @@ async def upload_dataset_to_ai_catalog(
         # Does file exist?
         if not os.path.exists(file_path):
             logger.error("File not found: %s", file_path)
-            return ToolError(f"File not found: {file_path}")
+            raise ToolError(f"File not found: {file_path}")
         catalog_item = client.Dataset.create_from_file(file_path)
     else:
         # Does URL exist?
         if file_url is None or not is_valid_url(file_url):
             logger.error("Invalid file URL: %s", file_url)
-            return ToolError(f"Invalid file URL: {file_url}")
+            raise ToolError(f"Invalid file URL: {file_url}")
         catalog_item = client.Dataset.create_from_url(file_url)
 
     if not catalog_item:
-        return ToolError("Failed to upload dataset.")
+        raise ToolError("Failed to upload dataset.")
 
     return ToolResult(
         content=f"Successfully uploaded dataset: {catalog_item.id}",

datarobot_genai/drmcp/tools/predictive/model.py

@@ -14,9 +14,12 @@
 
 import json
 import logging
+from typing import Annotated
 from typing import Any
 
 from datarobot.models.model import Model
+from fastmcp.exceptions import ToolError
+from fastmcp.tools.tool import ToolResult
 
 from datarobot_genai.drmcp.core.clients import get_sdk_client
 from datarobot_genai.drmcp.core.mcp_instance import dr_mcp_tool
@@ -50,33 +53,25 @@ class ModelEncoder(json.JSONEncoder):
         return super().default(obj)
 
 
-@dr_mcp_tool(tags={"model", "management", "info"})
-async def get_best_model(project_id: str, metric: str | None = None) -> str:
-    """
-    Get the best model for a DataRobot project, optionally by a specific metric.
+@dr_mcp_tool(tags={"predictive", "model", "read", "management", "info"})
+async def get_best_model(
+    *,
+    project_id: Annotated[str, "The DataRobot project ID"] | None = None,
+    metric: Annotated[str, "The metric to use for best model selection (e.g., 'AUC', 'LogLoss')"]
+    | None = None,
+) -> ToolError | ToolResult:
+    """Get the best model for a DataRobot project, optionally by a specific metric."""
+    if not project_id:
+        raise ToolError("Project ID must be provided")
 
-    Args:
-        project_id: The ID of the DataRobot project.
-        metric: (Optional) The metric to use for best model selection (e.g., 'AUC', 'LogLoss').
-
-    Returns
-    -------
-        A formatted string describing the best model.
-
-    Raises
-    ------
-        Exception: If project not found or no models exist in the project.
-    """
     client = get_sdk_client()
     project = client.Project.get(project_id)
     if not project:
-        logger.error(f"Project with ID {project_id} not found")
-        raise Exception(f"Project with ID {project_id} not found.")
+        raise ToolError(f"Project with ID {project_id} not found.")
 
     leaderboard = project.get_models()
     if not leaderboard:
-        logger.info(f"No models found for project {project_id}")
-        raise Exception("No models found for this project.")
+        raise ToolError("No models found for this project.")
 
     if metric:
         reverse_sort = metric.upper() in [
@@ -98,51 +93,91 @@ async def get_best_model(project_id: str, metric: str | None = None) -> str:
     best_model = leaderboard[0]
     logger.info(f"Found best model {best_model.id} for project {project_id}")
 
-    # Format the response as a human-readable string
     metric_info = ""
+    metric_value = None
+
     if metric and best_model.metrics and metric in best_model.metrics:
         metric_value = best_model.metrics[metric].get("validation")
         if metric_value is not None:
             metric_info = f" with {metric}: {metric_value:.2f}"
 
-    return f"Best model: {best_model.model_type}{metric_info}"
-
-
-@dr_mcp_tool(tags={"model", "prediction", "scoring"})
-async def score_dataset_with_model(project_id: str, model_id: str, dataset_url: str) -> str:
-    """
-    Score a dataset using a specific DataRobot model.
+    # Include full metrics in the response
+    best_model_dict = model_to_dict(best_model)
+    best_model_dict["metric"] = metric
+    best_model_dict["metric_value"] = metric_value
+
+    # Format metrics for human-readable content
+    metrics_text = ""
+    if best_model.metrics:
+        metrics_list = []
+        for metric_name, metric_data in best_model.metrics.items():
+            if isinstance(metric_data, dict) and "validation" in metric_data:
+                val = metric_data["validation"]
+                if val is not None:
+                    metrics_list.append(f"{metric_name}: {val:.4f}")
+        if metrics_list:
+            metrics_text = "\nPerformance metrics:\n" + "\n".join(f"  - {m}" for m in metrics_list)
+
+    return ToolResult(
+        content=f"Best model: {best_model.model_type}{metric_info}{metrics_text}",
+        structured_content={
+            "project_id": project_id,
+            "best_model": best_model_dict,
+        },
+    )
+
+
+@dr_mcp_tool(tags={"predictive", "model", "read", "scoring", "dataset"})
+async def score_dataset_with_model(
+    *,
+    project_id: Annotated[str, "The DataRobot project ID"] | None = None,
+    model_id: Annotated[str, "The DataRobot model ID"] | None = None,
+    dataset_url: Annotated[str, "The dataset URL"] | None = None,
+) -> ToolError | ToolResult:
+    """Score a dataset using a specific DataRobot model."""
+    if not project_id:
+        raise ToolError("Project ID must be provided")
+    if not model_id:
+        raise ToolError("Model ID must be provided")
+    if not dataset_url:
+        raise ToolError("Dataset URL must be provided")
 
-    Args:
-        project_id: The ID of the DataRobot project.
-        model_id: The ID of the DataRobot model to use for scoring.
-        dataset_url: The URL to the dataset to score (must be accessible to DataRobot).
-
-    Returns
-    -------
-        A string summary of the scoring job or a meaningful error message.
-    """
     client = get_sdk_client()
     project = client.Project.get(project_id)
     model = client.Model.get(project, model_id)
     job = model.score(dataset_url)
-    logger.info(f"Started scoring job {job.id} for model {model_id}")
-    return f"Scoring job started: {job.id}"
-
 
-@dr_mcp_tool(tags={"model", "management", "list"})
-async def list_models(project_id: str) -> str:
-    """
-    List all models in a project.
+    return ToolResult(
+        content=f"Scoring job started: {job.id}",
+        structured_content={
+            "scoring_job_id": job.id,
+            "project_id": project_id,
+            "model_id": model_id,
+            "dataset_url": dataset_url,
+        },
+    )
+
+
+@dr_mcp_tool(tags={"predictive", "model", "read", "management", "list"})
+async def list_models(
+    *,
+    project_id: Annotated[str, "The DataRobot project ID"] | None = None,
+) -> ToolError | ToolResult:
+    """List all models in a project."""
+    if not project_id:
+        raise ToolError("Project ID must be provided")
 
-    Args:
-        project_id: The ID of the DataRobot project.
-
-    Returns
-    -------
-        A string summary of the models in the project.
-    """
     client = get_sdk_client()
     project = client.Project.get(project_id)
     models = project.get_models()
-    return json.dumps(models, indent=2, cls=ModelEncoder)
+
+    return ToolResult(
+        content=(
+            f"Found {len(models)} models in project {project_id}, here are the details:\n"
+            f"{json.dumps(models, indent=2, cls=ModelEncoder)}"
+        ),
+        structured_content={
+            "project_id": project_id,
+            "models": [model_to_dict(model) for model in models],
+        },
+    )

datarobot_genai/drmcp/tools/predictive/project.py

@@ -54,9 +54,9 @@ async def get_project_dataset_by_name(
     The dataset ID and the dataset type (source or prediction) as a string, or an error message.
     """
     if not project_id:
-        return ToolError("Project ID is required.")
+        raise ToolError("Project ID is required.")
     if not dataset_name:
-        return ToolError("Dataset name is required.")
+        raise ToolError("Dataset name is required.")
 
     client = get_sdk_client()
     project = client.Project.get(project_id)