version 0.1.17

.eslintignore

@@ -5,3 +5,5 @@
 **/dist/**/*.js
 **/dist/**/*.cjs
 **/dist/**/*.mjs
+
+tailwind.out.css

.gitignore

@@ -322,3 +322,6 @@ pnpm-lock.yaml
 
 docker/volumes
 agent_universe.db
+
+
+packages/magent-ui/src/magent_ui/static

.npmrc

@@ -4,3 +4,5 @@ save-workspace-protocol=rolling
 
 # pnpm deploy workaround https://github.com/pnpm/pnpm/issues/6437#issuecomment-1549409913
 dedupe-peer-dependents=false
+
+link-workspace-packages=deep

.prettierignore

@@ -8,10 +8,12 @@ pnpm-lock.yaml
 **/dist
 **/coverage
 **/es
+packages/**/static
 
 # generated code
 **/.dumi/tmp
 **/.dumi/tmp-production
+**/.umi-production
 **/.docusaurus
 **/.umi
 
@@ -27,3 +29,5 @@ tinyColor.less
 .changeset
 
 docker
+
+tailwind.out.css

.stylelintignore

@@ -1 +1,2 @@
 tinyColor.less
+tailwind.out.css

.vscode/cspell.json

@@ -5,7 +5,7 @@
   // language - current active spelling language
   "language": "en",
   // words - list of words to be always considered correct
-  "words": ["ahooks", "difizen", "dumi", "dumirc", "magent"],
+  "words": ["ahooks", "aiofiles", "difizen", "dumi", "dumirc", "magent"],
   // flagWords - list of words to be always considered incorrect
   // This is useful for offensive words and common spelling errors.
   // For example "hte" should be "the"

.vscode/settings.json

@@ -34,6 +34,26 @@
   "yaml.schemas": {
     "https://json.schemastore.org/github-issue-config.json": ".github/ISSUE_TEMPLATE/config.yml"
   },
