huggingface-hub 0.32.2__py3-none-any.whl → 0.32.3__py3-none-any.whl

huggingface_hub/__init__.py

@@ -46,7 +46,7 @@ import sys
 from typing import TYPE_CHECKING
 
 
-__version__ = "0.32.2"
+__version__ = "0.32.3"
 
 # Alphabetical order of definitions is ensured in tests
 # WARNING: any comment added in this dictionary definition will be lost when

huggingface_hub/inference/_mcp/_cli_hacks.py

@@ -0,0 +1,87 @@
+import asyncio
+import sys
+from functools import partial
+
+import typer
+
+
+def _patch_anyio_open_process():
+    """
+    Patch anyio.open_process to allow detached processes on Windows and Unix-like systems.
+
+    This is necessary to prevent the MCP client from being interrupted by Ctrl+C when running in the CLI.
+    """
+    import subprocess
+
+    import anyio
+
+    if getattr(anyio, "_tiny_agents_patched", False):
+        return
+    anyio._tiny_agents_patched = True
+
+    original_open_process = anyio.open_process
+
+    if sys.platform == "win32":
+        # On Windows, we need to set the creation flags to create a new process group
+
+        async def open_process_in_new_group(*args, **kwargs):
+            """
+            Wrapper for open_process to handle Windows-specific process creation flags.
+            """
+            # Ensure we pass the creation flags for Windows
+            kwargs.setdefault("creationflags", subprocess.CREATE_NEW_PROCESS_GROUP)
+            return await original_open_process(*args, **kwargs)
+
+        anyio.open_process = open_process_in_new_group
+    else:
+        # For Unix-like systems, we can use setsid to create a new session
+        async def open_process_in_new_group(*args, **kwargs):
+            """
+            Wrapper for open_process to handle Unix-like systems with start_new_session=True.
+            """
+            kwargs.setdefault("start_new_session", True)
+            return await original_open_process(*args, **kwargs)
+
+        anyio.open_process = open_process_in_new_group
+
+
+async def _async_prompt(exit_event: asyncio.Event, prompt: str = "» ") -> str:
+    """
+    Asynchronous prompt function that reads input from stdin without blocking.
+
+    This function is designed to work in an asynchronous context, allowing the event loop to gracefully stop it (e.g. on Ctrl+C).
+
+    Alternatively, we could use https://github.com/vxgmichel/aioconsole but that would be an additional dependency.
+    """
+    loop = asyncio.get_event_loop()
+
+    if sys.platform == "win32":
+        # Windows: Use run_in_executor to avoid blocking the event loop
+        # Degraded solution: this is not ideal as user will have to CTRL+C once more to stop the prompt (and it'll not be graceful)
+        return await loop.run_in_executor(None, partial(typer.prompt, prompt, prompt_suffix=" "))
+    else:
+        # UNIX-like: Use loop.add_reader for non-blocking stdin read
+        future = loop.create_future()
+
+        def on_input():
+            line = sys.stdin.readline()
+            loop.remove_reader(sys.stdin)
+            future.set_result(line)
+
+        print(prompt, end=" ", flush=True)
+        loop.add_reader(sys.stdin, on_input)  # not supported on Windows
+
+        # Wait for user input or exit event
+        # Wait until either the user hits enter or exit_event is set
+        await asyncio.wait(
+            [future, exit_event.wait()],
+            return_when=asyncio.FIRST_COMPLETED,
+        )
+
+        # Check which one has been triggered
+        if exit_event.is_set():
+            future.cancel()
+            return ""
+
+        line = await future
+        return line.strip()

huggingface_hub/inference/_mcp/cli.py

@@ -2,12 +2,12 @@ import asyncio
 import os
 import signal
 import traceback
-from functools import partial
 from typing import Any, Dict, List, Optional
 
 import typer
 from rich import print
 
+from ._cli_hacks import _async_prompt, _patch_anyio_open_process
 from .agent import Agent
 from .utils import _load_agent_config
 
