Merge pull request modelcontextprotocol#24 from modelcontextprotocol/…

…justin/pypi-publish

Python build + publish workflow

.github/workflows/python.yml

@@ -0,0 +1,84 @@
+name: Python
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  release:
+    types: [published]
+
+jobs:
+  detect-packages:
+    runs-on: ubuntu-latest
+    outputs:
+      packages: ${{ steps.find-packages.outputs.packages }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Find Python packages
+        id: find-packages
+        working-directory: src
+        run: |
+          PACKAGES=$(find . -name pyproject.toml -exec dirname {} \; | sed 's/^\.\///' | jq -R -s -c 'split("\n")[:-1]')
+          echo "packages=$PACKAGES" >> $GITHUB_OUTPUT
+
+  build:
+    needs: [detect-packages]
+    strategy:
+      matrix:
+        package: ${{ fromJson(needs.detect-packages.outputs.packages) }}
+    name: Build ${{ matrix.package }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: "src/${{ matrix.package }}/.python-version"
+
+      - name: Install dependencies
+        working-directory: src/${{ matrix.package }}
+        run: uv sync --frozen --all-extras --dev
+
+      - name: Run pyright
+        working-directory: src/${{ matrix.package }}
+        run: uv run --frozen pyright
+
+      - name: Build package
+        working-directory: src/${{ matrix.package }}
+        run: uv build
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-${{ matrix.package }}
+          path: src/${{ matrix.package }}/dist/
+
+  publish:
+    runs-on: ubuntu-latest
+    needs: [build, detect-packages]
+    if: github.event_name == 'release'
+
+    strategy:
+      matrix:
+        package: ${{ fromJson(needs.detect-packages.outputs.packages) }}
+    name: Publish ${{ matrix.package }}
+
+    environment: release
+    permissions:
+      id-token: write # Required for trusted publishing
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist-${{ matrix.package }}
+          path: dist/
+
+      - name: Publish package to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/main.yml → .github/workflows/typescript.yml

@@ -1,3 +1,5 @@
+name: TypeScript
+
 on:
   push:
     branches:

src/git/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "mcp-git"
+name = "mcp-server-git"
 version = "0.2.0"
 description = "A Model Context Protocol server providing tools to read, search, and manipulate Git repositories programmatically via LLMs"
 readme = "README.md"
@@ -23,11 +23,14 @@ dependencies = [
 ]
 
 [project.scripts]
-mcp-git = "mcp_git:main"
+mcp-server-git = "mcp_server_git:main"
 
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [tool.uv]
-dev-dependencies = ["ruff>=0.7.3"]
+dev-dependencies = [
+    "pyright>=1.1.389",
+    "ruff>=0.7.3",
+]

src/git/src/mcp_server_git/__main__.py

@@ -0,0 +1,5 @@
+# __main__.py
+
+from mcp_server_git import main
+
+main()

src/sqlite/pyproject.toml

@@ -1,16 +1,19 @@
 [project]
-name = "sqlite"
+name = "mcp-server-sqlite"
 version = "0.1.0"
 description = "A simple SQLite MCP server"
 readme = "README.md"
 requires-python = ">=3.11"
-dependencies = [
-    "mcp>=0.9.1",
-]
+dependencies = ["mcp>=0.9.1"]
 
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.uv]
+dev-dependencies = [
+    "pyright>=1.1.389",
+]
+
 [project.scripts]
-sqlite = "sqlite:main"
+mcp-server-sqlite = "mcp_server_sqlite:main"

src/sqlite/src/sqlite/server.py → src/sqlite/src/mcp_server_sqlite/server.py

@@ -5,8 +5,9 @@
 from pathlib import Path
 from mcp.server.models import InitializationOptions
 import mcp.types as types
-from mcp.server import NotificationOptions, Server, AnyUrl
+from mcp.server import NotificationOptions, Server
 import mcp.server.stdio
+from pydantic import AnyUrl
 
 # Set up logging to file
 log_file = Path('mcp_server.log')
@@ -332,7 +333,7 @@ async def handle_call_tool(
                     memo = self._synthesize_memo()
 
                     # Notify clients that the memo resource has changed
-                    await self.request_context.session.send_resource_updated("memo://insights")  
+                    await self.request_context.session.send_resource_updated(AnyUrl("memo://insights"))
 
                     return [types.TextContent(type="text", text="Insight added to memo")]
                 if not arguments: