diff --git a/README.md b/README.md
index 1624a7719cfa69838bd447f945a78734dd36b8f0..31040f2a2677fa00993a26496c90d2b24dfac2ef 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ pinned: false
# Global Marine Foundation Data Agent
-Current UI release: **v4.6.8**.
+Current UI release: **v4.6.9**.
## v3.4.0 稳定性重构（第一阶段）
diff --git a/VERSION b/VERSION
index d3acad059334fc5d7ea299f10be58d683ff257b2..ded82a977f159f27052c0b1e6189b602a4eee13b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.6.8
+4.6.9
diff --git a/routes/manual_tasks.py b/routes/manual_tasks.py
new file mode 100644
index 0000000000000000000000000000000000000000..d52cd79fc4e0f3431fecb91bbfe396bc21f0cfe2
--- /dev/null
+++ b/routes/manual_tasks.py
@@ -0,0 +1,66 @@
+from __future__ import annotations
+from fastapi import HTTPException, Request
+
+
+def _inject(context):
+ globals().update(context)
+
+
+async def create_manual_task(request:Request):
+ try:
+ body=await request.json()
+ except Exception:
+ raise HTTPException(400,"invalid json")
+ uid,_=await resolve_request_user(request,str(body.get("user_id") or ""))
+ try:
+ task=MANUAL_TASK_STORE.create(
+ uid,
+ body.get("title"),
+ body.get("description") or "",
+ body.get("status") or "pending",
+ )
+ except ValueError as exc:
+ raise HTTPException(400,str(exc))
+ try:
+ await safe_memory_event(uid,"manual_task_created",{"task_id":task["task_id"],"title":task["title"],"status":task["status"]})
+ except Exception:
+ pass
+ return {"status":"ok","task":task,"storage":MANUAL_TASK_STORE.storage_mode}
+
+
+async def update_manual_task(task_id:str,request:Request):
+ try:
+ body=await request.json()
+ except Exception:
+ raise HTTPException(400,"invalid json")
+ uid,_=await resolve_request_user(request,str(body.get("user_id") or ""))
+ try:
+ task=MANUAL_TASK_STORE.update(uid,task_id,body)
+ except ValueError as exc:
+ raise HTTPException(400,str(exc))
+ if not task:
+ raise HTTPException(404,"manual task not found")
+ try:
+ await safe_memory_event(uid,"manual_task_updated",{"task_id":task_id,"status":task.get("status")})
+ except Exception:
+ pass
+ return {"status":"ok","task":task,"storage":MANUAL_TASK_STORE.storage_mode}
+
+
+async def delete_manual_task(task_id:str,request:Request):
+ supplied=str(request.query_params.get("user_id") or "").strip()
+ uid,_=await resolve_request_user(request,supplied)
+ if not MANUAL_TASK_STORE.delete(uid,task_id):
+ raise HTTPException(404,"manual task not found")
+ try:
+ await safe_memory_event(uid,"manual_task_deleted",{"task_id":task_id})
+ except Exception:
+ pass
+ return {"status":"ok","task_id":task_id}
+
+
+def register_manual_task_routes(app,context):
+ _inject(context)
+ app.add_api_route("/api/sidebar/tasks/manual",create_manual_task,methods=["POST"])
+ app.add_api_route("/api/sidebar/tasks/manual/{task_id}",update_manual_task,methods=["PATCH"])
+ app.add_api_route("/api/sidebar/tasks/manual/{task_id}",delete_manual_task,methods=["DELETE"])
diff --git a/services/manual_tasks.py b/services/manual_tasks.py
new file mode 100644
index 0000000000000000000000000000000000000000..21b55b006f89aed0fbf982dfac79edf95c27bca8
--- /dev/null
+++ b/services/manual_tasks.py
@@ -0,0 +1,109 @@
+from __future__ import annotations
+
+import json
+import secrets
+import time
+from datetime import datetime
+from pathlib import Path
+from threading import RLock
+from typing import Any
+
+
+class ManualTaskStore:
+ VALID_STATUSES={"pending","running","completed","failed"}
+
+ def __init__(self, root:Path, valid_user_id, max_tasks:int=300):
+ self.root=Path(root)/"manual_tasks"
+ self.root.mkdir(parents=True,exist_ok=True)
+ self.valid_user_id=valid_user_id
+ self.max_tasks=max(20,int(max_tasks))
+ self.lock=RLock()
+
+ @property
+ def storage_mode(self)->str:
+ return "persistent" if str(self.root).startswith("/data/") else "server-session"
+
+ def _file(self,user_id:str)->Path:
+ if not self.valid_user_id(user_id):
+ raise ValueError("invalid user_id")
+ return self.root/f"{user_id}.json"
+
+ def _read(self,user_id:str)->list[dict[str,Any]]:
+ path=self._file(user_id)
+ try:
+ raw=json.loads(path.read_text(encoding="utf-8"))
+ return raw if isinstance(raw,list) else []
+ except Exception:
+ return []
+
+ def _write(self,user_id:str,tasks:list[dict[str,Any]])->None:
+ path=self._file(user_id)
+ tmp=path.with_suffix(".tmp")
+ tmp.write_text(json.dumps(tasks[:self.max_tasks],ensure_ascii=False,indent=2),encoding="utf-8")
+ tmp.replace(path)
+
+ def _clean_text(self,value:Any,limit:int)->str:
+ return " ".join(str(value or "").replace("\x00","").split())[:limit]
+
+ def _normalize_status(self,value:Any)->str:
+ status=str(value or "pending").strip().lower()
+ return status if status in self.VALID_STATUSES else "pending"
+
+ def list_user(self,user_id:str,limit:int=200)->list[dict[str,Any]]:
+ with self.lock:
+ tasks=self._read(user_id)
+ tasks.sort(key=lambda x:str(x.get("updated_at") or x.get("created_at") or ""),reverse=True)
+ return tasks[:max(1,min(int(limit or 200),self.max_tasks))]
+
+ def create(self,user_id:str,title:str,description:str="",status:str="pending")->dict[str,Any]:
+ now=datetime.now().astimezone().isoformat(timespec="seconds")
+ task={
+ "kind":"manual",
+ "task_id":"manual_"+secrets.token_hex(8),
+ "user_id":user_id,
+ "title":self._clean_text(title,160),
+ "description":self._clean_text(description,4000),
+ "status":self._normalize_status(status),
+ "source":"manual",
+ "created_at":now,
+ "updated_at":now,
+ }
+ if not task["title"]:
+ raise ValueError("title is required")
+ with self.lock:
+ tasks=self._read(user_id)
+ tasks=[task]+[x for x in tasks if x.get("task_id")!=task["task_id"]]
+ self._write(user_id,tasks)
+ return task
+
+ def update(self,user_id:str,task_id:str,patch:dict[str,Any])->dict[str,Any]|None:
+ with self.lock:
+ tasks=self._read(user_id)
+ target=None
+ for task in tasks:
+ if str(task.get("task_id") or "")==task_id:
+ target=task
+ break
+ if target is None:
+ return None
+ if "title" in patch:
+ title=self._clean_text(patch.get("title"),160)
+ if not title:
+ raise ValueError("title is required")
+ target["title"]=title
+ if "description" in patch:
+ target["description"]=self._clean_text(patch.get("description"),4000)
+ if "status" in patch:
+ target["status"]=self._normalize_status(patch.get("status"))
+ target["updated_at"]=datetime.now().astimezone().isoformat(timespec="seconds")
+ self._write(user_id,tasks)
+ return dict(target)
+
+ def delete(self,user_id:str,task_id:str)->bool:
+ with self.lock:
+ tasks=self._read(user_id)
+ kept=[x for x in tasks if str(x.get("task_id") or "")!=task_id]
+ if len(kept)==len(tasks):
+ return False
+ self._write(user_id,kept)
+ return True
diff --git a/static/js/app.js b/static/js/app.js
index ce27324301d306e605147cf1cfb33defd39b2a74..112403ac018b43c721ab93c33036266c580f1fb3 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -1087,8 +1087,8 @@ async function renderServices(){
const TASK_OPERATION_ZH={quality_check:"数据质量检查",marine_export:"海洋数据导出",marine_query:"海洋数据查询",marine_subset:"海洋区域裁剪",fisheries_query:"渔业数据查询",task:"数据处理任务"};
function taskOperationLabel(v){return TASK_OPERATION_ZH[String(v||"")]||String(v||"数据处理任务")}
-function taskStatusGroup(v){const s=String(v||"");if(/completed|done|success|成功|完成/i.test(s))return "completed";if(/failed|error|失败|异常/i.test(s))return "failed";return "running"}
-function taskStatusLabel(v){const g=taskStatusGroup(v);return g==="completed"?"已完成":g==="failed"?"失败":"处理中"}
+function taskStatusGroup(v){const s=String(v||"");if(/completed|done|success|成功|完成/i.test(s))return "completed";if(/failed|error|失败|异常/i.test(s))return "failed";if(/pending|todo|queued|待处理|等待/i.test(s))return "pending";return "running"}
+function taskStatusLabel(v){const g=taskStatusGroup(v);return g==="completed"?"已完成":g==="failed"?"失败":g==="pending"?"待处理":"处理中"}
function taskProgressHtml(task){
const g=taskStatusGroup(task.status),explicit=Number(task.progress);
if(task.progress!==null&&task.progress!==undefined&&Number.isFinite(explicit))return '
处理进度：'+esc(explicit)+'%
';
@@ -1119,21 +1119,68 @@ function assetContinuePrompt(asset){return '请分析这个已生成的数据资
function openAssetDetail(asset){
document.querySelector(".drawer-backdrop")?.remove();const wrap=document.createElement("div");wrap.className="drawer-backdrop";wrap.innerHTML='';document.body.appendChild(wrap);const close=()=>wrap.remove();wrap.querySelector(".drawer-close").onclick=close;wrap.onclick=e=>{if(e.target===wrap)close()};wrap.querySelector(".asset-chat").onclick=()=>{close();goChat(assetContinuePrompt(asset))}
}
+function openManualTaskEditor(task=null){
+ document.querySelector(".drawer-backdrop")?.remove();
+ const editing=!!task;
+ const wrap=document.createElement("div");wrap.className="drawer-backdrop";
+ wrap.innerHTML='';
+ document.body.appendChild(wrap);
+ const close=()=>wrap.remove();
+ wrap.querySelector(".drawer-close").onclick=close;
+ wrap.querySelector(".manual-task-cancel").onclick=close;
+ wrap.onclick=e=>{if(e.target===wrap)close()};
+ const status=wrap.querySelector("#manualTaskStatus");status.value=task?.status||"pending";
+ wrap.querySelector("#manualTaskSave").onclick=async()=>{
+ const title=wrap.querySelector("#manualTaskTitle").value.trim();
+ const description=wrap.querySelector("#manualTaskDescription").value.trim();
+ if(!title){toast("请填写任务名称");wrap.querySelector("#manualTaskTitle").focus();return}
+ const btn=wrap.querySelector("#manualTaskSave");btn.disabled=true;
+ try{
+ if(editing){
+ await j("/api/sidebar/tasks/manual/"+encodeURIComponent(task.task_id),{method:"PATCH",body:JSON.stringify({user_id:USER_ID,title,description,status:status.value})});
+ toast("任务已更新");
+ }else{
+ await j("/api/sidebar/tasks/manual",{method:"POST",body:JSON.stringify({user_id:USER_ID,title,description,status:status.value})});
+ toast("任务已创建");
+ }
+ close();await renderTasks();
+ }catch(err){toast("保存失败："+(err.message||String(err)))}
+ finally{btn.disabled=false}
+ };
+ setTimeout(()=>wrap.querySelector("#manualTaskTitle")?.focus(),0);
+}
+
+async function deleteManualTask(task){
+ if(!confirm('确认删除任务“'+(task.title||"未命名任务")+'”？'))return;
+ try{
+ await j("/api/sidebar/tasks/manual/"+encodeURIComponent(task.task_id)+"?user_id="+encodeURIComponent(USER_ID),{method:"DELETE"});
+ toast("任务已删除");await renderTasks();
+ }catch(err){toast("删除失败："+(err.message||String(err)))}
+}
+
async function renderTasks(){
- const root=$("workspaceInner");root.innerHTML='我的任务
查看当前登录用户的数据处理任务和生成的数据资产。
正在读取任务记录…
';$("refreshTasks").onclick=renderTasks;
+ const root=$("workspaceInner");root.innerHTML='我的任务
查看当前登录用户的数据处理任务和生成的数据资产。
正在读取任务记录…
';$("refreshTasks").onclick=renderTasks;$("newManualTask").onclick=()=>openManualTaskEditor();
try{
- const data=await j("/api/sidebar/tasks?user_id="+encodeURIComponent(USER_ID)),tasks=data.tasks||[],assets=data.assets||[],localTasks=data.local_tasks||[],allStatus=[...tasks,...localTasks],running=allStatus.filter(x=>["running","queued","transferring","paused"].includes(String(x.status||"").toLowerCase())).length,failed=allStatus.filter(x=>["failed","partial"].includes(String(x.status||"").toLowerCase())).length,completed=allStatus.filter(x=>String(x.status||"").toLowerCase()==="completed").length;
- let html='我的任务
'+esc(data.enabled?"任务、结果和数据资产已按当前用户关联":"任务记录服务尚未启用")+'
'+(tasks.length+localTasks.length)+'全部任务
'+running+'处理中
'+completed+'已完成
'+failed+'失败
'+assets.length+'数据资产
我的任务
'+esc(data.enabled?"任务、结果和数据资产已按当前用户关联":"任务记录服务尚未启用")+'
'+(tasks.length+localTasks.length)+'全部任务
'+pending+'待处理
'+running+'处理中
'+completed+'已完成
'+failed+'失败
'+assets.length+'数据资产
手动任务存储：'+esc(data.manual_task_storage==="persistent"?"账号服务器持久化（可跨设备）":"服务器会话存储（未挂载持久卷）")+'。
';
if(data.error)html+='';
html+='持久化任务
处理任务
数据资产
';
- root.innerHTML=html;$("refreshTasks").onclick=renderTasks;
+ root.innerHTML=html;$("refreshTasks").onclick=renderTasks;$("newManualTask").onclick=()=>openManualTaskEditor();
const drawPersistent=()=>{
const box=$("persistentTaskList");if(!box)return;
if(!localTasks.length){box.innerHTML='暂无持久化任务Ocean 批量导出和大文件下载任务会保存在这里。
';return}
box.innerHTML=localTasks.map((x,i)=>{
+ if(x.kind==="manual"){const g=taskStatusGroup(x.status);return ''+esc(x.title||"手动任务")+''+esc(taskStatusLabel(x.status))+'
'+esc(x.task_id||"")+' · 手动创建 · '+esc(formatTime(x.updated_at||x.created_at))+'
'+esc(x.description||"暂无任务说明")+'
'+(x.status!=="completed"?'':'')+'
Ocean 批量导出'+esc(x.status||"-")+'
'+esc(x.job_id||"")+' · '+esc(formatTime(x.updated_at||x.created_at))+(x.thread_id?' · 关联会话 '+esc(x.thread_id):'')+'
'+esc(x.prompt||"")+'
'+pct.toFixed(0)+'% · 完成 '+esc(c.completed||0)+' / '+esc(x.total||0)+' · 失败 '+esc(c.failed||0)+'
'+(x.status==="paused"?'':'')+((c.failed||0)>0?'':'')+''+(x.thread_id?'':'')+'
大文件下载'+esc(x.status||"-")+'
'+esc(x.job_id||"")+' · '+esc(x.filename||"download")+' · '+esc(formatTime(x.updated_at))+'
已传输 '+esc(formatBytes(x.transferred_bytes||0))+(x.total_bytes?' / '+esc(formatBytes(x.total_bytes)):'')+(x.resume_supported?' · 支持断点续传':'')+'