feat: workflow和chat分离
1，增加了创建workflow的页面 2.删除了event
This commit is contained in:
@@ -98,7 +98,7 @@ async def workflow_error_handler(request: Request, exc: WorkflowError):
|
||||
|
||||
|
||||
base_dir = os.path.dirname(
|
||||
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
)
|
||||
frontend_dir = os.path.join(base_dir, "frontend", "dist")
|
||||
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
# Copyright 2026 zhaoxi826
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import datetime
|
||||
from pydantic import BaseModel, Field, ConfigDict
|
||||
from ulid import ULID
|
||||
from typing import Any, Dict
|
||||
import asyncio
|
||||
from kilostar.core.work.workflow.workflow import KiloStarWorkflow
|
||||
|
||||
|
||||
class kilostarEvent(BaseModel):
|
||||
"""kilostarEvent 核心组件类。
|
||||
这是一个领域数据模型或功能封装类，承载了 kilostarEvent 相关的内聚属性定义与状态维护。它的存在隔离了局部的业务复杂性，并对外提供了类型安全的访问接口。"""
|
||||
|
||||
model_config = ConfigDict(arbitrary_types_allowed=True)
|
||||
trace_id: str = Field(
|
||||
default_factory=lambda: str(ULID()), description="事件的唯一标识符"
|
||||
)
|
||||
platform: str = Field(description="消息来源的平台")
|
||||
user_id: str = Field(description="用户id")
|
||||
user_name: str = Field(description="用户名")
|
||||
create_time: str = Field(
|
||||
default_factory=lambda: str(
|
||||
datetime.datetime.now(datetime.timezone.utc).isoformat()
|
||||
),
|
||||
description="事件创建时间",
|
||||
)
|
||||
message: str = Field(description="用户发来的消息")
|
||||
attachment: Dict[str, str] | None = Field(default=None, description="附件")
|
||||
# --------------------------------------------------------------------------------------------------------------
|
||||
context: Dict[str, Any] = Field(
|
||||
default_factory=dict, description="事件上下文内容，可包含工作流模板等信息"
|
||||
)
|
||||
workflow: KiloStarWorkflow | None = Field(default=None, description="工作流")
|
||||
pending_queue: asyncio.Queue[str] | None = Field(
|
||||
default=None, description="待处理队列"
|
||||
)
|
||||
receive_queue: asyncio.Queue[str] | None = Field(
|
||||
default=None, description="待接收队列"
|
||||
)
|
||||
@@ -12,10 +12,9 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status, UploadFile, File
|
||||
from fastapi import APIRouter, Depends, HTTPException, UploadFile, File
|
||||
from pydantic import BaseModel
|
||||
from kilostar.utils.access import Accessor, TokenData
|
||||
from kilostar.api.platform.event import kilostarEvent
|
||||
from kilostar.utils.ray_hook import ray_actor_hook
|
||||
import os
|
||||
import anyio
|
||||
@@ -43,22 +42,13 @@ async def create_message(
|
||||
Returns: : 序列化后的标准网络响应模型（如包含业务状态码、成功标志及对应的数据载荷 Data）。"""
|
||||
logger.info("收到消息，来源：客户端")
|
||||
logger.debug(f"消息内容：{message.message}")
|
||||
event = kilostarEvent(
|
||||
platform="client",
|
||||
user_id=str(token_data.user_id),
|
||||
regulatory_node = ray_actor_hook("regulatory_node").regulatory_node
|
||||
reply = await regulatory_node.handle_client_message.remote(
|
||||
user_id=token_data.user_id,
|
||||
user_name=token_data.username,
|
||||
message=message.message,
|
||||
)
|
||||
regulatory_node = ray_actor_hook("regulatory_node").regulatory_node
|
||||
message = await regulatory_node.working.remote(event)
|
||||
if message.startswith("任务已创建"):
|
||||
return {"message": f"{event.trace_id}\n\n{message}"}
|
||||
elif message == "未知相应类型":
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="模型回复错误"
|
||||
)
|
||||
else:
|
||||
return {"message": message}
|
||||
return {"message": reply}
|
||||
|
||||
|
||||
@client_router.post("/upload")
|
||||
|
||||
+38
-41
@@ -42,9 +42,12 @@ async def create_workflow(
|
||||
command=request.command,
|
||||
)
|
||||
|
||||
# 将需求发送给意识节点去处理构建
|
||||
global_workflow_manager = ray_actor_hook(
|
||||
"global_workflow_manager"
|
||||
).global_workflow_manager
|
||||
await global_workflow_manager.create_trace.remote(trace_id)
|
||||
|
||||
consciousness_node = ray_actor_hook("consciousness_node").consciousness_node
|
||||
# 可以异步通知意识节点开始与用户在特定 Trace ID 下对话
|
||||
consciousness_node.start_workflow_design.remote(trace_id, request.command)
|
||||
|
||||
return {"trace_id": trace_id, "status": "creating"}
|
||||
@@ -59,6 +62,39 @@ async def get_workflow_list(token_data: TokenData = Depends(Accessor.get_current
|
||||
return {"workflows": workflows}
|
||||
|
||||
|
||||
@workflow_router.get("/sse/{trace_id}")
|
||||
async def get_workflow_sse(trace_id: str, request: Request):
|
||||
global_workflow_manager = ray_actor_hook(
|
||||
"global_workflow_manager"
|
||||
).global_workflow_manager
|
||||
|
||||
async def event_generator():
|
||||
try:
|
||||
while True:
|
||||
if await request.is_disconnected():
|
||||
break
|
||||
message = await global_workflow_manager.get_pending.remote(trace_id)
|
||||
if message:
|
||||
yield f"data: {message}\n\n"
|
||||
else:
|
||||
await asyncio.sleep(0.5)
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
|
||||
return StreamingResponse(event_generator(), media_type="text/event-stream")
|
||||
|
||||
|
||||
@workflow_router.post("/reply/{trace_id}")
|
||||
async def post_workflow_reply(trace_id: str, request: Request):
|
||||
data = await request.json()
|
||||
reply_msg = data.get("message", "")
|
||||
global_workflow_manager = ray_actor_hook(
|
||||
"global_workflow_manager"
|
||||
).global_workflow_manager
|
||||
await global_workflow_manager.put_received.remote(trace_id, reply_msg)
|
||||
return {"status": "ok"}
|
||||
|
||||
|
||||
@workflow_router.get("/{trace_id}")
|
||||
async def get_workflow_detail(
|
||||
trace_id: str, token_data: TokenData = Depends(Accessor.get_current_user)
|
||||
@@ -80,42 +116,3 @@ async def get_workflow_detail(
|
||||
"steps": steps,
|
||||
"context_blackboard": context.blackboard if context else {},
|
||||
}
|
||||
|
||||
|
||||
@workflow_router.get("/sse/{trace_id}")
|
||||
async def get_workflow_sse(trace_id: str, request: Request):
|
||||
"""
|
||||
用于与意识节点交互，获取工作流状态或设计阶段的问答消息
|
||||
"""
|
||||
global_workflow_manager = ray_actor_hook(
|
||||
"global_workflow_manager"
|
||||
).global_workflow_manager
|
||||
|
||||
async def event_generator():
|
||||
try:
|
||||
while True:
|
||||
if await request.is_disconnected():
|
||||
break
|
||||
message = await global_workflow_manager.get_pending.remote(trace_id)
|
||||
if message:
|
||||
yield f"data: {message}\n\n"
|
||||
else:
|
||||
await asyncio.sleep(0.5)
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
|
||||
return StreamingResponse(event_generator(), media_type="text/event-stream")
|
||||
|
||||
|
||||
@workflow_router.post("/reply/{trace_id}")
|
||||
async def post_workflow_reply(trace_id: str, request: Request):
|
||||
"""
|
||||
用于用户回复意识节点的提问（设计阶段或运行中的中断确认）
|
||||
"""
|
||||
data = await request.json()
|
||||
reply_msg = data.get("message", "")
|
||||
global_workflow_manager = ray_actor_hook(
|
||||
"global_workflow_manager"
|
||||
).global_workflow_manager
|
||||
await global_workflow_manager.put_received.remote(trace_id, reply_msg)
|
||||
return {"status": "ok"}
|
||||
|
||||
@@ -1,212 +1,48 @@
|
||||
import ray
|
||||
import asyncio
|
||||
from typing import Dict
|
||||
from kilostar.api.platform.event import kilostarEvent
|
||||
from kilostar.core.work.workflow.workflow import KiloStarWorkflow
|
||||
from kilostar.utils.ray_hook import ray_actor_hook
|
||||
from kilostar.utils.logger import get_logger
|
||||
|
||||
|
||||
class TraceQueues:
|
||||
def __init__(self):
|
||||
self.pending: asyncio.Queue[str] = asyncio.Queue()
|
||||
self.receive: asyncio.Queue[str] = asyncio.Queue()
|
||||
|
||||
|
||||
@ray.remote
|
||||
class GlobalWorkflowManager:
|
||||
def __init__(self):
|
||||
self.event_dict: Dict[str, kilostarEvent] = {}
|
||||
self.event_object_refs: Dict[str, ray.ObjectRef] = {}
|
||||
self.postgres_database = None
|
||||
self._traces: Dict[str, TraceQueues] = {}
|
||||
self.logger = get_logger("GlobalWorkflowManager")
|
||||
|
||||
async def init_manager(self):
|
||||
self.postgres_database = ray_actor_hook("postgres_database").postgres_database
|
||||
self.logger.info("GlobalWorkflowManager initialized")
|
||||
|
||||
# Load all events from database to memory
|
||||
try:
|
||||
records = await self.postgres_database.get_all_events.remote()
|
||||
for record in records:
|
||||
try:
|
||||
event = kilostarEvent.model_validate_json(record.event_data_json)
|
||||
event.pending_queue = asyncio.Queue()
|
||||
event.receive_queue = asyncio.Queue()
|
||||
self.event_dict[event.trace_id] = event
|
||||
async def create_trace(self, trace_id: str) -> None:
|
||||
if trace_id not in self._traces:
|
||||
self._traces[trace_id] = TraceQueues()
|
||||
|
||||
# Store in ray object store for cache
|
||||
event_copy = event.model_copy()
|
||||
event_copy.pending_queue = None
|
||||
event_copy.receive_queue = None
|
||||
self.event_object_refs[event.trace_id] = ray.put(
|
||||
event_copy.model_dump_json()
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error(f"Failed to load event {record.trace_id}: {e}")
|
||||
self.logger.info(f"Loaded {len(self.event_dict)} events from database")
|
||||
|
||||
# Trigger resumption of incomplete workflows
|
||||
workflow_running_engine = None
|
||||
for trace_id, event in self.event_dict.items():
|
||||
if event.workflow and event.workflow.status.status in [
|
||||
"waiting_llm_working",
|
||||
"waiting_tool_working",
|
||||
"llm_working",
|
||||
"tool_working",
|
||||
]:
|
||||
self.logger.info(f"Resuming incomplete workflow {trace_id}")
|
||||
if not workflow_running_engine:
|
||||
try:
|
||||
workflow_running_engine = ray_actor_hook(
|
||||
"workflow_running_engine"
|
||||
).workflow_running_engine
|
||||
except AttributeError:
|
||||
self.logger.warning(
|
||||
"workflow_running_engine not found, cannot resume workflow"
|
||||
)
|
||||
break
|
||||
await workflow_running_engine.resume_workflow.remote(event)
|
||||
|
||||
except Exception as e:
|
||||
self.logger.error(f"Failed to fetch events from database: {e}")
|
||||
|
||||
async def _upsert_event_to_db(self, event: kilostarEvent):
|
||||
try:
|
||||
# Create a copy and remove non-serializable queues
|
||||
event_copy = event.model_copy()
|
||||
event_copy.pending_queue = None
|
||||
event_copy.receive_queue = None
|
||||
|
||||
event_json = event_copy.model_dump_json()
|
||||
# Update cache
|
||||
self.event_object_refs[event.trace_id] = ray.put(event_json)
|
||||
|
||||
await self.postgres_database.upsert_event.remote(event.trace_id, event_json)
|
||||
except Exception as e:
|
||||
self.logger.error(
|
||||
f"Failed to upsert event {event.trace_id} to database: {e}"
|
||||
)
|
||||
|
||||
async def add_event(self, event: kilostarEvent) -> None:
|
||||
event.pending_queue = asyncio.Queue()
|
||||
event.receive_queue = asyncio.Queue()
|
||||
self.event_dict[event.trace_id] = event
|
||||
await self._upsert_event_to_db(event)
|
||||
|
||||
async def delete_event(self, trace_id: str) -> None:
|
||||
if trace_id in self.event_dict:
|
||||
del self.event_dict[trace_id]
|
||||
if trace_id in self.event_object_refs:
|
||||
del self.event_object_refs[trace_id]
|
||||
try:
|
||||
await self.postgres_database.delete_event.remote(trace_id)
|
||||
except Exception as e:
|
||||
self.logger.error(f"Failed to delete event {trace_id} from database: {e}")
|
||||
|
||||
async def get_event(self, trace_id: str) -> kilostarEvent | None:
|
||||
# First check memory dict
|
||||
if trace_id in self.event_dict:
|
||||
return self.event_dict[trace_id]
|
||||
|
||||
# Then check Ray object store cache
|
||||
if trace_id in self.event_object_refs:
|
||||
try:
|
||||
event_json = ray.get(self.event_object_refs[trace_id])
|
||||
return kilostarEvent.model_validate_json(event_json)
|
||||
except Exception as e:
|
||||
self.logger.warning(
|
||||
f"Failed to fetch event from cache for trace {trace_id}: {e}"
|
||||
)
|
||||
|
||||
# Fallback to database
|
||||
try:
|
||||
record = await self.postgres_database.get_event.remote(trace_id)
|
||||
if record:
|
||||
event = kilostarEvent.model_validate_json(record.event_data_json)
|
||||
|
||||
# Restore to memory dict with missing transient queues
|
||||
event.pending_queue = asyncio.Queue()
|
||||
event.receive_queue = asyncio.Queue()
|
||||
self.event_dict[trace_id] = event
|
||||
|
||||
# Restore to cache
|
||||
event_copy = event.model_copy()
|
||||
event_copy.pending_queue = None
|
||||
event_copy.receive_queue = None
|
||||
self.event_object_refs[trace_id] = ray.put(event_copy.model_dump_json())
|
||||
|
||||
return event
|
||||
except Exception as e:
|
||||
self.logger.error(
|
||||
f"Failed to fetch event {trace_id} from database fallback: {e}"
|
||||
)
|
||||
|
||||
return None
|
||||
|
||||
async def update_attachment(
|
||||
self, trace_id: str, attachment: Dict[str, str]
|
||||
) -> None:
|
||||
if trace_id in self.event_dict:
|
||||
self.event_dict[trace_id].attachment = attachment
|
||||
await self._upsert_event_to_db(self.event_dict[trace_id])
|
||||
|
||||
async def update_workflow(self, trace_id: str, workflow: KiloStarWorkflow) -> None:
|
||||
if trace_id in self.event_dict:
|
||||
self.event_dict[trace_id].workflow = workflow
|
||||
await self._upsert_event_to_db(self.event_dict[trace_id])
|
||||
|
||||
async def get_workflow(self, trace_id: str) -> KiloStarWorkflow | None:
|
||||
event = await self.get_event(trace_id)
|
||||
return event.workflow if event else None
|
||||
|
||||
async def list_events(self) -> list[dict]:
|
||||
result = []
|
||||
|
||||
# Read strictly from the database to ensure we get all events,
|
||||
# and ignore the cache to prevent frontend missing items.
|
||||
try:
|
||||
records = await self.postgres_database.get_all_events.remote()
|
||||
for record in records:
|
||||
try:
|
||||
event = kilostarEvent.model_validate_json(record.event_data_json)
|
||||
workflow_title = event.workflow.title if event.workflow else None
|
||||
workflow_status = (
|
||||
event.workflow.status.status
|
||||
if event.workflow and event.workflow.status
|
||||
else None
|
||||
)
|
||||
result.append(
|
||||
{
|
||||
"event_id": event.trace_id,
|
||||
"workflow_title": workflow_title,
|
||||
"status": workflow_status,
|
||||
"user_name": event.user_name,
|
||||
"message": event.message,
|
||||
"create_time": event.create_time,
|
||||
}
|
||||
)
|
||||
# Best-effort cache population
|
||||
self.event_object_refs[event.trace_id] = ray.put(
|
||||
record.event_data_json
|
||||
)
|
||||
except Exception:
|
||||
continue
|
||||
except Exception as e:
|
||||
self.logger.error(f"Failed to list_events from DB: {e}")
|
||||
|
||||
return result
|
||||
async def delete_trace(self, trace_id: str) -> None:
|
||||
self._traces.pop(trace_id, None)
|
||||
|
||||
async def put_pending(self, trace_id, item) -> None:
|
||||
if trace_id in self.event_dict and self.event_dict[trace_id].pending_queue:
|
||||
await self.event_dict[trace_id].pending_queue.put(item)
|
||||
if trace_id in self._traces:
|
||||
await self._traces[trace_id].pending.put(item)
|
||||
|
||||
async def get_pending(self, trace_id) -> str:
|
||||
if trace_id in self.event_dict and self.event_dict[trace_id].pending_queue:
|
||||
return await self.event_dict[trace_id].pending_queue.get()
|
||||
await asyncio.sleep(1) # Prevent CPU spinning if not found
|
||||
if trace_id in self._traces:
|
||||
return await self._traces[trace_id].pending.get()
|
||||
await asyncio.sleep(1)
|
||||
return ""
|
||||
|
||||
async def put_received(self, trace_id, item) -> None:
|
||||
if trace_id in self.event_dict and self.event_dict[trace_id].receive_queue:
|
||||
await self.event_dict[trace_id].receive_queue.put(item)
|
||||
if trace_id in self._traces:
|
||||
await self._traces[trace_id].receive.put(item)
|
||||
|
||||
async def get_received(self, trace_id) -> str:
|
||||
if trace_id in self.event_dict and self.event_dict[trace_id].receive_queue:
|
||||
return await self.event_dict[trace_id].receive_queue.get()
|
||||
await asyncio.sleep(1) # Prevent CPU spinning if not found
|
||||
if trace_id in self._traces:
|
||||
return await self._traces[trace_id].receive.get()
|
||||
await asyncio.sleep(1)
|
||||
return ""
|
||||
|
||||
@@ -12,6 +12,6 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from .regulatory_node import regulatoryNode
|
||||
from .regulatory_node import RegulatoryNode
|
||||
|
||||
__all__ = ["regulatoryNode"]
|
||||
__all__ = ["RegulatoryNode"]
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
import datetime
|
||||
import ray
|
||||
from typing import Union, overload
|
||||
from kilostar.api.platform.event import kilostarEvent
|
||||
from kilostar.adapter.model_adapter.agent_factory import AgentFactory
|
||||
from kilostar.core.global_state_machine.global_state_machine import GlobalStateMachine
|
||||
from kilostar.core.global_state_machine.model_provider import Provider
|
||||
@@ -29,6 +28,14 @@ from pydantic_ai import RunContext, Agent
|
||||
from kilostar.utils.ray_hook import ray_actor_hook
|
||||
|
||||
|
||||
class ClientMessage:
|
||||
def __init__(self, user_id: str, user_name: str, message: str):
|
||||
self.user_id = user_id
|
||||
self.user_name = user_name
|
||||
self.message = message
|
||||
self.platform = "client"
|
||||
|
||||
|
||||
@ray.remote
|
||||
class RegulatoryNode:
|
||||
"""regulatoryNode 核心组件类。
|
||||
@@ -116,35 +123,43 @@ class RegulatoryNode:
|
||||
)
|
||||
return prompt
|
||||
|
||||
###工作函数
|
||||
async def working(self, payload: Union[kilostarEvent, TerminationMessage]) -> str:
|
||||
"""
|
||||
working方法，是节点唯一的调用方法，对于_run函数的结果进行判断并实现最终回复
|
||||
async def handle_chat_message(
|
||||
self, user_id: str, chat_id: str, message: str
|
||||
) -> str:
|
||||
payload = ClientMessage(
|
||||
user_id=user_id, user_name="", message=message
|
||||
)
|
||||
return await self._process(payload)
|
||||
|
||||
async def handle_client_message(
|
||||
self, user_id: str, user_name: str, message: str
|
||||
) -> str:
|
||||
payload = ClientMessage(
|
||||
user_id=user_id, user_name=user_name, message=message
|
||||
)
|
||||
return await self._process(payload)
|
||||
|
||||
async def working(self, payload: Union[ClientMessage, TerminationMessage]) -> str:
|
||||
"""working方法，是节点唯一的调用方法，对于_run函数的结果进行判断并实现最终回复
|
||||
Args:
|
||||
payload: 消息载荷，包含所有信息
|
||||
|
||||
Returns:
|
||||
str,监控节点对于用户的回复
|
||||
"""
|
||||
return await self._process(payload)
|
||||
|
||||
async def _process(
|
||||
self, payload: Union[ClientMessage, TerminationMessage]
|
||||
) -> str:
|
||||
try:
|
||||
result = await self._run(payload)
|
||||
if isinstance(result, ForConsciousnessNode):
|
||||
self.logger.info("regulatoryNode: 任务已分配给工作流引擎处理")
|
||||
if isinstance(payload, kilostarEvent):
|
||||
try:
|
||||
global_workflow_manager = ray_actor_hook(
|
||||
"global_workflow_manager"
|
||||
).global_workflow_manager
|
||||
await global_workflow_manager.add_event.remote(payload)
|
||||
workflow_running_engine = ray_actor_hook(
|
||||
"workflow_running_engine"
|
||||
).workflow_running_engine
|
||||
await workflow_running_engine.put_event.remote(payload)
|
||||
except Exception as e:
|
||||
self.logger.error(
|
||||
f"regulatoryNode: 无法将事件放入 WorkflowRunningEngine: {e}"
|
||||
)
|
||||
return "抱歉，任务提交失败，系统内部错误。"
|
||||
self.logger.info("regulatoryNode: 任务需交意识节点处理")
|
||||
workflow_running_engine = ray_actor_hook(
|
||||
"workflow_running_engine"
|
||||
).workflow_running_engine
|
||||
await workflow_running_engine.put_event.remote(payload)
|
||||
return f"任务已创建，准备创建工作流。原因：{result.reasoning}"
|
||||
elif isinstance(result, ForUser):
|
||||
self.logger.info("regulatoryNode: 直接向用户返回简单回复。")
|
||||
@@ -158,43 +173,15 @@ class RegulatoryNode:
|
||||
|
||||
@overload
|
||||
async def _run(
|
||||
self, payload: kilostarEvent
|
||||
) -> Union[ForConsciousnessNode, ForUser]:
|
||||
"""
|
||||
_run方法
|
||||
Args:
|
||||
payload: kilostarEvent的实例，是用户输入时对于消息的封装
|
||||
|
||||
Returns:
|
||||
ForUser对象，监控节点对于用户进行的简单回答
|
||||
ForConsciousnessNode对象，监控节点将用户的请求判断为复杂任务，将kilostarEvent传递给意识节点
|
||||
"""
|
||||
...
|
||||
self, payload: ClientMessage
|
||||
) -> Union[ForConsciousnessNode, ForUser]: ...
|
||||
|
||||
@overload
|
||||
async def _run(self, payload: TerminationMessage) -> ForUser:
|
||||
"""
|
||||
_run方法
|
||||
Args:
|
||||
payload: Termination的实例，是工作流结束后到达监控节点的最后结果
|
||||
|
||||
Returns:
|
||||
ForUser对象，工作流结束后给用户的返回
|
||||
"""
|
||||
...
|
||||
async def _run(self, payload: TerminationMessage) -> ForUser: ...
|
||||
|
||||
async def _run(
|
||||
self, payload: Union[kilostarEvent, TerminationMessage]
|
||||
self, payload: Union[ClientMessage, TerminationMessage]
|
||||
) -> Union[ForConsciousnessNode, ForUser]:
|
||||
"""
|
||||
_run方法，将payload转化为对llm发送的消息并发送
|
||||
Args:
|
||||
payload: 消息载荷
|
||||
|
||||
Returns:
|
||||
ForConsciousnessNode对象，对意识节点发送的消息
|
||||
ForUser对象，对用户发送到消息
|
||||
"""
|
||||
platform = payload.platform
|
||||
user_name = payload.user_name
|
||||
message = payload.message
|
||||
|
||||
@@ -44,6 +44,7 @@ def database_exception(func):
|
||||
raise e
|
||||
except UserNotExistError as e:
|
||||
logger.error(f"更改密码失败，用户不存在：{e}")
|
||||
raise e
|
||||
except Exception as e:
|
||||
logger.exception(f"未预期的数据库错误: {e}")
|
||||
raise e
|
||||
|
||||
@@ -12,9 +12,14 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from kilostar.core.postgres_database.model.user import User
|
||||
from kilostar.core.postgres_database.model.provider import Provider
|
||||
from kilostar.core.postgres_database.model.individual import WorkerIndividual
|
||||
from kilostar.core.postgres_database.model.user import User, UserAuthority
|
||||
from kilostar.core.postgres_database.model.provider import ProviderModel
|
||||
from kilostar.core.postgres_database.model.individual import (
|
||||
BaseIndividualModel,
|
||||
SpecialistIndividualModel,
|
||||
OrdinaryIndividualModel,
|
||||
SpecialIndividualModel,
|
||||
)
|
||||
from kilostar.core.postgres_database.model.workflow import (
|
||||
Workflow,
|
||||
WorkflowContextModel,
|
||||
@@ -23,13 +28,30 @@ from kilostar.core.postgres_database.model.chat_history import (
|
||||
ChatHistoryRegister,
|
||||
ChatHistoryMessage,
|
||||
)
|
||||
from kilostar.core.postgres_database.model.system_node import SystemNodeConfigModel
|
||||
|
||||
# 兼容旧代码的别名
|
||||
Provider = ProviderModel
|
||||
SystemNodeConfig = SystemNodeConfigModel
|
||||
|
||||
# AgentType: 与 BaseIndividualModel 的 polymorphic_on 保持一致
|
||||
from typing import Literal
|
||||
AgentType = Literal["base", "specialist", "ordinary", "special"]
|
||||
|
||||
__all__ = [
|
||||
"User",
|
||||
"UserAuthority",
|
||||
"ProviderModel",
|
||||
"Provider",
|
||||
"WorkerIndividual",
|
||||
"BaseIndividualModel",
|
||||
"SpecialistIndividualModel",
|
||||
"OrdinaryIndividualModel",
|
||||
"SpecialIndividualModel",
|
||||
"Workflow",
|
||||
"WorkflowContextModel",
|
||||
"ChatHistoryRegister",
|
||||
"ChatHistoryMessage",
|
||||
"SystemNodeConfigModel",
|
||||
"SystemNodeConfig",
|
||||
"AgentType",
|
||||
]
|
||||
|
||||
@@ -26,13 +26,13 @@ class ChatHistoryRegister(BaseDataModel):
|
||||
__tablename__ = "chat_history_register"
|
||||
|
||||
chat_id: Mapped[str] = mapped_column(
|
||||
String(64), primary_key=True, description="聊天会话ID"
|
||||
String(64), primary_key=True, comment="聊天会话ID"
|
||||
)
|
||||
user_id: Mapped[str] = mapped_column(
|
||||
String(64), index=True, description="归属的用户ID"
|
||||
String(64), index=True, comment="归属的用户ID"
|
||||
)
|
||||
title: Mapped[str] = mapped_column(
|
||||
String(255), default="新对话", description="对话标题"
|
||||
String(255), default="新对话", comment="对话标题"
|
||||
)
|
||||
created_at: Mapped[str] = mapped_column(
|
||||
DateTime(timezone=True), server_default=func.now()
|
||||
@@ -50,15 +50,15 @@ class ChatHistoryMessage(BaseDataModel):
|
||||
__tablename__ = "chat_history_message"
|
||||
|
||||
message_id: Mapped[str] = mapped_column(
|
||||
String(64), primary_key=True, description="消息ID"
|
||||
String(64), primary_key=True, comment="消息ID"
|
||||
)
|
||||
chat_id: Mapped[str] = mapped_column(
|
||||
String(64), index=True, description="所属会话ID"
|
||||
String(64), index=True, comment="所属会话ID"
|
||||
)
|
||||
message: Mapped[str] = mapped_column(String, description="消息体内容")
|
||||
message: Mapped[str] = mapped_column(String, comment="消息体内容")
|
||||
message_owner: Mapped[str] = mapped_column(
|
||||
String(50),
|
||||
description="消息发送方，例如 'user', 'regulatory_node', 'consciousness_node' 等",
|
||||
comment="消息发送方，例如 'user', 'regulatory_node', 'consciousness_node' 等",
|
||||
)
|
||||
created_at: Mapped[str] = mapped_column(
|
||||
DateTime(timezone=True), server_default=func.now()
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
from enum import Enum
|
||||
from typing import List, Optional, Dict, Any
|
||||
from sqlalchemy import String, Text, text, ForeignKey
|
||||
from sqlalchemy import String, Text, text, ForeignKey, Enum as SAEnum
|
||||
from sqlalchemy.dialects.postgresql import JSONB
|
||||
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||
|
||||
@@ -119,7 +119,8 @@ class SpecialIndividualModel(BaseIndividualModel):
|
||||
ForeignKey("base_individual.agent_id", ondelete="CASCADE"), primary_key=True
|
||||
)
|
||||
modality_type: Mapped[ModalityType] = mapped_column(
|
||||
default=ModalityType.MULTIMODAL, server_default=text("'multimodal'")
|
||||
SAEnum(ModalityType),
|
||||
default=ModalityType.MULTIMODAL,
|
||||
)
|
||||
multimodal_config: Mapped[Optional[Dict[str, Any]]] = mapped_column(JSONB)
|
||||
|
||||
|
||||
@@ -22,22 +22,22 @@ class Workflow(BaseDataModel):
|
||||
__tablename__ = "workflow"
|
||||
|
||||
trace_id: Mapped[str] = mapped_column(
|
||||
String(64), primary_key=True, description="工作流唯一ID (Trace ID)"
|
||||
String(64), primary_key=True, comment="工作流唯一ID (Trace ID)"
|
||||
)
|
||||
user_id: Mapped[str] = mapped_column(
|
||||
String(64), index=True, description="创建该工作流的用户ID"
|
||||
String(64), index=True, comment="创建该工作流的用户ID"
|
||||
)
|
||||
title: Mapped[str] = mapped_column(String(255), description="工作流标题/简短描述")
|
||||
title: Mapped[str] = mapped_column(String(255), comment="工作流标题/简短描述")
|
||||
command: Mapped[str] = mapped_column(
|
||||
String, description="创建工作流的原始用户命令文本"
|
||||
String, comment="创建工作流的原始用户命令文本"
|
||||
)
|
||||
status: Mapped[str] = mapped_column(
|
||||
String(50),
|
||||
default="creating",
|
||||
description="工作流的总体状态 (例如: creating, running, pending, completed, failed等)",
|
||||
comment="工作流的总体状态 (例如: creating, running, pending, completed, failed等)",
|
||||
)
|
||||
version: Mapped[str] = mapped_column(
|
||||
String(50), default="v1.0", description="系统协议版本号"
|
||||
String(50), default="v1.0", comment="系统协议版本号"
|
||||
)
|
||||
created_at: Mapped[str] = mapped_column(
|
||||
DateTime(timezone=True), server_default=func.now()
|
||||
@@ -51,27 +51,27 @@ class WorkflowContextModel(BaseDataModel):
|
||||
__tablename__ = "workflow_context"
|
||||
|
||||
trace_id: Mapped[str] = mapped_column(
|
||||
String(64), primary_key=True, description="对应的工作流 Trace ID"
|
||||
String(64), primary_key=True, comment="对应的工作流 Trace ID"
|
||||
)
|
||||
workflow_status: Mapped[dict] = mapped_column(
|
||||
JSONB, default=dict, description="工作流状态变更历史"
|
||||
JSONB, default=dict, comment="工作流状态变更历史"
|
||||
)
|
||||
blackboard: Mapped[dict] = mapped_column(
|
||||
JSONB, default=dict, description="大模型输出的存储区 (共享黑板)"
|
||||
JSONB, default=dict, comment="大模型输出的存储区 (共享黑板)"
|
||||
)
|
||||
work_step_status: Mapped[dict] = mapped_column(
|
||||
JSONB, nullable=True, description="工作流运行步骤状态"
|
||||
JSONB, nullable=True, comment="工作流运行步骤状态"
|
||||
)
|
||||
workflow_pointer: Mapped[int] = mapped_column(
|
||||
nullable=True, description="工作流指针，指向具体运行步骤位置"
|
||||
nullable=True, comment="工作流指针，指向具体运行步骤位置"
|
||||
)
|
||||
workflow_log: Mapped[list] = mapped_column(
|
||||
JSONB, default=list, description="工作流运行日志"
|
||||
JSONB, default=list, comment="工作流运行日志"
|
||||
)
|
||||
work_link: Mapped[list] = mapped_column(
|
||||
JSONB,
|
||||
default=list,
|
||||
description="工作链(即 WorkflowStep 的定义列表，包含图结构和原子动作)",
|
||||
comment="工作链(即 WorkflowStep 的定义列表，包含图结构和原子动作)",
|
||||
)
|
||||
created_at: Mapped[str] = mapped_column(
|
||||
DateTime(timezone=True), server_default=func.now()
|
||||
|
||||
@@ -20,12 +20,14 @@ from kilostar.core.postgres_database.model.chat_history import (
|
||||
)
|
||||
from sqlalchemy.ext.asyncio import async_sessionmaker, AsyncSession
|
||||
from ulid import ULID
|
||||
from kilostar.core.postgres_database.database_exception import database_exception
|
||||
|
||||
|
||||
class ChatHistoryDatabase:
|
||||
def __init__(self, async_session_maker: async_sessionmaker[AsyncSession]):
|
||||
self.async_session_maker = async_session_maker
|
||||
|
||||
@database_exception
|
||||
async def create_chat_session(
|
||||
self, user_id: str, title: str = "新对话"
|
||||
) -> ChatHistoryRegister:
|
||||
@@ -37,6 +39,7 @@ class ChatHistoryDatabase:
|
||||
await session.refresh(chat)
|
||||
return chat
|
||||
|
||||
@database_exception
|
||||
async def list_chat_sessions(self, user_id: str) -> List[ChatHistoryRegister]:
|
||||
async with self.async_session_maker() as session:
|
||||
statement = (
|
||||
@@ -47,6 +50,7 @@ class ChatHistoryDatabase:
|
||||
results = await session.execute(statement)
|
||||
return results.scalars().all()
|
||||
|
||||
@database_exception
|
||||
async def add_chat_message(
|
||||
self, chat_id: str, message: str, message_owner: str
|
||||
) -> ChatHistoryMessage:
|
||||
@@ -71,6 +75,7 @@ class ChatHistoryDatabase:
|
||||
await session.refresh(msg)
|
||||
return msg
|
||||
|
||||
@database_exception
|
||||
async def list_chat_messages(self, chat_id: str) -> List[ChatHistoryMessage]:
|
||||
async with self.async_session_maker() as session:
|
||||
statement = (
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
from sqlalchemy import select
|
||||
from typing import List, Optional
|
||||
from kilostar.core.postgres_database.model.workflow import EventRecord
|
||||
from sqlalchemy.ext.asyncio import async_sessionmaker, AsyncSession
|
||||
|
||||
|
||||
class EventDatabase:
|
||||
def __init__(self, async_session_maker: async_sessionmaker[AsyncSession]):
|
||||
self.async_session_maker = async_session_maker
|
||||
|
||||
async def upsert_event(self, trace_id: str, event_data_json: str) -> EventRecord:
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(EventRecord).where(EventRecord.trace_id == trace_id)
|
||||
results = await session.execute(statement)
|
||||
record = results.scalar_one_or_none()
|
||||
if record:
|
||||
record.event_data_json = event_data_json
|
||||
else:
|
||||
record = EventRecord(trace_id=trace_id, event_data_json=event_data_json)
|
||||
session.add(record)
|
||||
await session.commit()
|
||||
await session.refresh(record)
|
||||
return record
|
||||
|
||||
async def get_event(self, trace_id: str) -> Optional[EventRecord]:
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(EventRecord).where(EventRecord.trace_id == trace_id)
|
||||
results = await session.execute(statement)
|
||||
return results.scalar_one_or_none()
|
||||
|
||||
async def get_all_events(self) -> List[EventRecord]:
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(EventRecord)
|
||||
results = await session.execute(statement)
|
||||
return results.scalars().all()
|
||||
|
||||
async def delete_event(self, trace_id: str) -> bool:
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(EventRecord).where(EventRecord.trace_id == trace_id)
|
||||
results = await session.execute(statement)
|
||||
record = results.scalar_one_or_none()
|
||||
if record:
|
||||
await session.delete(record)
|
||||
await session.commit()
|
||||
return True
|
||||
return False
|
||||
@@ -12,13 +12,24 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from kilostar.core.postgres_database.model.individual import WorkerIndividual
|
||||
from kilostar.core.postgres_database.model.individual import (
|
||||
BaseIndividualModel,
|
||||
SpecialistIndividualModel,
|
||||
OrdinaryIndividualModel,
|
||||
SpecialIndividualModel,
|
||||
)
|
||||
from sqlalchemy import select
|
||||
from typing import List, Optional
|
||||
from kilostar.core.postgres_database.database_exception import database_exception
|
||||
|
||||
from ulid import ULID
|
||||
|
||||
_AGENT_TYPE_MODEL_MAP = {
|
||||
"specialist": SpecialistIndividualModel,
|
||||
"ordinary": OrdinaryIndividualModel,
|
||||
"special": SpecialIndividualModel,
|
||||
}
|
||||
|
||||
|
||||
class IndividualDatabase:
|
||||
"""IndividualDatabase 核心组件类。
|
||||
@@ -27,56 +38,50 @@ class IndividualDatabase:
|
||||
def __init__(self, async_session_maker):
|
||||
self.async_session_maker = async_session_maker
|
||||
|
||||
@staticmethod
|
||||
def _select_model(agent_type: str):
|
||||
return _AGENT_TYPE_MODEL_MAP.get(agent_type, BaseIndividualModel)
|
||||
|
||||
@database_exception
|
||||
async def add_worker_individual(self, **kwargs) -> WorkerIndividual:
|
||||
async def add_worker_individual(self, **kwargs):
|
||||
"""创建并持久化新的 worker individual 实体。
|
||||
接收构建参数，执行必要的数据校验与默认值填充后，将新记录安全地写入底层存储或系统注册表中。
|
||||
Returns: (WorkerIndividual): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
接收构建参数，执行必要的数据校验与默认值填充后，将新记录安全地写入底层存储或系统注册表中。"""
|
||||
async with self.async_session_maker() as session:
|
||||
agent_id = str(ULID())
|
||||
individual = WorkerIndividual(agent_id=agent_id, **kwargs)
|
||||
agent_type = kwargs.get("agent_type", "base")
|
||||
model_cls = self._select_model(agent_type)
|
||||
individual = model_cls(agent_id=agent_id, **kwargs)
|
||||
session.add(individual)
|
||||
await session.commit()
|
||||
await session.refresh(individual)
|
||||
return individual
|
||||
|
||||
@database_exception
|
||||
async def get_worker_individual(self, agent_id: str) -> Optional[WorkerIndividual]:
|
||||
"""检索并获取特定的 worker individual 数据集合或实例对象。
|
||||
根据提供的查询条件或上下文凭证，从数据库、缓存或第三方服务中读取对应的资源状态。
|
||||
Args: agent_id (str): 目标对象的唯一全局标识符 (UUID/ULID)，用于在数据库表或缓存结构中精准匹配该 agent 实例。
|
||||
Returns: (Optional[WorkerIndividual]): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
async def get_worker_individual(self, agent_id: str):
|
||||
"""检索并获取特定的 worker individual 数据集合或实例对象。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(WorkerIndividual).where(
|
||||
WorkerIndividual.agent_id == agent_id
|
||||
statement = select(BaseIndividualModel).where(
|
||||
BaseIndividualModel.agent_id == agent_id
|
||||
)
|
||||
results = await session.execute(statement)
|
||||
return results.scalar_one_or_none()
|
||||
|
||||
@database_exception
|
||||
async def get_worker_individual_list(self, owner_id: str) -> List[WorkerIndividual]:
|
||||
"""检索并获取特定的 worker individual list 数据集合或实例对象。
|
||||
根据提供的查询条件或上下文凭证，从数据库、缓存或第三方服务中读取对应的资源状态。
|
||||
Args: owner_id (str): 目标对象的唯一全局标识符 (UUID/ULID)，用于在数据库表或缓存结构中精准匹配该 owner 实例。
|
||||
Returns: (List[WorkerIndividual]): 经过筛选、排序或分页处理后的实体对象列表集合。"""
|
||||
async def get_worker_individual_list(self, owner_id: str):
|
||||
"""检索并获取特定的 worker individual list 数据集合或实例对象。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(WorkerIndividual).where(
|
||||
WorkerIndividual.owner_id == owner_id
|
||||
statement = select(BaseIndividualModel).where(
|
||||
BaseIndividualModel.owner_id == owner_id
|
||||
)
|
||||
results = await session.execute(statement)
|
||||
return list(results.scalars().all())
|
||||
|
||||
@database_exception
|
||||
async def update_worker_individual(
|
||||
self, agent_id: str, **kwargs
|
||||
) -> Optional[WorkerIndividual]:
|
||||
"""对现有的 worker individual 进行状态更新或属性覆盖。
|
||||
基于增量变更原则，合并最新的配置或数据，并触发相关依赖组件的缓存刷新或事件通知。
|
||||
Args: agent_id (str): 目标对象的唯一全局标识符 (UUID/ULID)，用于在数据库表或缓存结构中精准匹配该 agent 实例。
|
||||
Returns: (Optional[WorkerIndividual]): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
async def update_worker_individual(self, agent_id: str, **kwargs):
|
||||
"""对现有的 worker individual 进行状态更新或属性覆盖。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(WorkerIndividual).where(
|
||||
WorkerIndividual.agent_id == agent_id
|
||||
statement = select(BaseIndividualModel).where(
|
||||
BaseIndividualModel.agent_id == agent_id
|
||||
)
|
||||
results = await session.execute(statement)
|
||||
individual = results.scalar_one_or_none()
|
||||
@@ -92,13 +97,10 @@ class IndividualDatabase:
|
||||
|
||||
@database_exception
|
||||
async def delete_worker_individual(self, agent_id: str) -> bool:
|
||||
"""安全地移除或注销 worker individual。
|
||||
执行物理删除或逻辑删除操作，并妥善清理相关的关联数据及占用资源。
|
||||
Args: agent_id (str): 目标对象的唯一全局标识符 (UUID/ULID)，用于在数据库表或缓存结构中精准匹配该 agent 实例。
|
||||
Returns: (bool): 一个布尔型结果标志，明确返回 True 表示该操作成功应用或条件达成，False 则表示失败或被拒绝。"""
|
||||
"""安全地移除或注销 worker individual。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(WorkerIndividual).where(
|
||||
WorkerIndividual.agent_id == agent_id
|
||||
statement = select(BaseIndividualModel).where(
|
||||
BaseIndividualModel.agent_id == agent_id
|
||||
)
|
||||
results = await session.execute(statement)
|
||||
individual = results.scalar_one_or_none()
|
||||
@@ -109,11 +111,9 @@ class IndividualDatabase:
|
||||
return True
|
||||
|
||||
@database_exception
|
||||
async def get_all_worker_individual(self) -> List[WorkerIndividual]:
|
||||
"""检索并获取特定的 all worker individual 数据集合或实例对象。
|
||||
根据提供的查询条件或上下文凭证，从数据库、缓存或第三方服务中读取对应的资源状态。
|
||||
Returns: (List[WorkerIndividual]): 经过筛选、排序或分页处理后的实体对象列表集合。"""
|
||||
async def get_all_worker_individual(self):
|
||||
"""检索并获取特定的 all worker individual 数据集合或实例对象。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(WorkerIndividual)
|
||||
statement = select(BaseIndividualModel)
|
||||
results = await session.execute(statement)
|
||||
return list(results.scalars().all())
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
from typing import List
|
||||
|
||||
from kilostar.core.postgres_database.model.provider import Provider
|
||||
from kilostar.core.postgres_database.model.provider import ProviderModel
|
||||
from sqlalchemy import select
|
||||
from kilostar.core.postgres_database.database_exception import database_exception
|
||||
|
||||
@@ -27,21 +27,25 @@ class ProviderDatabase:
|
||||
self.async_session_maker = async_session_maker
|
||||
|
||||
@database_exception
|
||||
async def get_provider(self) -> List[Provider]:
|
||||
async def get_provider(self) -> List[ProviderModel]:
|
||||
"""检索并获取特定的 provider 数据集合或实例对象。
|
||||
根据提供的查询条件或上下文凭证，从数据库、缓存或第三方服务中读取对应的资源状态。
|
||||
Returns: (List[Provider]): 经过筛选、排序或分页处理后的实体对象列表集合。"""
|
||||
Returns: (List[ProviderModel]): 经过筛选、排序或分页处理后的实体对象列表集合。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(Provider)
|
||||
statement = select(ProviderModel)
|
||||
results = await session.execute(statement)
|
||||
results = results.scalars().all()
|
||||
providers = [
|
||||
Provider(
|
||||
ProviderModel(
|
||||
provider_id=provider.provider_id,
|
||||
provider_title=provider.provider_title,
|
||||
provider_url=provider.provider_url,
|
||||
provider_apikey=provider.provider_apikey,
|
||||
provider_models=provider.provider_models,
|
||||
provider_type=provider.provider_type,
|
||||
provider_owner=provider.provider_owner,
|
||||
provider_status=provider.provider_status,
|
||||
is_active=provider.is_active,
|
||||
)
|
||||
for provider in results
|
||||
]
|
||||
@@ -53,7 +57,7 @@ class ProviderDatabase:
|
||||
接收构建参数，执行必要的数据校验与默认值填充后，将新记录安全地写入底层存储或系统注册表中。
|
||||
Returns: (None): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
async with self.async_session_maker() as session:
|
||||
provider = Provider(**kwargs)
|
||||
provider = ProviderModel(**kwargs)
|
||||
session.add(provider)
|
||||
await session.commit()
|
||||
|
||||
@@ -64,19 +68,19 @@ class ProviderDatabase:
|
||||
Args: provider_id (str): 目标对象的唯一全局标识符 (UUID/ULID)，用于在数据库表或缓存结构中精准匹配该 provider 实例。
|
||||
Returns: (None): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
async with self.async_session_maker() as session:
|
||||
provider = await session.get(Provider, provider_id)
|
||||
provider = await session.get(ProviderModel, provider_id)
|
||||
if provider is not None:
|
||||
session.delete(provider)
|
||||
await session.commit()
|
||||
|
||||
@database_exception
|
||||
async def update_provider(self, provider_id: str, **kwargs) -> Provider:
|
||||
async def update_provider(self, provider_id: str, **kwargs) -> None:
|
||||
"""对现有的 provider 进行状态更新或属性覆盖。
|
||||
基于增量变更原则，合并最新的配置或数据，并触发相关依赖组件的缓存刷新或事件通知。
|
||||
Args: provider_id (str): 目标对象的唯一全局标识符 (UUID/ULID)，用于在数据库表或缓存结构中精准匹配该 provider 实例。
|
||||
Returns: (Provider): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
async with self.async_session_maker() as session:
|
||||
provider = await session.get(Provider, provider_id)
|
||||
provider = await session.get(ProviderModel, provider_id)
|
||||
if provider is not None:
|
||||
for key, value in kwargs.items():
|
||||
setattr(provider, key, value)
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from kilostar.core.postgres_database.model.system_node import SystemNodeConfig
|
||||
from kilostar.core.postgres_database.model.system_node import SystemNodeConfigModel
|
||||
from sqlalchemy import select
|
||||
from typing import List, Optional
|
||||
from kilostar.core.postgres_database.database_exception import database_exception
|
||||
@@ -32,14 +32,14 @@ class SystemNodeDatabase:
|
||||
provider_title: str,
|
||||
model_id: str,
|
||||
tools: Optional[List[str]] = None,
|
||||
) -> SystemNodeConfig:
|
||||
) -> SystemNodeConfigModel:
|
||||
"""执行与 upsert system node config 相关的核心业务流转操作。
|
||||
该方法封装了具体的算法策略或状态控制逻辑，确保操作能够在事务上下文中被原子且一致地执行。
|
||||
Args: node_name (str): 赋予该实体的人类可读名称或标题字符串，主要用于前端 UI 展示、日志记录或模糊检索。 provider_title (str): 目标对象的唯一全局标识符 (UUID/ULID)，用于在数据库表或缓存结构中精准匹配该 provider_title 实例。 model_id (str): 目标对象的唯一全局标识符 (UUID/ULID)，用于在数据库表或缓存结构中精准匹配该 model 实例。 tools (Optional[List[str]]): 控制逻辑流向的具体字符串参数，指定了期望的 tools 内容。
|
||||
Returns: (SystemNodeConfig): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
Returns: (SystemNodeConfigModel): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(SystemNodeConfig).where(
|
||||
SystemNodeConfig.node_name == node_name
|
||||
statement = select(SystemNodeConfigModel).where(
|
||||
SystemNodeConfigModel.node_name == node_name
|
||||
)
|
||||
results = await session.execute(statement)
|
||||
config = results.scalar_one_or_none()
|
||||
@@ -49,7 +49,7 @@ class SystemNodeDatabase:
|
||||
if tools is not None:
|
||||
config.tools = tools
|
||||
else:
|
||||
config = SystemNodeConfig(
|
||||
config = SystemNodeConfigModel(
|
||||
node_name=node_name,
|
||||
provider_title=provider_title,
|
||||
model_id=model_id,
|
||||
@@ -61,26 +61,26 @@ class SystemNodeDatabase:
|
||||
return config
|
||||
|
||||
@database_exception
|
||||
async def get_all_system_node_configs(self) -> List[SystemNodeConfig]:
|
||||
async def get_all_system_node_configs(self) -> List[SystemNodeConfigModel]:
|
||||
"""检索并获取特定的 all system node configs 数据集合或实例对象。
|
||||
根据提供的查询条件或上下文凭证，从数据库、缓存或第三方服务中读取对应的资源状态。
|
||||
Returns: (List[SystemNodeConfig]): 经过筛选、排序或分页处理后的实体对象列表集合。"""
|
||||
Returns: (List[SystemNodeConfigModel]): 经过筛选、排序或分页处理后的实体对象列表集合。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(SystemNodeConfig)
|
||||
statement = select(SystemNodeConfigModel)
|
||||
results = await session.execute(statement)
|
||||
return list(results.scalars().all())
|
||||
|
||||
@database_exception
|
||||
async def get_system_node_config(
|
||||
self, node_name: str
|
||||
) -> Optional[SystemNodeConfig]:
|
||||
) -> Optional[SystemNodeConfigModel]:
|
||||
"""检索并获取特定的 system node config 数据集合或实例对象。
|
||||
根据提供的查询条件或上下文凭证，从数据库、缓存或第三方服务中读取对应的资源状态。
|
||||
Args: node_name (str): 赋予该实体的人类可读名称或标题字符串，主要用于前端 UI 展示、日志记录或模糊检索。
|
||||
Returns: (Optional[SystemNodeConfig]): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
Returns: (Optional[SystemNodeConfigModel]): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(SystemNodeConfig).where(
|
||||
SystemNodeConfig.node_name == node_name
|
||||
statement = select(SystemNodeConfigModel).where(
|
||||
SystemNodeConfigModel.node_name == node_name
|
||||
)
|
||||
results = await session.execute(statement)
|
||||
return results.scalar_one_or_none()
|
||||
|
||||
@@ -70,7 +70,7 @@ class AuthDatabase:
|
||||
raise UserNotExistError()
|
||||
if not Accessor.verify_password(old_password, user.hashed_password):
|
||||
raise UserPasswordError()
|
||||
user.hashed_password = new_password
|
||||
user.hashed_password = Accessor.hash_password(new_password)
|
||||
session.add(user)
|
||||
await session.commit()
|
||||
await session.refresh(user)
|
||||
|
||||
@@ -19,12 +19,14 @@ from kilostar.core.postgres_database.model.workflow import (
|
||||
WorkflowContextModel,
|
||||
)
|
||||
from sqlalchemy.ext.asyncio import async_sessionmaker, AsyncSession
|
||||
from kilostar.core.postgres_database.database_exception import database_exception
|
||||
|
||||
|
||||
class WorkflowDatabase:
|
||||
def __init__(self, async_session_maker: async_sessionmaker[AsyncSession]):
|
||||
self.async_session_maker = async_session_maker
|
||||
|
||||
@database_exception
|
||||
async def create_workflow(
|
||||
self, trace_id: str, user_id: str, title: str, command: str
|
||||
) -> Workflow:
|
||||
@@ -41,12 +43,14 @@ class WorkflowDatabase:
|
||||
await session.refresh(wf)
|
||||
return wf
|
||||
|
||||
@database_exception
|
||||
async def get_workflow(self, trace_id: str) -> Optional[Workflow]:
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(Workflow).where(Workflow.trace_id == trace_id)
|
||||
results = await session.execute(statement)
|
||||
return results.scalar_one_or_none()
|
||||
|
||||
@database_exception
|
||||
async def update_workflow_status(
|
||||
self, trace_id: str, status: str
|
||||
) -> Optional[Workflow]:
|
||||
@@ -60,12 +64,14 @@ class WorkflowDatabase:
|
||||
await session.refresh(record)
|
||||
return record
|
||||
|
||||
@database_exception
|
||||
async def list_workflows(self, user_id: str) -> List[Workflow]:
|
||||
async with self.async_session_maker() as session:
|
||||
statement = select(Workflow).where(Workflow.user_id == user_id)
|
||||
results = await session.execute(statement)
|
||||
return results.scalars().all()
|
||||
|
||||
@database_exception
|
||||
async def upsert_workflow_context(
|
||||
self, trace_id: str, **kwargs
|
||||
) -> WorkflowContextModel:
|
||||
@@ -85,6 +91,7 @@ class WorkflowDatabase:
|
||||
await session.refresh(record)
|
||||
return record
|
||||
|
||||
@database_exception
|
||||
async def get_workflow_context(
|
||||
self, trace_id: str
|
||||
) -> Optional[WorkflowContextModel]:
|
||||
|
||||
@@ -20,8 +20,26 @@ from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from kilostar.core.postgres_database.model.base import BaseDataModel
|
||||
|
||||
# 在 create_all 前显式导入所有 ORM 模型类，确保它们注册到 metadata
|
||||
from kilostar.core.postgres_database.model.provider import ProviderModel
|
||||
from kilostar.core.postgres_database.model.user import User
|
||||
from kilostar.core.postgres_database.model.individual import (
|
||||
BaseIndividualModel,
|
||||
SpecialistIndividualModel,
|
||||
OrdinaryIndividualModel,
|
||||
SpecialIndividualModel,
|
||||
)
|
||||
from kilostar.core.postgres_database.model.workflow import (
|
||||
Workflow,
|
||||
WorkflowContextModel,
|
||||
)
|
||||
from kilostar.core.postgres_database.model.chat_history import (
|
||||
ChatHistoryRegister,
|
||||
ChatHistoryMessage,
|
||||
)
|
||||
from kilostar.core.postgres_database.model.system_node import SystemNodeConfigModel
|
||||
|
||||
from .module.individual import IndividualDatabase
|
||||
from .module.event import EventDatabase
|
||||
from .module.user import AuthDatabase
|
||||
from .module.provider import ProviderDatabase
|
||||
from .module.system_node import SystemNodeDatabase
|
||||
@@ -51,7 +69,6 @@ class PostgresDatabase:
|
||||
self._auth_database = AuthDatabase(self.async_session_maker)
|
||||
self._provider_database = ProviderDatabase(self.async_session_maker)
|
||||
self._individual_database = IndividualDatabase(self.async_session_maker)
|
||||
self._event_database = EventDatabase(self.async_session_maker)
|
||||
self._system_node_database = SystemNodeDatabase(self.async_session_maker)
|
||||
self._workflow_database = WorkflowDatabase(self.async_session_maker)
|
||||
self._chat_history_database = ChatHistoryDatabase(self.async_session_maker)
|
||||
@@ -59,16 +76,13 @@ class PostgresDatabase:
|
||||
self.ready_event = asyncio.Event()
|
||||
|
||||
async def init_db(self) -> None:
|
||||
"""完成 db 模块的启动与依赖初始化。
|
||||
在系统引导或服务拉起阶段被调用，负责建立网络连接、分配基础内存资源及注册核心服务组件。
|
||||
Returns: (None): 经由当前业务模型加工处理后所输出的具体数据实例或领域模型对象。"""
|
||||
try:
|
||||
async with self.async_engine.begin() as conn:
|
||||
await conn.run_sync(BaseDataModel.metadata.create_all)
|
||||
print("✅ 数据库表创建/验证完成")
|
||||
except Exception as e:
|
||||
# Provide a warning if the database is not accessible, allowing
|
||||
# the app to start up for development/UI tests without crashing immediately.
|
||||
print(f"Warning: Failed to initialize PostgreSQL database: {e}")
|
||||
print(f"❌ 数据库初始化失败: {e}")
|
||||
raise
|
||||
finally:
|
||||
self.ready_event.set()
|
||||
|
||||
@@ -242,23 +256,6 @@ class PostgresDatabase:
|
||||
await self.ready_event.wait()
|
||||
return await self._individual_database.get_all_worker_individual()
|
||||
|
||||
# Event Database Methods
|
||||
async def upsert_event(self, trace_id: str, event_data_json: str):
|
||||
await self.ready_event.wait()
|
||||
return await self._event_database.upsert_event(trace_id, event_data_json)
|
||||
|
||||
async def get_event(self, trace_id: str):
|
||||
await self.ready_event.wait()
|
||||
return await self._event_database.get_event(trace_id)
|
||||
|
||||
async def get_all_events(self):
|
||||
await self.ready_event.wait()
|
||||
return await self._event_database.get_all_events()
|
||||
|
||||
async def delete_event(self, trace_id: str):
|
||||
await self.ready_event.wait()
|
||||
return await self._event_database.delete_event(trace_id)
|
||||
|
||||
# Workflow Database Methods
|
||||
async def create_workflow(
|
||||
self, trace_id: str, user_id: str, title: str, command: str
|
||||
|
||||
@@ -12,13 +12,14 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import jwt
|
||||
import os
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Optional
|
||||
from fastapi import HTTPException, status, Request
|
||||
from pydantic import BaseModel, ValidationError
|
||||
from kilostar.core.postgres_database.model import User
|
||||
from pwdlib import PasswordHash
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user