refactor: remove workspace mode entirely

Author: mathislucka

src/deepset_mcp/__init__.py

@@ -4,7 +4,6 @@
 
 from deepset_mcp.config import DEEPSET_DOCS_DEFAULT_SHARE_URL
 from deepset_mcp.mcp.server import configure_mcp_server
-from deepset_mcp.mcp.tool_models import WorkspaceMode
 from deepset_mcp.mcp.tool_registry import ALL_DEEPSET_TOOLS
 
-__all__ = ["configure_mcp_server", "WorkspaceMode", "ALL_DEEPSET_TOOLS", "DEEPSET_DOCS_DEFAULT_SHARE_URL"]
+__all__ = ["configure_mcp_server", "ALL_DEEPSET_TOOLS", "DEEPSET_DOCS_DEFAULT_SHARE_URL"]

src/deepset_mcp/main.py

@@ -12,7 +12,6 @@
 
 from deepset_mcp.config import DEEPSET_DOCS_DEFAULT_SHARE_URL, DOCS_SEARCH_TOOL_NAME
 from deepset_mcp.mcp.server import configure_mcp_server
-from deepset_mcp.mcp.tool_models import WorkspaceMode
 from deepset_mcp.mcp.tool_registry import TOOL_REGISTRY
 
 
@@ -60,13 +59,6 @@ def main(
             help="Deepset docs search share URL. Can also be set via DEEPSET_DOCS_SHARE_URL environment variable.",
         ),
     ] = None,
