Jeadie/spiceai

.devcontainer/devcontainer.json

@@ -0,0 +1,41 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/rust
+{
+	"name": "Rust",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/rust:1-1-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {},
+		"ghcr.io/devcontainers/features/python:1": {
+			"version": "3.10",
+			"toolsToInstall": "uv"
+		}
+	},
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+			"settings": {
+				"editor.formatOnSave": true,
+				"[rust]": {
+					"editor.defaultFormatter": "rust-lang.rust-analyzer"
+				}
+			}
+		}
+	},
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "uv venv"
+	// Use 'mounts' to make the cargo cache persistent in a Docker Volume.
+	// "mounts": [
+	// 	{
+	// 		"source": "devcontainer-cargo-cache-${devcontainerId}",
+	// 		"target": "/usr/local/cargo",
+	// 		"type": "volume"
+	// 	}
+	// ]
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.github/workflows/ci.yml

@@ -0,0 +1,209 @@
+name: CI
+
+on:
+  push:
+    branches: [ main, release ]
+    tags:
+      - 'release-*'
+  pull_request:
+    branches: [ main, release ]
+
+env:
+  CARGO_TERM_COLOR: always
+  ARTIFACT_DIR: release-artifacts
+
+jobs:
+  commit-lint:
+    name: Lint Commit Messages
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+
+      - name: Install commitlint
+        run: |
+          npm install --save-dev @commitlint/cli @commitlint/config-conventional
+          echo "module.exports = {extends: ['@commitlint/config-conventional']}" > commitlint.config.js
+
+      - name: Lint commit messages
+        run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose
+
+  fmt:
+    name: Code Formatting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Rust fmt
+        run: rustup toolchain install nightly --component rustfmt
+
+      - name: Check formatting
+        run: cargo +nightly fmt --all -- --check
+
+  clippy:
+    name: Lint with Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Run clippy
+        run: cargo clippy --all-targets --all-features -- -D warnings
+
+  spelling:
+    name: spell check with typos
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Spell Check Repo
+      uses: crate-ci/typos@master
+
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      # install nodejs
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Set up Python
+        run: uv python install
+
+      - name: Create venv for python
+        run: uv venv
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Run tests
+        run: cargo test --all-features
+
+  coverage:
+    name: Code Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      # install nodejs
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Set up Python
+        run: uv python install
+
+      - name: Create venv for python
+        run: uv venv
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Install cargo-llvm-cov
+        run: cargo install cargo-llvm-cov
+
+      - name: Install llvm-tools-preview
+        run: rustup component add llvm-tools-preview
+
+      - name: Run tests with coverage
+        run: cargo llvm-cov --all-features
+
+  security_audit:
+    name: Security Audit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Install cargo-audit
+        run: cargo install cargo-audit
+
+      - name: Run cargo-audit
+        run: cargo audit
+
+  doc:
+    name: Generate Documentation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Generate documentation
+        run: |
+          cargo doc --no-deps -p rmcp -p rmcp-macros
+        env:
+          RUSTDOCFLAGS: -Dwarnings
+
+  release:
+    name: Release crates
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/release' || startsWith(github.ref, 'refs/tags/release')
+    needs: [fmt, clippy, test]
+    steps:
+      # Since this job has access to the `CRATES_TOKEN`, it's probably a good
+      # idea to be extra careful about what Actions are being called. The reason
+      # is that if an attacker gains access to other actions such as
+      # `Swatinem/rust-cache`, they could use that to steal the `CRATES_TOKEN`.
+      # This happened recently in the attack on `tj-actions/changed-files`, but
+      # has happened many times before as well.
+
+      - uses: actions/checkout@v4
+
+      - name: Update Rust
+        run: | 
+          rustup update stable
+          rustup default stable
+
+      - name: Cargo login
+        run: cargo login ${{ secrets.CRATES_TOKEN }}
+
+      - name: Publish macros dry run
+        run: cargo publish -p rmcp-macros --dry-run
+        continue-on-error: true
+
+      - name: Publish rmcp dry run
+        run: cargo publish -p rmcp --dry-run
+        continue-on-error: true
+
+      - name: Publish macro
+        if: ${{ startsWith(github.ref, 'refs/tags/release') }}
+        continue-on-error: true 
+        run: cargo publish -p rmcp-macros
+
+      - name: Publish rmcp
+        if: ${{ startsWith(github.ref, 'refs/tags/release') }}
+        continue-on-error: true 
+        run: cargo publish -p rmcp 

Cargo.toml

@@ -1,20 +1,24 @@
+
+
 [workspace]
-members = [
-    "crates/*",
-    "examples/clients",
-    "examples/servers",
-    "examples/macros"
-]
+members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
 resolver = "2"
 
 [workspace.dependencies]
-mcp-core = { path = "./crates/mcp-core" }
-mcp-macros = { path = "./crates/mcp-macros" }
+rmcp = { version = "0.1.5", path = "./crates/rmcp" }
+rmcp-macros = { version = "0.1.5", path = "./crates/rmcp-macros" }
 
 [workspace.package]
-edition = "2021"
-version = "1.0.7"
-authors = ["Block <ai-oss-tools@block.xyz>"]
-license = "MIT"
+edition = "2024"
+version = "0.1.5"
+authors = ["4t145 <u4t145@163.com>"]
+license = "MIT/Apache-2.0"
 repository = "https://github.com/modelcontextprotocol/rust-sdk/"
-description = "Rust SDK for the Model Context Protocol"
+description = "Rust SDK for Model Context Protocol"
+keywords = ["mcp", "sdk", "tokio", "modelcontextprotocol"]
+homepage = "https://github.com/modelcontextprotocol/rust-sdk"
+categories = [
+    "network-programming",
+    "asynchronous",
+]
+readme = "README.md"