fix flow with async

app.py

@@ -4,9 +4,9 @@ from pathlib import Path
 
 import gradio as gr
 from mcp import StdioServerParameters
-from mcpadapt.core import MCPAdapt
-from mcpadapt.smolagents_adapter import SmolAgentsAdapter
+from mcpadapt.core import MCPAdapt  # noqa: F401
 from smolagents import InferenceClientModel
+from smolagents.mcp_client import MCPClient
 
 from config import (
     AGENT_MODEL,
@@ -25,8 +25,7 @@ from src.upgrade_advisor.chat.chat import (
 )
 from src.upgrade_advisor.misc import (
     _monkeypatch_gradio_save_history,
-    get_example_pyproject_question,
-    get_example_requirements_question,
+    get_example_questions,
 )
 from src.upgrade_advisor.theme import christmas
 
@@ -180,12 +179,21 @@ def main():
         # Gradio chat interface state to persist uploaded files
         files_state = gr.State([])
 
-        with MCPAdapt(
-            serverparams=[
+        # with MCPAdapt(
+        #     serverparams=[
+        #         gh_mcp_params,
+        #         upload_mcp_params,
+        #     ],
+        #     adapter=SmolAgentsAdapter(structured_output=True),
+        # ) as toolset:
+        example_questions = get_example_questions(n=4)
+
+        with MCPClient(
+            server_parameters=[
                 gh_mcp_params,
                 upload_mcp_params,
             ],
-            adapter=SmolAgentsAdapter(structured_output=True),
+            structured_output=True,
         ) as toolset:
             logger.info("MCP clients connected successfully")
 
@@ -200,42 +208,30 @@ def main():
             demo = gr.ChatInterface(
                 fn=chat_fn,
                 chatbot=gr.Chatbot(
-                    height=600,
+                    height=800,
                     type="messages",
                 ),
                 title="Package Upgrade Advisor",
                 type="messages",
-                # additional_inputs_accordion="Attach pyproject.toml file",
+                additional_inputs_accordion="""
+                You may attach a pyproject.toml or requirements.txt file to get
+                specific upgrade advice for your project.
+                """,
                 textbox=gr.MultimodalTextbox(
-                    label="pyproject.toml",
-                    file_types=[".toml"],
+                    label="pyproject.toml or requirements.txt file can be attached",
+                    file_types=[".toml", ".txt"],
                     file_count="single",
                     min_width=100,
                     sources="upload",
-                    inputs=files_state,
                 ),
-                # additional_inputs=[files_state],
-                additional_outputs=files_state,
+                additional_inputs=[files_state],
+                additional_outputs=[files_state],
                 save_history=True,
-                examples=[
-                    ["Tell me about the 'requests' package. How to use it with JSON ?"],
-                    [get_example_requirements_question()],
-                    [get_example_pyproject_question()],
-                    ["Which version of 'pandas' is compatible with 'numpy' 2.0?"],
-                    [
-                        {
-                            "text": """Can I upgrade my dependencies from
-                                       the attached pyproject.toml to work with
-                                       python 3.14? Any suggestions on
-                                       potential issues I should be aware of?""",
-                            "files": ["tests/test2.toml"],
-                        }
-                    ],
-                ],
+                examples=example_questions,
                 stop_btn=True,
                 theme=christmas,
             )
-            demo.launch()
+            demo.launch(mcp_server=True, share=False)
 
     finally:
         logger.info("Cleaning up MCP client resources")

src/upgrade_advisor/agents/prompts.py

@@ -34,6 +34,10 @@ def get_package_discovery_prompt(
     - "How to safely upgrade the packages in pyproject.toml to their highest
     versions without breaking my project?"
 
+    DO NOT waste your time answering questions that are not related to Python package
+    discovery or upgrade advice. Politely inform the user that you can only help
+    with Python package-related queries.
+
     Your knowledge cutoff may prevent you from knowing what's recent.
     NO MATTER WHAT, always use the current date (ISO format YYYY-MM-DD): {today_date}
     when reasoning about dates and

src/upgrade_advisor/agents/tools/tools.py

@@ -1,8 +1,6 @@
-import asyncio
 import logging
 import shutil
 from pathlib import Path
-from typing import Any
 
 from smolagents.tools import Tool
 
@@ -15,6 +13,7 @@ from src.upgrade_advisor.schema import (
     UVResolutionResultSchema,
 )
 
+from ...misc import run_coro_sync
 from .pypi_api import (
     github_repo_and_releases,
     pypi_search,
@@ -28,55 +27,6 @@ logger.setLevel(logging.INFO)
 logger.addHandler(logging.StreamHandler())
 
 
-class AsyncTool(Tool):
-    """A least-effort base class for defining an asynchronous tool.
-
-    Improvements that can be made:
-    - Timeout handling for async tasks.
-    - Cancellation support for long-running tasks.
-    """
-
-    loop = asyncio.get_event_loop()
-    task = None
-
-    async def forward(self) -> Any:
-        raise NotImplementedError(
-            "AsyncTool subclasses must implement the forward method."
-        )
-
-    def async_forward(self, *args, **kwargs) -> Any:
-        self.task = asyncio.create_task(self.forward(*args, **kwargs))
-        try:
-            # call the async forward method and wait for result
-            return self.loop.run_until_complete(self.task)
-        except asyncio.CancelledError as e:
-            logger.error(f"Tool {self.name} execution was cancelled: {e}")
-            raise e
-        except Exception as e:
-            logger.error(f"Error in tool {self.name} execution: {e}")
-            raise e
-        finally:
-            logger.info(f"Tool {self.name} execution completed.")
-
-    def _inspect_args(self):
-        import inspect
-
-        sig = inspect.signature(self.forward)
-        bound = sig.bind_partial()
-        return bound.args, bound.kwargs
-
-    def __call__(self, *args, **kwargs):
-        """Stripped down call method to support async forward calls."""
-        if not self.is_initialized:
-            self.setup()
-        encoded_inputs = self.encode(*args, **kwargs)
-        # call async forward instead of forward
-        # we could aalso just await here, but this way we can have a sync interface
-        outputs = self.async_forward({**encoded_inputs})
-        decoded_outputs = self.decode(outputs)
-        return decoded_outputs
-
-
 class ReadUploadFileTool(Tool):
     """Tool to safely read files saved in the `uploads` directory."""
 
@@ -138,6 +88,9 @@ class WriteTomlFileTool(Tool):
         pyproject.toml file before resolving dependencies.
         Also useful if the user cannot upload files directly or if the uploaded
         file has missing sections or formatting issues.
+        If the user has provided a requirements.txt file instead of a pyproject.toml,
+        this tool can be used to convert the requirements.txt content into a
+        minimal pyproject.toml file. But make sure to follow the PEP621 format.
         """
     inputs = {
         "content": {
@@ -231,7 +184,34 @@ class ResolvePyProjectTOMLTool(Tool):
         return result
 
 
-class PypiSearchTool(AsyncTool):
+class RepoFromURLTool(Tool):
+    """Tool to extract GitHub repository information from a URL."""
+
+    name = "repo_from_url"
+    description = """
+        Extract GitHub repository information from a given URL.
+        Returns a dictionary containing the owner and repository name.
+        It returns a dictionary with the schema described in `output_schema` attribute.
+        """
+    inputs = {
+        "url": {
+            "type": "string",
+            "description": "GitHub repository URL with https:// prefix.",
+        }
+    }
+    output_type = "object"
+    output_schema = GithubRepoSchema.schema()
+
+    def __init__(self):
+        super().__init__()
+
+    def forward(self, url: str) -> dict:
+        result = resolve_repo_from_url(url)
+
+        return result
+
+
+class PypiSearchTool(Tool):
     """Tool to search PyPI for package metadata."""
 
     name = "pypi_search"
@@ -255,12 +235,14 @@ class PypiSearchTool(AsyncTool):
     def __init__(self):
         super().__init__()
 
-    async def forward(self, package: str, cutoff: int) -> dict:
-        result = await pypi_search(package, cutoff=cutoff)
+    def forward(self, package: str, cutoff: int) -> dict:
+        coro = pypi_search(package, cutoff=cutoff)
+        result = run_coro_sync(coro)
+
         return result
 
 
-class PypiSearchVersionTool(AsyncTool):
+class PypiSearchVersionTool(Tool):
     """Tool to search PyPI for specific package version metadata."""
 
     name = "pypi_search_version"
@@ -288,39 +270,13 @@ class PypiSearchVersionTool(AsyncTool):
     def __init__(self):
         super().__init__()
 
-    async def forward(self, package: str, version: str, cutoff: int) -> dict:
-        result = await pypi_search_version(package, version, cutoff=cutoff)
-        return result
-
-
-class RepoFromURLTool(Tool):
-    """Tool to extract GitHub repository information from a URL."""
-
-    name = "repo_from_url"
-    description = """
-        Extract GitHub repository information from a given URL.
-        Returns a dictionary containing the owner and repository name.
-        It returns a dictionary with the schema described in `output_schema` attribute.
-        """
-    inputs = {
-        "url": {
-            "type": "string",
-            "description": "GitHub repository URL with https:// prefix.",
-        }
-    }
-    output_type = "object"
-    output_schema = GithubRepoSchema.schema()
-
-    def __init__(self):
-        super().__init__()
-
-    def forward(self, url: str) -> dict:
-        result = resolve_repo_from_url(url)
-
+    def forward(self, package: str, version: str, cutoff: int) -> dict:
+        coro = pypi_search_version(package, version, cutoff=cutoff)
+        result = run_coro_sync(coro)
         return result
 
 
-class RepoFromPyPITool(AsyncTool):
+class RepoFromPyPITool(Tool):
     """Tool to extract GitHub repository information from a PyPI package."""
 
     name = "repo_from_pypi"
@@ -349,7 +305,8 @@ class RepoFromPyPITool(AsyncTool):
     def __init__(self):
         super().__init__()
 
-    async def forward(self, package: str, cutoff: int) -> dict:
-        result = await github_repo_and_releases(package, cutoff=cutoff)
+    def forward(self, package: str, cutoff: int) -> dict:
+        coro = github_repo_and_releases(package, cutoff=cutoff)
+        result = run_coro_sync(coro)
 
         return result

src/upgrade_advisor/misc.py

@@ -1,49 +1,155 @@
+import asyncio
 import logging
+import random
+import threading
+from typing import Any
+
+_bg_loop: asyncio.AbstractEventLoop | None = None
+_bg_thread: threading.Thread | None = None
+_bg_lock = threading.Lock()
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 logger.addHandler(logging.StreamHandler())
 
 
-def get_example_requirements_question() -> str:
-    return """
-    Here are the contents of my requirements file:
+def get_example_questions(n: int = 3) -> str:
+    requirements_question = """ Here are the contents of my requirements file:
 
-    numpy==1.19.5
-    pandas==2.1.3
-    scipy==1.12.0
-    opencv-python==4.8.1.78
-    torch==2.1.2
+        numpy==1.19.5
+        pandas==2.1.3
+        scipy==1.12.0
+        opencv-python==4.8.1.78
+        torch==2.1.2
 
-    help me fix it, its giving errors
-    """
+        help me fix it, its giving errors
+        """
+    requirements_question_2 = """Here are the contents of my requirements.txt:
 
+        numpy==1.19.5
+        pandas==2.2.0
+        scipy==1.12.0
+        scikit-learn==1.4.2
+        python-dateutil==2.8.2
 
-def get_example_pyproject_question() -> str:
-    return """
-    Here are the contents of my pyproject.toml file:
 
-    [tool.poetry]
-    name = "example-project"
-    version = "0.1.0"
-    description = "An example Python project"
-    authors = ["Your Name <[email protected]>"]
+        I’m on Python 3.11 and running:
 
-    [tool.poetry.dependencies]
-    python = "^3.8"
-    numpy = "^1.21.0"
-    pandas = "^1.3.0"
-    requests = "^2.26.0"
-    fastapi = "^0.70.0"
-    uvicorn = "^0.15.0"
+        pip install -r requirements.txt
 
-    [tool.poetry.dev-dependencies]
-    pytest = "^6.2.5"
-    black = "^21.9b0"
+        I get this error:
 
-    Help me identify any potential package upgrade issues.
-    I wish to upgrade numpy to version 1.23.0 and pandas to version 1.5.0.
-    """
+        ERROR: Cannot install pandas==2.2.0 and numpy==1.19.5 because these
+        package versions have conflicting dependencies
+
+        Can you help me adjust the versions so they all work together on Python
+        3.11, and explain how you picked them?"""
+    pyproject_question = """
+        Here are the contents of my pyproject.toml file:
+
+        [tool.poetry]
+        name = "example-project"
+        version = "0.1.0"
+        description = "An example Python project"
+        authors = ["Your Name <[email protected]>"]
+
+        [tool.poetry.dependencies]
+        python = "^3.8"
+        numpy = "^1.21.0"
+        pandas = "^1.3.0"
+        requests = "^2.26.0"
+        fastapi = "^0.70.0"
+        uvicorn = "^0.15.0"
+
+        [tool.poetry.dev-dependencies]
+        pytest = "^6.2.5"
+        black = "^21.9b0"
+
+        Help me identify any potential package upgrade issues.
+        I wish to upgrade numpy to version 1.23.0 and pandas to version 1.5.0.
+        """
+    requiments_question_apple = """Here’s my requirements.txt:
+
+        torch==2.1.2
+        torchvision==0.16.0
+        torchaudio==2.1.2
+        numpy==1.26.2
+
+
+        I’m on a MacBook with Apple Silicon (M2), Python 3.10, using:
+
+        pip install -r requirements.txt
+
+        I get errors about no matching wheel for torch:
+
+        ERROR: Could not find a version that satisfies the requirement torch==2.1.2
+
+        How should I change these dependencies so they work correctly on M2,
+        and what install commands should I use?"""
+
+    upgraded_python_question = """I had a project running on Python 3.8 with
+                               this requirements.txt:
+
+        numpy==1.20.0
+        pandas==1.2.3
+        scikit-learn==0.24.1
+        xgboost==1.4.0
+
+
+        I upgraded my system to Python 3.12 and tried:
+
+        pip install -r requirements.txt
+
+        Now I get multiple errors about incompatible versions and missing wheels.
+
+        I’d like to:
+
+        Make this environment work on Python 3.12
+
+        Keep roughly the same libraries, but I’m fine upgrading to newer
+        compatible versions
+
+        Can you propose updated versions for these packages that work on Python
+        3.12 and explain any major breaking changes I should watch for?"""
+
+    pip_confusion_question = """I’m using Poetry, but I also ran pip install
+                             manually a few times and now things are broken.
+
+        My pyproject.toml dependencies:
+
+        [tool.poetry.dependencies]
+        python = "^3.10"
+        fastapi = "^0.95.0"
+        uvicorn = "^0.22.0"
+
+
+        pip list shows different versions:
+
+        fastapi 0.100.0
+
+        uvicorn 0.23.0
+
+        When I run poetry run uvicorn app.main:app, I get import errors like:
+
+        ImportError: cannot import name 'FastAPI' from 'fastapi'
+
+        Can you explain what’s going on with Poetry vs pip in this situation,
+        and give me a clear set of steps to get back to a consistent
+        environment?"""
+
+    all_questions = [
+        requirements_question,
+        requirements_question_2,
+        pyproject_question,
+        requiments_question_apple,
+        upgraded_python_question,
+        pip_confusion_question,
+    ]
+    choices = random.sample(all_questions, k=n)
+    # format as list of lists for gradio examples
+    choices = [[choice] for choice in choices]
+
+    return choices
 
 
 def _monkeypatch_gradio_save_history():
@@ -72,3 +178,38 @@ def _monkeypatch_gradio_save_history():
 
     gr.ChatInterface._save_conversation = _safe_save_conversation
     gr.ChatInterface._ua_safe_patch = True
+
+
+def run_coro_sync(coro) -> Any:
+    """Run an async coroutine and return its result from sync code.
+
+    - If no event loop is running: use asyncio.run().
+    - If a loop is already running: dispatch to a dedicated background loop.
+    """
+    try:
+        loop = asyncio.get_running_loop()
+        loop_running = loop.is_running()
+    except RuntimeError:
+        loop = None
+        loop_running = False
+
+    # No loop: safest case
+    if not loop_running:
+        return asyncio.run(coro)
+
+    # Loop already running: use background loop in another thread
+    global _bg_loop, _bg_thread
+    with _bg_lock:
+        if _bg_loop is None or _bg_loop.is_closed():
+            _bg_loop = asyncio.new_event_loop()
+            _bg_thread = threading.Thread(
+                target=_bg_loop.run_forever,
+                name="async-tool-background-loop",
+                daemon=True,
+            )
+            _bg_thread.start()
+
+        bg_loop = _bg_loop
+
+    future = asyncio.run_coroutine_threadsafe(coro, bg_loop)
+    return future.result()

tests/requirements.txt

@@ -0,0 +1,5 @@
+numpy==1.19.5                                                                                                                             
+pandas==2.1.3                                                                                                                             
+scipy==1.12.0                                                                                                                             
+opencv-python==4.8.1.78                                                                                                       
+torch==2.1.2