Feat/channel cron integration v2 (#165)

tptpp · claude · jikong.tp · web-flow · commit f6e48f6fbed6 · 2026-03-16T19:49:51.000+08:00
Co-authored-by: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
Co-authored-by: jikong.tp &lt;jikong.tp@antgroup.com&gt;
diff --git a/README.ja.md b/README.ja.md
@@ -109,9 +109,12 @@ uv sync --all-packages --frozen \
     --extra "derisks" \
     --extra "storage_oss2" \
     --extra "client" \
-    --extra "ext_base"
+    --extra "ext_base" \
+    --extra "channel_dingtalk"
 ```
 
+> 注意：`channel_dingtalk` はオプションです。DingTalk チャネルのサポートが不要な場合は削除してください。
+
 #### サーバーの起動
 
 `derisk-proxy-aliyun.toml` で API_KEY を設定し、実行：
diff --git a/README.md b/README.md
@@ -107,9 +107,12 @@ uv sync --all-packages --frozen \
     --extra "derisks" \
     --extra "storage_oss2" \
     --extra "client" \
-    --extra "ext_base"
+    --extra "ext_base" \
+    --extra "channel_dingtalk"
 ```
 
+> Note: `channel_dingtalk` is optional. Skip it if you don't need DingTalk channel support.
+
 #### Start Server
 
 Configure the API_KEY in `derisk-proxy-aliyun.toml`, then run:
diff --git a/README.zh.md b/README.zh.md
@@ -107,9 +107,12 @@ uv sync --all-packages --frozen \
     --extra "derisks" \
     --extra "storage_oss2" \
     --extra "client" \
-    --extra "ext_base"
+    --extra "ext_base" \
+    --extra "channel_dingtalk"
 ```
 
+> 注意：`channel_dingtalk` 为可选依赖，若不需要钉钉渠道支持可移除此行。
+
 #### 启动服务
 
 在 `derisk-proxy-aliyun.toml` 中配置 API_KEY，然后运行：
diff --git a/packages/derisk-app/src/derisk_app/config.py b/packages/derisk-app/src/derisk_app/config.py
@@ -147,7 +147,7 @@ class RagParameters(BaseParameters):
 class ServiceWebParameters(BaseParameters):
     host: str = field(default="0.0.0.0", metadata={"help": _("Webserver deploy host")})
     port: int = field(
-        default=5670, metadata={"help": _("Webserver deploy port, default is 5670")}
+        default=7777, metadata={"help": _("Webserver deploy port, default is 7777")}
     )
     light: Optional[bool] = field(
         default=False, metadata={"help": _("Run Webserver in light mode")}
diff --git a/packages/derisk-app/src/derisk_app/initialization/db_model_initialization.py b/packages/derisk-app/src/derisk_app/initialization/db_model_initialization.py
@@ -28,6 +28,7 @@
     ServeEntity as AppConfigServeEntity,
 )
 from derisk_serve.mcp.models.models import ServeEntity as MCPServeEntity
+from derisk_serve.channel.models.models import ChannelEntity
 
 _MODELS = [
     FileServeEntity,
diff --git a/packages/derisk-app/src/derisk_app/initialization/serve_initialization.py b/packages/derisk-app/src/derisk_app/initialization/serve_initialization.py
@@ -38,6 +38,7 @@ def scan_serve_configs():
         "derisk_serve.asset",
         "derisk_serve.config",
         "derisk_serve.version",
+        "derisk_serve.channel",
     ]
 
     scanner = ModelScanner[BaseServeConfig]()
diff --git a/packages/derisk-app/src/derisk_app/knowledge/_cli/knowledge_cli.py b/packages/derisk-app/src/derisk_app/knowledge/_cli/knowledge_cli.py
@@ -6,7 +6,7 @@
 
 from derisk.configs.model_config import DATASETS_DIR
 
-_DEFAULT_API_ADDRESS: str = "http://127.0.0.1:5670"
+_DEFAULT_API_ADDRESS: str = "http://127.0.0.1:7777"
 API_ADDRESS: str = _DEFAULT_API_ADDRESS
 
 logger = logging.getLogger("derisk_cli")
diff --git a/packages/derisk-client/src/derisk_client/client.py b/packages/derisk-client/src/derisk_client/client.py
@@ -63,7 +63,7 @@ def __init__(
 
         Args:
             api_base: Optional[str], a full URL for the DERISK API.
-                Defaults to the `http://localhost:5670/api/v2`.
+                Defaults to the `http://localhost:7777/api/v2`.
             api_key: Optional[str], The derisk api key to use for authentication.
                 Defaults to None.
             timeout: Optional[httpx._types.TimeoutTypes]: The timeout to use.
@@ -79,14 +79,14 @@ def __init__(
 
             from derisk_client import Client
 
-            DERISK_API_BASE = "http://localhost:5670/api/v2"
+            DERISK_API_BASE = "http://localhost:7777/api/v2"
             DERISK_API_KEY = "derisk"
             client = Client(api_base=DERISK_API_BASE, api_key=DERISK_API_KEY)
             client.chat(model="chatgpt_proxyllm", messages="Hello?")
         """
         if not api_base:
             api_base = os.getenv(
-                "DERISK_API_BASE", f"http://localhost:5670/{CLIENT_API_PATH}/{version}"
+                "DERISK_API_BASE", f"http://localhost:7777/{CLIENT_API_PATH}/{version}"
             )
         if not api_key:
             api_key = os.getenv("DERISK_API_KEY")
@@ -157,7 +157,7 @@ async def chat(
 
             from derisk_client import Client
 
-            DERISK_API_BASE = "http://localhost:5670/api/v2"
+            DERISK_API_BASE = "http://localhost:7777/api/v2"
             DERISK_API_KEY = "derisk"
             client = Client(api_base=DERISK_API_BASE, api_key=DERISK_API_KEY)
             res = await client.chat(model="chatgpt_proxyllm", messages="Hello?")
@@ -233,7 +233,7 @@ async def chat_stream(
 
             from derisk_client import Client
 
-            DERISK_API_BASE = "http://localhost:5670/api/v2"
+            DERISK_API_BASE = "http://localhost:7777/api/v2"
             DERISK_API_KEY = "derisk"
             client = Client(api_base=DERISK_API_BASE, api_key=DERISK_API_KEY)
             res = await client.chat_stream(model="chatgpt_proxyllm", messages="Hello?")
diff --git a/packages/derisk-core/pyproject.toml b/packages/derisk-core/pyproject.toml
@@ -14,7 +14,7 @@ license = "MIT"
 readme = "README.md"
 requires-python = ">= 3.10"
 dependencies = [
-    "aiohttp==3.8.4",
+    "aiohttp>=3.10.0",
     "chardet==5.1.0",
     "importlib-resources==5.12.0",
     "python-dotenv==1.0.0",
diff --git a/packages/derisk-core/src/derisk/agent/expand/pdca_agent/PDCA_FILE_SYSTEM_INTEGRATION_SUMMARY.md b/packages/derisk-core/src/derisk/agent/expand/pdca_agent/PDCA_FILE_SYSTEM_INTEGRATION_SUMMARY.md
@@ -176,7 +176,7 @@ derisk:
 
 **URL 格式:**
 - OSS: `https://bucket.oss-region.aliyuncs.com/object?signature=xxx`
-- 本地: `http://localhost:5670/api/v2/serve/file/files/{bucket}/{file_id}`
+- 本地: `http://localhost:7777/api/v2/serve/file/files/{bucket}/{file_id}`
 
 ### 2. OSS 客户端（兼容模式）
 
diff --git a/packages/derisk-core/src/derisk/agent/expand/pdca_agent/tests/test_pdca_file_system_v3.py b/packages/derisk-core/src/derisk/agent/expand/pdca_agent/tests/test_pdca_file_system_v3.py
@@ -120,7 +120,7 @@ def generate_url_v3(storage_type, uri, file_name):
             return f"https://bucket.oss-region.aliyuncs.com/object?download={file_name}"
         else:
             # 本地存储通过文件服务代理
-            return f"http://localhost:5670/api/v2/serve/file/files/{uri}"
+            return f"http://localhost:7777/api/v2/serve/file/files/{uri}"
 
     v1_url = generate_url_v1("oss://bucket/object", "test.txt")
     v3_oss_url = generate_url_v3("oss", "derisk-fs://bucket/file", "test.txt")
diff --git a/packages/derisk-core/src/derisk/agent/expand/pdca_agent/tests/test_simple.py b/packages/derisk-core/src/derisk/agent/expand/pdca_agent/tests/test_simple.py
@@ -57,7 +57,7 @@ def generate_url(storage_type, uri, file_name=None):
         if storage_type == "oss":
             return f"https://oss.example.com/{uri}?download={file_name}"
         else:
-            return f"http://localhost:5670/api/v2/serve/file/files/{uri}"
+            return f"http://localhost:7777/api/v2/serve/file/files/{uri}"
 
     oss_url = generate_url("oss", "test/file.txt", "file.txt")
     assert "oss.example.com" in oss_url
diff --git a/packages/derisk-core/src/derisk/model/cluster/worker/manager.py b/packages/derisk-core/src/derisk/model/cluster/worker/manager.py
@@ -1274,7 +1274,7 @@ def initialize_worker_manager_in_client(
     include_router: bool = True,
     run_locally: bool = True,
     controller_addr: Optional[str] = None,
-    binding_port: int = 5670,
+    binding_port: int = 7777,
     binding_host: Optional[str] = None,
     start_listener: Optional[Callable[["WorkerManager"], None]] = None,
     system_app: Optional[SystemApp] = None,
diff --git a/packages/derisk-core/src/derisk/util/benchmarks/llm/llm_benchmarks.py b/packages/derisk-core/src/derisk/util/benchmarks/llm/llm_benchmarks.py
@@ -23,7 +23,7 @@
 # or vllm
 model_type = "huggingface"
 
-controller_addr = "http://127.0.0.1:5670"
+controller_addr = "http://127.0.0.1:7777"
 
 result_csv_file = None
 
diff --git a/packages/derisk-core/src/derisk/util/command_utils.py b/packages/derisk-core/src/derisk/util/command_utils.py
@@ -138,8 +138,8 @@ def _get_ports_by_cmdline_part(service_keys: List[str]) -> List[int]:
         except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
             pass
 
-    # Sort ports with preference for 8000 and 5670
-    ports.sort(key=lambda x: (x != 8000, x != 5670, x))
+    # Sort ports with preference for 8000 and 7777
+    ports.sort(key=lambda x: (x != 8000, x != 7777, x))
     return ports
 
 
diff --git a/packages/derisk-core/src/derisk/util/tests/configure/test_manager.py b/packages/derisk-core/src/derisk/util/tests/configure/test_manager.py
@@ -160,7 +160,7 @@ def test_nested_config():
         "service": {
             "web": {
                 "host": "127.0.0.1",
-                "port": 5670,
+                "port": 7777,
                 "database": {"type": "sqlite", "path": "db.sqlite3"},
             },
             "model": {
@@ -175,7 +175,7 @@ def test_nested_config():
     service_config = config_manager.parse_config(ServiceConfig, "service")
 
     assert service_config.web.host == "127.0.0.1"
-    assert service_config.web.port == 5670
+    assert service_config.web.port == 7777
     assert service_config.web.database.type == "sqlite"
     assert service_config.web.database.path == "db.sqlite3"
     assert service_config.model.controller.port == 8000
@@ -226,7 +226,7 @@ def test_complete_config(tmp_path: Path):
 
 [service.web]
 host = "127.0.0.1"
-port = 5670
+port = 7777
 
 [service.web.database]
 type = "sqlite"
@@ -305,7 +305,7 @@ def test_complete_config(tmp_path: Path):
 
     # verify web service configuration
     assert root_config.service.web.host == "127.0.0.1"
-    assert root_config.service.web.port == 5670
+    assert root_config.service.web.port == 7777
     assert root_config.service.web.database.type == "sqlite"
 
     # Verify model service configuration
diff --git a/packages/derisk-ext/pyproject.toml b/packages/derisk-ext/pyproject.toml
@@ -12,7 +12,8 @@ requires-python = ">= 3.10"
 dependencies = [
     "derisk>=0.7.0",
     "pymysql",
-    "allpairspy"
+    "allpairspy",
+    "httpx>=0.24.0",
 ]
 
 [project.urls]
@@ -100,6 +101,19 @@ mcp_gateway=[
     "werkzeug>=3.1.3",
 ]
 
+channel_feishu=[
+    "lark-oapi>=1.0.0",
+]
+
+channel_dingtalk=[
+    "dingtalk-stream>=0.24.0",
+]
+
+channel_all=[
+    "lark-oapi>=1.0.0",
+    "dingtalk-stream>=0.24.0",
+]
+
 
 [tool.uv]
 managed = true
diff --git a/packages/derisk-ext/src/derisk_ext/channels/dingtalk/client.py b/packages/derisk-ext/src/derisk_ext/channels/dingtalk/client.py
@@ -260,7 +260,12 @@ async def stop(self) -> None:
 
         if self._stream_client:
             try:
-                self._stream_client.stop()
+                # Try graceful_stop first, then stop, otherwise just cleanup
+                if hasattr(self._stream_client, 'graceful_stop'):
+                    self._stream_client.graceful_stop()
+                elif hasattr(self._stream_client, 'stop'):
+                    self._stream_client.stop()
+                # If no stop method, the daemon thread will terminate on its own
             except Exception as e:
                 logger.error(f"Error stopping Stream client: {e}")
 
diff --git a/packages/derisk-serve/src/derisk_serve/conversation/models/models.py b/packages/derisk-serve/src/derisk_serve/conversation/models/models.py
@@ -140,7 +140,7 @@ def get_conv_by_page(
                     if condition is not None and condition is not False:
                         query = query.filter(condition)
 
-            query = query.order_by(ServeEntity.id.desc())
+            query = query.order_by(ServeEntity.gmt_modified.desc())
             total_count = query.count()
             items = query.offset((page - 1) * page_size).limit(page_size)
             total_pages = (total_count + page_size - 1) // page_size
diff --git a/packages/derisk-serve/src/derisk_serve/file/config.py b/packages/derisk-serve/src/derisk_serve/file/config.py
@@ -52,8 +52,8 @@ class ServeConfig(BaseServeConfig):
         default=None, metadata={"help": _("The host of the file server")}
     )
     port: Optional[int] = field(
-        default=5670,
-        metadata={"help": _("The port of the file server, default is 5670")},
+        default=7777,
+        metadata={"help": _("The port of the file server, default is 7777")},
     )
     download_chunk_size: Optional[int] = field(
         default=1024 * 1024,
@@ -88,7 +88,7 @@ def get_node_address(self) -> str:
             from derisk.util.net_utils import _get_ip_address
 
             file_server_host = _get_ip_address()
-        file_server_port = self.port or 5670
+        file_server_port = self.port or 7777
         return f"{file_server_host}:{file_server_port}"
 
     def get_local_storage_path(self) -> str:
diff --git a/uv.lock b/uv.lock
diff --git a/web/src/app/channel/page.tsx b/web/src/app/channel/page.tsx
diff --git a/web/src/client/api/channel/index.ts b/web/src/client/api/channel/index.ts
diff --git a/web/src/locales/en/common.ts b/web/src/locales/en/common.ts
diff --git a/web/src/locales/zh/common.ts b/web/src/locales/zh/common.ts

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ class RagParameters(BaseParameters):`
`147`	`147`	`class ServiceWebParameters(BaseParameters):`
`148`	`148`	`host: str = field(default="0.0.0.0", metadata={"help": _("Webserver deploy host")})`
`149`	`149`	`port: int = field(`
`150`		`- default=5670, metadata={"help": _("Webserver deploy port, default is 5670")}`
	`150`	`+ default=7777, metadata={"help": _("Webserver deploy port, default is 7777")}`
`151`	`151`	`)`
`152`	`152`	`light: Optional[bool] = field(`
`153`	`153`	`default=False, metadata={"help": _("Run Webserver in light mode")}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`ServeEntity as AppConfigServeEntity,`
`29`	`29`	`)`
`30`	`30`	`from derisk_serve.mcp.models.models import ServeEntity as MCPServeEntity`
	`31`	`+from derisk_serve.channel.models.models import ChannelEntity`
`31`	`32`
`32`	`33`	`_MODELS = [`
`33`	`34`	`FileServeEntity,`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ def scan_serve_configs():`
`38`	`38`	`"derisk_serve.asset",`
`39`	`39`	`"derisk_serve.config",`
`40`	`40`	`"derisk_serve.version",`
	`41`	`+ "derisk_serve.channel",`
`41`	`42`	`]`
`42`	`43`
`43`	`44`	`scanner = ModelScanner[BaseServeConfig]()`