bohr-agent-sdk 0.1.103__py3-none-any.whl → 0.1.105__py3-none-any.whl

{bohr_agent_sdk-0.1.103.dist-info → bohr_agent_sdk-0.1.105.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bohr-agent-sdk
-Version: 0.1.103
+Version: 0.1.105
 Summary: SDK for scientific agents
 Home-page: https://github.com/dptech-corp/bohr-agent-sdk/
 Author: DP Technology
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: click>=8.0.0
-Requires-Dist: mcp
+Requires-Dist: mcp>=1.17.0
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: typing-extensions>=4.8.0
 Requires-Dist: dpdispatcher>=0.6.8
@@ -30,6 +30,7 @@ Requires-Dist: paho-mqtt>=2.1.0
 Requires-Dist: redis>=6.2.0
 Requires-Dist: twine>=6.1.0
 Requires-Dist: build>=1.2.2.post1
+Requires-Dist: cloudpickle==2.2.0
 Requires-Dist: watchdog>=6.0.0
 Requires-Dist: fastapi>=0.116.0
 Requires-Dist: bohrium-open-sdk

{bohr_agent_sdk-0.1.103.dist-info → bohr_agent_sdk-0.1.105.dist-info}/RECORD

@@ -60,21 +60,21 @@ dp/agent/device/device/__init__.py,sha256=w7_1S16S1vWUq0RGl0GFgjq2vFkc5oNvy8cQTn
 dp/agent/device/device/device.py,sha256=9ZRIJth-4qMO-i-u_b_cO3d6a4eTbTQjPaxFsV_zEkc,9643
 dp/agent/device/device/types.py,sha256=JuxB-hjf1CjjvfBxCLwRAXVFlYS-nPEdiJpBWLFVCzo,1924
 dp/agent/server/__init__.py,sha256=rckaYd8pbYyB4ENEhgjXKeGMXjdnrgcJpdM1gu5u1Wc,508
-dp/agent/server/calculation_mcp_server.py,sha256=eClRP7A-t5hMGyTh81KC3GAKjSPNJIylOrOKyzqwo8o,11459
+dp/agent/server/calculation_mcp_server.py,sha256=iRFOdgTxySMGk7ZaSseNssEp-A7zT5cW1Ym2_MIKnG4,12602
 dp/agent/server/preprocessor.py,sha256=XUWu7QOwo_sIDMYS2b1OTrM33EXEVH_73vk-ju1Ok8A,1264
-dp/agent/server/utils.py,sha256=8jgYZEW4XBp86AF2Km6QkwHltBmrnS-soTpHov7ZEJw,4501
+dp/agent/server/utils.py,sha256=ui3lca9EagcGqmYf8BKLsPARIzXxJ3jgN98yuEO3OSQ,1668
 dp/agent/server/executor/__init__.py,sha256=s95M5qKQk39Yi9qaVJZhk_nfj54quSf7EDghR3OCFUA,248
 dp/agent/server/executor/base_executor.py,sha256=EFJBsYVYAvuRbiLAbLOwLTw3h7ScjN025xnSP4uJHrQ,2052
-dp/agent/server/executor/dispatcher_executor.py,sha256=urpzmKH_tBOgblBdJEa3y8eEhXqUDrdcdWCnUdJpfZk,9420
+dp/agent/server/executor/dispatcher_executor.py,sha256=wUJEmCrLzckwinOd8Caf5H9TN-YVfHLpfYgkVFd2OC0,10828
 dp/agent/server/executor/local_executor.py,sha256=wYCclNZFkLb3v7KpW1nCnupO8piBES-esYlDAuz86zk,6120
 dp/agent/server/storage/__init__.py,sha256=Sgsyp5hb0_hhIGugAPfQFzBHt_854rS_MuMuE3sn8Gs,389
 dp/agent/server/storage/base_storage.py,sha256=728-oNG6N8isV95gZVnyi4vTznJPJhSjxw9Gl5Y_y5o,2356
 dp/agent/server/storage/bohrium_storage.py,sha256=EsKX4dWWvZTn2TEhZv4zsvihfDK0mmPFecrln-Ytk40,10488
-dp/agent/server/storage/http_storage.py,sha256=w0lY95wQqKmjXTGFRhEG2hLu8GBFwgqG8ocm5lJ_fYc,1470
+dp/agent/server/storage/http_storage.py,sha256=KiySq7g9-iJr12XQCKKyJLn8wJoDnSRpQAR5_qPJ1ZU,1471
 dp/agent/server/storage/local_storage.py,sha256=t1wfjByjXew9ws3PuUxWxmZQ0-Wt1a6t4wmj3fW62GI,1352
 dp/agent/server/storage/oss_storage.py,sha256=pgjmi7Gir3Y5wkMDCvU4fvSls15fXT7Ax-h9MYHFPK0,3359
-bohr_agent_sdk-0.1.103.dist-info/METADATA,sha256=hds24-rnglRxU193mo5VosDHUGte8Zk_Cmu12umIQF0,10184
-bohr_agent_sdk-0.1.103.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bohr_agent_sdk-0.1.103.dist-info/entry_points.txt,sha256=5n5kneF5IbDQtoQ2WfF-QuBjDtsimJte9Rv9baSGgc0,86
-bohr_agent_sdk-0.1.103.dist-info/top_level.txt,sha256=87xLUDhu_1nQHoGLwlhJ6XlO7OsjILh6i1nX6ljFzDo,3
-bohr_agent_sdk-0.1.103.dist-info/RECORD,,
+bohr_agent_sdk-0.1.105.dist-info/METADATA,sha256=tNAvWoQAxoKaWU1pfKhK8t7F-r_YyD0GZvVdX4F-OMo,10226
+bohr_agent_sdk-0.1.105.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bohr_agent_sdk-0.1.105.dist-info/entry_points.txt,sha256=5n5kneF5IbDQtoQ2WfF-QuBjDtsimJte9Rv9baSGgc0,86
+bohr_agent_sdk-0.1.105.dist-info/top_level.txt,sha256=87xLUDhu_1nQHoGLwlhJ6XlO7OsjILh6i1nX6ljFzDo,3
+bohr_agent_sdk-0.1.105.dist-info/RECORD,,

dp/agent/server/calculation_mcp_server.py

@@ -6,17 +6,23 @@ from copy import deepcopy
 from datetime import datetime
 from pathlib import Path
 from urllib.parse import urlparse
-from typing import Literal, Optional, get_origin
+from typing import Any, Literal, Optional, TypedDict
 
+import mcp
 from mcp.server.fastmcp import FastMCP
-from mcp.server.fastmcp.server import Context
-from mcp.server.fastmcp.utilities.func_metadata import _get_typed_signature
+from mcp.server.fastmcp.utilities.context_injection import (
+    find_context_parameter,
+)
+from mcp.server.fastmcp.utilities.func_metadata import (
+    _get_typed_signature,
+    func_metadata,
+)
 from starlette.responses import JSONResponse
 from starlette.routing import Route
 
 from .executor import executor_dict
 from .storage import storage_dict
-from .utils import get_logger, get_metadata, convert_to_content, Tool
+from .utils import get_logger, JobResult, Tool
 logger = get_logger(__name__)
 
 
@@ -133,7 +139,7 @@ def handle_output_artifacts(results, exec_id, storage):
 
 
 def get_job_results(job_id: str, executor: Optional[dict] = None,
-                    storage: Optional[dict] = None) -> dict:
+                    storage: Optional[dict] = None) -> Any:
     """
     Get results of a calculation job
     Args:
@@ -148,63 +154,80 @@ def get_job_results(job_id: str, executor: Optional[dict] = None,
         results, output_artifacts = handle_output_artifacts(
             results, exec_id, storage)
         logger.info("Job %s result is %s" % (job_id, results))
-    return convert_to_content(results, job_info={
+    return JobResult(result=results, job_info={
         "output_artifacts": output_artifacts,
     })
 
 
 class CalculationMCPServer:
-    def __init__(self, *args, preprocess_func=None, **kwargs):
+    def __init__(self, *args, preprocess_func=None, fastmcp_mode=False,
+                 **kwargs):
+        """
+        Args:
+            preprocess_func: The preprocess function for all tools
+            fastmcp_mode: compatible for fastmcp.FastMCP
+        """
         self.preprocess_func = preprocess_func
+        self.fastmcp_mode = fastmcp_mode
         self.mcp = FastMCP(*args, **kwargs)
 
-    def add_patched_tool(self, fn, new_fn, name, is_async=False, doc=None):
-        # patch the metadata of the tool
-        context_kwarg = None
-        sig = inspect.signature(fn)
-        for param_name, param in sig.parameters.items():
-            if get_origin(param.annotation) is not None:
-                continue
-            if issubclass(param.annotation, Context):
-                context_kwarg = param_name
-                break
-        # combine parameters
-        parameters = []
-        for param in _get_typed_signature(fn).parameters.values():
-            if param.annotation is Path:
-                parameters.append(inspect.Parameter(
-                    name=param.name, default=param.default,
-                    annotation=str, kind=param.kind))
-            elif param.annotation is Optional[Path]:
-                parameters.append(inspect.Parameter(
-                    name=param.name, default=param.default,
-                    annotation=Optional[str], kind=param.kind))
-            else:
-                parameters.append(param)
-        for param in _get_typed_signature(new_fn).parameters.values():
-            if param.name != "kwargs":
-                parameters.append(param)
-        func_arg_metadata = get_metadata(
-            name,
-            parameters=parameters,
+    def add_patched_tool(self, fn, new_fn, name, is_async=False, doc=None,
+                         override_return_annotation=False):
+        """patch the metadata of the tool"""
+        context_kwarg = find_context_parameter(fn)
+
+        def _get_typed_signature_patched(call):
+            """patch parameters"""
+            typed_signature = _get_typed_signature(call)
+            new_typed_signature = _get_typed_signature(new_fn)
+            parameters = []
+            for param in typed_signature.parameters.values():
+                if param.annotation is Path:
+                    parameters.append(inspect.Parameter(
+                        name=param.name, default=param.default,
+                        annotation=str, kind=param.kind))
+                elif param.annotation is Optional[Path]:
+                    parameters.append(inspect.Parameter(
+                        name=param.name, default=param.default,
+                        annotation=Optional[str], kind=param.kind))
+                else:
+                    parameters.append(param)
+            for param in new_typed_signature.parameters.values():
+                if param.name != "kwargs":
+                    parameters.append(param)
+            return inspect.Signature(
+                parameters,
+                return_annotation=(new_typed_signature.return_annotation
+                                   if override_return_annotation
+                                   else typed_signature.return_annotation))
+
+        # Due to the frequent changes of MCP, we use a patching style here
+        mcp.server.fastmcp.utilities.func_metadata._get_typed_signature = \
+            _get_typed_signature_patched
+        func_arg_metadata = func_metadata(
+            fn,
             skip_names=[context_kwarg] if context_kwarg is not None else [],
-            globalns=getattr(fn, "__globals__", {})
+            structured_output=None,
         )
-        json_schema = func_arg_metadata.arg_model.model_json_schema()
+        mcp.server.fastmcp.utilities.func_metadata._get_typed_signature = \
+            _get_typed_signature
+        if self.fastmcp_mode and func_arg_metadata.wrap_output:
+            # Only simulate behavior of fastmcp for output_schema
+            func_arg_metadata.output_schema["x-fastmcp-wrap-result"] = True
+        parameters = func_arg_metadata.arg_model.model_json_schema(
+            by_alias=True)
         tool = Tool(
             fn=new_fn,
             name=name,
             description=doc or fn.__doc__,
-            parameters=json_schema,
+            parameters=parameters,
             fn_metadata=func_arg_metadata,
             is_async=is_async,
             context_kwarg=context_kwarg,
-            annotations=None,
         )
         self.mcp._tool_manager._tools[name] = tool
 
     def add_tool(self, fn, *args, **kwargs):
-        self.mcp.add_tool(fn, *args, **kwargs)
         tool = Tool.from_function(fn, *args, **kwargs)
         self.mcp._tool_manager._tools[tool.name] = tool
         return tool
@@ -215,7 +238,9 @@ class CalculationMCPServer:
 
         def decorator(fn: Callable) -> Callable:
             def submit_job(executor: Optional[dict] = None,
-                           storage: Optional[dict] = None, **kwargs):
+                           storage: Optional[dict] = None,
+                           **kwargs) -> TypedDict("results", {
+                               "job_id": str, "extra_info": Optional[dict]}):
                 trace_id = datetime.today().strftime('%Y-%m-%d-%H:%M:%S.%f')
                 logger.info("Job processing (Trace ID: %s)" % trace_id)
                 with set_directory(trace_id):
@@ -233,7 +258,7 @@ class CalculationMCPServer:
                     "job_id": job_id,
                     "extra_info": res.get("extra_info"),
                 }
-                return convert_to_content(result, job_info={
+                return JobResult(result=result, job_info={
                     "trace_id": trace_id,
                     "executor_type": executor_type,
                     "job_id": job_id,
@@ -263,7 +288,7 @@ class CalculationMCPServer:
                     logger.info("Job %s result is %s" % (job_id, results))
                     await context.log(level="info", message="Job %s result is"
                                       " %s" % (job_id, results))
-                return convert_to_content(results, job_info={
+                return JobResult(result=results, job_info={
                     "trace_id": trace_id,
                     "executor_type": executor_type,
                     "job_id": job_id,
@@ -273,8 +298,9 @@ class CalculationMCPServer:
                 })
 
             self.add_patched_tool(fn, run_job, fn.__name__, is_async=True)
-            self.add_patched_tool(fn, submit_job, "submit_" + fn.__name__,
-                                  doc="Submit a job")
+            self.add_patched_tool(
+                fn, submit_job, "submit_" + fn.__name__, doc="Submit a job",
+                override_return_annotation=True)
             self.add_tool(query_job_status)
             self.add_tool(terminate_job)
             self.add_tool(get_job_results)
@@ -284,9 +310,10 @@ class CalculationMCPServer:
     def run(self, **kwargs):
         if os.environ.get("DP_AGENT_RUNNING_MODE") in ["1", "true"]:
             return
-        async def health_check(request) :
+
+        async def health_check(request):
             return JSONResponse({"status": "ok"})
-        
+
         self.mcp._custom_starlette_routes.append(
             Route(
                 "/health",

dp/agent/server/executor/dispatcher_executor.py

@@ -9,6 +9,7 @@ from pathlib import Path
 
 import jsonpickle
 from dpdispatcher import Machine, Resources, Task, Submission
+from dpdispatcher.utils.job_status import JobStatus
 
 from .base_executor import BaseExecutor
 from .... import __path__
@@ -33,6 +34,50 @@ def get_source_code(fn):
     return "".join(pre_lines + source_lines) + "\n"
 
 
+def get_func_def_script(fn):
+    script = ""
+    packages = []
+    fn_name = fn.__name__
+    module_name = fn.__module__
+    module = sys.modules[module_name]
+    if getattr(module, fn_name, None) is not fn:
+        # cannot import from module, maybe a local function
+        import cloudpickle
+        packages.extend(cloudpickle.__path__)
+        script += "import cloudpickle\n"
+        script += "%s = cloudpickle.loads(%s)\n" % \
+            (fn_name, cloudpickle.dumps(fn))
+    elif module_name in ["__main__", "__mp_main__"]:
+        if hasattr(module, "__file__"):
+            name = os.path.splitext(os.path.basename(module.__file__))[0]
+            if getattr(module, "__package__", None):
+                package = module.__package__
+                package_name = package.split('.')[0]
+                module = importlib.import_module(package_name)
+                packages.extend(module.__path__)
+                script += "from %s.%s import %s\n" % (
+                    package, name, fn_name)
+            else:
+                packages.append(module.__file__)
+                script += "from %s import %s\n" % (name, fn_name)
+        else:
+            # cannot get file of __main__, maybe in the interactive mode
+            import cloudpickle
+            packages.extend(cloudpickle.__path__)
+            script += "import cloudpickle\n"
+            script += "%s = cloudpickle.loads(%s)\n" % \
+                (fn_name, cloudpickle.dumps(fn))
+    else:
+        package_name = module_name.split('.')[0]
+        module = importlib.import_module(package_name)
+        if hasattr(module, "__path__"):
+            packages.extend(module.__path__)
+        elif hasattr(module, "__file__"):
+            packages.append(module.__file__)
+        script += "from %s import %s\n" % (module_name, fn_name)
+    return script, packages
+
+
 class DispatcherExecutor(BaseExecutor):
     def __init__(
             self,
@@ -86,34 +131,19 @@ class DispatcherExecutor(BaseExecutor):
     def submit(self, fn, kwargs):
         script = ""
         fn_name = fn.__name__
-        module_name = fn.__module__
-        import_func_line = None
-        if module_name in ["__main__", "__mp_main__"]:
-            module = sys.modules[module_name]
-            if hasattr(module, "__file__"):
-                self.python_packages.append(module.__file__)
-                name = os.path.splitext(os.path.basename(module.__file__))[0]
-                import_func_line = "from %s import %s\n" % (name, fn_name)
-            else:
-                script += get_source_code(fn)
-        else:
-            package_name = module_name.split('.')[0]
-            module = importlib.import_module(package_name)
-            if hasattr(module, "__path__"):
-                self.python_packages.extend(module.__path__)
-            elif hasattr(module, "__file__"):
-                self.python_packages.append(module.__file__)
-            import_func_line = "from %s import %s\n" % (module_name, fn_name)
+        func_def_script, packages = get_func_def_script(fn)
+        self.python_packages.extend(packages)
 
         script += "import asyncio, jsonpickle, os\n"
         script += "from pathlib import Path\n\n"
         script += "if __name__ == \"__main__\":\n"
         script += "    cwd = os.getcwd()\n"
-        script += "    kwargs = jsonpickle.loads(r'''%s''')\n" % \
-                  jsonpickle.dumps(kwargs)
+        script += "    kwargs = jsonpickle.loads(%s)\n" % repr(
+            jsonpickle.dumps(kwargs))
         script += "    try:\n"
-        if import_func_line is not None:
-            script += "        " + import_func_line
+        for line in func_def_script.splitlines():
+            if line:
+                script += "        " + line + "\n"
         if inspect.iscoroutinefunction(fn):
             script += "        results = asyncio.run(%s(**kwargs))\n" % fn_name
         else:
@@ -198,17 +228,23 @@ class DispatcherExecutor(BaseExecutor):
         submission = Submission.deserialize(
             submission_dict=json.loads(content))
         submission.update_submission_state()
-        if not submission.check_all_finished():
+        if not submission.check_all_finished() and not any(
+            job.job_state in [JobStatus.terminated, JobStatus.unknown,
+                              JobStatus.unsubmitted]
+                for job in submission.belonging_jobs):
             return "Running"
         try:
             submission.run_submission(exit_on_submit=True)
         except Exception as e:
             logger.error(e)
             return "Failed"
-        if os.path.isfile("results.txt"):
-            return "Succeeded"
+        if submission.check_all_finished():
+            if os.path.isfile("results.txt"):
+                return "Succeeded"
+            else:
+                return "Failed"
         else:
-            return "Failed"
+            return "Running"
 
     def terminate(self, job_id):
         machine = Machine.load_from_dict(self.machine)

dp/agent/server/storage/http_storage.py

@@ -51,4 +51,4 @@ class HTTPStorage(BaseStorage):
 
 
 class HTTPSStorage(HTTPStorage):
-    scheme = "https"
+    scheme = "https"

dp/agent/server/utils.py

@@ -1,26 +1,10 @@
-import inspect
 import logging
 import traceback
-from collections.abc import Sequence
-from typing import Annotated, Any, List, Optional
+from typing import Any
 
-import jsonpickle
 import mcp
-from mcp.server.fastmcp.exceptions import InvalidSignature
-from mcp.server.fastmcp.utilities.func_metadata import (
-    ArgModelBase,
-    _get_typed_annotation,
-    FuncMetadata,
-)
-from mcp.server.fastmcp.utilities.types import Image
-from mcp.types import (
-    EmbeddedResource,
-    ImageContent,
-    TextContent,
-)
-from pydantic import Field, WithJsonSchema, create_model
-from pydantic.fields import FieldInfo
-from pydantic_core import PydanticUndefined
+from mcp.types import TextContent
+from pydantic import BaseModel
 
 
 def get_logger(name, level="INFO",
@@ -34,110 +18,34 @@ def get_logger(name, level="INFO",
     return logger
 
 
-def get_metadata(
-    func_name: str,
-    parameters: List[inspect.Parameter],
-    skip_names: Sequence[str] = (),
-    globalns: dict = {},
-) -> FuncMetadata:
-    dynamic_pydantic_model_params: dict[str, Any] = {}
-    for param in parameters:
-        if param.name.startswith("_"):
-            raise InvalidSignature(
-                f"Parameter {param.name} of {func_name} cannot start with '_'"
-            )
-        if param.name in skip_names:
-            continue
-        annotation = param.annotation
-
-        # `x: None` / `x: None = None`
-        if annotation is None:
-            annotation = Annotated[
-                None,
-                Field(
-                    default=param.default
-                    if param.default is not inspect.Parameter.empty
-                    else PydanticUndefined
-                ),
-            ]
-
-        # Untyped field
-        if annotation is inspect.Parameter.empty:
-            annotation = Annotated[
-                Any,
-                Field(),
-                # 🤷
-                WithJsonSchema({"title": param.name, "type": "string"}),
-            ]
-
-        field_info = FieldInfo.from_annotated_attribute(
-            _get_typed_annotation(annotation, globalns),
-            param.default
-            if param.default is not inspect.Parameter.empty
-            else PydanticUndefined,
-        )
-        dynamic_pydantic_model_params[param.name] = (
-            field_info.annotation, field_info)
-        continue
-
-    arguments_model = create_model(
-        f"{func_name}Arguments",
-        **dynamic_pydantic_model_params,
-        __base__=ArgModelBase,
-    )
-    resp = FuncMetadata(arg_model=arguments_model)
-    return resp
-
-
-def convert_to_content(
-    result: Any,
-    job_info: Optional[dict] = None,
-) -> Sequence[TextContent | ImageContent | EmbeddedResource]:
-    """Convert a result to a sequence of content objects."""
-    other_contents = []
-    if isinstance(result, Image):
-        other_contents.append(result.to_image_content())
-        result = None
-
-    if isinstance(result, TextContent | ImageContent | EmbeddedResource):
-        other_contents.append(result)
-        result = None
-
-    if isinstance(result, list | tuple):
-        for item in result.copy():
-            if isinstance(item, Image):
-                other_contents.append(item.to_image_content())
-                result.remove(item)
-            elif isinstance(
-                    result, TextContent | ImageContent | EmbeddedResource):
-                other_contents.append(item)
-                result.remove(item)
-
-    if isinstance(result, dict):
-        for key, value in list(result.items()):
-            if isinstance(value, Image):
-                other_contents.append(value.to_image_content())
-                del result[key]
-            elif isinstance(
-                    value, TextContent | ImageContent | EmbeddedResource):
-                other_contents.append(value)
-                del result[key]
-
-    if not isinstance(result, str):
-        result = jsonpickle.dumps(result)
-
-    return [TextContent(type="text", text=result, job_info=job_info)] \
-        + other_contents
+class JobResult(BaseModel):
+    result: Any
+    job_info: dict
 
 
 class Tool(mcp.server.fastmcp.tools.Tool):
     """
     Workaround MCP server cannot print traceback
-    Remove this if MCP has proper support
+    Add job info to first unstructured content
     """
     async def run(self, *args, **kwargs):
         try:
-            return await super().run(*args, **kwargs)
+            kwargs["convert_result"] = False
+            result = await super().run(*args, **kwargs)
+            if isinstance(result, JobResult):
+                job_info = result.job_info
+                result = self.fn_metadata.convert_result(result.result)
+                if isinstance(result, tuple) and len(result) == 2:
+                    unstructured_content, _ = result
+                else:
+                    unstructured_content = result
+                if len(unstructured_content) == 0:
+                    unstructured_content.append(
+                        TextContent(type="text", text="null"))
+                unstructured_content[0].job_info = job_info
+            else:
+                result = self.fn_metadata.convert_result(result)
+            return result
         except Exception as e:
             traceback.print_exc()
             raise e