@@ -25,11 +25,6 @@ run_cli = typer.Typer(
 app.add_typer(run_cli, name="run")
 
 
-async def _ainput(prompt: str = "» ") -> str:
-    loop = asyncio.get_running_loop()
-    return await loop.run_in_executor(None, partial(typer.prompt, prompt, prompt_suffix=" "))
-
-
 async def run_agent(
     agent_path: Optional[str],
 ) -> None:
@@ -41,11 +36,15 @@ async def run_agent(
             Path to a local folder containing an `agent.json` and optionally a custom `PROMPT.md` file or a built-in agent stored in a Hugging Face dataset.
 
     """
+    _patch_anyio_open_process()  # Hacky way to prevent stdio connections to be stopped by Ctrl+C
+
     config, prompt = _load_agent_config(agent_path)
 
+    inputs: List[Dict[str, Any]] = config.get("inputs", [])
     servers: List[Dict[str, Any]] = config.get("servers", [])
 
     abort_event = asyncio.Event()
+    exit_event = asyncio.Event()
     first_sigint = True
 
     loop = asyncio.get_running_loop()
@@ -60,8 +59,7 @@ async def run_agent(
             return
 
         print("\n[red]Exiting...[/red]", flush=True)
-
-        os._exit(130)
+        exit_event.set()
 
     try:
         sigint_registered_in_loop = False
@@ -71,6 +69,61 @@ async def run_agent(
         except (AttributeError, NotImplementedError):
             # Windows (or any loop that doesn't support it) : fall back to sync
             signal.signal(signal.SIGINT, lambda *_: _sigint_handler())
+
+        # Handle inputs (i.e. env variables injection)
+        if len(inputs) > 0:
+            print(
+                "[bold blue]Some initial inputs are required by the agent. "
+                "Please provide a value or leave empty to load from env.[/bold blue]"
+            )
+            for input_item in inputs:
+                input_id = input_item["id"]
+                description = input_item["description"]
+                env_special_value = "${input:" + input_id + "}"  # Special value to indicate env variable injection
+
+                # Check env variables that will use this input
+                input_vars = list(
+                    {
+                        key
+                        for server in servers
+                        for key, value in server.get("config", {}).get("env", {}).items()
+                        if value == env_special_value
+                    }
+                )
+
+                if not input_vars:
+                    print(f"[yellow]Input {input_id} defined in config but not used by any server.[/yellow]")
+                    continue
+
+                # Prompt user for input
+                print(
+                    f"[blue] • {input_id}[/blue]: {description}. (default: load from {', '.join(input_vars)}).",
+                    end=" ",
+                )
+                user_input = (await _async_prompt(exit_event=exit_event)).strip()
+                if exit_event.is_set():
+                    return
+
+                # Inject user input (or env variable) into servers' env
+                for server in servers:
+                    env = server.get("config", {}).get("env", {})
+                    for key, value in env.items():
+                        if value == env_special_value:
+                            if user_input:
+                                env[key] = user_input
+                            else:
+                                value_from_env = os.getenv(key, "")
+                                env[key] = value_from_env
+                                if value_from_env:
+                                    print(f"[green]Value successfully loaded from '{key}'[/green]")
+                                else:
+                                    print(
+                                        f"[yellow]No value found for '{key}' in environment variables. Continuing.[/yellow]"
+                                    )
+
+            print()
+
+        # Main agent loop
         async with Agent(
             provider=config.get("provider"),
             model=config.get("model"),
@@ -86,8 +139,12 @@ async def run_agent(
             while True:
                 abort_event.clear()
 
+                # Check if we should exit
+                if exit_event.is_set():
+                    return
+
                 try:
-                    user_input = await _ainput()
+                    user_input = await _async_prompt(exit_event=exit_event)
                     first_sigint = True
                 except EOFError:
                     print("\n[red]EOF received, exiting.[/red]", flush=True)
@@ -103,6 +160,8 @@ async def run_agent(
                     async for chunk in agent.run(user_input, abort_event=abort_event):
                         if abort_event.is_set() and not first_sigint:
                             break
+                        if exit_event.is_set():
+                            return
 
                         if hasattr(chunk, "choices"):
                             delta = chunk.choices[0].delta

huggingface_hub/inference/_mcp/mcp_client.py

@@ -109,6 +109,11 @@ class MCPClient:
         await self.client.__aexit__(exc_type, exc_val, exc_tb)
         await self.cleanup()
 
+    async def cleanup(self):
+        """Clean up resources"""
+        await self.client.close()
+        await self.exit_stack.aclose()
+
     @overload
     async def add_mcp_server(self, type: Literal["stdio"], **params: Unpack[StdioServerParameters_T]): ...
 
@@ -286,11 +291,13 @@ class MCPClient:
                 for tool_call in delta.tool_calls:
                     # Aggregate chunks into tool calls
                     if tool_call.index not in final_tool_calls:
-                        if tool_call.function.arguments is None:  # Corner case (depends on provider)
+                        if (
+                            tool_call.function.arguments is None or tool_call.function.arguments == "{}"
+                        ):  # Corner case (depends on provider)
                             tool_call.function.arguments = ""
                         final_tool_calls[tool_call.index] = tool_call
 
-                    if tool_call.function.arguments:
+                    elif tool_call.function.arguments:
                         final_tool_calls[tool_call.index].function.arguments += tool_call.function.arguments
 
             # Optionally exit early if no tools in first chunks
@@ -327,7 +334,3 @@ class MCPClient:
             tool_message_as_obj = ChatCompletionInputMessage.parse_obj_as_instance(tool_message)
             messages.append(tool_message_as_obj)
             yield tool_message_as_obj
-
-    async def cleanup(self):
-        """Clean up resources"""
-        await self.exit_stack.aclose()

{huggingface_hub-0.32.2.dist-info → huggingface_hub-0.32.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: huggingface-hub
-Version: 0.32.2
+Version: 0.32.3
 Summary: Client library to download and publish models, datasets and other repos on the huggingface.co hub
 Home-page: https://github.com/huggingface/huggingface_hub
 Author: Hugging Face, Inc.

{huggingface_hub-0.32.2.dist-info → huggingface_hub-0.32.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-huggingface_hub/__init__.py,sha256=j0CPc82aFQA-FV3ew00Ukp6u4v-Lz3cBrH-K33Z50yE,50644
+huggingface_hub/__init__.py,sha256=cK2MmEMaR4mvhSeDsQFuY2MLlfw8A3lKZbrwTzs-V9E,50644
 huggingface_hub/_commit_api.py,sha256=ZbmuIhFdF8B3F_cvGtxorka7MmIQOk8oBkCtYltnCvI,39456
 huggingface_hub/_commit_scheduler.py,sha256=tfIoO1xWHjTJ6qy6VS6HIoymDycFPg0d6pBSZprrU2U,14679
 huggingface_hub/_inference_endpoints.py,sha256=qXR0utAYRaEWTI8EXzAsDpVDcYpp8bJPEBbcOxRS52E,17413
@@ -81,10 +81,11 @@ huggingface_hub/inference/_generated/types/zero_shot_classification.py,sha256=BA
 huggingface_hub/inference/_generated/types/zero_shot_image_classification.py,sha256=8J9n6VqFARkWvPfAZNWEG70AlrMGldU95EGQQwn06zI,1487
 huggingface_hub/inference/_generated/types/zero_shot_object_detection.py,sha256=GUd81LIV7oEbRWayDlAVgyLmY596r1M3AW0jXDp1yTA,1630
 huggingface_hub/inference/_mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+huggingface_hub/inference/_mcp/_cli_hacks.py,sha256=NP8xA-7-3kJIzLHg3FuHXdnpli89OAMPILPrTk60lwU,3131
 huggingface_hub/inference/_mcp/agent.py,sha256=azX9_lsFjNlgsEvRYdKgsmOmpNReWIcbuMeIVWc852k,4264
-huggingface_hub/inference/_mcp/cli.py,sha256=q7WUlc7K9cHffKnS8uVydqM7IGxDz2gnwoNKkiRF5GU,5873
+huggingface_hub/inference/_mcp/cli.py,sha256=6WP2bqdfSj80IYdwnzwO4ilEb7PgghgctD4iLV4ydqg,8588
 huggingface_hub/inference/_mcp/constants.py,sha256=tE_V6qcvsmvVoJa4eg04jhoTR2Cx1cNHieY2ENrm1_M,2511
-huggingface_hub/inference/_mcp/mcp_client.py,sha256=HUDkEURrWeQ9AY7W4_H4jca0BM12rKPbjdP4vNaXiwc,13998
+huggingface_hub/inference/_mcp/mcp_client.py,sha256=yHfpfztIepARqD_3bFSFWOn402BWO1tptqlIVGR7zJk,14130
 huggingface_hub/inference/_mcp/utils.py,sha256=K7rr4FxCh9OYWwYNlnvQraNLy9y3z-5yVMBIaoCQMjA,4052
 huggingface_hub/inference/_providers/__init__.py,sha256=IrLTMERrbRuPiVdBQEMK9TMvXrsGId4-u2ucMkG-vTU,7671
 huggingface_hub/inference/_providers/_common.py,sha256=Octgz-PbHw62iW3Oa8rF7rxvBJR0ZmL4ouv3NoX-weE,10131
@@ -137,9 +138,9 @@ huggingface_hub/utils/insecure_hashlib.py,sha256=iAaepavFZ5Dhfa5n8KozRfQprKmvcjS
 huggingface_hub/utils/logging.py,sha256=0A8fF1yh3L9Ka_bCDX2ml4U5Ht0tY8Dr3JcbRvWFuwo,4909
 huggingface_hub/utils/sha.py,sha256=OFnNGCba0sNcT2gUwaVCJnldxlltrHHe0DS_PCpV3C4,2134
 huggingface_hub/utils/tqdm.py,sha256=xAKcyfnNHsZ7L09WuEM5Ew5-MDhiahLACbbN2zMmcLs,10671
-huggingface_hub-0.32.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-huggingface_hub-0.32.2.dist-info/METADATA,sha256=w2Df9xLc5FhDmwO11yIxMDiHc-i7aqLvXFRzRvzgI_E,14777
-huggingface_hub-0.32.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-huggingface_hub-0.32.2.dist-info/entry_points.txt,sha256=uelw0-fu0kd-CxIuOsR1bsjLIFnAaMQ6AIqluJYDhQw,184
-huggingface_hub-0.32.2.dist-info/top_level.txt,sha256=8KzlQJAY4miUvjAssOAJodqKOw3harNzuiwGQ9qLSSk,16
-huggingface_hub-0.32.2.dist-info/RECORD,,
+huggingface_hub-0.32.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+huggingface_hub-0.32.3.dist-info/METADATA,sha256=YG4e05qfvJNzzMc6QTzFoDez-KfYpn3acXE_LmzpllY,14777
+huggingface_hub-0.32.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+huggingface_hub-0.32.3.dist-info/entry_points.txt,sha256=uelw0-fu0kd-CxIuOsR1bsjLIFnAaMQ6AIqluJYDhQw,184
+huggingface_hub-0.32.3.dist-info/top_level.txt,sha256=8KzlQJAY4miUvjAssOAJodqKOw3harNzuiwGQ9qLSSk,16
+huggingface_hub-0.32.3.dist-info/RECORD,,