admin/DataClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: project as seperated workspace

Browse Source
This commit is contained in:
qixinbo
2026-03-22 16:48:41 +08:00
parent 995de29981
commit 6f074df40e
9 changed files with 206 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/core/session_alias_store.py
+34 -15
View File
@@ -42,6 +42,8 @@ class SessionAliasStore:
conn.execute("ALTER TABLE session_cache ADD COLUMN pinned INTEGER NOT NULL DEFAULT 0")
if "archived" not in cols:
conn.execute("ALTER TABLE session_cache ADD COLUMN archived INTEGER NOT NULL DEFAULT 0")
if "project_id" not in cols:
conn.execute("ALTER TABLE session_cache ADD COLUMN project_id INTEGER")
def sync_sessions(self, sessions: list[dict[str, Any]]) -> None:
now = datetime.now(timezone.utc).isoformat()
@@ -75,20 +77,31 @@ class SessionAliasStore:
else:
conn.execute("DELETE FROM session_cache")
def list_cached_sessions(self) -> list[dict[str, Any]]:
def list_cached_sessions(self, project_id: int | None = None) -> list[dict[str, Any]]:
with self._connect() as conn:
rows = conn.execute(
"""
SELECT session_key, created_at, updated_at, alias, pinned, archived
FROM session_cache
ORDER BY pinned DESC, archived ASC, updated_at DESC
"""
).fetchall()
if project_id is not None:
rows = conn.execute(
"""
SELECT session_key, created_at, updated_at, alias, pinned, archived, project_id
FROM session_cache
WHERE project_id = ? OR project_id IS NULL
ORDER BY pinned DESC, archived ASC, updated_at DESC
""",
(project_id,)
).fetchall()
else:
rows = conn.execute(
"""
SELECT session_key, created_at, updated_at, alias, pinned, archived, project_id
FROM session_cache
ORDER BY pinned DESC, archived ASC, updated_at DESC
"""
).fetchall()
return [self._row_to_session_item(row) for row in rows]
def sync_and_list(self, sessions: list[dict[str, Any]]) -> list[dict[str, Any]]:
def sync_and_list(self, sessions: list[dict[str, Any]], project_id: int | None = None) -> list[dict[str, Any]]:
self.sync_sessions(sessions)
return self.list_cached_sessions()
return self.list_cached_sessions(project_id)
def set_alias(self, session_key: str, alias: str) -> None:
now = datetime.now(timezone.utc).isoformat()
@@ -111,32 +124,36 @@ class SessionAliasStore:
alias: str | None = None,
pinned: bool | None = None,
archived: bool | None = None,
project_id: int | None = None,
) -> dict[str, Any]:
now = datetime.now(timezone.utc).isoformat()
with self._connect() as conn:
row = conn.execute(
"SELECT alias, pinned, archived FROM session_cache WHERE session_key = ?",
"SELECT alias, pinned, archived, project_id FROM session_cache WHERE session_key = ?",
(session_key,),
).fetchone()
current_alias = (str(row["alias"]) if row and row["alias"] else "")
current_pinned = bool(row["pinned"]) if row else False
current_archived = bool(row["archived"]) if row else False
current_project_id = row["project_id"] if row and "project_id" in row.keys() else None
next_alias = current_alias if alias is None else alias.strip()
next_pinned = current_pinned if pinned is None else bool(pinned)
next_archived = current_archived if archived is None else bool(archived)
next_project_id = current_project_id if project_id is None else project_id
conn.execute(
"""
INSERT INTO session_cache (session_key, created_at, updated_at, alias, pinned, archived, last_seen_at)
VALUES (?, '', '', ?, ?, ?, ?)
INSERT INTO session_cache (session_key, created_at, updated_at, alias, pinned, archived, project_id, last_seen_at)
VALUES (?, '', '', ?, ?, ?, ?, ?)
ON CONFLICT(session_key) DO UPDATE SET
alias = excluded.alias,
pinned = excluded.pinned,
archived = excluded.archived,
project_id = excluded.project_id,
last_seen_at = excluded.last_seen_at
""",
(session_key, next_alias, int(next_pinned), int(next_archived), now),
(session_key, next_alias, int(next_pinned), int(next_archived), next_project_id, now),
)
return {"alias": next_alias or None, "pinned": next_pinned, "archived": next_archived}
return {"alias": next_alias or None, "pinned": next_pinned, "archived": next_archived, "project_id": next_project_id}
def get_alias(self, session_key: str) -> str | None:
with self._connect() as conn:
@@ -159,6 +176,7 @@ class SessionAliasStore:
title = alias or fallback
pinned = bool(row["pinned"]) if "pinned" in row.keys() else False
archived = bool(row["archived"]) if "archived" in row.keys() else False
project_id = row["project_id"] if "project_id" in row.keys() else None
return {
"key": row["session_key"],
"created_at": row["created_at"],
@@ -167,6 +185,7 @@ class SessionAliasStore:
"alias": alias or None,
"pinned": pinned,
"archived": archived,
"project_id": project_id,
}
backend/main.py
+18 -4
View File
@@ -116,6 +116,7 @@ class SessionAliasUpdateRequest(BaseModel):
title: Optional[str] = None
pinned: Optional[bool] = None
archived: Optional[bool] = None
project_id: Optional[int] = None
class BatchDeleteRequest(BaseModel):
@@ -299,11 +300,11 @@ async def nanobot_chat_stream(request: ChatRequest):
)
@app.get("/nanobot/sessions")
def get_sessions():
def get_sessions(project_id: Optional[int] = None):
if not nanobot_service.agent:
return session_alias_store.list_cached_sessions()
return session_alias_store.list_cached_sessions(project_id=project_id)
sessions = nanobot_service.agent.sessions.list_sessions()
return session_alias_store.sync_and_list(sessions)
return session_alias_store.sync_and_list(sessions, project_id=project_id)
@app.get("/nanobot/sessions/{session_id}")
def get_session(session_id: str):
@@ -320,12 +321,23 @@ def get_session(session_id: str):
"messages": session.messages
}
class EnsureSessionRequest(BaseModel):
project_id: Optional[int] = None
@app.post("/nanobot/sessions/{session_id}/ensure")
def ensure_session(session_id: str):
def ensure_session(session_id: str, request: EnsureSessionRequest = EnsureSessionRequest()):
if not nanobot_service.agent:
raise HTTPException(status_code=400, detail="Nanobot not running")
session = nanobot_service.agent.sessions.get_or_create(session_id)
nanobot_service.agent.sessions.save(session)
# Save project_id to the alias store immediately upon creation
if request.project_id is not None:
session_alias_store.update_alias_meta(
session_key=session_id,
project_id=request.project_id
)
alias = session_alias_store.get_alias(session_id)
return {
"key": session.key,
@@ -333,6 +345,7 @@ def ensure_session(session_id: str):
"updated_at": session.updated_at,
"metadata": session.metadata,
"alias": alias,
"project_id": request.project_id
}
@app.delete("/nanobot/sessions/{session_id}")
@@ -382,6 +395,7 @@ def update_session(session_id: str, payload: SessionAliasUpdateRequest):
alias=payload.title,
pinned=payload.pinned,
archived=payload.archived,
project_id=payload.project_id,
)
return {"status": "success", **updated}