-    workspace_mode: Annotated[
-        WorkspaceMode,
-        typer.Option(
-            "--workspace-mode",
-            help="Whether workspace should be set statically or dynamically provided during a tool call.",
-        ),
-    ] = WorkspaceMode.STATIC,
     tools: Annotated[
         list[str] | None,
         typer.Option(
@@ -126,11 +118,10 @@ def main(
     The Deepset MCP server provides tools to interact with the deepset AI platform,
     allowing you to create, debug, and learn about pipelines on the platform.
 
-    :param workspace: Deepset workspace name
+    :param workspace: Deepset workspace name. Pass if you only want to run the tools on a specific workspace.
     :param api_key: Deepset API key for authentication
     :param api_url: Deepset API base URL
     :param docs_share_url: Deepset docs search share URL
-    :param workspace_mode: Whether workspace should be set statically or dynamically
     :param tools: List of tools to register
     :param list_tools: List all available tools and exit
     :param api_key_from_auth_header: Get API key from authorization header
@@ -171,13 +162,8 @@ def main(
         )
         raise typer.Exit(1)
 
-    if workspace_mode == WorkspaceMode.STATIC and not workspace:
-        typer.echo(
-            "Error: Workspace is required when using static workspace mode. "
-            "Set --workspace or DEEPSET_WORKSPACE environment variable.",
-            err=True,
-        )
-        raise typer.Exit(1)
+    if not workspace:
+        logging.info("No workspace specified. Workspace needs to be provided during tool calling.")
 
     if DOCS_SEARCH_TOOL_NAME in tool_names and docs_share_url is None:
         typer.echo(
@@ -190,7 +176,6 @@ def main(
     mcp = FastMCP("deepset AI platform MCP server")
     configure_mcp_server(
         mcp_server_instance=mcp,
-        workspace_mode=workspace_mode,
         deepset_api_key=api_key,
         deepset_api_url=api_url,
         deepset_workspace=workspace,

src/deepset_mcp/mcp/__init__.py

@@ -5,6 +5,6 @@
 from .server import configure_mcp_server
 from .store import initialize_or_get_initialized_store
 from .tool_factory import build_tool
-from .tool_models import ToolConfig, WorkspaceMode
+from .tool_models import ToolConfig
 
-__all__ = ["configure_mcp_server", "build_tool", "ToolConfig", "WorkspaceMode", "initialize_or_get_initialized_store"]
+__all__ = ["configure_mcp_server", "build_tool", "ToolConfig", "initialize_or_get_initialized_store"]

src/deepset_mcp/mcp/server.py

@@ -12,13 +12,12 @@
 from deepset_mcp.config import DEEPSET_DOCS_DEFAULT_SHARE_URL
 from deepset_mcp.mcp.store import initialize_or_get_initialized_store
 from deepset_mcp.mcp.tool_factory import register_tools
-from deepset_mcp.mcp.tool_models import DeepsetDocsConfig, WorkspaceMode
+from deepset_mcp.mcp.tool_models import DeepsetDocsConfig
 from deepset_mcp.mcp.tool_registry import TOOL_REGISTRY
 
 
 def configure_mcp_server(
     mcp_server_instance: FastMCP,
-    workspace_mode: WorkspaceMode | str,
     tools_to_register: set[str] | None = None,
     deepset_api_key: str | None = None,
     deepset_api_url: str | None = None,
@@ -32,12 +31,11 @@ def configure_mcp_server(
     """Configure the MCP server with the specified tools and settings.
 
     :param mcp_server_instance: The FastMCP server instance to configure
-    :param workspace_mode: The workspace mode ("static" or "dynamic")
     :param tools_to_register: Set of tool names to register with the server.
         Will register all tools if set to None.
     :param deepset_api_key: Optional Deepset API key for authentication
     :param deepset_api_url: Optional Deepset API base URL
-    :param deepset_workspace: Optional workspace name for static mode
+    :param deepset_workspace: Pass a deepset workspace name if you only want to run the tools on a specific workspace.
     :param deepset_docs_shareable_prototype_url: Shareable prototype URL that allows access to a docs search pipeline.
         Will fall back to the default shareable prototype URL if set to None.
     :param get_api_key_from_authorization_header: Whether to extract API key from authorization header
@@ -52,15 +50,6 @@ def configure_mcp_server(
     if deepset_docs_shareable_prototype_url is None:
         deepset_docs_shareable_prototype_url = DEEPSET_DOCS_DEFAULT_SHARE_URL
 
-    if isinstance(workspace_mode, str):
-        workspace_mode = WorkspaceMode(workspace_mode)
-
-    if workspace_mode == WorkspaceMode.STATIC and deepset_workspace is None:
-        raise ValueError(
-            "Static workspace mode requires a workspace name. "
-            "Please provide 'deepset_workspace' when using WorkspaceMode.STATIC."
-        )
-
     if deepset_api_key is None and not get_api_key_from_authorization_header:
         raise ValueError(
             "API key is required for authentication. "
@@ -79,7 +68,6 @@ def configure_mcp_server(
 
     register_tools(
         mcp_server_instance=mcp_server_instance,
-        workspace_mode=workspace_mode,
         workspace=deepset_workspace,
         tool_names=tools_to_register,
         docs_config=docs_config,

src/deepset_mcp/mcp/tool_factory.py

@@ -14,7 +14,7 @@
 
 from deepset_mcp.api.client import AsyncDeepsetClient
 from deepset_mcp.config import DEFAULT_CLIENT_HEADER, DOCS_SEARCH_TOOL_NAME
-from deepset_mcp.mcp.tool_models import DeepsetDocsConfig, MemoryType, ToolConfig, WorkspaceMode
+from deepset_mcp.mcp.tool_models import DeepsetDocsConfig, MemoryType, ToolConfig
 from deepset_mcp.mcp.tool_registry import TOOL_REGISTRY
 from deepset_mcp.tokonomics import (
     ObjectStore,
@@ -274,7 +274,6 @@ async def async_wrapper(**kwargs: Any) -> Any:
 
 def register_tools(
     mcp_server_instance: FastMCP,
-    workspace_mode: WorkspaceMode,
     api_key: str | None = None,
     workspace: str | None = None,
     tool_names: set[str] | None = None,
@@ -287,9 +286,8 @@ def register_tools(
 
     Args:
         mcp_server_instance: FastMCP server instance
-        workspace_mode: How workspace should be handled
         api_key: An api key for the deepset AI platform; only needs to be provided when not read from request context.
-        workspace: Workspace to use; only needs to be provided if using a static workspace.
+        workspace: Pass a deepset workspace name if you only want to run the tools on a specific workspace.
         tool_names: Set of tool names to register (if None, registers all tools)
         get_api_key_from_authorization_header: Whether to use request context to retrieve an API key for tool execution.
         docs_config: Configuration for the deepset documentation search tool.
@@ -302,12 +300,6 @@ def register_tools(
             "Either pass 'api_key' or 'use_request_context'."
         )
 
-    if workspace_mode == WorkspaceMode.STATIC and workspace is None:
-        raise ValueError(
-            "'workspace_mode' set to 'static' but no workspace provided. "
-            "You need to set a deepset workspace name as 'workspace'."
-        )
-
     if docs_config is None and tool_names is None:
         raise ValueError(
             f"'docs_config' cannot be None when requesting to register all tools. "

src/deepset_mcp/mcp/tool_models.py

@@ -48,13 +48,6 @@ class ToolConfig:
     """Any other arguments that should be passed to the tool at registration time instead of being passed by the LLM."""
 
 
-class WorkspaceMode(StrEnum):
-    """Configuration for how workspace is provided to tools."""
-
-    STATIC = "static"  # workspace from env, no parameter in tool signature
-    DYNAMIC = "dynamic"  # workspace as required parameter in tool signature
-
-
 @dataclass
 class DeepsetDocsConfig:
     """Configuration for deepset documentation search tool."""

test/unit/test_server_base_url.py

@@ -7,7 +7,6 @@
 from unittest.mock import MagicMock, patch
 
 from deepset_mcp.mcp.server import configure_mcp_server
-from deepset_mcp.mcp.tool_models import WorkspaceMode
 
 
 class TestConfigureMcpServerBaseUrl:
@@ -22,7 +21,6 @@ def test_configure_mcp_server_passes_base_url(self, mock_register_tools: MagicMo
         configure_mcp_server(
             mcp_server_instance=mock_server,
             tools_to_register={"list_pipelines"},
-            workspace_mode=WorkspaceMode.STATIC,
             deepset_api_key="test-key",
             deepset_api_url=custom_url,
             deepset_workspace="test-workspace",
@@ -41,7 +39,6 @@ def test_configure_mcp_server_without_base_url(self, mock_register_tools: MagicM
         configure_mcp_server(
             mcp_server_instance=mock_server,
             tools_to_register={"list_pipelines"},
-            workspace_mode=WorkspaceMode.STATIC,
             deepset_api_key="test-key",
             deepset_workspace="test-workspace",
         )

test/unit/test_tool_factory.py

@@ -18,7 +18,7 @@
     apply_workspace,
     build_tool,
 )
-from deepset_mcp.mcp.tool_models import MemoryType, ToolConfig, WorkspaceMode
+from deepset_mcp.mcp.tool_models import MemoryType, ToolConfig
 from deepset_mcp.tokonomics import InMemoryBackend, ObjectStore
 from test.unit.conftest import BaseFakeClient
 
@@ -501,7 +501,7 @@ async def sample_func(a: int) -> str:
             return str(a)
 
         config = ToolConfig()
-        result = build_tool(sample_func, config, WorkspaceMode.STATIC)
+        result = build_tool(sample_func, config)
 
         # Should return async function
         assert inspect.iscoroutinefunction(result)
@@ -518,7 +518,7 @@ def sample_func(a: int) -> str:
             return str(a)
 
         config = ToolConfig()
-        result = build_tool(sample_func, config, WorkspaceMode.STATIC)
+        result = build_tool(sample_func, config)
 
         # Should return async function
         assert inspect.iscoroutinefunction(result)
@@ -549,7 +549,7 @@ async def sample_func(client: AsyncClientProtocol, workspace: str, a: int, custo
             custom_args={"custom_arg": "injected"},
         )
 
-        result = build_tool(sample_func, config, WorkspaceMode.STATIC, workspace="test-workspace")
+        result = build_tool(sample_func, config, workspace="test-workspace")
 
         # Check final signature
         sig = inspect.signature(result)
@@ -578,9 +578,7 @@ async def sample_func(client: AsyncClientProtocol, workspace: str, a: int) -> st
             needs_workspace=True,
         )
 
-        result = build_tool(
-            sample_func, config, WorkspaceMode.STATIC, workspace="test-workspace", use_request_context=True
-        )
+        result = build_tool(sample_func, config, workspace="test-workspace", use_request_context=True)
 
         # Mock the context and use FakeClient
         mock_ctx = MagicMock()
@@ -611,7 +609,7 @@ async def sample_func(a: int, b: str) -> str:
             needs_workspace=False,
         )
 
-        result = build_tool(sample_func, config, WorkspaceMode.STATIC)
+        result = build_tool(sample_func, config)
 
         # Should work without ctx
         output = await result(a=42, b="test")
@@ -633,7 +631,7 @@ async def sample_func(a: int) -> str:
             mock_explorable.return_value = mock_decorator
             mock_decorator.return_value = sample_func
 
-            build_tool(sample_func, config, WorkspaceMode.STATIC, object_store=object_store)
+            build_tool(sample_func, config, object_store=object_store)
 
             # Should have applied the decorator
             mock_explorable.assert_called_once()
@@ -647,7 +645,7 @@ async def sample_func(client: AsyncClientProtocol, a: int) -> str:
             return str(a)
 
         config = ToolConfig(needs_client=True)
-        result = build_tool(sample_func, config, WorkspaceMode.STATIC)
+        result = build_tool(sample_func, config)
 
         # Test missing context
         with pytest.raises(ValueError, match="Context is required"):
@@ -675,7 +673,7 @@ async def sample_func(client: AsyncClientProtocol, a: int) -> str:
 
         config = ToolConfig(needs_client=True)
         custom_url = "https://custom.api.example.com"
-        result = build_tool(sample_func, config, WorkspaceMode.STATIC, base_url=custom_url)
+        result = build_tool(sample_func, config, base_url=custom_url)
 
         # Mock the context
         mock_ctx = MagicMock()