codeocean-mcp-server 0.7.2__tar.gz → 0.12.0__tar.gz

{codeocean_mcp_server-0.7.2 → codeocean_mcp_server-0.12.0}/CHANGELOG.md

@@ -1,6 +1,39 @@
 CHANGELOG
 =========
 
+## 0.12.0 (2026-08-27)
+
+- [#38](https://github.com/codeocean/codeocean-mcp-server/pull/38) feat: serve over streamable HTTP with per-request credentials
+
+## 0.11.0 (2026-03-09)
+
+- [#35](https://github.com/codeocean/codeocean-mcp-server/pull/35) feat: add `delete_computation` tool to stop and delete computations
+
+## 0.10.0 (2026-02-24)
+
+- [#33](https://github.com/codeocean/codeocean-mcp-server/pull/33) feat: upgrade mcp package
+
+## 0.9.1 (2026-02-04)
+
+- [#31](https://github.com/codeocean/codeocean-mcp-server/pull/31) feat: clarify data asset attach tool usage
+
+## 0.9.0 (2026-01-30)
+
+- [#29](https://github.com/codeocean/codeocean-mcp-server/pull/29) feat: upgrade codeocean SDK to v0.14.0
+- **Minimum Code Ocean platform version updated to `4.2.0`.**
+
+## 0.8.2 (2026-01-29)
+
+- [#27](https://github.com/codeocean/codeocean-mcp-server/pull/27) fix: update documentation for search results to include pagination details
+
+## 0.8.1 (2026-01-28)
+
+- fix: update documentation for CapsuleSearchResults and DataAssetSearchResults to reflect item_count
+
+## 0.8.0 (2026-01-27)
+
+- [#24](https://github.com/codeocean/codeocean-mcp-server/pull/24) feat: Token efficient search responses
+
 ## 0.7.2 (2025-12-27)
 
 - [#20](https://github.com/codeocean/codeocean-mcp-server/pull/20) feat: custom log formatting

{codeocean_mcp_server-0.7.2 → codeocean_mcp_server-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: codeocean-mcp-server
-Version: 0.7.2
+Version: 0.12.0
 Summary: Code Ocean MCP Server
 Project-URL: Homepage, https://github.com/codeocean/codeocean-mcp-server
 Project-URL: Issues, https://github.com/codeocean/codeocean-mcp-server/issues
@@ -12,8 +12,8 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: codeocean<0.13.0,>=0.12.0
-Requires-Dist: mcp<1.13.0,>=1.12.0
+Requires-Dist: codeocean<0.15.0,>=0.14.0
+Requires-Dist: mcp<1.24.0,>=1.23.0
 Description-Content-Type: text/markdown
 
 # Code Ocean MCP Server
@@ -33,6 +33,7 @@ This MCP server provides tools to search and run capsules and pipelines, and man
     - [Roo Code](#roo-code)
     - [Cursor](#cursor)
     - [Windsurf](#windsurf)
+- [Streamable HTTP Transport](#streamable-http-transport)
 - [Local Testing](#local-testing)
 
 ## Prerequisites
@@ -215,6 +216,19 @@ Windsurf (Cascade) uses mcp_config.json under ~/.codeium/windsurf/ (or via the C
 
 3.	Save and restart Windsurf (or hit “Refresh” in the MCP panel).
 
+## Streamable HTTP Transport
+
+By default the server runs over stdio and authenticates with the `CODEOCEAN_TOKEN` environment variable, as
+described above. It can also serve multiple users from a single process over streamable HTTP, taking each
+caller's API token from the request instead:
+
+```bash
+CODEOCEAN_DOMAIN=https://acmecorp.codeocean.com codeocean-mcp-server --transport streamable-http --host 127.0.0.1 --port 8000
+```
+
+Clients then pass their own token as `Authorization: Bearer <YOUR_API_KEY>` on every request; `CODEOCEAN_TOKEN`
+is not used, and a request without a token is refused. The endpoint is `http://<host>:<port>/mcp`.
+
 ## Local Testing
 
 You can test the MCP server locally during development with [MCP Inspector](https://modelcontextprotocol.io/legacy/tools/inspector):

{codeocean_mcp_server-0.7.2 → codeocean_mcp_server-0.12.0}/README.md

@@ -15,6 +15,7 @@ This MCP server provides tools to search and run capsules and pipelines, and man
     - [Roo Code](#roo-code)
     - [Cursor](#cursor)
     - [Windsurf](#windsurf)
+- [Streamable HTTP Transport](#streamable-http-transport)
 - [Local Testing](#local-testing)
 
 ## Prerequisites
@@ -197,6 +198,19 @@ Windsurf (Cascade) uses mcp_config.json under ~/.codeium/windsurf/ (or via the C
 
 3.	Save and restart Windsurf (or hit “Refresh” in the MCP panel).
 
+## Streamable HTTP Transport
+
+By default the server runs over stdio and authenticates with the `CODEOCEAN_TOKEN` environment variable, as
+described above. It can also serve multiple users from a single process over streamable HTTP, taking each
+caller's API token from the request instead:
+
+```bash
+CODEOCEAN_DOMAIN=https://acmecorp.codeocean.com codeocean-mcp-server --transport streamable-http --host 127.0.0.1 --port 8000
+```
+
+Clients then pass their own token as `Authorization: Bearer <YOUR_API_KEY>` on every request; `CODEOCEAN_TOKEN`
+is not used, and a request without a token is refused. The endpoint is `http://<host>:<port>/mcp`.
+
 ## Local Testing
 
 You can test the MCP server locally during development with [MCP Inspector](https://modelcontextprotocol.io/legacy/tools/inspector):

{codeocean_mcp_server-0.7.2 → codeocean_mcp_server-0.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codeocean-mcp-server"
-version = "0.7.2"
+version = "0.12.0"
 authors = [{ name = "Code Ocean", email = "dev@codeocean.com" }]
 description = "Code Ocean MCP Server"
 readme = "README.md"
@@ -11,8 +11,8 @@ classifiers = [
   "Operating System :: OS Independent",
 ]
 dependencies = [
-  "codeocean>=0.12.0,<0.13.0",
-  "mcp>=1.12.0,<1.13.0",
+  "codeocean>=0.14.0,<0.15.0",
+  "mcp>=1.23.0,<1.24.0",
 ]
 license = "MIT"
 
@@ -66,3 +66,5 @@ filterwarnings = [
   "ignore:datetime.datetime.utcnow() is deprecated:DeprecationWarning:botocore.auth",
   "ignore::DeprecationWarning:botocore.*",
 ]
+markers = ["integration: requires external services (AWS/Bedrock)"]
+asyncio_mode = "strict"

codeocean_mcp_server-0.12.0/src/codeocean_mcp_server/client.py

@@ -0,0 +1,54 @@
+"""Per-request Code Ocean client resolution for the streamable-HTTP transport."""
+
+from functools import lru_cache
+
+from codeocean import CodeOcean
+from mcp.server.fastmcp import FastMCP
+from starlette.requests import Request
+
+
+@lru_cache(maxsize=32)
+def _cached_client(domain: str, token: str, agent_id: str | None) -> CodeOcean:
+    """Return a client for the given credentials, reusing its HTTP connection pool across requests."""
+    return CodeOcean(domain=domain, token=token, agent_id=agent_id)
+
+
+def _bearer_token(request: Request) -> str | None:
+    """Return the token from an 'Authorization: Bearer <token>' header, or None for any other scheme."""
+    scheme, _, token = request.headers.get("authorization", "").partition(" ")
+    if scheme.lower() != "bearer":
+        return None
+    return token.strip() or None
+
+
+class RequestScopedClient:
+    """A `CodeOcean` stand-in that resolves to the calling request's own client on every attribute access.
+
+    Tools reach the SDK as `client.<sub_client>.<method>(...)`, evaluated when the tool runs, so wrapping
+    the client is enough to give each request its own credentials without touching the tools themselves.
+
+    Outside a request — tool registration, where descriptions are read from SDK docstrings — attribute
+    access resolves to a client built from the environment's token, which issues no network call.
+    """
+
+    def __init__(self, mcp: FastMCP, domain: str, token: str | None, agent_id: str | None):
+        """Wrap the credentials that are fixed for the process, around the token that varies per request."""
+        self._mcp = mcp
+        self._domain = domain
+        self._token = token
+        self._agent_id = agent_id
+
+    def __getattr__(self, name: str):
+        """Delegate to the calling request's client."""
+        return getattr(self._resolve(), name)
+
+    def _resolve(self) -> CodeOcean:
+        try:
+            request = self._mcp.get_context().request_context.request
+        except ValueError:
+            # Registration happens outside any request, so it needs no credential of its own.
+            return _cached_client(self._domain, self._token or "", self._agent_id)
+        token = _bearer_token(request) if request is not None else None
+        if not token:
+            raise ValueError("Missing Code Ocean API token: send it as an 'Authorization: Bearer <token>' header.")
+        return _cached_client(self._domain, token, self._agent_id)

codeocean_mcp_server-0.12.0/src/codeocean_mcp_server/search.py

@@ -0,0 +1,140 @@
+import re
+from typing import Any, ClassVar, Optional
+
+from pydantic import BaseModel
+
+# Constants
+MAX_DESCRIPTION_LENGTH = 200
+MAX_TAGS_COUNT = 10
+TRUNCATION_SUFFIX = "...(more)"
+TAGS_TRUNCATION_MARKER = "..more.."
+
+
+def truncate_description(description: Optional[str], max_length: int = MAX_DESCRIPTION_LENGTH) -> Optional[str]:
+    """Truncate description with word-boundary-aware cutting."""
+    if not description:
+        return None
+
+    # Light whitespace normalization: collapse 3+ consecutive whitespace to single space.
+    normalized = re.sub(r"\s{3,}", " ", description).strip()
+    if not normalized:
+        return None
+
+    if len(normalized) <= max_length:
+        return normalized
+
+    truncate_at = max_length - len(TRUNCATION_SUFFIX)
+    if truncate_at <= 0:
+        return TRUNCATION_SUFFIX[:max_length]
+
+    last_space = normalized.rfind(" ", 0, truncate_at)
+    cut_at = last_space if last_space > max_length // 2 else truncate_at
+    return normalized[:cut_at].rstrip() + TRUNCATION_SUFFIX
+
+
+def limit_tags(tags: Optional[list[str]], max_count: int = MAX_TAGS_COUNT) -> list[str]:
+    """Limit tags to maximum count with truncation marker."""
+    if not tags:
+        return []
+
+    if len(tags) <= max_count:
+        return list(tags)
+
+    return list(tags[: max_count - 1]) + [TAGS_TRUNCATION_MARKER]
+
+
+class CompactCapsuleItem(BaseModel):
+    """Compact capsule/pipeline item (id kept, other fields shortened)."""
+
+    id: str
+    n: str
+    s: str
+    d: Optional[str] = None
+    t: list[str]
+
+
+class CompactDataAssetItem(BaseModel):
+    """Compact data asset item (id kept, other fields shortened)."""
+
+    id: str
+    n: str
+    d: Optional[str] = None
+    t: list[str]
+
+
+class SearchMeta(BaseModel):
+    """Base model providing search metadata fields."""
+
+    has_more: bool
+    next_token: Optional[str] = None
+    item_count: int
+    field_names: Optional[dict[str, str]] = None
+
+
+class CapsuleSearchResults(SearchMeta):
+    """Compact results: {items: [{id, n, s, d, t}], has_more, next_token, item_count}.
+
+    Item fields: id=id, n=name, s=slug, d=description (truncated), t=tags (limited).
+    Pagination: item_count returns the number of items in the current page.
+      Use next_token for additional pages when has_more=true.
+    Set include_field_names=true to add field_names with full labels.
+    Use get_capsule(id) if full details needed.
+    """
+
+    items: list[CompactCapsuleItem]
+    FIELD_NAMES: ClassVar[dict[str, str]] = {"id": "id", "n": "name", "s": "slug", "d": "description", "t": "tags"}
+
+    @classmethod
+    def from_sdk_results(cls, sdk_results: Any, include_field_names: bool = False) -> "CapsuleSearchResults":
+        """Convert SDK search results to compact format."""
+        items = [
+            CompactCapsuleItem(
+                id=c.id,
+                n=c.name,
+                s=c.slug,
+                d=truncate_description(c.description),
+                t=limit_tags(c.tags),
+            )
+            for c in sdk_results.results
+        ]
+        return cls(
+            items=items,
+            has_more=sdk_results.has_more,
+            next_token=getattr(sdk_results, "next_token", None),
+            item_count=len(items),
+            field_names=cls.FIELD_NAMES if include_field_names else None,
+        )
+
+
+class DataAssetSearchResults(SearchMeta):
+    """Compact results: {items: [{id, n, d, t}], has_more, next_token, item_count}.
+
+    Item fields: id=id, n=name, d=description (truncated), t=tags (limited).
+    Pagination: item_count returns the number of items in the current page.
+      Use next_token for additional pages when has_more=true.
+    Set include_field_names=true to add field_names with full labels.
+    Use get_data_asset(id) if full details needed.
+    """
+
+    items: list[CompactDataAssetItem]
+    FIELD_NAMES: ClassVar[dict[str, str]] = {"id": "id", "n": "name", "d": "description", "t": "tags"}
+
+    @classmethod
+    def from_sdk_results(cls, sdk_results: Any, include_field_names: bool = False) -> "DataAssetSearchResults":
+        """Convert SDK search results to compact format."""
+        items = [
+            CompactDataAssetItem(
+                id=d.id,
+                n=d.name,
+                d=truncate_description(d.description),
+                t=limit_tags(d.tags),
+            )
+            for d in sdk_results.results
+        ]
+        return cls(
+            items=items,
+            has_more=sdk_results.has_more,
+            next_token=getattr(sdk_results, "next_token", None),
+            item_count=len(items),
+            field_names=cls.FIELD_NAMES if include_field_names else None,
+        )

codeocean_mcp_server-0.12.0/src/codeocean_mcp_server/server.py

@@ -0,0 +1,70 @@
+import argparse
+import os
+
+from codeocean import CodeOcean
+from mcp.server.fastmcp import FastMCP
+
+from codeocean_mcp_server.client import RequestScopedClient
+from codeocean_mcp_server.logging_config import configure_logging
+from codeocean_mcp_server.tools import (
+    capsules,
+    computations,
+    custom_metadata,
+    data_assets,
+)
+
+
+def parse_args(argv: list[str] | None = None) -> argparse.Namespace:
+    """Parse command line arguments."""
+    parser = argparse.ArgumentParser(prog="codeocean-mcp-server", description="Code Ocean MCP Server")
+    parser.add_argument(
+        "--transport",
+        choices=["stdio", "streamable-http"],
+        default="stdio",
+        help="Transport to serve on. Over streamable-HTTP the API token is taken per request from the "
+        "'Authorization: Bearer <token>' header instead of from CODEOCEAN_TOKEN.",
+    )
+    parser.add_argument("--host", default="127.0.0.1", help="Host to bind to when serving over streamable-HTTP.")
+    parser.add_argument("--port", type=int, default=8000, help="Port to bind to when serving over streamable-HTTP.")
+    return parser.parse_args(argv)
+
+
+def main():
+    """Run the MCP server."""
+    configure_logging()
+    args = parse_args()
+    stdio = args.transport == "stdio"
+    domain = os.getenv("CODEOCEAN_DOMAIN")
+    token = os.getenv("CODEOCEAN_TOKEN")
+    if not domain:
+        raise ValueError("Environment variable CODEOCEAN_DOMAIN must be set.")
+    agent_id = os.getenv("AGENT_ID", "AI Agent")
+
+    mcp = FastMCP(
+        name="Code Ocean",
+        instructions=(
+            f"MCP server for Code Ocean: search & run capsules, pipelines, and assets using Code Ocean domain {domain}."
+        ),
+        host=args.host,
+        port=args.port,
+        stateless_http=True,
+    )
+
+    if stdio:
+        # Over stdio the process serves a single user, so the environment's client is used directly, as before.
+        if not token:
+            raise ValueError("Environment variable CODEOCEAN_TOKEN must be set when serving over stdio.")
+        client = CodeOcean(domain=domain, token=token, agent_id=agent_id)
+    else:
+        client = RequestScopedClient(mcp, domain, token, agent_id)
+
+    capsules.add_tools(mcp, client)
+    data_assets.add_tools(mcp, client)
+    computations.add_tools(mcp, client)
+    custom_metadata.add_tools(mcp, client)
+
+    mcp.run(transport=args.transport)
+
+
+if __name__ == "__main__":
+    main()

{codeocean_mcp_server-0.7.2 → codeocean_mcp_server-0.12.0}/src/codeocean_mcp_server/tools/capsules.py

@@ -3,7 +3,6 @@ from codeocean.capsule import (
     AppPanel,
     Capsule,
     CapsuleSearchParams,
-    CapsuleSearchResults,
     Computation,
     DataAssetAttachParams,
     DataAssetAttachResults,
@@ -11,6 +10,7 @@ from codeocean.capsule import (
 from mcp.server.fastmcp import FastMCP
 
 from codeocean_mcp_server.models import dataclass_to_pydantic
+from codeocean_mcp_server.search import CapsuleSearchResults
 
 AppPanelModel = dataclass_to_pydantic(AppPanel)
 CapsuleSearchParamsModel = dataclass_to_pydantic(CapsuleSearchParams)
@@ -20,37 +20,47 @@ DataAssetAttachParamsModel = dataclass_to_pydantic(DataAssetAttachParams)
 def add_tools(mcp: FastMCP, client: CodeOcean):
     """Add capsule tools to the MCP server."""
 
-    @mcp.tool(
-        description=(
-            str(client.capsules.search_capsules.__doc__) + "Use only for capsule searches. "
-            "Provide only the minimal required parameters (e.g. limit=10); "
-            "do not include optional params "
-            "like sort_by or sort_order unless requested."
-        )
-    )
-    def search_capsules(search_params: CapsuleSearchParamsModel) -> CapsuleSearchResults:
+    @mcp.tool(description=(str(client.capsules.search_capsules.__doc__) + " " + str(CapsuleSearchResults.__doc__)))
+    def search_capsules(
+        search_params: CapsuleSearchParamsModel,
+        include_field_names: bool = False,
+    ) -> CapsuleSearchResults:
         """Search for capsules matching specified criteria."""
         params = CapsuleSearchParams(**search_params.model_dump(exclude_none=True))
-        return client.capsules.search_capsules(params)
+        results = client.capsules.search_capsules(params)
+        return CapsuleSearchResults.from_sdk_results(results, include_field_names)
+
+    @mcp.tool(description=(str(client.pipelines.search_pipelines.__doc__) + " " + str(CapsuleSearchResults.__doc__)))
+    def search_pipelines(
+        search_params: CapsuleSearchParamsModel,
+        include_field_names: bool = False,
+    ) -> CapsuleSearchResults:
+        """Search for pipelines matching specified criteria."""
+        params = CapsuleSearchParams(**search_params.model_dump(exclude_none=True))
+        results = client.pipelines.search_pipelines(params)
+        return CapsuleSearchResults.from_sdk_results(results, include_field_names)
 
     @mcp.tool(
         description=(
-            str(client.capsules.search_pipelines.__doc__) + "Use only for pipeline searches. "
-            "Provide only the minimal required parameters (e.g. limit=10); "
-            "do not include optional params "
-            "like sort_by or sort_order unless requested."
+            str(client.capsules.get_capsule.__doc__) + "Use only to fetch metadata for a known capsule ID. "
+            "Do not use for searching."
         )
     )
-    def search_pipelines(search_params: CapsuleSearchParamsModel) -> CapsuleSearchResults:
-        """Search for pipelines matching specified criteria."""
-        params = CapsuleSearchParams(**search_params.model_dump(exclude_none=True))
-        return client.capsules.search_pipelines(params)
+    def get_capsule(capsule_id: str) -> Capsule:
+        """Retrieve a capsule by its ID."""
+        return client.capsules.get_capsule(capsule_id)
+
+    @mcp.tool(description=client.capsules.list_computations.__doc__)
+    def list_computations(capsule_id: str) -> list[Computation]:
+        """List all computations for a capsule."""
+        return client.capsules.list_computations(capsule_id)
 
     @mcp.tool(
         description=(
             str(client.capsules.attach_data_assets.__doc__)
-            + "Accepts a list of parameter objects (e.g. [{'id': '...'}]), "
-            "not just a list of IDs."
+            + " Use when the capsule has no running cloud workstations. For active cloud workstation sessions"
+            " use attach_computation_data_assets instead."
+            " Accepts a list of parameter objects (e.g. [{'id': '...'}]), not just a list of IDs."
         )
     )
     def attach_data_assets(
@@ -63,18 +73,14 @@ def add_tools(mcp: FastMCP, client: CodeOcean):
 
     @mcp.tool(
         description=(
-            str(client.capsules.get_capsule.__doc__) + "Use only to fetch metadata for a known capsule ID. "
-            "Do not use for searching."
+            str(client.capsules.detach_data_assets.__doc__)
+            + " Use when the capsule has no running cloud workstations. For active cloud workstation sessions"
+            " use detach_computation_data_assets instead."
         )
     )
-    def get_capsule(capsule_id: str) -> Capsule:
-        """Retrieve a capsule by its ID."""
-        return client.capsules.get_capsule(capsule_id)
-
-    @mcp.tool(description=client.capsules.list_computations.__doc__)
-    def list_computations(capsule_id: str) -> list[Computation]:
-        """List all computations for a capsule."""
-        return client.capsules.list_computations(capsule_id)
+    def detach_data_assets(capsule_id: str, data_assets: list[str]) -> None:
+        """Remove attached data assets from a capsule."""
+        client.capsules.detach_data_assets(capsule_id, data_assets)
 
     @mcp.tool(description=client.capsules.get_capsule_app_panel.__doc__)
     def get_capsule_app_panel(capsule_id: str, version: int | None = None) -> AppPanelModel:

{codeocean_mcp_server-0.7.2 → codeocean_mcp_server-0.12.0}/src/codeocean_mcp_server/tools/computations.py

@@ -5,15 +5,17 @@ from codeocean.computation import (
     Folder,
     RunParams,
 )
+from codeocean.data_asset import DataAssetAttachParams, DataAssetAttachResults
 from mcp.server.fastmcp import FastMCP
 
 from codeocean_mcp_server.file_utils import download_and_read_file
 from codeocean_mcp_server.models import dataclass_to_pydantic
 
 RunParamsModel = dataclass_to_pydantic(RunParams)
+DataAssetAttachParamsModel = dataclass_to_pydantic(DataAssetAttachParams)
 
 
-def add_tools(mcp: FastMCP, client: CodeOcean):
+def add_tools(mcp: FastMCP, client: CodeOcean):  # noqa: C901
     """Add capsule tools to the MCP server."""
 
     @mcp.tool(description=client.computations.get_computation.__doc__)
@@ -59,3 +61,33 @@ def add_tools(mcp: FastMCP, client: CodeOcean):
         """Download a file using the provided URL and return its content."""
         file_urls = client.computations.get_result_file_urls(computation_id, file_path)
         return download_and_read_file(file_urls.download_url)
+
+    @mcp.tool(description=client.computations.rename_computation.__doc__)
+    def rename_computation(computation_id: str, name: str) -> None:
+        """Rename an existing computation."""
+        client.computations.rename_computation(computation_id, name)
+
+    @mcp.tool(description=client.computations.delete_computation.__doc__)
+    def delete_computation(computation_id: str) -> None:
+        """Delete a computation and stop it if currently running."""
+        client.computations.delete_computation(computation_id)
+
+    @mcp.tool(
+        description=(
+            str(client.computations.attach_data_assets.__doc__)
+            + " Accepts a list of parameter objects (e.g. [{'id': '...'}]). "
+            "Use for cloud workstation sessions."
+        )
+    )
+    def attach_computation_data_assets(
+        computation_id: str,
+        attach_params: list[DataAssetAttachParamsModel],
+    ) -> list[DataAssetAttachResults]:
+        """Attach data assets to a cloud workstation session."""
+        params = [DataAssetAttachParams(**p.model_dump(exclude_none=True)) for p in attach_params]
+        return client.computations.attach_data_assets(computation_id, params)
+
+    @mcp.tool(description=client.computations.detach_data_assets.__doc__)
+    def detach_computation_data_assets(computation_id: str, data_assets: list[str]) -> None:
+        """Detach data assets from a cloud workstation session."""
+        client.computations.detach_data_assets(computation_id, data_assets)

{codeocean_mcp_server-0.7.2 → codeocean_mcp_server-0.12.0}/src/codeocean_mcp_server/tools/data_assets.py

@@ -5,7 +5,6 @@ from codeocean.data_asset import (
     DataAsset,
     DataAssetParams,
     DataAssetSearchParams,
-    DataAssetSearchResults,
     DataAssetUpdateParams,
     FileURLs,
     Folder,
@@ -14,6 +13,7 @@ from mcp.server.fastmcp import FastMCP
 
 from codeocean_mcp_server.file_utils import download_and_read_file
 from codeocean_mcp_server.models import dataclass_to_pydantic
+from codeocean_mcp_server.search import DataAssetSearchResults
 
 DataAssetModel = dataclass_to_pydantic(DataAsset)
 DataAssetParamsModel = dataclass_to_pydantic(DataAssetParams)
@@ -25,17 +25,23 @@ def add_tools(mcp: FastMCP, client: CodeOcean):
     """Add data asset tools to the MCP server."""
 
     @mcp.tool(
-        description=(
-            str(client.data_assets.search_data_assets.__doc__)
-            + "Search for data assets (external or internal). You may filter by "
-            "fields such as `origin`, tags, or other criteria supported by the "
-            "SDK."
-        )
+        description=(str(client.data_assets.search_data_assets.__doc__) + " " + str(DataAssetSearchResults.__doc__))
     )
-    def search_data_assets(search_params: DataAssetSearchParamsModel) -> DataAssetSearchResults:
+    def search_data_assets(
+        search_params: DataAssetSearchParamsModel,
+        include_field_names: bool = False,
+    ) -> DataAssetSearchResults:
         """Retrieve data assets matching search criteria for datasets."""
         params = DataAssetSearchParams(**search_params.model_dump(exclude_none=True))
-        return client.data_assets.search_data_assets(params)
+        results = client.data_assets.search_data_assets(params)
+        return DataAssetSearchResults.from_sdk_results(results, include_field_names)
+
+    @mcp.tool(
+        description=("Get full details for a data asset by ID. Use after compact search to retrieve complete metadata.")
+    )
+    def get_data_asset(data_asset_id: str) -> DataAsset:
+        """Retrieve a data asset by its ID."""
+        return client.data_assets.get_data_asset(data_asset_id)
 
     @mcp.tool(
         description=(

{codeocean_mcp_server-0.7.2 → codeocean_mcp_server-0.12.0}/tests/bedrock_call.py

@@ -7,7 +7,15 @@ from bedrock_tools_converter import convert_tool_format
 
 BEDROCK_MODEL = os.getenv("BEDROCK_MODEL") or "amazon.nova-pro-v1:0"
 
-client = boto3.client("bedrock-runtime")
+_client = None
+
+
+def _get_client():
+    """Lazily initialize the Bedrock client."""
+    global _client
+    if _client is None:
+        _client = boto3.client("bedrock-runtime")
+    return _client
 
 
 def call_bedrock(
@@ -26,4 +34,4 @@ def call_bedrock(
     if tools is not None:
         payload["toolConfig"] = convert_tool_format(tools, model)
 
-    return client.converse(**payload)
+    return _get_client().converse(**payload)

codeocean_mcp_server-0.12.0/tests/conftest.py

@@ -0,0 +1,23 @@
+"""Pytest configuration for codeocean-mcp-server tests."""
+
+import pytest
+
+
+def pytest_addoption(parser):
+    """Add --integration flag to pytest."""
+    parser.addoption(
+        "--integration",
+        action="store_true",
+        default=False,
+        help="Run integration tests (requires AWS/Bedrock setup)",
+    )
+
+
+def pytest_collection_modifyitems(config, items):
+    """Skip integration tests unless --integration flag is passed."""
+    if config.getoption("--integration"):
+        return
+    skip_integration = pytest.mark.skip(reason="need --integration flag to run")
+    for item in items:
+        if "integration" in item.keywords:
+            item.add_marker(skip_integration)