Fix tests. Add test GHA. Improve publish action.

Author: rectalogic

.github/workflows/publish.yml

@@ -1,19 +1,18 @@
-name: Publish Python Package
+name: Publish Python Package and GitHub Release
 
 on:
-  release:
-    types: [created]
-
-permissions:
-  contents: read
+  push:
+    tags:        
+      - '**'
 
 jobs:
-  #call-test:
-  #  uses: ./.github/workflows/test.yml
+  call-test:
+    uses: ./.github/workflows/test.yml
 
   build:
+    name: Build distribution package
     runs-on: ubuntu-latest
-    #needs: [call-test]
+    needs: [call-test]
     steps:
     - uses: actions/checkout@v4
     - name: Install uv
@@ -26,7 +25,13 @@ jobs:
       with:
         python-version: "3.12"
     - name: Install dependencies
-      run: uv sync --dev --python 3.12 --python-preference only-system
+      run: |
+        uv sync --locked --dev --python 3.12 --python-preference only-system
+        version=$(uv run --locked python -c 'from importlib.metadata import version; print(version("langchain_mcp"))')
+        if [ "$version" != "${{ github.ref_name }}" ]; then
+          echo "Built version $version does not match tag ${{ github.ref_name }}, aborting"
+          exit 1
+        fi
     - name: Build
       run: |
         uv build
@@ -36,7 +41,8 @@ jobs:
         name: python-package-distribution
         path: dist/
 
-  deploy:
+  publish:
+    name: Publish Python distribution package to PyPI
     runs-on: ubuntu-latest
     needs:
     - build
@@ -51,3 +57,39 @@ jobs:
         path: dist/
     - name: Publish to PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
+
+  github-release:
+    name: Sign the Python distribution package with Sigstore and upload to GitHub Release
+    needs:
+    - publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+    steps:
+    - name: Download dists
+      uses: actions/download-artifact@v4
+      with:
+        name: python-package-distribution
+        path: dist/
+    - name: Sign with Sigstore
+      uses: sigstore/[email protected]
+      with:
+        inputs: >-
+          ./dist/*.tar.gz
+          ./dist/*.whl
+    - name: Create GitHub Release
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: >-
+        gh release create
+        '${{ github.ref_name }}'
+        --repo '${{ github.repository }}'
+        --notes ""
+    - name: Upload artifact signatures to GitHub Release
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      run: >-
+        gh release upload
+        '${{ github.ref_name }}' dist/**
+        --repo '${{ github.repository }}'

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: Test
+
+on: [push, pull_request, workflow_call]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install uv
+      uses: astral-sh/setup-uv@v2
+      with:
+        enable-cache: true
+        cache-dependency-glob: "uv.lock"
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Run tests
+      run: uv run --isolated --locked --python ${{ matrix.python-version }} --python-preference only-system pytest
+    - name: Lint
+      run: |
+        uv run --python ${{ matrix.python-version }} --python-preference only-system ruff format --check
+        uv run --python ${{ matrix.python-version }} --python-preference only-system ruff check 

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "langchain-mcp"
-version = "0.0.0"
-description = "Placholder, coming soon"
+version = "0.1.0a1"
+description = "Model Context Protocol tool calling support for LangChain"
 readme = "README.md"
 authors = [
     { name = "Andrew Wason", email = "[email protected]" }
@@ -10,7 +10,7 @@ requires-python = ">=3.10"
 dependencies = [
     "langchain-core~=0.3.21",
     "mcp~=1.0.0",
-    "pydantic>=2.10.2",
+    "pydantic~=2.10.2",
 ]
 classifiers = [
     "License :: OSI Approved :: MIT License",
@@ -69,4 +69,4 @@ select = [
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
-asyncio_default_fixture_loop_scope = "session"
+asyncio_default_fixture_loop_scope = "class"

src/langchain_mcp/toolkit.py

@@ -1,12 +1,14 @@
 # Copyright (C) 2024 Andrew Wason
 # SPDX-License-Identifier: MIT
 
+import asyncio
 import typing as t
+import warnings
 from collections.abc import Callable
 
 import pydantic
 import pydantic_core
-from langchain_core.tools.base import BaseTool, BaseToolkit, InjectedToolArg, ToolException
+from langchain_core.tools.base import BaseTool, BaseToolkit, ToolException
 from mcp import ClientSession
 
 
@@ -68,7 +70,10 @@ class MCPTool(BaseTool):
     handle_tool_error: bool | str | Callable[[ToolException], str] | None = True
 
     def _run(self, *args: t.Any, **kwargs: t.Any) -> t.Any:
-        raise NotImplementedError("Must invoke tool asynchronously")
+        warnings.warn(
+            "Invoke this tool asynchronousely using `ainvoke`. This method exists only to satisfy tests.", stacklevel=1
+        )
+        return asyncio.run(self._arun(*args, **kwargs))
 
     async def _arun(self, *args: t.Any, **kwargs: t.Any) -> t.Any:
         result = await self.session.call_tool(self.name, arguments=kwargs)

tests/integration_tests/test_tool.py

@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: MIT
 
 import pytest
-from langchain_tests.unit_tests import ToolsUnitTests
+from langchain_tests.integration_tests import ToolsIntegrationTests
 
 
 @pytest.mark.usefixtures("mcptool")
-class TestMCPToolIntegration(ToolsUnitTests):
+class TestMCPToolIntegration(ToolsIntegrationTests):
     @property
     def tool_constructor(self):
         return self.tool