Lars/Trainer_LLM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llm-api/plan_router.py aktualisiert
All checks were successful
Deploy Trainer_LLM to llm-node / deploy (push) Successful in 1s
Details

Browse Source
This commit is contained in:
Lars 2025-08-13 08:01:09 +02:00
parent 9fd41ce3f0
commit d2af8881a8
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
llm-api/plan_router.py
View File

@ -1,15 +1,16 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
plan_router.py – v0.12.3 (WP-15) plan_router.py – v0.12.4 (WP-15)
Minimal-CRUD für Plan-Templates & Pläne (POST/GET) + Idempotenz via Fingerprint. Minimal-CRUD für Plan-Templates & Pläne (POST/GET) + Idempotenz via Fingerprint.
Änderungen ggü. v0.12.0/0.12.1/0.12.2: Änderungen ggü. v0.12.1/0.12.3:
- NEU: GET /plan_templates – Liste & Filter (discipline, age_group, target_group, section, goal, keyword) - FIX: POST /plan materialisiert `plan_section_names` im Payload (robuste Section-Filter).
- NEU: GET /plans – Liste & Filter (created_by, discipline, age_group, target_group, goal, section, created_from/created_to) - GET /plans filtert auf `plan_section_names` (statt verschachteltem `sections.name`).
- FIX/NEU: POST /plan materialisiert `plan_section_names` für robuste Section-Filter & Index - GET /plan_templates & GET /plans: Filter + Paging + Swagger-Beschreibungen.
- Beibeh.: Idempotenz via fingerprint, optionale Strict-Checks (template/exercises) - Optional: Strict-Checks (template_id/exercises) via ENV.
- Swagger-Doku präzisiert
Hinweis: KEYWORD-Index für `plans.plan_section_names` per bootstrap sicherstellen.
""" """
from fastapi import APIRouter, HTTPException, Query from fastapi import APIRouter, HTTPException, Query
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
@ -325,17 +326,15 @@ def create_plan(p: Plan):
if isinstance(payload.get("created_at"), datetime): if isinstance(payload.get("created_at"), datetime):
payload["created_at"] = payload["created_at"].astimezone(timezone.utc).isoformat() payload["created_at"] = payload["created_at"].astimezone(timezone.utc).isoformat()
# Materialisierte Section-Namen für robuste Filter/Indizes # Materialisierte Section-Namen für robuste Filter/Indizes
"""
try: try:
payload["plan_section_names"] = _norm_list([s.get("name", "") for s in (payload.get("sections") or [])]) payload["plan_section_names"] = _norm_list([
(s.get("name") or "").strip() for s in (payload.get("sections") or []) if isinstance(s, dict)
])
except Exception: except Exception:
payload["plan_section_names"] = _norm_list([s.name for s in (p.sections or [])]) payload["plan_section_names"] = _norm_list([
""" (getattr(s, "name", "") or "").strip() for s in (p.sections or [])
try: ])
payload["plan_section_names"] = sorted({ (s.get("name") or "").strip() for s in (payload.get("sections") or []) if s.get("name") })
except Exception:
payload["plan_section_names"] = sorted({ (s.name or "").strip() for s in (p.sections or []) if getattr(s, "name", None) })
vec = _embed(_plan_embed_text(p)) vec = _embed(_plan_embed_text(p))
qdrant.upsert(collection_name=PLAN_COLLECTION, points=[PointStruct(id=str(p.id), vector=vec, payload=payload)]) qdrant.upsert(collection_name=PLAN_COLLECTION, points=[PointStruct(id=str(p.id), vector=vec, payload=payload)])
return p return p
@ -397,7 +396,7 @@ def list_plans(
must.append(FieldCondition(key="goals", match=MatchValue(value=goal))) must.append(FieldCondition(key="goals", match=MatchValue(value=goal)))
if section: if section:
must.append(FieldCondition(key="plan_section_names", match=MatchValue(value=section))) must.append(FieldCondition(key="plan_section_names", match=MatchValue(value=section)))
flt = Filter(must=must or None) if must else None flt = Filter(must=must or None) if must else None
fetch_n = max(offset + limit, 1) fetch_n = max(offset + limit, 1)