mle-kit-mcp 0.2.5__py3-none-any.whl → 1.0.0__py3-none-any.whl

mle_kit_mcp/server.py

@@ -1,9 +1,8 @@
 import os
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Literal
 
 import fire  # type: ignore
-import uvicorn
 from mcp.server.fastmcp import FastMCP
 from dotenv import load_dotenv
 
@@ -21,14 +20,26 @@ from .tools.llm_proxy import (
 from .files import get_workspace_dir, WorkspaceDirectory
 
 
-def run(host: str = "0.0.0.0", port: int = 5050, workspace: Optional[str] = None) -> None:
+def run(
+    host: str = "0.0.0.0",
+    port: int = 5050,
+    mount_path: str = "/",
+    streamable_http_path: str = "/mcp",
+    workspace: Optional[str] = None,
+    transport: Literal["stdio", "sse", "streamable-http"] = "streamable-http",
+) -> None:
     load_dotenv()
     if workspace:
         WorkspaceDirectory.set_dir(Path(workspace))
     workspace_path = get_workspace_dir()
     workspace_path.mkdir(parents=True, exist_ok=True)
 
-    server = FastMCP("MLE kit MCP", stateless_http=True)
+    server = FastMCP(
+        "MLE kit MCP",
+        stateless_http=True,
+        streamable_http_path=streamable_http_path,
+        mount_path=mount_path,
+    )
 
     remote_text_editor = create_remote_text_editor(text_editor)
 
@@ -41,9 +52,9 @@ def run(host: str = "0.0.0.0", port: int = 5050, workspace: Optional[str] = None
         server.add_tool(llm_proxy_local)
         server.add_tool(llm_proxy_remote)
 
-    http_app = server.streamable_http_app()
-
-    uvicorn.run(http_app, host=host, port=port)
+    server.settings.port = port
+    server.settings.host = host
+    server.run(transport=transport)
 
 
 if __name__ == "__main__":

mle_kit_mcp/tools/bash.py

@@ -1,5 +1,6 @@
 import atexit
 import signal
+import shlex
 from typing import Optional, Any
 
 from docker import from_env as docker_from_env  # type: ignore
@@ -67,7 +68,11 @@ signal.signal(signal.SIGINT, cleanup_container)
 signal.signal(signal.SIGTERM, cleanup_container)
 
 
-def bash(command: str, cwd: Optional[str] = None) -> str:
+def bash(
+    command: str,
+    cwd: Optional[str] = None,
+    timeout: int = 60,
+) -> str:
     """
     Run commands in a bash shell.
     When invoking this tool, the contents of the "command" parameter does NOT need to be XML-escaped.
@@ -76,22 +81,48 @@ def bash(command: str, cwd: Optional[str] = None) -> str:
     State is persistent across command calls and discussions with the user.
     To inspect a particular line range of a file, e.g. lines 10-25, try 'sed -n 10,25p /path/to/the/file'.
     Please avoid commands that may produce a very large amount of output.
-    Please run long lived commands in the background, e.g. 'sleep 10 &' or start a server in the background.
 
     Args:
         command: The bash command to run.
         cwd: The working directory to run the command in. Relative to the workspace directory.
+        timeout: Timeout for the command execution in seconds. Kills after this. 60 seconds by default.
     """
-
+    assert timeout and timeout > 0, "Timeout must be set and greater than 0"
     container = get_container()
     workdir = DOCKER_WORKSPACE_DIR_PATH
     if cwd:
-        workdir = DOCKER_WORKSPACE_DIR_PATH + "/" + cwd
+        workdir += "/" + cwd
+
+    wrapped = f"bash -lc {shlex.quote(command)}"
+    final_command = f"timeout --signal=TERM --kill-after=5s {int(timeout)}s {wrapped}"
+
     result = container.exec_run(
-        ["bash", "-c", command],
+        ["bash", "-lc", final_command],
         workdir=workdir,
         stdout=True,
         stderr=True,
+        demux=True,
     )
-    output: str = result.output.decode("utf-8").strip()
+    stdout_bytes, stderr_bytes = (
+        result.output if isinstance(result.output, tuple) else (result.output, b"")
+    )
+
+    if result.exit_code in (124, 137):
+        timeout_msg = (
+            f"Command timed out after {int(timeout)} seconds: {command};\n"
+            f"You can increase the timeout by changing the parameter of the tool call."
+        )
+        stderr_bytes = (stderr_bytes or b"") + timeout_msg.encode("utf-8")
+
+    stdout_text = (stdout_bytes or b"").decode("utf-8", errors="replace").strip()
+    stderr_text = (stderr_bytes or b"").decode("utf-8", errors="replace").strip()
+
+    output_parts = []
+    if stdout_text:
+        output_parts.append("Command stdout: " + stdout_text)
+    if stderr_text:
+        output_parts.append("Command stderr: " + stderr_text)
+    output = ("\n".join(output_parts)).strip()
+    if not output:
+        output = "No output from the command"
     return output

{mle_kit_mcp-0.2.5.dist-info → mle_kit_mcp-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mle-kit-mcp
-Version: 0.2.5
+Version: 1.0.0
 Summary: MCP server that provides different tools for MLE
 Author-email: Ilya Gusev <phoenixilya@gmail.com>
 Project-URL: Homepage, https://github.com/IlyaGusev/mle_kit_mcp

{mle_kit_mcp-0.2.5.dist-info → mle_kit_mcp-1.0.0.dist-info}/RECORD

@@ -3,16 +3,16 @@ mle_kit_mcp/__main__.py,sha256=rcmsOtJd3SA82exjrcGBuxuptcoxF8AXI7jNjiVq2BY,59
 mle_kit_mcp/files.py,sha256=ux53kWw7hBAcOmS9qNI4gpQX8XcQPT2LICC--S5-TGI,635
 mle_kit_mcp/llm_proxy.py,sha256=01BG6OA8husOQXxgJQ7RnTNEE_1HDczlCNoAVnYWURQ,1225
 mle_kit_mcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mle_kit_mcp/server.py,sha256=R59DC7HVdpPcGHVXghPGUhrRKfn9Uqmy2MPkaYNfyzw,1320
+mle_kit_mcp/server.py,sha256=6KGjhcjjqP9PxKw17X7ZejeRrGfCB8Mk4SmnoTklCMs,1587
 mle_kit_mcp/utils.py,sha256=iHNcEZZzPD37bEYE18SzJ3WUjLP3Ym-kc91SwcW1vlI,1984
 mle_kit_mcp/tools/__init__.py,sha256=r2fIg2mZ6zaeq0CzEKCEdeUTjV0pcA9NZaaOfBNVTnE,332
-mle_kit_mcp/tools/bash.py,sha256=kunYHc3dyPGOooT-KY9L7eI_N22lBrcDbTlcp_yTTws,2820
+mle_kit_mcp/tools/bash.py,sha256=IDzR3dkGOKGuwEE0FooQMI-Ztx99t8YJKoMu4FjxNGw,3922
 mle_kit_mcp/tools/llm_proxy.py,sha256=uEPZETqJWGOwLESWfvIjJidL6LSRry5j-qq6rpjtxLM,4623
 mle_kit_mcp/tools/remote_gpu.py,sha256=2Wjp6fYTGX9i6bZUhSWM5WMKh0eMc73wCdezes04bDg,12546
 mle_kit_mcp/tools/text_editor.py,sha256=hkobiyYB5um6bs5sWYDQ1S2Y5n31i7I6fOBUDFkNhmM,9531
-mle_kit_mcp-0.2.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mle_kit_mcp-0.2.5.dist-info/METADATA,sha256=pKWNkp9pLxtGAofpzamJA4BuTkzxwf0hqq8CNl1s0ts,1074
-mle_kit_mcp-0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mle_kit_mcp-0.2.5.dist-info/entry_points.txt,sha256=-iHSUVPN49jkBj1ySpc-P0rVF5-IPHw-KWNayNIiEsk,49
-mle_kit_mcp-0.2.5.dist-info/top_level.txt,sha256=XeBtCq_CnVI0gh0Z_daZOLmGl5XPlkA8RgHaj5s5VQY,12
-mle_kit_mcp-0.2.5.dist-info/RECORD,,
+mle_kit_mcp-1.0.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mle_kit_mcp-1.0.0.dist-info/METADATA,sha256=Imea6N52932F2PMdNOtvpPqtnCR5s17ZHdBbZfFTqyI,1074
+mle_kit_mcp-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mle_kit_mcp-1.0.0.dist-info/entry_points.txt,sha256=-iHSUVPN49jkBj1ySpc-P0rVF5-IPHw-KWNayNIiEsk,49
+mle_kit_mcp-1.0.0.dist-info/top_level.txt,sha256=XeBtCq_CnVI0gh0Z_daZOLmGl5XPlkA8RgHaj5s5VQY,12
+mle_kit_mcp-1.0.0.dist-info/RECORD,,