From c07eb860fa38378be367d008004f19bbdbedc85c Mon Sep 17 00:00:00 2001 From: dfuhrmann3 Date: Tue, 7 Jul 2026 16:14:17 +0200 Subject: [PATCH] feat(ui): group validation fields into tabs (Basis/Parteien/Positionen/PDF-Text) Reduces scrolling - Summen und Export bleiben unterhalb der Tabs immer sichtbar. Reine UI-Umgruppierung, keine Aenderung an Feldern oder Berechnungslogik. Co-Authored-By: Claude Opus 4.8 --- main.py | 340 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 174 insertions(+), 166 deletions(-) diff --git a/main.py b/main.py index 6a31f87..bddec63 100644 --- a/main.py +++ b/main.py @@ -38,16 +38,16 @@ if "invoice_counter" not in st.session_state: # 1. API-CLIENT FÜR DAS vLLM-BACKEND # ========================================== class LLMClient: - + def __init__(self, model="gemma431b", base_url="http://10.192.0.140:8002"): self.model = model - + base_url = base_url.strip() if base_url.startswith("[") and ")" in base_url: match = re.search(r"\((https?://.*?)\)", base_url) if match: base_url = match.group(1) - + self.base_url = base_url.rstrip("/") def chat(self, prompt, system_prompt="You are a helpful assistant.", temperature=0.0, json_schema=None): @@ -64,10 +64,10 @@ class LLMClient: "messages": messages, "temperature": temperature } - + if json_schema: payload["guided_json"] = json.dumps(json_schema) if isinstance(json_schema, dict) else json_schema - + try: response = requests.post(url, json=payload, timeout=120) response.raise_for_status() @@ -109,7 +109,6 @@ with col1: st.success("PDF eingelesen!") uploaded_file.seek(0) st.pdf(uploaded_file) - with st.expander("Gefundener Text"): st.text(pdf_text) with col2: st.subheader("2. Strukturierte Daten validieren") @@ -118,9 +117,9 @@ with col2: if uploaded_file is not None and pdf_text.strip() != "": if st.button("Daten extrahieren", width="stretch"): with st.spinner("Extrahiere Daten über vLLM-API..."): - + schema_dict = InvoiceMetadata.model_json_schema() - + sys_prompt = ( "Du bist ein präziser OCR-Parser für deutsche B2B-Rechnungen. " "Extrahiere die Metadaten fehlerfrei als valides JSON-Objekt. " @@ -149,14 +148,14 @@ with col2: "Antworte ausschließlich mit dem reinen JSON-Objekt. Schreibe keinen anderen Text." ) prompt_meta = f"Rechnungstext:\n{pdf_text}" - + res_meta_text = llm.chat( - prompt=prompt_meta, - system_prompt=sys_prompt, - temperature=0.0, + prompt=prompt_meta, + system_prompt=sys_prompt, + temperature=0.0, json_schema=schema_dict ) - + clean_json_text = res_meta_text.strip() backtick_trigger = chr(96) * 3 if clean_json_text.startswith(backtick_trigger): @@ -166,14 +165,14 @@ with col2: if lines and lines[-1].startswith(backtick_trigger): lines = lines[:-1] clean_json_text = "\n".join(lines).strip() - + try: final_data = json.loads(clean_json_text) except Exception as e: st.error(f"Fehler beim Parsen der API-Antwort: {e}") st.code(res_meta_text) st.stop() - + if final_data.get("recipient_email") == VERKAEUFER["email"]: final_data["recipient_email"] = "" @@ -195,179 +194,188 @@ with col2: if st.session_state.extracted_data: data = st.session_state.extracted_data - + st.caption("Mit :red[*] markierte Felder sind EN16931-Pflichtfelder und müssen für einen gültigen Export befüllt sein.") if data.get("contract_type"): st.caption(f"🏷️ Erkannter Vertragstyp: **{data['contract_type']}**") if data.get("hardware_serials"): st.caption(f"🔧 Erkannte Seriennummern: {', '.join(data['hardware_serials'])}") - # --- BT-3 RECHNUNGSTYP DROPDOWN-MENÜ --- - inv_type_ui = st.selectbox( - "Rechnungstyp (BT-3)", - options=["380 (Handelsrechnung)", "381 (Gutschrift)", "384 (Korrekturrechnung)", "326 (Teilrechnung)"], - index=0, - help="Bestimmt den steuerrechtlichen Belegtyp im XML-Header." - ) - selected_type_code = inv_type_ui.split(" ")[0] - - inv_num = st.text_input("Rechnungsnummer (BT-1) :red[*]", value=data.get("invoice_number", "")) - inv_date = st.text_input("Rechnungsdatum (BT-2, YYYY-MM-DD) :red[*]", value=data.get("invoice_date", "")) - inv_delivery = st.text_input("Lieferdatum (BT-72, YYYY-MM-DD)", value=data.get("delivery_date", "")) - cust_num = st.text_input( - "Kundennummer / Leitweg-ID (BT-10)", - value=data.get("customer_number", ""), - help="Eure Kundennummer beim Empfänger (Standardfall für B2B) oder eine Leitweg-ID, falls " - "der Empfänger eine Behörde ist." - ) - buyer_ref = st.text_input( - "Ihr Auftrag / Bestellnummer (BT-13)", - value=data.get("buyer_reference", "") - ) - - # UI-Eingabefelder für die Daten vor Position 1 (BT-22 etc.) - st.markdown("---") - st.markdown("**Globale Referenzen & Vorlauftexte:**") - c_ref1, c_ref2, c_ref3 = st.columns(3) - with c_ref1: - dn_id = st.text_input("Lieferscheinnummer (BT-16)", value=data.get("delivery_note_id", "")) - with c_ref2: - o_id = st.text_input("Auftragsbestätigung / Verkaufsauftrag (BT-14)", value=data.get("order_id", "")) - with c_ref3: - c_id = st.text_input("Vertrag / Vergabeangebot (BT-12)", value=data.get("contract_id", "")) - - c_p1, c_p2 = st.columns(2) - with c_p1: - s_start = st.text_input("Leistungszeitraum Start (BT-73, YYYY-MM-DD)", value=data.get("service_start_date", "")) - with c_p2: - s_end = st.text_input("Leistungszeitraum Ende (BT-74, YYYY-MM-DD)", value=data.get("service_end_date", "")) - - pay_term = st.text_input( - "Zahlungsziel in Tagen (BT-9) :red[*]", - value=str(data.get("payment_term_days", "") or "") + # Reiter-Navigation: gruppiert die Eingabefelder, damit man nicht die ganze Seite + # runterscrollen muss. Summen & Export stehen bewusst UNTERHALB der Tabs (immer sichtbar). + tab_basis, tab_parteien, tab_positionen, tab_pdftext = st.tabs( + ["Basis", "Parteien", "Positionen", "PDF-Text"] ) - i_note = st.text_area("Globale Rechnungserläuterung / Freitext (BT-22)", value=data.get("invoice_note", ""), height=150) - st.markdown("---") - - # Adressdaten - c_s, c_r = st.columns(2) - with c_s: - st.markdown("**Absender (Verkäufer):**") - st.text_input("Firma (BT-27)", value=VERKAEUFER["name"], disabled=True) - st.text_input("E-Mail (BT-34)", value=VERKAEUFER["email"], disabled=True) - st.text_input("Telefon (BT-42)", value=VERKAEUFER["phone"], disabled=True) - st.text_input("Straße (BT-35)", value=VERKAEUFER["street"], disabled=True) - st.text_input("PLZ (BT-38)", value=VERKAEUFER["zip"], disabled=True) - st.text_input("Stadt (BT-37)", value=VERKAEUFER["city"], disabled=True) - st.text_input("Umsatzsteuer-ID (BT-31)", value=VERKAEUFER["vat_id"], disabled=True) - st.text_input("Registernummer (BT-30)", value=VERKAEUFER["register_id"], disabled=True) - st.text_input("IBAN (BT-84)", value=VERKAEUFER_IBAN, disabled=True) - with c_r: - st.markdown("**Empfänger (Kunde):**") - r_name = st.text_input("Firma (BT-44) :red[*]", value=data.get("recipient_name", "")) - r_email = st.text_input("E-Mail (BT-49) :red[*]", value=data.get("recipient_email", "")) - r_street = st.text_input("Straße (BT-50)", value=data.get("recipient_street", "")) - r_zip = st.text_input("PLZ (BT-53)", value=data.get("recipient_zip", "")) - r_city = st.text_input("Stadt (BT-52) :red[*]", value=data.get("recipient_city", "")) + with tab_basis: + # --- BT-3 RECHNUNGSTYP DROPDOWN-MENÜ --- + inv_type_ui = st.selectbox( + "Rechnungstyp (BT-3)", + options=["380 (Handelsrechnung)", "381 (Gutschrift)", "384 (Korrekturrechnung)", "326 (Teilrechnung)"], + index=0, + help="Bestimmt den steuerrechtlichen Belegtyp im XML-Header." + ) + selected_type_code = inv_type_ui.split(" ")[0] - st.markdown("---") + inv_num = st.text_input("Rechnungsnummer (BT-1) :red[*]", value=data.get("invoice_number", "")) + inv_date = st.text_input("Rechnungsdatum (BT-2, YYYY-MM-DD) :red[*]", value=data.get("invoice_date", "")) + inv_delivery = st.text_input("Lieferdatum (BT-72, YYYY-MM-DD)", value=data.get("delivery_date", "")) + cust_num = st.text_input( + "Kundennummer / Leitweg-ID (BT-10)", + value=data.get("customer_number", ""), + help="Eure Kundennummer beim Empfänger (Standardfall für B2B) oder eine Leitweg-ID, falls " + "der Empfänger eine Behörde ist." + ) + buyer_ref = st.text_input( + "Ihr Auftrag / Bestellnummer (BT-13)", + value=data.get("buyer_reference", "") + ) - payment_means_codes_list = list(PAYMENT_MEANS_CODES.keys()) - payment_means_labels = [f"{code} - {PAYMENT_MEANS_CODES[code]}" for code in payment_means_codes_list] - selected_payment_means_label = st.selectbox( - "Zahlungsmittel (BT-81)", - options=payment_means_labels, - index=payment_means_codes_list.index("58"), - ) - selected_payment_means_code = selected_payment_means_label.split(" - ")[0] + # UI-Eingabefelder für die Daten vor Position 1 (BT-22 etc.) + st.markdown("---") + st.markdown("**Globale Referenzen & Vorlauftexte:**") + c_ref1, c_ref2, c_ref3 = st.columns(3) + with c_ref1: + dn_id = st.text_input("Lieferscheinnummer (BT-16)", value=data.get("delivery_note_id", "")) + with c_ref2: + o_id = st.text_input("Auftragsbestätigung / Verkaufsauftrag (BT-14)", value=data.get("order_id", "")) + with c_ref3: + c_id = st.text_input("Vertrag / Vergabeangebot (BT-12)", value=data.get("contract_id", "")) - st.markdown("### 3. Positionen") - - if st.button("➕ Neue Position hinzufügen"): - data["items"].append({ - "name": "Neue Dienstleistung", "description": "", "quantity": 1.0, "unit": "Stk.", - "unit_price": 0.0, "vat_rate_percent": float(data.get("vat_rate_percent") or 19.0), - }) - st.rerun() - - edited_items = [] - inv_id = st.session_state.invoice_counter - - for idx, item in enumerate(data.get("items", [])): - with st.expander(f"📋 Position {idx+1}: {item.get('name', 'Dienstleistung')}", expanded=True): - - c_del, _ = st.columns([1, 4]) - with c_del: - if st.button("🗑️ Position löschen", key=f"del_btn_{inv_id}_{idx}"): - data["items"].pop(idx) - st.rerun() - - c_name, c_desc = st.columns([1, 1]) - with c_name: - item_name = st.text_input("Artikelname (BT-153) :red[*]", value=item.get("name", ""), key=f"item_name_{inv_id}_{idx}") - with c_desc: - desc_text = item.get("description", "") - estimated_lines = desc_text.count("\n") + (len(desc_text) // 45) + 1 - calc_height = max(68, min(400, estimated_lines * 24)) - item_description = st.text_area("Zusatzbeschreibung (BT-154)", value=desc_text, key=f"item_desc_{inv_id}_{idx}", height=calc_height) - - c_qty, c_unit, c_price, c_vat, c_total = st.columns(5) - with c_qty: - item_quantity = st.number_input("Menge (BT-129) :red[*]", value=float(item.get("quantity") or 0.0), format="%.3f", step=0.1, key=f"item_qty_{inv_id}_{idx}") - with c_unit: - item_unit = st.text_input("Einheit (BT-130) :red[*]", value=item.get("unit", "Stk."), key=f"item_unit_{inv_id}_{idx}") - with c_price: - item_price = st.number_input("Einzelpreis (BT-146, €) :red[*]", value=float(item.get("unit_price") or 0.0), format="%.2f", key=f"item_price_{inv_id}_{idx}") - with c_vat: - item_vat_rate = st.number_input( - "Steuersatz (BT-152, %) :red[*]", - value=float(item.get("vat_rate_percent") or data.get("vat_rate_percent") or 19.0), - key=f"item_vat_{inv_id}_{idx}", - ) - with c_total: - raw_item_total = item_quantity * item_price - item_total_amount = kaufmaennisches_runden(raw_item_total) - st.markdown("**Gesamtbetrag (€):**") - st.markdown(f"**{item_total_amount:.2f} €**") + c_p1, c_p2 = st.columns(2) + with c_p1: + s_start = st.text_input("Leistungszeitraum Start (BT-73, YYYY-MM-DD)", value=data.get("service_start_date", "")) + with c_p2: + s_end = st.text_input("Leistungszeitraum Ende (BT-74, YYYY-MM-DD)", value=data.get("service_end_date", "")) - edited_items.append({ - "name": item_name, - "description": item_description, - "quantity": item_quantity, - "unit": item_unit, - "unit_price": item_price, - "total_amount": item_total_amount, - "vat_rate_percent": item_vat_rate, + pay_term = st.text_input( + "Zahlungsziel in Tagen (BT-9) :red[*]", + value=str(data.get("payment_term_days", "") or "") + ) + + payment_means_codes_list = list(PAYMENT_MEANS_CODES.keys()) + payment_means_labels = [f"{code} - {PAYMENT_MEANS_CODES[code]}" for code in payment_means_codes_list] + selected_payment_means_label = st.selectbox( + "Zahlungsmittel (BT-81)", + options=payment_means_labels, + index=payment_means_codes_list.index("58"), + ) + selected_payment_means_code = selected_payment_means_label.split(" - ")[0] + + i_note = st.text_area("Globale Rechnungserläuterung / Freitext (BT-22)", value=data.get("invoice_note", ""), height=150) + + with tab_parteien: + c_s, c_r = st.columns(2) + with c_s: + st.markdown("**Absender (Verkäufer):**") + st.text_input("Firma (BT-27)", value=VERKAEUFER["name"], disabled=True) + st.text_input("E-Mail (BT-34)", value=VERKAEUFER["email"], disabled=True) + st.text_input("Telefon (BT-42)", value=VERKAEUFER["phone"], disabled=True) + st.text_input("Straße (BT-35)", value=VERKAEUFER["street"], disabled=True) + st.text_input("PLZ (BT-38)", value=VERKAEUFER["zip"], disabled=True) + st.text_input("Stadt (BT-37)", value=VERKAEUFER["city"], disabled=True) + st.text_input("Umsatzsteuer-ID (BT-31)", value=VERKAEUFER["vat_id"], disabled=True) + st.text_input("Registernummer (BT-30)", value=VERKAEUFER["register_id"], disabled=True) + st.text_input("IBAN (BT-84)", value=VERKAEUFER_IBAN, disabled=True) + with c_r: + st.markdown("**Empfänger (Kunde):**") + r_name = st.text_input("Firma (BT-44) :red[*]", value=data.get("recipient_name", "")) + r_email = st.text_input("E-Mail (BT-49) :red[*]", value=data.get("recipient_email", "")) + r_street = st.text_input("Straße (BT-50)", value=data.get("recipient_street", "")) + r_zip = st.text_input("PLZ (BT-53)", value=data.get("recipient_zip", "")) + r_city = st.text_input("Stadt (BT-52) :red[*]", value=data.get("recipient_city", "")) + + with tab_positionen: + if st.button("➕ Neue Position hinzufügen"): + data["items"].append({ + "name": "Neue Dienstleistung", "description": "", "quantity": 1.0, "unit": "Stk.", + "unit_price": 0.0, "vat_rate_percent": float(data.get("vat_rate_percent") or 19.0), }) - + st.rerun() + + edited_items = [] + inv_id = st.session_state.invoice_counter + + for idx, item in enumerate(data.get("items", [])): + with st.expander(f"📋 Position {idx+1}: {item.get('name', 'Dienstleistung')}", expanded=True): + + c_del, _ = st.columns([1, 4]) + with c_del: + if st.button("🗑️ Position löschen", key=f"del_btn_{inv_id}_{idx}"): + data["items"].pop(idx) + st.rerun() + + c_name, c_desc = st.columns([1, 1]) + with c_name: + item_name = st.text_input("Artikelname (BT-153) :red[*]", value=item.get("name", ""), key=f"item_name_{inv_id}_{idx}") + with c_desc: + desc_text = item.get("description", "") + estimated_lines = desc_text.count("\n") + (len(desc_text) // 45) + 1 + calc_height = max(68, min(400, estimated_lines * 24)) + item_description = st.text_area("Zusatzbeschreibung (BT-154)", value=desc_text, key=f"item_desc_{inv_id}_{idx}", height=calc_height) + + c_qty, c_unit, c_price, c_vat, c_total = st.columns(5) + with c_qty: + item_quantity = st.number_input("Menge (BT-129) :red[*]", value=float(item.get("quantity") or 0.0), format="%.3f", step=0.1, key=f"item_qty_{inv_id}_{idx}") + with c_unit: + item_unit = st.text_input("Einheit (BT-130) :red[*]", value=item.get("unit", "Stk."), key=f"item_unit_{inv_id}_{idx}") + with c_price: + item_price = st.number_input("Einzelpreis (BT-146, €) :red[*]", value=float(item.get("unit_price") or 0.0), format="%.2f", key=f"item_price_{inv_id}_{idx}") + with c_vat: + item_vat_rate = st.number_input( + "Steuersatz (BT-152, %) :red[*]", + value=float(item.get("vat_rate_percent") or data.get("vat_rate_percent") or 19.0), + key=f"item_vat_{inv_id}_{idx}", + ) + with c_total: + raw_item_total = item_quantity * item_price + item_total_amount = kaufmaennisches_runden(raw_item_total) + st.markdown("**Gesamtbetrag (€):**") + st.markdown(f"**{item_total_amount:.2f} €**") + + edited_items.append({ + "name": item_name, + "description": item_description, + "quantity": item_quantity, + "unit": item_unit, + "unit_price": item_price, + "total_amount": item_total_amount, + "vat_rate_percent": item_vat_rate, + }) + + st.markdown("---") + # Der frühere globale Steuersatz dient jetzt nur noch als Vorbelegung für neu + # hinzugefügte Positionen (siehe "Neue Position hinzufügen" oben) - abgerechnet wird + # pro Position mit dem jeweils eingetragenen Steuersatz (Multi-Tax-Support). + vat_rate = st.number_input("Standard-Steuersatz für neue Positionen (%)", value=float(data.get("vat_rate_percent") or 19.0)) + + c_disc1, c_disc2, c_disc3, c_disc4 = st.columns(4) + with c_disc1: + discount_percent = st.number_input("Rabatt (BT-21, %)", value=0.0, min_value=0.0, max_value=100.0, step=0.5) + with c_disc2: + discount_reason = st.text_input("Rabattgrund", value="") + with c_disc3: + skonto_percent = st.number_input("Skonto (BT-20, %)", value=0.0, min_value=0.0, max_value=100.0, step=0.5) + with c_disc4: + skonto_days = st.text_input("Skonto-Frist (Tage)", value="") + + with tab_pdftext: + st.text(pdf_text if pdf_text.strip() else "(Kein PDF-Text verfügbar)") + + # --- SUMMEN & EXPORT: bewusst AUSSERHALB der Tabs, damit sie unabhängig vom aktiven + # Reiter immer sichtbar und ohne Scrollen erreichbar sind. --- st.markdown("---") - # Der frühere globale Steuersatz dient jetzt nur noch als Vorbelegung für neu - # hinzugefügte Positionen (siehe "Neue Position hinzufügen" oben) - abgerechnet wird - # pro Position mit dem jeweils eingetragenen Steuersatz (Multi-Tax-Support). - vat_rate = st.number_input("Standard-Steuersatz für neue Positionen (%)", value=float(data.get("vat_rate_percent") or 19.0)) - - c_disc1, c_disc2, c_disc3, c_disc4 = st.columns(4) - with c_disc1: - discount_percent = st.number_input("Rabatt (BT-21, %)", value=0.0, min_value=0.0, max_value=100.0, step=0.5) - with c_disc2: - discount_reason = st.text_input("Rabattgrund", value="") - with c_disc3: - skonto_percent = st.number_input("Skonto (BT-20, %)", value=0.0, min_value=0.0, max_value=100.0, step=0.5) - with c_disc4: - skonto_days = st.text_input("Skonto-Frist (Tage)", value="") - totals = compute_invoice_totals(edited_items, discount_percent=discount_percent) computed_net_amount = totals["tax_basis_total"] computed_vat_amount = totals["total_vat_amount"] computed_gross_amount = totals["total_gross_amount"] - + st.markdown("**Berechnete Summen:**") c_net_ui, c_vat_ui, c_gross_ui = st.columns(3) with c_net_ui: st.metric("Netto-Gesamt (€)", f"{computed_net_amount:.2f}") with c_vat_ui: st.metric("MwSt-Gesamt (€)", f"{computed_vat_amount:.2f}") with c_gross_ui: st.metric("Brutto-Zahlbetrag (€)", f"{computed_gross_amount:.2f}") - + # --- EXPORT-SEKTION DROPDOWN-AUSWAHL --- st.markdown("---") export_format = st.selectbox( @@ -376,7 +384,7 @@ with col2: index=1, help="XRechnung generiert ein reines, valides UBL-XML. ZUGFeRD bettet ein schema-konformes CII-XML (factur-x.xml) direkt in deine PDF ein." ) - + final_invoice_dict = { "invoice_type_code": selected_type_code, "invoice_number": inv_num, "invoice_date": inv_date, "delivery_date": inv_delivery,