代码提交
This commit is contained in:
1 parent
151ecceb85
commit
816c46d447
6 files changed
+140
-26
No files matched your search
@@ -109,8 +109,8 @@ CI runs these regression tests for every pull request via [.github/workflows/bac
|
||||
|
||||
### Position roundtable recovery persistence
|
||||
|
||||
`/api/position-roundtable` uses LangGraph threads as the live execution source
|
||||
and stores an additional SQL recovery copy in
|
||||
`/api/position-roundtable` uses the shared `/api/intent/*` LangGraph flow as
|
||||
the live Step-1 execution source and stores an additional SQL recovery copy in
|
||||
`position_roundtable_sessions`/`position_roundtable_nodes`. The recovery copy
|
||||
contains complete intent/node/summary/action-plan conversations, unsent
|
||||
composer drafts, workflow snapshots, and bounded full text for generated
|
||||
@@ -118,7 +118,11 @@ Markdown/JSON artifacts. This lets history and downstream closing agents keep
|
||||
working when container-local checkpoint or sandbox volumes are replaced.
|
||||
Revision `20260723_05` adds the conversation columns. Session deletion
|
||||
explicitly removes child nodes so SQLite deployments do not depend on FK
|
||||
cascade pragmas.
|
||||
cascade pragmas. The router is mounted canonically below
|
||||
`/api/position-roundtable` and, for intranet gateway allowlists, below the
|
||||
schema-hidden compatibility prefix `/api/multi-agent/position-roundtable`.
|
||||
Clients may retry the compatibility route only for a framework/proxy-level
|
||||
`404 Not Found`; domain-level missing-session responses must remain real 404s.
|
||||
|
||||
### Harness / App Split
|
||||
|
||||
@@ -411,6 +415,8 @@ integration point is the existing `/api/roundtable-chains` store: each `seats` J
|
||||
may carry an optional `position_id` (validated by `ChainSeatSchema`, no schema
|
||||
migration). The original roundtable only reads its established seat fields and
|
||||
therefore remains unchanged. The separate `/api/position-roundtable` router
|
||||
(also mounted at `/api/multi-agent/position-roundtable` for intranet gateway
|
||||
compatibility)
|
||||
persists task/intent/frozen-chain snapshots in `position_roundtable_sessions`
|
||||
and direct-agent node indexes in `position_roundtable_nodes` (migration
|
||||
`20260721_01`). Message history remains in the established LangGraph thread
|
||||
|
||||
@@ -124,7 +124,7 @@ FastAPI application providing REST endpoints for frontend integration:
|
||||
| `GET/POST /api/agents` | List visible agents or create a user-owned agent |
|
||||
| `GET/PUT/DELETE /api/agents/{id}` | Read, update, or delete an id-addressed agent |
|
||||
| `GET/POST/PUT/DELETE /api/roundtable-chains` | Manage user-owned roundtable business chains; each seat may optionally carry `position_id` for the separate position-collaboration workspace (the original roundtable ignores it) |
|
||||
| `GET/POST/PUT /api/position-roundtable/sessions` | Standalone position-collaboration sessions: freeze task/intent/chain snapshots, index one direct-agent node per seat, build upstream handoff context (including bounded UTF-8 excerpts of text artifacts), and make archived sessions read-only without invoking the original roundtable coordinator or jobs. Built-in summary/action-plan completion mirrors visible report text into a Markdown artifact when a model omits its final `write_file` call. `POST /sessions/{id}/nodes/{nodeKey}/reject` accepts an optional reason, marks the rejected delivery for rework, and invalidates affected downstream deliveries so they are regenerated in order. |
|
||||
| `GET/POST/PUT /api/position-roundtable/sessions` | Standalone position-collaboration sessions: freeze task/intent/chain snapshots, index one direct-agent node per seat, build upstream handoff context (including bounded UTF-8 excerpts of text artifacts), and make archived sessions read-only without invoking the original roundtable coordinator or jobs. Built-in summary/action-plan completion mirrors visible report text into a Markdown artifact when a model omits its final `write_file` call. `POST /sessions/{id}/nodes/{nodeKey}/reject` accepts an optional reason, marks the rejected delivery for rework, and invalidates affected downstream deliveries so they are regenerated in order. The same router is also mounted at `/api/multi-agent/position-roundtable/*` for intranet gateways that only forward the established multi-agent namespace; the compatibility mount is intentionally omitted from OpenAPI. |
|
||||
| `GET /api/memory` | Retrieve memory data |
|
||||
| `POST /api/memory/reload` | Force memory reload |
|
||||
| `GET /api/memory/config` | Memory configuration |
|
||||
@@ -475,3 +475,10 @@ unsent composer drafts, and generated text deliverables. LangGraph checkpoints
|
||||
remain the execution source, but SQL history continues to render after a
|
||||
checkpoint or sandbox-output volume is replaced. Apply Alembic revision
|
||||
`20260723_05` (or simply upgrade to `head`) before deploying this version.
|
||||
|
||||
Its live intent conversation still uses the shared `/api/intent/init` and
|
||||
`/api/intent/stream` endpoints used by the original multi-agent roundtable.
|
||||
Only the recovery snapshot layer is position-specific. Deployments must expose
|
||||
either `/api/position-roundtable/*` or the compatibility mirror
|
||||
`/api/multi-agent/position-roundtable/*`; updated clients probe both and only
|
||||
retry when the first response is the framework/proxy-level `404 Not Found`.
|
||||
@@ -1474,7 +1474,15 @@ This gateway provides custom endpoints for models, MCP configuration, skills, an
|
||||
app.include_router(roundtable_chains.router)
|
||||
|
||||
# 岗位协同独立会话 / 节点状态(不使用原圆桌总控或后台作业)
|
||||
app.include_router(position_roundtable.router)
|
||||
# Canonical position-workspace persistence API.
|
||||
app.include_router(position_roundtable.router, prefix="/api")
|
||||
# Compatibility route for intranet gateways whose allowlist only exposes
|
||||
# the established `/api/multi-agent/*` namespace.
|
||||
app.include_router(
|
||||
position_roundtable.router,
|
||||
prefix="/api/multi-agent",
|
||||
include_in_schema=False,
|
||||
)
|
||||
|
||||
# Global business ? agent / chain mapping at /api/business-mapping
|
||||
app.include_router(business_mapping.router)
|
||||
|
||||
@@ -21,7 +21,9 @@ from pydantic import BaseModel, Field
|
||||
from app.gateway.path_utils import aresolve_thread_virtual_path
|
||||
from deerflow.runtime.user_context import get_effective_user_id
|
||||
|
||||
router = APIRouter(prefix="/api/position-roundtable", tags=["position-roundtable"])
|
||||
# The application mounts this router below both `/api` (canonical) and the
|
||||
# long-established `/api/multi-agent` namespace (intranet compatibility).
|
||||
router = APIRouter(prefix="/position-roundtable", tags=["position-roundtable"])
|
||||
|
||||
NODE_STATUSES = {"locked", "ready", "running", "done", "stale", "rejected", "error"}
|
||||
_HANDOFF_TEXT_BUDGET = 12_000
|
||||
|
||||
@@ -9,6 +9,7 @@ import pytest_asyncio
|
||||
from fastapi import HTTPException
|
||||
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
|
||||
|
||||
from app.gateway.app import create_app
|
||||
from app.gateway import services as gateway_services
|
||||
from app.gateway.routers import intent as intent_router
|
||||
from app.gateway.routers import position_roundtable as position_roundtable_router
|
||||
@@ -35,6 +36,20 @@ def test_reject_node_request_allows_an_optional_reason():
|
||||
assert request.reason == ""
|
||||
|
||||
|
||||
def test_position_roundtable_router_has_intranet_compatibility_prefix():
|
||||
"""The workspace must survive proxies that only expose /api/multi-agent."""
|
||||
app = create_app()
|
||||
registrations = {
|
||||
(route.include_context.prefix, route.include_context.include_in_schema)
|
||||
for route in app.routes
|
||||
if getattr(route, "original_router", None) is position_roundtable_router.router
|
||||
}
|
||||
|
||||
assert ("/api", True) in registrations
|
||||
assert ("/api/multi-agent", False) in registrations
|
||||
assert position_roundtable_router.router.prefix == "/position-roundtable"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_session_activation_freezes_chain_and_creates_nodes_once(store):
|
||||
created = await store.create_session(
|
||||
|
||||
Reference in new issue
Block a user