refactor: tighten backend, flows, frontend, tests; push flows to Langflow
This commit is contained in:
parent
6688fb08c6
commit
06ab25fb47
31 changed files with 783 additions and 358 deletions
|
|
@ -3,15 +3,18 @@
|
|||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
from collections.abc import AsyncIterator
|
||||
from uuid import UUID
|
||||
|
||||
from sqlmodel import Session, select
|
||||
import httpx
|
||||
from sqlmodel import Session
|
||||
|
||||
from app.models import ApprovalTask, FlowRun, FlowVersion
|
||||
from app.db import get_engine
|
||||
from app.models import FlowRun, FlowVersion
|
||||
|
||||
from . import input_schema as form_schema
|
||||
from . import store
|
||||
from .lfx_client import LfxClient, LfxRunFailed
|
||||
from .lfx_client import LfxClient, LfxNotFound, LfxRunFailed
|
||||
from .store import InvalidError
|
||||
|
||||
|
||||
|
|
@ -40,12 +43,7 @@ def build_envelope(
|
|||
|
||||
|
||||
def _task_exists(session: Session, run_id: UUID) -> bool:
|
||||
return (
|
||||
session.exec(
|
||||
select(ApprovalTask).where(ApprovalTask.run_id == run_id, ApprovalTask.status == "open")
|
||||
).first()
|
||||
is not None
|
||||
)
|
||||
return store.has_open_task(session, run_id)
|
||||
|
||||
|
||||
async def execute_run(
|
||||
|
|
@ -97,3 +95,73 @@ async def execute_run(
|
|||
if _task_exists(session, run.id):
|
||||
return store.set_run_result(session, run, "pending_approval", output)
|
||||
return store.set_run_result(session, run, "completed", output)
|
||||
|
||||
|
||||
async def stream_run(
|
||||
session: Session,
|
||||
lfx: LfxClient,
|
||||
version: FlowVersion,
|
||||
*,
|
||||
payload: dict,
|
||||
tenant_id: str,
|
||||
session_id: str | None,
|
||||
callback_base_url: str,
|
||||
continuation_flow_id: UUID | None,
|
||||
callback_token: str,
|
||||
) -> tuple[FlowRun, str, str, str]:
|
||||
"""Create a run + envelope for SSE streaming. Returns (run, envelope, lfx_id, sid).
|
||||
|
||||
The actual SSE bytes are produced by the API layer; finalization uses a
|
||||
fresh session (the request session may be closed when the generator ends).
|
||||
"""
|
||||
if not version.lfx_flow_id:
|
||||
raise InvalidError(f"version {version.id} is not deployed to LFX")
|
||||
run = store.create_run(
|
||||
session, version, input=payload, tenant_id=tenant_id, session_id=session_id
|
||||
)
|
||||
cached = version.input_schema or form_schema.extract_form_schema(version.langflow_json)
|
||||
envelope = build_envelope(
|
||||
payload=payload,
|
||||
run_id=run.id,
|
||||
callback_base_url=callback_base_url,
|
||||
continuation_flow_id=continuation_flow_id,
|
||||
callback_token=callback_token,
|
||||
fields=form_schema.schema_field_names(cached),
|
||||
)
|
||||
return run, envelope, version.lfx_flow_id, session_id or str(run.id)
|
||||
|
||||
|
||||
async def stream_lfx_chunks(
|
||||
lfx: LfxClient, lfx_flow_id: str, envelope: str, sid: str
|
||||
) -> AsyncIterator[str]:
|
||||
"""Yield raw SSE chunks from LFX, mapping transport errors to error events."""
|
||||
try:
|
||||
async with (
|
||||
httpx.AsyncClient(
|
||||
base_url=lfx.base_url, timeout=lfx.timeout, headers=lfx._headers()
|
||||
) as client,
|
||||
client.stream(
|
||||
"POST",
|
||||
f"/flows/{lfx_flow_id}/stream",
|
||||
json={"input_value": envelope, "session_id": sid},
|
||||
) as response,
|
||||
):
|
||||
if response.status_code == 404:
|
||||
raise LfxNotFound(f"flow {lfx_flow_id} unknown to LFX")
|
||||
response.raise_for_status()
|
||||
async for chunk in response.aiter_text():
|
||||
yield chunk
|
||||
except (LfxNotFound, httpx.HTTPError) as exc:
|
||||
yield f"event: error\ndata: {json.dumps({'error': str(exc)})}\n\n"
|
||||
|
||||
|
||||
def finalize_streamed_run(run_id: UUID) -> str:
|
||||
"""Mark a streamed run completed/pending_approval from a fresh session."""
|
||||
with Session(get_engine()) as fresh:
|
||||
try:
|
||||
fresh_run = store.get_run(fresh, run_id)
|
||||
status = "pending_approval" if store.has_open_task(fresh, run_id) else "completed"
|
||||
store.set_run_result(fresh, fresh_run, status, {"streamed": True})
|
||||
except store.NotFoundError:
|
||||
status = "failed"
|
||||
return status
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue