bohr-agent-sdk 0.1.100__tar.gz → 0.1.102__tar.gz

{bohr_agent_sdk-0.1.100 → bohr_agent_sdk-0.1.102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bohr-agent-sdk
-Version: 0.1.100
+Version: 0.1.102
 Summary: SDK for scientific agents
 Home-page: https://github.com/dptech-corp/bohr-agent-sdk/
 Author: DP Technology
@@ -30,6 +30,9 @@ 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: watchdog>=6.0.0
+Requires-Dist: fastapi>=0.116.0
+Requires-Dist: bohrium-open-sdk==0.1.5
 Provides-Extra: device
 Requires-Dist: pywinauto-recorder>=0.1.0; extra == "device"
 Provides-Extra: cloud
@@ -44,6 +47,7 @@ Requires-Dist: black>=23.11.0; extra == "dev"
 Requires-Dist: isort>=5.12.0; extra == "dev"
 Requires-Dist: mypy>=1.7.0; extra == "dev"
 Requires-Dist: pylint>=3.0.0; extra == "dev"
+Requires-Dist: google-adk; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx>=7.2.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme>=1.3.0; extra == "docs"
@@ -92,7 +96,7 @@ dp-agent run tool cloud
 dp-agent run tool calculation
 
 # 运行代理
-dp-agent run agent
+dp-agent run agent --config config.json
 
 # 调试模式
 dp-agent run debug

{bohr_agent_sdk-0.1.100 → bohr_agent_sdk-0.1.102}/README.md

@@ -38,7 +38,7 @@ dp-agent run tool cloud
 dp-agent run tool calculation
 
 # 运行代理
-dp-agent run agent
+dp-agent run agent --config config.json
 
 # 调试模式
 dp-agent run debug

{bohr_agent_sdk-0.1.100 → bohr_agent_sdk-0.1.102}/pyproject.toml

@@ -33,6 +33,9 @@ dependencies = [
     "redis>=6.2.0",
     "twine>=6.1.0",
     "build>=1.2.2.post1",
+    "watchdog>=6.0.0",
+    "fastapi>=0.116.0",
+    "bohrium-open-sdk==0.1.5"
 ]
 
 # 可选依赖
@@ -58,6 +61,7 @@ dev = [
     "isort>=5.12.0",
     "mypy>=1.7.0",
     "pylint>=3.0.0",
+    "google-adk"
 ]
 
 # 文档工具依赖
@@ -86,6 +90,40 @@ where = ["src"]
 
 [tool.setuptools]
 package-dir = {"" = "src"}
+include-package-data = false  # 关闭自动包含，使用显式配置
+
+[tool.setuptools.package-data]
+"dp.agent.cli.templates" = [
+    "**/*.template",
+    "**/*.json",
+    "**/*.md", 
+    "**/*.txt",
+    "**/*.py"
+]
+"dp.agent.cli.templates.ui" = [
+    "**/*.py",
+    "config/*.json",
+    "*.txt"
+]
+# 包含前端静态文件和必要的配置文件（用于开发模式）
+"dp.agent.cli.templates.ui.frontend" = [
+    "ui-static/**/*",
+    "package.json",  # 开发模式需要
+    "vite.config.ts",  # Vite 配置
+    "tsconfig.json",  # TypeScript 配置
+    "index.html"  # 开发模式入口
+]
+
+# 使用 exclude-package-data 排除不需要的文件
+[tool.setuptools.exclude-package-data]
+"dp.agent.cli.templates.ui.frontend" = [
+    "*.sh",
+    ".eslintrc.cjs",
+    "tsconfig.node.json",  # 排除这个，但保留 tsconfig.json
+    "src/**/*",  # 排除源码
+    "public/**/*",  # 排除 public 目录
+    "node_modules/**/*"  # 排除 node_modules
+]
 
 [build-system]
 requires = [

{bohr_agent_sdk-0.1.100 → bohr_agent_sdk-0.1.102}/setup.py

@@ -9,7 +9,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="bohr-agent-sdk",
-    version="0.1.100",
+    version="0.1.102",
     description="SDK for science agent and mcp tools",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -28,6 +28,13 @@ setup(
         "python-dotenv>=1.0.0",  # 环境变量管理
         "typing-extensions>=4.8.0",  # 额外的类型提示功能
         "aiohttp>=3.9.1",        # 异步HTTP客户端
+        "fastapi>=0.116",
+        "uvicorn>=0.24.0",       # ASGI服务器
+        "websockets>=12.0",      # WebSocket支持
+        "watchdog>=3.0.0",       # 文件监视
+        "google-genai",          # Google AI SDK
+        "google-generativeai",   # Google Generative AI
+        "aiofiles",
     ],
     # extras_require={
     #     "dev": [

{bohr_agent_sdk-0.1.100 → bohr_agent_sdk-0.1.102}/src/bohr_agent_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bohr-agent-sdk
-Version: 0.1.100
+Version: 0.1.102
 Summary: SDK for scientific agents
 Home-page: https://github.com/dptech-corp/bohr-agent-sdk/
 Author: DP Technology
@@ -30,6 +30,9 @@ 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: watchdog>=6.0.0
+Requires-Dist: fastapi>=0.116.0
+Requires-Dist: bohrium-open-sdk==0.1.5
 Provides-Extra: device
 Requires-Dist: pywinauto-recorder>=0.1.0; extra == "device"
 Provides-Extra: cloud
@@ -44,6 +47,7 @@ Requires-Dist: black>=23.11.0; extra == "dev"
 Requires-Dist: isort>=5.12.0; extra == "dev"
 Requires-Dist: mypy>=1.7.0; extra == "dev"
 Requires-Dist: pylint>=3.0.0; extra == "dev"
+Requires-Dist: google-adk; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: sphinx>=7.2.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme>=1.3.0; extra == "docs"
@@ -92,7 +96,7 @@ dp-agent run tool cloud
 dp-agent run tool calculation
 
 # 运行代理
-dp-agent run agent
+dp-agent run agent --config config.json
 
 # 调试模式
 dp-agent run debug

bohr_agent_sdk-0.1.102/src/bohr_agent_sdk.egg-info/SOURCES.txt

@@ -0,0 +1,85 @@
+README.md
+pyproject.toml
+setup.py
+src/bohr_agent_sdk.egg-info/PKG-INFO
+src/bohr_agent_sdk.egg-info/SOURCES.txt
+src/bohr_agent_sdk.egg-info/dependency_links.txt
+src/bohr_agent_sdk.egg-info/entry_points.txt
+src/bohr_agent_sdk.egg-info/requires.txt
+src/bohr_agent_sdk.egg-info/top_level.txt
+src/dp/__init__.py
+src/dp/agent/__init__.py
+src/dp/agent/adapter/adk/__init__.py
+src/dp/agent/adapter/adk/storage_artifact_service.py
+src/dp/agent/adapter/adk/utils.py
+src/dp/agent/adapter/adk/client/__init__.py
+src/dp/agent/adapter/adk/client/calculation_mcp_tool.py
+src/dp/agent/adapter/camel/__init__.py
+src/dp/agent/adapter/camel/client/__init__.py
+src/dp/agent/adapter/camel/client/calculation_mcp_client.py
+src/dp/agent/cli/__init__.py
+src/dp/agent/cli/cli.py
+src/dp/agent/cli/templates/__init__.py
+src/dp/agent/cli/templates/main.py.template
+src/dp/agent/cli/templates/calculation/simple.py.template
+src/dp/agent/cli/templates/device/tescan_device.py.template
+src/dp/agent/cli/templates/ui/__init__.py
+src/dp/agent/cli/templates/ui/test_download.py
+src/dp/agent/cli/templates/ui/ui_utils.py
+src/dp/agent/cli/templates/ui/websocket-server.py
+src/dp/agent/cli/templates/ui/api/__init__.py
+src/dp/agent/cli/templates/ui/api/config.py
+src/dp/agent/cli/templates/ui/api/constants.py
+src/dp/agent/cli/templates/ui/api/debug.py
+src/dp/agent/cli/templates/ui/api/files.py
+src/dp/agent/cli/templates/ui/api/files_upload.py
+src/dp/agent/cli/templates/ui/api/files_user.py
+src/dp/agent/cli/templates/ui/api/messages.py
+src/dp/agent/cli/templates/ui/api/projects.py
+src/dp/agent/cli/templates/ui/api/sessions.py
+src/dp/agent/cli/templates/ui/api/utils.py
+src/dp/agent/cli/templates/ui/api/websocket.py
+src/dp/agent/cli/templates/ui/config/__init__.py
+src/dp/agent/cli/templates/ui/config/agent_config.py
+src/dp/agent/cli/templates/ui/frontend/index.html
+src/dp/agent/cli/templates/ui/frontend/package.json
+src/dp/agent/cli/templates/ui/frontend/tsconfig.json
+src/dp/agent/cli/templates/ui/frontend/tsconfig.node.json
+src/dp/agent/cli/templates/ui/frontend/vite.config.ts
+src/dp/agent/cli/templates/ui/frontend/ui-static/index.html
+src/dp/agent/cli/templates/ui/frontend/ui-static/assets/index-DdAmKhul.js
+src/dp/agent/cli/templates/ui/frontend/ui-static/assets/index-DfN2raU9.css
+src/dp/agent/cli/templates/ui/scripts/build_ui.py
+src/dp/agent/cli/templates/ui/server/__init__.py
+src/dp/agent/cli/templates/ui/server/app.py
+src/dp/agent/cli/templates/ui/server/connection.py
+src/dp/agent/cli/templates/ui/server/file_watcher.py
+src/dp/agent/cli/templates/ui/server/middleware.py
+src/dp/agent/cli/templates/ui/server/models.py
+src/dp/agent/cli/templates/ui/server/session_manager.py
+src/dp/agent/cli/templates/ui/server/user_files.py
+src/dp/agent/cli/templates/ui/server/utils.py
+src/dp/agent/cloud/__init__.py
+src/dp/agent/cloud/main.py
+src/dp/agent/cloud/mcp.py
+src/dp/agent/cloud/mqtt.py
+src/dp/agent/device/__init__.py
+src/dp/agent/device/mqtt_device_twin.py
+src/dp/agent/device/device/__init__.py
+src/dp/agent/device/device/device.py
+src/dp/agent/device/device/types.py
+src/dp/agent/server/__init__.py
+src/dp/agent/server/calculation_mcp_server.py
+src/dp/agent/server/preprocessor.py
+src/dp/agent/server/utils.py
+src/dp/agent/server/executor/__init__.py
+src/dp/agent/server/executor/base_executor.py
+src/dp/agent/server/executor/dispatcher_executor.py
+src/dp/agent/server/executor/local_executor.py
+src/dp/agent/server/storage/__init__.py
+src/dp/agent/server/storage/base_storage.py
+src/dp/agent/server/storage/bohrium_storage.py
+src/dp/agent/server/storage/http_storage.py
+src/dp/agent/server/storage/local_storage.py
+src/dp/agent/server/storage/oss_storage.py
+tests/test_cli.py

{bohr_agent_sdk-0.1.100 → bohr_agent_sdk-0.1.102}/src/bohr_agent_sdk.egg-info/requires.txt

@@ -10,6 +10,9 @@ paho-mqtt>=2.1.0
 redis>=6.2.0
 twine>=6.1.0
 build>=1.2.2.post1
+watchdog>=6.0.0
+fastapi>=0.116.0
+bohrium-open-sdk==0.1.5
 
 [all]
 bohr-agent-sdk[bohrium,cloud,dev,device,dispatcher,docs]
@@ -27,6 +30,7 @@ black>=23.11.0
 isort>=5.12.0
 mypy>=1.7.0
 pylint>=3.0.0
+google-adk
 
 [device]
 pywinauto-recorder>=0.1.0

{bohr_agent_sdk-0.1.100 → bohr_agent_sdk-0.1.102}/src/dp/agent/adapter/adk/client/calculation_mcp_tool.py

@@ -49,6 +49,7 @@ class CalculationMCPTool(MCPTool):
         results_tool: Optional[MCPTool] = None,
         query_interval: int = 10,
         logging_callback: Callable = logging_handler,
+        override: bool = True,
     ):
         """Calculation MCP tool
         extended from google.adk.tools.mcp_tool.MCPTool
@@ -71,6 +72,7 @@ class CalculationMCPTool(MCPTool):
             results_tool: The tool of getting job results
             query_interval: Time interval of querying job status
             logging_callback: Callback function for server notifications
+            override: Override storage and executor in tool params or not
         """
         self.executor = executor
         self.storage = storage
@@ -82,6 +84,7 @@ class CalculationMCPTool(MCPTool):
         self.query_interval = query_interval
         self.wait = wait
         self.logging_callback = logging_callback
+        self.override = override
 
     async def log(self, level: str, message: Any, tool_context: ToolContext):
         await self.logging_callback(types.LoggingMessageNotificationParams(
@@ -90,9 +93,9 @@ class CalculationMCPTool(MCPTool):
     async def run_async(self, args, tool_context: ToolContext, **kwargs):
         # TODO: add progress callback when run_async
         args = deepcopy(args)
-        if "executor" not in args:
+        if self.override or "executor" not in args:
             args["executor"] = self.executor
-        if "storage" not in args:
+        if self.override or "storage" not in args:
             args["storage"] = self.storage
         if not self.async_mode and self.wait:
             return await super().run_async(
@@ -155,6 +158,7 @@ class CalculationMCPToolset(MCPToolset):
         async_mode: bool = False,
         wait: bool = True,
         logging_callback: Callable = logging_handler,
+        override: bool = True,
         **kwargs,
     ):
         """
@@ -174,7 +178,9 @@ class CalculationMCPToolset(MCPToolset):
                 tools
             async_mode: Submit and query until the job finishes, instead of
                 waiting in single connection
+            wait: Wait for the job to finish or directly return
             logging_callback: Callback function for server notifications
+            override: Override storage and executor in tool params or not
         """
         super().__init__(**kwargs)
         self.logging_callback = logging_callback
@@ -191,6 +197,7 @@ class CalculationMCPToolset(MCPToolset):
         self.query_tool = None
         self.terminate_tool = None
         self.results_tool = None
+        self.override = override
 
     async def get_tools(self, *args, **kwargs) -> List[CalculationMCPTool]:
         tools = await super().get_tools(*args, **kwargs)
@@ -213,6 +220,7 @@ class CalculationMCPToolset(MCPToolset):
                 terminate_tool=tools.get("terminate_job"),
                 results_tool=tools.get("get_job_results"),
                 logging_callback=self.logging_callback,
+                override=self.override,
             )
             calc_tool.__dict__.update(tool.__dict__)
             calc_tool.is_long_running = not self.wait

{bohr_agent_sdk-0.1.100 → bohr_agent_sdk-0.1.102}/src/dp/agent/cli/cli.py

@@ -8,7 +8,18 @@ import signal
 import uuid
 import requests
 
+try:
+    from dotenv import load_dotenv
+    env_file = Path('.env')
+    if not env_file.exists():
+        env_file = Path(__file__).parent.parent.parent.parent.parent / '.env'
+    if env_file.exists():
+        load_dotenv(env_file)
+except ImportError:
+    pass
+
 from ..server.storage import storage_dict
+from .templates.ui.ui_utils import UIConfigManager, UIProcessManager
 
 @click.group()
 def cli():
@@ -29,37 +40,34 @@ def scaffolding(type):
     """Fetch scaffolding for the science agent."""
     click.echo(f"Generating {type} project scaffold...")
     
-    # 获取模板目录路径
     templates_dir = Path(__file__).parent / 'templates'
-    
-    # 获取用户当前工作目录
     current_dir = Path.cwd()
     
     
-    # 创建必要的目录结构
+    # Create necessary directory structure
     if type == 'device':
-        project_dirs = project_dirs = ['cloud', 'device']
+        project_dirs = ['cloud', 'device']
     elif type == 'calculation':
-        project_dirs = project_dirs = ['calculation']
+        project_dirs = ['calculation']
         
     for dir_name in project_dirs:
         dst_dir = current_dir / dir_name
         
         if dst_dir.exists():
-            click.echo(f"Warning: {dir_name} already exists，skipping...")
-            click.echo(f"If you want to create a new scaffold, please delete the existing project folder first.")
+            click.echo(f"Warning: {dir_name} already exists, skipping...")
+            click.echo(f"To create a new scaffold, please delete the existing folder first.")
             continue
             
-        # 只创建目录，不复制SDK文件
+        # Create directory only
         dst_dir.mkdir(parents=True, exist_ok=True)
     
-    # 创建__init__.py文件以使目录成为Python包
+    # Create __init__.py files to make directories Python packages
     for dir_name in project_dirs:
         init_file = current_dir / dir_name / '__init__.py'
         if not init_file.exists():
             init_file.write_text('')
     
-    # 从模板创建main.py文件
+    # Create main.py from template
     main_template = templates_dir / 'main.py.template'
     main_file = current_dir / 'main.py'
     if not main_file.exists():
@@ -78,11 +86,11 @@ def scaffolding(type):
         calculation_file = current_dir / 'calculation' / 'simple.py'
         if not calculation_file.exists():
             shutil.copy2(calculation_template, calculation_file)
-            click.echo("\nCreated calculation example implementation in calculation/calculation.py")
-            click.echo("Please modify this file according to your actual calculation control requirements.")
+            click.echo("\nCreated calculation example implementation in calculation/simple.py")
+            click.echo("Please modify this file according to your actual calculation requirements.")
     
-    click.echo("\nSucceed for fetching scaffold!")
-    click.echo("Now you can use dp-agent run-cloud or dp-agent run-device to run this project!")
+    click.echo("\nSuccessfully created scaffold!")
+    click.echo("Now you can use dp-agent run tool cloud/device/calculation to run this project!")
 
 @fetch.command()
 def config():
@@ -104,7 +112,6 @@ def config():
         response = requests.get(remote_env_url)
         with open(env_file, 'w') as f:
             f.write(response.text)
-        #shutil.copy2(env_template, env_file)
         click.echo("Configuration file .env has been created.")
         click.echo("\nIMPORTANT: Please update the following configurations in your .env file:")
         click.echo("1. MQTT_INSTANCE_ID - Your Aliyun MQTT instance ID")
@@ -172,16 +179,109 @@ def calculation():
         sys.exit(1)
 
 @run.command()
-def agent():
-    """Run the science agent."""
-    click.echo("Starting agent...")
-    click.echo("Agent started.")
+@click.option('--ui/--no-ui', default=True, help='Enable/disable Web UI interface')
+@click.option('--config', help='Configuration file path (default: agent-config.json)')
+@click.option('--port', type=int, help='Server port (default from config)')
+@click.option('--module', help='Agent module path (default: agent)')
+@click.option('--agent-name', help='Agent variable name (default: root_agent)')
+@click.option('--dev/--prod', default=False, help='Development mode (default: production)')
+def agent(ui, config, port, module, agent_name, dev):
+    """Run the science agent with optional UI interface."""
+    if not ui:
+            click.echo("Starting agent in console mode...")
+        click.echo("Console mode not yet implemented.")
+        return
+    
+    current_dir = Path.cwd()
+    config_path = Path(config) if config else current_dir / "agent-config.json"
+    config_manager = UIConfigManager(config_path if config_path.exists() else None)
+    
+    if module:
+        config_manager.config['agent']['module'] = module
+    
+    agent_module = config_manager.config['agent']['module']
+    
+    if '/' in agent_module or '\\' in agent_module or agent_module.endswith('.py'):
+        file_path = Path(agent_module)
+
+        if not file_path.is_absolute():
+            file_path = current_dir / file_path
+
+        if not file_path.exists():
+            click.echo(f"Error: Agent file not found: {file_path}")
+            click.echo("\nPlease ensure:")
+            click.echo("1. File path is correct")
+            click.echo("2. File exists and is accessible")
+            sys.exit(1)
+    else:
+        module_parts = agent_module.split('.')
+        module_dir = current_dir / Path(*module_parts[:-1])
+        module_file = current_dir / Path(*module_parts[:-1]) / f"{module_parts[-1]}.py"
+        module_init = module_dir / "__init__.py"
+        
+        if not (module_dir.exists() or module_file.exists()):
+            click.echo(f"Error: Module {agent_module} not found.")
+            click.echo(f"Tried to find: {module_dir} or {module_file}")
+            click.echo("\nPlease ensure:")
+            click.echo("1. You have created the agent module")
+            click.echo("2. The 'agent.module' path is correctly configured in config.json")
+            click.echo("3. Or use --module parameter to specify the correct module path")
+            sys.exit(1)
+    
+    if os.environ.get('UI_TEMPLATE_DIR'):
+        ui_dir = Path(os.environ.get('UI_TEMPLATE_DIR'))
+    else:
+        try:
+            current_file = Path(__file__).resolve()
+
+            if 'site-packages' in str(current_file):
+                ui_dir = Path(__file__).parent / "templates" / "ui"
+            else:
+                ui_dir = current_file.parent / "templates" / "ui"
+                click.echo(f"🔧 Development mode detected, using source path: {ui_dir}")
+
+        except Exception:
+            ui_dir = Path(__file__).parent / "templates" / "ui"
+    
+    if not ui_dir.exists():
+        click.echo(f"Error: UI template directory not found: {ui_dir}")
+        click.echo("Tip: You can specify template path via UI_TEMPLATE_DIR environment variable")
+        sys.exit(1)
+    
+    if agent_name:
+        config_manager.config['agent']['rootAgent'] = agent_name
+    if port:
+        config_manager.config['server']['port'] = port
+
+    temp_config = ui_dir / "config" / "agent-config.temp.json"
+    config_manager.save_config(temp_config)
+
+    os.environ['AGENT_CONFIG_PATH'] = str(temp_config)
+    os.environ['PYTHONPATH'] = f"{current_dir}:{os.environ.get('PYTHONPATH', '')}"
+    
+    try:
+        process_manager = UIProcessManager(ui_dir, config_manager.config)
+
+        process_manager.start_websocket_server()
+        process_manager.start_frontend_server(dev_mode=dev)
+
+        click.echo("\nPress Ctrl+C to stop the service...")
+        process_manager.wait_for_processes()
+
+    except KeyboardInterrupt:
+        click.echo("\nShutting down services...")
+        if 'process_manager' in locals():
+            process_manager.cleanup()
+        sys.exit(0)
+    except Exception as e:
+        click.echo(f"Error: {e}")
+        if 'process_manager' in locals():
+            process_manager.cleanup()
+        sys.exit(1)
+    finally:
+        if 'temp_config' in locals() and temp_config.exists():
+            temp_config.unlink()
 
-@run.command()
-def debug():
-    """Debug the science agent in cloud environment."""
-    click.echo("Starting cloud environment in debug mode...")
-    click.echo("Cloud environment debug mode started.")
 
 @cli.group()
 def artifact():
@@ -229,6 +329,7 @@ def download(**kwargs):
     path = storage.download(key, path)
     click.echo("%s has been downloaded to %s" % (uri, path))
 
+
 def main():
     cli()
 

bohr_agent_sdk-0.1.102/src/dp/agent/cli/templates/__init__.py

@@ -0,0 +1 @@
+# CLI 模板包

bohr_agent_sdk-0.1.102/src/dp/agent/cli/templates/calculation/simple.py.template

@@ -0,0 +1,15 @@
+from dp.agent.server import CalculationMCPServer
+
+# 创建 MCP Server 实例
+mcp = CalculationMCPServer("Demo", host="0.0.0.0", port=5001)
+
+# 用装饰器注册远程调用函数
+@mcp.tool()
+def add_numbers(a: int, b: int) -> int:
+    """Add two numbers."""
+    return a + b
+
+def run():
+    print("Starting MCP server on http://127.0.0.1:5001 ...")
+    mcp.run(transport="streamable-http")
+