chore: enforce ruff lint and format standards across backend
This commit is contained in:
Jonas Miederer
parent
a8e312a4f8
commit
a6cc585dd0
39 changed files with 459 additions and 559 deletions
|
|
@ -68,7 +68,8 @@ def builtin_node(
|
|||
return node_dict
|
||||
|
||||
|
||||
def custom_node( code: str,
|
||||
def custom_node(
|
||||
code: str,
|
||||
node_id: str,
|
||||
values: dict | None = None,
|
||||
position: tuple[int, int] = (0, 0),
|
||||
|
|
@ -109,9 +110,7 @@ def kirche_node(
|
|||
|
||||
comp_name = getattr(CustomInputForm, "name", None) or "CustomInputForm"
|
||||
inst = CustomInputForm()
|
||||
frontend_node = ComponentFrontendNode.from_inputs(
|
||||
**inst.get_template_config(inst)
|
||||
)
|
||||
frontend_node = ComponentFrontendNode.from_inputs(**inst.get_template_config(inst))
|
||||
inst._map_parameters_on_frontend_node(frontend_node)
|
||||
node = frontend_node.to_dict(keep_name=False)
|
||||
node = inst._update_template(node)
|
||||
|
|
@ -207,9 +206,7 @@ def edge(src: dict, src_output: str, dst: dict, dst_input: str) -> dict:
|
|||
# --------------------------------------------------------------------------
|
||||
# flow document
|
||||
# --------------------------------------------------------------------------
|
||||
def flow_doc(
|
||||
name: str, description: str, nodes: list[dict], edges: list[dict]
|
||||
) -> dict:
|
||||
def flow_doc(name: str, description: str, nodes: list[dict], edges: list[dict]) -> dict:
|
||||
return {
|
||||
"data": {
|
||||
"nodes": nodes,
|
||||
|
|
@ -233,7 +230,7 @@ def flow_doc(
|
|||
# --------------------------------------------------------------------------
|
||||
# custom component code
|
||||
# --------------------------------------------------------------------------
|
||||
RULE_CHECK_CODE = '''from lfx.custom import Component
|
||||
RULE_CHECK_CODE = """from lfx.custom import Component
|
||||
from lfx.io import MessageTextInput, Output
|
||||
from lfx.schema.message import Message
|
||||
import json
|
||||
|
|
@ -277,9 +274,9 @@ class RuleCheckComponent(Component):
|
|||
except (TypeError, ValueError):
|
||||
schwelle = 200000.0
|
||||
return Message(text="PRUEFUNG" if betrag > schwelle else "OK")
|
||||
'''
|
||||
"""
|
||||
|
||||
ENVELOPE_CODE = '''from lfx.custom import Component
|
||||
ENVELOPE_CODE = """from lfx.custom import Component
|
||||
from lfx.io import MessageTextInput, Output
|
||||
from lfx.schema.message import Message
|
||||
import json
|
||||
|
|
@ -336,9 +333,9 @@ class EnvelopeComponent(Component):
|
|||
def get_continuation(self) -> Message:
|
||||
value = self._env().get("continuation_flow_id")
|
||||
return Message(text=str(value) if value else "")
|
||||
'''
|
||||
"""
|
||||
|
||||
APPROVAL_CALLBACK_CODE = '''from lfx.custom import Component
|
||||
APPROVAL_CALLBACK_CODE = """from lfx.custom import Component
|
||||
from lfx.io import MessageTextInput, Output
|
||||
from lfx.schema.message import Message
|
||||
|
||||
|
|
@ -393,7 +390,7 @@ class ApprovalCallbackComponent(Component):
|
|||
except Exception as exc:
|
||||
return Message(text=f"CALLBACK_FAILED: {exc}")
|
||||
return Message(text="PENDING_HUMAN_APPROVAL")
|
||||
'''
|
||||
"""
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
|
|
@ -456,9 +453,7 @@ def build_approval_handoff() -> dict:
|
|||
"ChatInput-entry",
|
||||
position=(0, 300),
|
||||
)
|
||||
envelope = custom_node(
|
||||
ENVELOPE_CODE, "CustomComponent-envelope", position=(400, 300)
|
||||
)
|
||||
envelope = custom_node(ENVELOPE_CODE, "CustomComponent-envelope", position=(400, 300))
|
||||
rule = custom_node(RULE_CHECK_CODE, "CustomComponent-rule", position=(800, 300))
|
||||
router = builtin_node(
|
||||
"lfx.components.flow_controls.conditional_router",
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import os
|
|||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
import urllib.request
|
||||
from pathlib import Path
|
||||
|
||||
|
|
@ -58,9 +59,7 @@ def main() -> None:
|
|||
tmp = Path(tempfile.mkdtemp(prefix="kirche-smoke-"))
|
||||
flow_dir = Path("/tmp/smoke-e2e-flows")
|
||||
flow_dir.mkdir(exist_ok=True)
|
||||
(flow_dir / "seed.json").write_text(
|
||||
(FIXTURES / "simple_rule.json").read_text()
|
||||
)
|
||||
(flow_dir / "seed.json").write_text((FIXTURES / "simple_rule.json").read_text())
|
||||
# Migrate a throwaway SQLite schema to head before starting the API.
|
||||
from alembic import command as alembic_command
|
||||
from alembic.config import Config
|
||||
|
|
@ -83,14 +82,26 @@ def main() -> None:
|
|||
"CALLBACK_BASE_URL": f"http://127.0.0.1:{API_PORT}",
|
||||
}
|
||||
lfx = subprocess.Popen(
|
||||
[str(VENV_BIN / "lfx"), "serve", "--host", "127.0.0.1",
|
||||
"--port", str(LFX_PORT), "--flow-dir", str(flow_dir), str(flow_dir)],
|
||||
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, env=env,
|
||||
[
|
||||
str(VENV_BIN / "lfx"),
|
||||
"serve",
|
||||
"--host",
|
||||
"127.0.0.1",
|
||||
"--port",
|
||||
str(LFX_PORT),
|
||||
"--flow-dir",
|
||||
str(flow_dir),
|
||||
str(flow_dir),
|
||||
],
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL,
|
||||
env=env,
|
||||
)
|
||||
uvicorn = subprocess.Popen(
|
||||
[str(VENV_BIN / "uvicorn"), "app.main:app", "--host", "127.0.0.1",
|
||||
"--port", str(API_PORT)],
|
||||
cwd=str(BACKEND), stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
|
||||
[str(VENV_BIN / "uvicorn"), "app.main:app", "--host", "127.0.0.1", "--port", str(API_PORT)],
|
||||
cwd=str(BACKEND),
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL,
|
||||
env=env,
|
||||
)
|
||||
try:
|
||||
|
|
@ -106,7 +117,8 @@ def main() -> None:
|
|||
|
||||
fx = json.loads((FIXTURES / "simple_rule.json").read_text())
|
||||
s, ver = api(
|
||||
"POST", f"/api/flows/{fid}/versions",
|
||||
"POST",
|
||||
f"/api/flows/{fid}/versions",
|
||||
{"langflow_json": fx, "author": "smoke"},
|
||||
)
|
||||
check("create version", s == 201, f"v{ver.get('version_no')}")
|
||||
|
|
@ -115,17 +127,25 @@ def main() -> None:
|
|||
check("deploy", s == 200 and dep.get("lfx_flow_id"), json.dumps(dep)[:160])
|
||||
|
||||
s, run = api(
|
||||
"POST", f"/api/flows/{fid}/run",
|
||||
"POST",
|
||||
f"/api/flows/{fid}/run",
|
||||
{"input": {"betrag": 120000, "schwelle": 200000}},
|
||||
)
|
||||
check("run standard", s == 200 and run.get("status") == "completed",
|
||||
json.dumps(run.get("output"))[:120])
|
||||
check(
|
||||
"run standard",
|
||||
s == 200 and run.get("status") == "completed",
|
||||
json.dumps(run.get("output"))[:120],
|
||||
)
|
||||
|
||||
s, run2 = api(
|
||||
"POST", f"/api/flows/{fid}/run",
|
||||
"POST",
|
||||
f"/api/flows/{fid}/run",
|
||||
{"input": {"betrag": 999000, "schwelle": 200000}},
|
||||
)
|
||||
check("run sonderfall", s == 200 and "Sonderfall" in (run2.get("output") or {}).get("result", ""))
|
||||
check(
|
||||
"run sonderfall",
|
||||
s == 200 and "Sonderfall" in (run2.get("output") or {}).get("result", ""),
|
||||
)
|
||||
|
||||
s, tasks = api("GET", "/api/approvals")
|
||||
check("approvals empty (no callback flow)", s == 200 and tasks == [])
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ from sqlmodel import Session
|
|||
|
||||
from app.db import get_engine, reset_engine
|
||||
from app.flows import export, sync
|
||||
from app.flows.langflow_client import LangflowClient
|
||||
from app.flows.langflow_client import LangflowClient, LangflowError
|
||||
from app.flows.lfx_client import LfxClient
|
||||
from app.flows.schemas import SyncReport
|
||||
from app.settings import settings
|
||||
|
|
@ -38,7 +38,7 @@ async def pull_from_langflow(flows_dir: Path) -> dict:
|
|||
name = doc.get("name") or flow_id
|
||||
path = export.write_flow_file(flows_dir, doc, name=name)
|
||||
pulled.append(path.stem)
|
||||
except Exception as exc: # noqa: BLE001 - pull-all is total
|
||||
except (LangflowError, OSError, ValueError) as exc:
|
||||
errors[flow_id] = str(exc)
|
||||
return {"pulled": sorted(pulled), "errors": errors}
|
||||
|
||||
|
|
@ -73,12 +73,11 @@ async def main_async(args) -> int:
|
|||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--pull", action="store_true",
|
||||
help="export all Langflow flows to backend/flows first")
|
||||
parser.add_argument("--sync", action="store_true",
|
||||
help="reconcile backend/flows into DB + LFX")
|
||||
parser.add_argument("--dir", default=None,
|
||||
help="flows directory (default: settings.flows_dir)")
|
||||
parser.add_argument(
|
||||
"--pull", action="store_true", help="export all Langflow flows to backend/flows first"
|
||||
)
|
||||
parser.add_argument("--sync", action="store_true", help="reconcile backend/flows into DB + LFX")
|
||||
parser.add_argument("--dir", default=None, help="flows directory (default: settings.flows_dir)")
|
||||
args = parser.parse_args()
|
||||
if not args.pull and not args.sync:
|
||||
args.sync = True
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue