cleanup

README.md

@@ -4,7 +4,7 @@
 
 TO-DO
 
-
+3. Inspector: `npx @modelcontextprotocol/inspector`, accessible at `http://localhost:6274` 
 
 
 ## Running the MCP Server Locally      
@@ -49,4 +49,8 @@ Connecting to `Continue` Extension from VSCode: TODO
             }
         }
     }
-}```
+}```
+
+
+
+

app.py

@@ -6,88 +6,92 @@ from smolagents import CodeAgent, InferenceClientModel, MCPClient
 
 from config import GITHUB_PAT as GITHUB_TOKEN
 from config import GITHUB_TOOLSETS, HF_TOKEN
-from src.upgrade_advisor.tools import resolve_repo_from_url
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 logger.addHandler(logging.StreamHandler())
 
+if __name__ == "__main__":
+    logger.info("Starting MCP client for GitHub MCP server")
+    logger.info(f"Using toolsets: {GITHUB_TOOLSETS}")
 
-logger.info("Starting MCP client for GitHub MCP server")
-logger.info(f"Using toolsets: {GITHUB_TOOLSETS}")
+    try:
+        gh_mcp_params = StdioServerParameters(
+            # for StdioServerParameters, we use podman to run the
+            # MCP server from GH in a container
+            command="podman",
+            args=[
+                "run",
+                "-i",
+                "--rm",
+                "-e",
+                "GITHUB_PERSONAL_ACCESS_TOKEN",
+                "-e",
+                "GITHUB_READ_ONLY",
+                "-e",
+                "GITHUB_TOOLSETS",
+                "ghcr.io/github/github-mcp-server",
+            ],
+            env={
+                "GITHUB_PERSONAL_ACCESS_TOKEN": GITHUB_TOKEN,
+                "GITHUB_READ_ONLY": "1",
+                "GITHUB_TOOLSETS": GITHUB_TOOLSETS,
+            },
+        )
+        pypi_mcp_params = dict(
+            url="https://mcp-1st-birthday-pypi-mcp.hf.space/gradio_api/mcp/",
+            transport="streamable-http",
+        )
 
-try:
-    gh_mcp_params = StdioServerParameters(
-        # for StdioServerParameters, we use podman to run the
-        # MCP server from GH in a container
-        command="podman",
-        args=[
-            "run",
-            "-i",
-            "--rm",
-            "-e",
-            "GITHUB_PERSONAL_ACCESS_TOKEN",
-            "-e",
-            "GITHUB_READ_ONLY",
-            "-e",
-            "GITHUB_TOOLSETS",
-            "ghcr.io/github/github-mcp-server",
-        ],
-        env={
-            "GITHUB_PERSONAL_ACCESS_TOKEN": GITHUB_TOKEN,
-            "GITHUB_READ_ONLY": "1",
-            "GITHUB_TOOLSETS": GITHUB_TOOLSETS,
-        },
-    )
-    gh_mcp_http_params = None
-    mcp_client = MCPClient(
-        server_parameters=[gh_mcp_params],
-    )
-    tools = mcp_client.get_tools()  # this already connects the client
-    print(f"Discovered tools: {[tool.name for tool in tools]}")
+        with MCPClient(
+            server_parameters=[gh_mcp_params, pypi_mcp_params],
+            structured_output=True,
+        ) as tools:
+            print(f"Discovered tools: {[tool.name for tool in tools]}")
 
-    model = InferenceClientModel(
-        token=HF_TOKEN,
-        # model_id="meta-llama/Llama-3.1-8B-Instruct" -> prefers to use web_search
-    )
-    additional_authorized_imports = [
-        # "requests",  # so that requests to html docs can be made
-    ]
+            model = InferenceClientModel(
+                token=HF_TOKEN,
+                # model_id="meta-llama/Llama-3.1-8B-Instruct",  # -> prefers to use web_search
+            )
+            additional_authorized_imports = [
+                # "requests",  # so that requests to html docs can be made
+            ]
 
-    custom_tools = [resolve_repo_from_url]
-    agent = CodeAgent(
-        tools=[*tools, *custom_tools],
-        model=model,
-        additional_authorized_imports=additional_authorized_imports,
-    )
+            agent = CodeAgent(
+                tools=[*tools],
+                model=model,
+                additional_authorized_imports=additional_authorized_imports,
+                max_steps=25,
+            )
 
-    demo = gr.ChatInterface(
-        fn=lambda message, history: str(agent.run(message)),
-        type="messages",
-        examples=[
-            """
-            Currently, I'm using pandas version 1.3.0 in my project.
-            I want to upgrade to version 2.0.0.
-            Here is my dependency list:
-            pandas==1.3.0, numpy==1.21.0, matplotlib==3.4.2.
-            Can you help me determine if this upgrade is safe and what
-            potential issues I might face?",
-            """
-        ],
-        title="Upgrade Assistant with MCP Tools",
-        description="""
-        An AI assistant that helps you verify if an upgrade can be performed
-        safely from one version of a software package to another, given
-        all your depencencies. It uses GitHub's MCP tools to analyze the
-        dependencies and check for compatibility issues.
-        """,
-    )
+            demo = gr.ChatInterface(
+                fn=lambda message, history: str(agent.run(message)),
+                type="messages",
+                examples=[
+                    """
+                    Currently, I'm using pandas version 1.3.0 in my project.
+                    I want to upgrade to version 2.0.0.
+                    Here is my dependency list:
+                    pandas==1.3.0, numpy==1.21.0, matplotlib==3.4.2.
+                    Can you help me determine if this upgrade is safe and what
+                    potential issues I might face?",
+                    """
+                ],
+                title="Upgrade Assistant with MCP Tools",
+                description="""
+                As an AI dependancy checker that investigates each library and its
+                dependancy chain
+                to check if an upgrade that the user requested can be performed
+                safely without causing deprecations, security vulnerabilities
+                or obsolete version clashes.
+                It uses GitHub's MCP tools and the PyPI MCP tools to analyze the
+                dependencies and check for compatibility issues.
+                Finally a report is written
+                clearly stating why the upgrade is or is not reccomended.
+                """,
+            )
 
-    demo.launch()
+            demo.launch()
 
-finally:
-    logger.info("Disconnecting MCP client")
-    try:
-        mcp_client.disconnect()
-    except Exception:
-        pass
+    finally:
+        logger.info("Disconnecting MCP client")

poetry.lock

@@ -129,6 +129,19 @@ files = [
     {file = "audioop_lts-0.2.2.tar.gz", hash = "sha256:64d0c62d88e67b98a1a5e71987b7aa7b5bcffc7dcee65b635823dbdd0a8dbbd0"},
 ]
 
+[[package]]
+name = "backports-asyncio-runner"
+version = "1.2.0"
+description = "Backport of asyncio.Runner, a context manager that controls event loop life cycle."
+optional = false
+python-versions = "<3.11,>=3.8"
+groups = ["main"]
+markers = "python_version == \"3.10\""
+files = [
+    {file = "backports_asyncio_runner-1.2.0-py3-none-any.whl", hash = "sha256:0da0a936a8aeb554eccb426dc55af3ba63bcdc69fa1a600b5bb305413a4477b5"},
+    {file = "backports_asyncio_runner-1.2.0.tar.gz", hash = "sha256:a5aa7b2b7d8f8bfcaa2b57313f70792df84e32a2a746f585213373f900b42162"},
+]
+
 [[package]]
 name = "brotli"
 version = "1.2.0"
@@ -1975,6 +1988,27 @@ tomli = {version = ">=1", markers = "python_version < \"3.11\""}
 [package.extras]
 dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "requests", "setuptools", "xmlschema"]
 
+[[package]]
+name = "pytest-asyncio"
+version = "1.3.0"
+description = "Pytest support for asyncio"
+optional = false
+python-versions = ">=3.10"
+groups = ["main"]
+files = [
+    {file = "pytest_asyncio-1.3.0-py3-none-any.whl", hash = "sha256:611e26147c7f77640e6d0a92a38ed17c3e9848063698d5c93d5aa7aa11cebff5"},
+    {file = "pytest_asyncio-1.3.0.tar.gz", hash = "sha256:d7f52f36d231b80ee124cd216ffb19369aa168fc10095013c6b014a34d3ee9e5"},
+]
+
+[package.dependencies]
+backports-asyncio-runner = {version = ">=1.1,<2", markers = "python_version < \"3.11\""}
+pytest = ">=8.2,<10"
+typing-extensions = {version = ">=4.12", markers = "python_version < \"3.13\""}
+
+[package.extras]
+docs = ["sphinx (>=5.3)", "sphinx-rtd-theme (>=1)"]
+testing = ["coverage (>=6.2)", "hypothesis (>=5.7.1)"]
+
 [[package]]
 name = "python-dateutil"
 version = "2.9.0.post0"
@@ -2792,4 +2826,4 @@ files = [
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10"
-content-hash = "f3c436d52951872d904881660cd71283ba5c6433fc2215faec5446cc096a02d7"
+content-hash = "1ede68647503f98e4f14b160f7687ab2cb971c47e7f54ca00b6bf89f71d6291b"

pyproject.toml

@@ -14,6 +14,8 @@ dependencies = [
     "gradio (>=5.49.1,<6.0.0)",
     "mcp (>=1.21.1,<2.0.0)",
     "pytest (>=9.0.1,<10.0.0)",
+    "pytest-asyncio (>=1.3.0,<2.0.0)",
+    "anyio (>=4.11.0,<5.0.0)",
 ]
 
 
@@ -24,3 +26,6 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry]
 package-mode = true
 packages = [{ include = "src/upgrade_advisor" }]
+
+[tool.ruff]
+line-length = 88

src/upgrade_advisor/tools/__init__.py

@@ -1 +0,0 @@
-from .tools import *  # noqa: F403,F401

src/upgrade_advisor/tools/tools.py

@@ -1,44 +0,0 @@
-import re
-
-from smolagents import tool
-
-
-@tool
-def resolve_repo_from_url(url: str) -> dict:
-    """Given a GitHub repository URL, return the owner and repo name.
-
-    Args:
-        url (str): The GitHub repository URL.
-    """
-    pattern = r"https?://github\.com/([^/]+)/([^/]+)(?:\.git)?/?"
-    match = re.match(pattern, url)
-    if match:
-        owner, repo = match.groups()
-        # Remove .git suffix if present
-        if repo.endswith(".git"):
-            repo = repo[:-4]
-        return {"owner": owner, "repo": repo}
-    else:
-        raise ValueError("Invalid GitHub repository URL.")
-
-
-@tool
-def resolve_repo_from_name(name: str) -> dict:
-    """Given a GitHub repository name, return the owner and repo name.
-
-    Args:
-        name (str): The GitHub repository name.
-    """
-    raise NotImplementedError("This tool is not yet implemented.")
-
-
-@tool
-def pypi_search(package: str, version: str) -> dict:
-    """
-    Lookup the PyPI repository for package information given its name and version.
-
-    Args:
-        package (str): Name of the package to lookup
-        version (str): Version number of the package
-    """
-    raise NotImplementedError

tests/test_tools.py

@@ -1,21 +0,0 @@
-from src.upgrade_advisor.tools import resolve_repo_from_url
-
-
-def test_resolve_repo_from_url():
-    url = "https://github.com/owner/repo.git"
-    result = resolve_repo_from_url(url)
-    assert result == {"owner": "owner", "repo": "repo"}
-
-
-def test_resolve_repo_from_url_without_suffix():
-    url = "https://github.com/owner/repo"
-    result = resolve_repo_from_url(url)
-    assert result == {"owner": "owner", "repo": "repo"}
-
-
-def test_resolve_repo_from_url_invalid():
-    url = "https://notgithub.com/owner/repo"
-    try:
-        resolve_repo_from_url(url)
-    except ValueError:
-        assert True