+  "files.exclude": {
+    "**/.git": true,
+    "**/.svn": true,
+    "**/.hg": true,
+    "**/CVS": true,
+    "**/.DS_Store": true,
+    "**/Thumbs.db": true
+  },
+
+  "search.exclude": {
+    "packages/**/dist": true,
+    "packages/**/es": true,
+    "packages/**/lib": true,
+    "web-packages/**/dist": true,
+    "web-packages/**/es": true,
+    "web-packages/**/lib": true,
+    "web-apps/**/dist": true,
+    "web-apps/**/es": true,
+    "web-apps/**/lib": true
+  },
   "[python]": {
     "editor.codeActionsOnSave": {
       "source.organizeImports": "never",

README.md

@@ -1,6 +1,6 @@
 # <img src="./docs/assets//logo.svg" width="30"> magent
 
-为智能体研发提供专业产品方案
+智能体研发产品方案
 
 ## magent-ui
 
@@ -10,17 +10,20 @@
 
 与 [agentUniverse](https://github.com/alipay/agentUniverse) 联合推出本地研发产品化方案，详见[产品化文档](https://github.com/alipay/agentUniverse/blob/master/docs/guidebook/zh/10_1_1_%E4%BA%A7%E5%93%81%E5%8C%96%E5%B9%B3%E5%8F%B0%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B.md)
 
+智能体工作流编排
+![智能体工作流编排](./docs/assets/au-flow.jpg)
+
+智能体编排
+![智能体编排](./docs/assets/au-react-dev.jpg)
+
 PEER 多智能体对话
 ![PEER 多智能体对话](./docs/assets/au-peer-chat.jpg)
 
-ReAct 智能体开发
-![ReAct 智能体开发](./docs/assets/au-react-dev.jpg)
-
 #### 后续计划
 
 - 9 月
-  - [ ] 支持 agent/tool/knowledge 产品化创建
-  - [ ] 支持 flow 方式研发 agent
+  - [x] 支持 agent/tool/knowledge 产品化创建
+  - [x] 支持 flow 方式研发 agent
   - [ ] 支持 peer 多智能体的表单编排
 
 #### 配置

api/requirements.txt

@@ -16,7 +16,7 @@ anyio==4.4.0
     # via httpx
     # via starlette
     # via watchfiles
-certifi==2024.6.2
+certifi==2024.7.4
     # via httpcore
     # via httpx
 click==8.1.7

packages/magent-ui/.gitignore

@@ -9,4 +9,3 @@ wheels/
 # venv
 .venv
 
-static

packages/magent-ui/pyproject.toml

@@ -1,16 +1,18 @@
 [project]
 name = "magent-ui"
-version = "0.1.16"
+version = "0.1.17"
 description = ""
 authors = [
-  { name = "shiyu", email = "dongyuxin.dyx@antgroup.com" },
   { name = "brokun", email = "brokun0128@gmail.com" },
+  { name = "shiyu", email = "dongyuxin.dyx@antgroup.com" },
+  { name = "sunshinesmilelk", email = "1176136681@qq.com" },
 ]
 
 dependencies = [
-    "sse-starlette>=2.1.2",
-    "jinja2>=3.1.4",
-    "python-multipart>=0.0.9",
+  "sse-starlette>=2.1.2",
+  "jinja2>=3.1.4",
+  "python-multipart>=0.0.9",
+  "aiofiles>=24.1.0",
 ]
 readme = "README.md"
 requires-python = ">= 3.10"

packages/magent-ui/src/magent_ui/app.py

@@ -4,6 +4,7 @@
 from fastapi.templating import Jinja2Templates
 from contextlib import asynccontextmanager
 import webbrowser
+from magent_ui.utils import AsyncTask
 import uvicorn
 import logging
 from magent_ui.routers.main import api_router
@@ -13,7 +14,7 @@
 from uvicorn.config import LOGGING_CONFIG
 
 # Use uvicorn's default logging configuration
-logging.config.dictConfig(LOGGING_CONFIG) # type: ignore
+logging.config.dictConfig(LOGGING_CONFIG)  # type: ignore
 
 # Get the uvicorn logger
 logger = logging.getLogger("uvicorn")
@@ -26,6 +27,7 @@
 
 templates = Jinja2Templates(directory=templates_dir)
 
+
 def launch(**kwargs):
     logger.info("Current log level is")
     project_root_path = get_project_root_path()
@@ -35,7 +37,8 @@ def launch(**kwargs):
     if app_config.log_level is not None:
         logger.setLevel(app_config.log_level)
 
-
+    if app_config.thread_worker is not None:
+        AsyncTask.set_max_worker(app_config.thread_worker)
 
     @asynccontextmanager
     async def lifespan(app: FastAPI):
@@ -54,7 +57,7 @@ async def lifespan(app: FastAPI):
     # static
     if os.path.exists(static_dir):
         app.mount(app_config.full_static_path, StaticFiles(directory=static_dir,
-                                                    html=True), name="static")
+                                                           html=True), name="static")
     else:
         logger.info('Can not find static directory. ', static_dir)
 
@@ -65,7 +68,7 @@ async def lifespan(app: FastAPI):
         os.makedirs(app_config.resource_dir_path)
 
     app.mount(app_config.full_resource_path, StaticFiles(directory=app_config.resource_dir_path,
-                                                  html=True))
+                                                         html=True))
 
     # auto redirect to app url
     @app.get(app_config.root_path, response_class=HTMLResponse)

packages/magent-ui/src/magent_ui/config.py

