This reverts commit 34c12d0131.
This commit is contained in:
parent
34abb7de1a
commit
80440e11a7
@ -884,7 +884,7 @@ jobs:
|
||||
pip install "pytest-asyncio==0.21.1"
|
||||
pip install "respx==0.22.0"
|
||||
pip install "pydantic==2.10.2"
|
||||
pip install "mcp==1.20.0"
|
||||
pip install "mcp==1.10.1"
|
||||
# Run pytest and generate JUnit XML report
|
||||
- run:
|
||||
name: Run tests
|
||||
@ -1151,7 +1151,7 @@ jobs:
|
||||
pip install "respx==0.22.0"
|
||||
pip install "hypercorn==0.17.3"
|
||||
pip install "pydantic==2.10.2"
|
||||
pip install "mcp==1.20.0"
|
||||
pip install "mcp==1.10.1"
|
||||
pip install "requests-mock>=1.12.1"
|
||||
pip install "responses==0.25.7"
|
||||
pip install "pytest-xdist==3.6.1"
|
||||
@ -1204,7 +1204,7 @@ jobs:
|
||||
pip install "respx==0.22.0"
|
||||
pip install "hypercorn==0.17.3"
|
||||
pip install "pydantic==2.10.2"
|
||||
pip install "mcp==1.20.0"
|
||||
pip install "mcp==1.10.1"
|
||||
pip install "requests-mock>=1.12.1"
|
||||
pip install "responses==0.25.7"
|
||||
pip install "pytest-xdist==3.6.1"
|
||||
@ -1562,7 +1562,7 @@ jobs:
|
||||
pip install "pytest-asyncio==0.21.1"
|
||||
pip install "pytest-cov==5.0.0"
|
||||
pip install "tomli==2.2.1"
|
||||
pip install "mcp==1.20.0"
|
||||
pip install "mcp==1.10.1"
|
||||
- run:
|
||||
name: Run tests
|
||||
command: |
|
||||
|
||||
@ -13,6 +13,6 @@ google-cloud-aiplatform==1.43.0
|
||||
google-cloud-iam==2.19.1
|
||||
fastapi-sso==0.16.0
|
||||
uvloop==0.21.0
|
||||
mcp==1.20.0 # for MCP server
|
||||
mcp==1.10.1 # for MCP server
|
||||
semantic_router==0.1.10 # for auto-routing with litellm
|
||||
fastuuid==0.12.0
|
||||
908
poetry.lock
generated
908
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@ -34,7 +34,7 @@ pydantic = "^2.5.0"
|
||||
jsonschema = "^4.22.0"
|
||||
numpydoc = {version = "*", optional = true} # used in utils.py
|
||||
|
||||
uvicorn = {version = "^0.31.1", optional = true}
|
||||
uvicorn = {version = "^0.29.0", optional = true}
|
||||
uvloop = {version = "^0.21.0", optional = true, markers="sys_platform != 'win32'"}
|
||||
gunicorn = {version = "^23.0.0", optional = true}
|
||||
fastapi = {version = ">=0.120.1", optional = true}
|
||||
@ -44,7 +44,7 @@ rq = {version = "*", optional = true}
|
||||
orjson = {version = "^3.9.7", optional = true}
|
||||
apscheduler = {version = "^3.10.4", optional = true}
|
||||
fastapi-sso = { version = "^0.16.0", optional = true }
|
||||
PyJWT = { version = ">=2.8.0,<3.0.0", optional = true }
|
||||
PyJWT = { version = "^2.8.0", optional = true }
|
||||
python-multipart = { version = "^0.0.18", optional = true}
|
||||
cryptography = {version = "*", optional = true}
|
||||
prisma = {version = "0.11.0", optional = true}
|
||||
@ -58,7 +58,7 @@ pynacl = {version = "^1.5.0", optional = true}
|
||||
websockets = {version = "^13.1.0", optional = true}
|
||||
boto3 = {version = "1.36.0", optional = true}
|
||||
redisvl = {version = "^0.4.1", optional = true, markers = "python_version >= '3.9' and python_version < '3.14'"}
|
||||
mcp = {version = "^1.20.0", optional = true, python = ">=3.10"}
|
||||
mcp = {version = "^1.10.0", optional = true, python = ">=3.10"}
|
||||
litellm-proxy-extras = {version = "0.4.1", optional = true}
|
||||
rich = {version = "13.7.1", optional = true}
|
||||
litellm-enterprise = {version = "0.1.20", optional = true}
|
||||
|
||||
@ -6,7 +6,7 @@ fastapi==0.120.1 # server dep
|
||||
starlette==0.49.1 # starlette fastapi dep
|
||||
backoff==2.2.1 # server dep
|
||||
pyyaml==6.0.2 # server dep
|
||||
uvicorn==0.31.1 # server dep
|
||||
uvicorn==0.29.0 # server dep
|
||||
gunicorn==23.0.0 # server dep
|
||||
fastuuid==0.13.5 # for uuid4
|
||||
uvloop==0.21.0 # uvicorn dep, gives us much better performance under load
|
||||
@ -19,7 +19,7 @@ google-cloud-aiplatform==1.47.0 # for vertex ai calls
|
||||
google-cloud-iam==2.19.1 # for GCP IAM Redis authentication
|
||||
google-genai==1.22.0
|
||||
anthropic[vertex]==0.54.0
|
||||
mcp==1.20.0 # for MCP server
|
||||
mcp==1.10.1 # for MCP server
|
||||
google-generativeai==0.5.0 # for vertex ai calls
|
||||
async_generator==1.10.0 # for async ollama calls
|
||||
langfuse==2.59.7 # for langfuse self-hosted logging
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
"""
|
||||
Test to verify MCP package version is 1.20.0 or higher.
|
||||
"""
|
||||
import pytest
|
||||
|
||||
|
||||
def test_mcp_version():
|
||||
"""
|
||||
Verify that the MCP package version is 1.20.0 or higher.
|
||||
This test ensures the MCP dependency upgrade was successful.
|
||||
"""
|
||||
try:
|
||||
import mcp
|
||||
|
||||
# Get version from package metadata
|
||||
try:
|
||||
from importlib.metadata import version
|
||||
|
||||
mcp_version = version("mcp")
|
||||
except ImportError:
|
||||
# Fallback for older Python versions
|
||||
import pkg_resources
|
||||
|
||||
mcp_version = pkg_resources.get_distribution("mcp").version
|
||||
|
||||
# Parse version string and check
|
||||
version_parts = mcp_version.split(".")
|
||||
major = int(version_parts[0])
|
||||
minor = int(version_parts[1]) if len(version_parts) > 1 else 0
|
||||
|
||||
# Version should be 1.20.0 or higher
|
||||
assert major >= 1, f"MCP major version should be >= 1, got {major}"
|
||||
if major == 1:
|
||||
assert (
|
||||
minor >= 20
|
||||
), f"MCP minor version should be >= 20 for major version 1, got {minor}"
|
||||
|
||||
print(f"✓ MCP version {mcp_version} meets requirement (>= 1.20.0)")
|
||||
|
||||
except ImportError:
|
||||
pytest.skip("MCP package not installed")
|
||||
|
||||
|
||||
def test_mcp_imports():
|
||||
"""
|
||||
Verify that all required MCP imports are still available after the version update.
|
||||
This ensures backward compatibility of the MCP package.
|
||||
"""
|
||||
try:
|
||||
# Test all imports used in the litellm codebase
|
||||
from mcp import ClientSession, StdioServerParameters
|
||||
from mcp.client.sse import sse_client
|
||||
from mcp.client.stdio import stdio_client
|
||||
from mcp.client.streamable_http import streamablehttp_client
|
||||
from mcp.types import CallToolRequestParams as MCPCallToolRequestParams
|
||||
from mcp.types import CallToolResult as MCPCallToolResult
|
||||
from mcp.types import TextContent
|
||||
from mcp.types import Tool as MCPTool
|
||||
|
||||
# Verify all imports are not None
|
||||
assert ClientSession is not None
|
||||
assert StdioServerParameters is not None
|
||||
assert sse_client is not None
|
||||
assert stdio_client is not None
|
||||
assert streamablehttp_client is not None
|
||||
assert MCPCallToolRequestParams is not None
|
||||
assert MCPCallToolResult is not None
|
||||
assert TextContent is not None
|
||||
assert MCPTool is not None
|
||||
|
||||
print("✓ All MCP imports are available and backward compatible")
|
||||
|
||||
except ImportError as e:
|
||||
pytest.fail(f"MCP import failed: {e}")
|
||||
Loading…
Reference in New Issue
Block a user