feat(work): add task-scoped attachment intake and durable file delivery
This commit is contained in:
@@ -65,6 +65,7 @@ class Broker:
|
||||
self.pending: dict[str, Pending] = {}
|
||||
self.worker_id = uuid.uuid4().hex
|
||||
self.lifecycle = None
|
||||
self.files = None
|
||||
|
||||
async def replies(self, pub):
|
||||
async for message in pub.listen():
|
||||
@@ -144,6 +145,11 @@ class Broker:
|
||||
except Exception:
|
||||
self.store.audit(owner, "dispatch", host, "identity_rejected")
|
||||
raise HTTPException(409, "device identity rejected") from None
|
||||
file_capable=bool(self.files and proof.get('work_files')=='work-files-v1' and chat_id and source_message_id)
|
||||
if self.files and self.files.pending_count(owner,host,device['binding_generation'],chat_id,True):
|
||||
return {'status':'materials_receiving','turn_id':turn,'result':'材料仍在接收,尚未执行任务。请等附件接收回执后再发送任务要求。'}
|
||||
if self.files and self.files.pending_count(owner,host,device['binding_generation'],chat_id) and not file_capable:
|
||||
return {'status':'unavailable','turn_id':turn,'result':'材料已保留,但当前客户端尚未支持附件处理;请升级配套客户端后再发任务要求。'}
|
||||
if not self.store.begin_turn(turn, owner, host):
|
||||
return {"status": "duplicate", "turn_id": turn, "result": "该请求已接收,不会重复执行。"}
|
||||
task = None
|
||||
@@ -154,6 +160,12 @@ class Broker:
|
||||
except ValueError:
|
||||
self.store.finish(turn,"unbound")
|
||||
return {"status":"unbound","turn_id":turn,"result":"绑定已变化,任务未下发。"}
|
||||
if task and file_capable:
|
||||
try:self.files.claim(task)
|
||||
except ValueError:
|
||||
self.store.finish(turn,'not_dispatched')
|
||||
self.lifecycle.transition(turn,'inflight','completed')
|
||||
return {'status':'not_dispatched','turn_id':turn,'result':'材料接收或设备绑定状态发生变化,尚未执行任务;请等附件回执后核对。'}
|
||||
private = x25519.X25519PrivateKey.generate()
|
||||
future = asyncio.get_running_loop().create_future()
|
||||
self.pending[turn] = Pending(future, private, public, host, session)
|
||||
@@ -161,6 +173,8 @@ class Broker:
|
||||
"text": text, "read_only": True, "channel": "im",
|
||||
"reply_key": raw_public(private.public_key())}
|
||||
if task:
|
||||
if file_capable:
|
||||
payload['file_transfer']='work-files-v1'
|
||||
if source_message_id:
|
||||
payload['result_delivery']='durable-http-v1'
|
||||
payload["task_context"] = {key:task[key] for key in ("environment","app_id","owner","host_id","binding_generation",
|
||||
@@ -234,6 +248,9 @@ def create_app(settings=None, redis=None, platform=None):
|
||||
lifecycle = DeviceLifecycle(store.lifecycle,r,broker)
|
||||
from .task_delivery import TaskDelivery
|
||||
deliveries = TaskDelivery(oauth,store.lifecycle,broker,f)
|
||||
if s.work_files_enabled:
|
||||
from .work_files import WorkFiles
|
||||
broker.files=WorkFiles(s,oauth,store.lifecycle,f)
|
||||
else:
|
||||
oauth = OAuth(s, r, f)
|
||||
oauth.store = store
|
||||
@@ -275,6 +292,7 @@ def create_app(settings=None, redis=None, platform=None):
|
||||
try:
|
||||
await lifecycle.maintain()
|
||||
await deliveries.recover_interrupted_sends()
|
||||
if broker.files:await broker.files.flush()
|
||||
await deliveries.flush()
|
||||
except Exception:
|
||||
# No credentials or raw exception text in background logs.
|
||||
@@ -297,11 +315,15 @@ def create_app(settings=None, redis=None, platform=None):
|
||||
await r.aclose()
|
||||
|
||||
app = FastAPI(title="Hainuo B1 connector", lifespan=lifespan, docs_url=None, redoc_url=None)
|
||||
app.add_middleware(BodyLimitMiddleware, max_body=s.max_body)
|
||||
app.add_middleware(BodyLimitMiddleware, max_body=s.max_body,
|
||||
path_limits={'/work/v2/files/upload':s.work_file_max_bytes}if broker.files else {})
|
||||
app.include_router(oauth.router)
|
||||
if lifecycle:
|
||||
app.include_router(deliveries.router)
|
||||
app.state.deliveries=deliveries
|
||||
if broker.files:
|
||||
app.include_router(broker.files.router)
|
||||
app.state.files=broker.files
|
||||
app.include_router(notification_router(s, r, store, f, oauth))
|
||||
from .web_session import WebSessions
|
||||
web_sessions = WebSessions(s, r, store, broker, f)
|
||||
@@ -528,7 +550,8 @@ def create_app(settings=None, redis=None, platform=None):
|
||||
message, sender = event.get("message", {}), event.get("sender", {})
|
||||
owner = sender.get("sender_id", {}).get("open_id")
|
||||
message_id = message.get("message_id", "")
|
||||
if (message.get("chat_type") != "p2p" or message.get("message_type") != "text"
|
||||
kind=message.get('message_type')
|
||||
if (message.get("chat_type") != "p2p" or kind not in ({'text','file'}if broker.files else {'text'})
|
||||
or sender.get("sender_type") != "user" or not isinstance(owner,str)
|
||||
or not 0 < len(owner) <= 128 or any(ord(c) < 32 for c in owner)
|
||||
or not re.fullmatch(r"[A-Za-z0-9_-]{1,128}", message_id)):
|
||||
@@ -539,13 +562,23 @@ def create_app(settings=None, redis=None, platform=None):
|
||||
or any(ord(c) < 32 for c in message["chat_id"])):
|
||||
return
|
||||
try:
|
||||
text = json.loads(message["content"])["text"].strip()
|
||||
if not text or len(text) > 8000:
|
||||
content=json.loads(message['content'])
|
||||
text = content['text'].strip() if kind=='text' else ''
|
||||
if kind=='text' and (not text or len(text) > 8000):
|
||||
return
|
||||
# Persistent receipt BEFORE any side effect. Restarts do not execute a delivery twice.
|
||||
event_turn = "event_" + hashlib.sha256(message_id.encode()).hexdigest()
|
||||
if not store.begin_turn(event_turn, owner, "event"):
|
||||
return
|
||||
if kind=='file':
|
||||
try:
|
||||
await broker.files.receive(owner,message['chat_id'],message_id,content)
|
||||
result='材料已接收。可以继续发送其他材料,最后发出本次任务要求;暂未执行模型任务。'
|
||||
except Exception:
|
||||
result='这件附件未接收成功,请核对文件格式、大小、资源权限或设备绑定;其他已接收材料仍保留。'
|
||||
try:await f.reply(message_id,result)
|
||||
finally:store.finish(event_turn,'attachment_processed')
|
||||
return
|
||||
if text == "/绑定":
|
||||
result = await make_binding_code(owner)
|
||||
elif text == "/解绑":
|
||||
|
||||
Reference in New Issue
Block a user