@@ -8,6 +8,7 @@
 logger = logging.getLogger("uvicorn")
 
 default_config = {
+    'thread_worker': 20,
     'host': '0.0.0.0',
     'port': 8888,
     'base_url': None,
@@ -27,6 +28,8 @@ def to_uvicorn_config(config: dict):
     # root path has already taken effect
     del uvicorn_config['root_path']
 
+    if uvicorn_config.get('thread_worker', None) is not None:
+        del uvicorn_config['thread_worker']
 
     return uvicorn_config
 
@@ -116,54 +119,66 @@ def load_config(config=default_config, project_root_path=None):
 resource_path = 'resources'
 app_path = 'app'
 
+
+config_count = 0
+
+
 class AppConfig():
-  config: dict
-  project_root_path:Path
-  resource_dir_path: Path
-
-  port: int
-  root_path: str
-  base_url: str
-  open_browser: bool
-  log_level: str
-
-  full_api_path: str
-  full_static_path: str
-  full_resource_path: str
-
-  api_url: str
-  static_url: str
-  resource_url: str
-  app_url: str
-
-  def load_config(self, project_root_path:Path, **kwargs):
-      config = load_config(kwargs, project_root_path)
-      self.project_root_path = project_root_path
-      self.resource_dir_path = project_root_path / 'app' / 'resources'
-      self.config = config
-      self.port = config.get('port', 8888)
-      base_root_path = '/'
-      root_path = config.get('root_path', base_root_path)
-      self.root_path = root_path
-      self.base_url = config.get('base_url', None)
-      self.open_browser = config.get('open_browser', True)
-      self.log_level = config.get('log_level', None)
-      if self.base_url is None:
-          self.base_url = root_path
-
-      if not root_path.startswith('/'):
-        logger.info('[magent] root_path should start with "/" ', root_path)
-        root_path = f'/{root_path}'
-        config['root_path'] = root_path
-
-      self.full_api_path = os.path.join(root_path, api_path)
-      self.full_static_path = os.path.join(root_path, static_path)
-      self.full_resource_path = os.path.join(root_path, resource_path)
-
-      self.api_url = os.path.join(self.base_url, api_path)
-      self.static_url = os.path.join(self.base_url, static_path)
-      self.resource_url = os.path.join(self.base_url, resource_path)
-      self.app_url = os.path.join(self.base_url, app_path)
+    config: dict
+    project_root_path: Path
+    resource_dir_path: Path
+
+    port: int
+    root_path: str
+    base_url: str
+    open_browser: bool
+    log_level: str
+
+    full_api_path: str
+    full_static_path: str
+    full_resource_path: str
+
+    api_url: str
+    static_url: str
+    resource_url: str
+    app_url: str
+
+    thread_worker: int
+
+    def __init__(self):
+        global config_count
+        config_count += 1
+        print('config:', config_count)
+
+    def load_config(self, project_root_path: Path, **kwargs):
+        config = load_config(kwargs, project_root_path)
+        self.project_root_path = project_root_path
+        self.resource_dir_path = project_root_path / 'app' / 'resources'
+        self.config = config
+        self.port = config.get('port', 8888)
+        base_root_path = '/'
+        root_path = config.get('root_path', base_root_path)
+        self.root_path = root_path
+        self.base_url = config.get('base_url', None)
+        self.open_browser = config.get('open_browser', True)
+        self.log_level = config.get('log_level', None)
+        self.thread_worker = config.get('thread_worker', None)
+        if self.base_url is None:
+            self.base_url = root_path
+
+        if not root_path.startswith('/'):
+            logger.info('[magent] root_path should start with "/" ', root_path)
+            root_path = f'/{root_path}'
+            config['root_path'] = root_path
+
+        self.full_api_path = os.path.join(root_path, api_path)
+        self.full_static_path = os.path.join(root_path, static_path)
+        self.full_resource_path = os.path.join(root_path, resource_path)
+
+        self.api_url = os.path.join(self.base_url, api_path)
+        self.static_url = os.path.join(self.base_url, static_path)
+        self.resource_url = os.path.join(self.base_url, resource_path)
+        self.app_url = os.path.join(self.base_url, app_path)
 
 
 app_config = AppConfig()