mikrowerk-edi-invoicing 0.5.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

edi_invoice_parser/__init__.py

@@ -1,34 +1,19 @@
 from .cross_industry_invoice_mapper import parse_and_map_x_rechnung
-from .model.x_rechnung import (XRechnung, XRechnungTradeParty, XRechnungTradeAddress, XRechnungTradeContact,
-                               XRechnungPaymentMeans, XRechnungBankAccount, XRechnungCurrency, XRechnungTradeLine,
-                               XRechnungAppliedTradeTax, XRechnungFinancialCard)
 from .model.trade_document_types import TradeDocument, TradeParty, TradePartyAddress, TradeCurrency, TradePartyContact, \
-    TradeLine, PaymentMeans, AppliedTradeTax, BankAccount, FinancialCard, ubl_doc_codes
-from .parse_plain_pdf_file import analyze_document
+    TradeLine, TradePaymentMeans, AppliedTradeTax, BankAccount, FinancialCard, ubl_doc_codes
 
 __all__ = ["parse_and_map_x_rechnung",
-           "XRechnung",
-           "XRechnungTradeParty",
-           "XRechnungTradeAddress",
-           "XRechnungTradeContact",
-           "XRechnungPaymentMeans",
-           "XRechnungBankAccount",
-           "XRechnungCurrency",
-           "XRechnungTradeLine",
-           "XRechnungAppliedTradeTax",
-           "XRechnungFinancialCard",
-           "analyze_document",
            "TradeDocument",
            "TradeParty",
            "TradePartyAddress",
            "TradeCurrency",
            "TradePartyContact",
            "TradeLine",
-           "PaymentMeans",
+           "TradePaymentMeans",
            "AppliedTradeTax",
            "BankAccount",
            "FinancialCard",
            "ubl_doc_codes"
            ]
 
-version = "0.5.0"
+version = "0.6.1"

edi_invoice_parser/cii_dom_parser/xml_cii_dom_parser.py

@@ -4,46 +4,46 @@ This implements a mapper from a drafthorse parsed x-rechnung-xml to the internal
 from datetime import datetime
 
 from .models.document import Document
-
+from ..model.trade_document_types import (TradeDocument, TradeParty, TradeCurrency, TradeLine, TradePaymentMeans,
+                                          AppliedTradeTax, TradePartyAddress, TradePartyContact, BankAccount,
+                                          FinancialCard)
 from ..model.xml_abstract_x_rechnung_parser import XMLAbstractXRechnungParser
-from ..model.x_rechnung import (XRechnung, XRechnungCurrency, XRechnungTradeParty, XRechnungTradeAddress,
-                                XRechnungTradeContact, XRechnungPaymentMeans, XRechnungFinancialCard,
-                                XRechnungTradeLine, XRechnungAppliedTradeTax, XRechnungBankAccount)
 
 
 class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
 
     @classmethod
-    def parse_and_map_x_rechnung(cls, _xml: any) -> XRechnung:
+    def parse_and_map_x_rechnung(cls, _xml: any) -> TradeDocument:
         doc = Document.parse(_xml)
         return cls().map_to_x_rechnung(doc)
 
     @classmethod
-    def map_to_x_rechnung(cls, doc: any) -> XRechnung:
+    def map_to_x_rechnung(cls, doc: any) -> TradeDocument:
         """
         :param doc: Element, the parsed dom root element
         :return:
         """
 
-        return XRechnung(
+        return TradeDocument(
             name=f"{cls().TYPE_CODES.get(doc.header.type_code.get_string(), 'Unknown doc type ')} {doc.header.id.get_string()}",
+            doc_type_name=f"{cls().TYPE_CODES.get(doc.header.type_code.get_string(), 'Unknown doc type ')}",
             doc_id=doc.header.id.get_string(),
             doc_type_code=doc.header.type_code.get_string(),
             issued_date_time=doc.header.issue_date_time.get_value(),
             notes=doc.header.notes.get_string_elements("\n"),
             languages=doc.header.languages.get_string_elements(";"),
-            buyer_reference=doc.trade.agreement.buyer_reference.get_string(),
+            receiver_reference=doc.trade.agreement.buyer_reference.get_string(),
             order_reference=doc.trade.agreement.buyer_order.issuer_assigned_id.get_string(),
             currency_code=doc.trade.settlement.currency_code.get_string(),
             line_total_amount=doc.trade.settlement.monetary_summation.line_total.get_value(),
             charge_total_amount=doc.trade.settlement.monetary_summation.charge_total.get_value(),
             allowance_total_amount=doc.trade.settlement.monetary_summation.allowance_total.get_value(),
-            tax_basis_total_amount=XRechnungCurrency.from_currency_tuple(
+            tax_basis_total_amount=TradeCurrency.from_currency_tuple(
                 doc.trade.settlement.monetary_summation.tax_basis_total.get_currency()),
-            tax_total_amount=[XRechnungCurrency.from_currency_tuple(tpl) for tpl in
+            tax_total_amount=[TradeCurrency.from_currency_tuple(tpl) for tpl in
                               doc.trade.settlement.monetary_summation.tax_total_other_currency.get_currencies()],
             # list of currency
-            grand_total_amount=XRechnungCurrency.from_currency_tuple(
+            grand_total_amount=TradeCurrency.from_currency_tuple(
                 doc.trade.settlement.monetary_summation.grand_total.get_currency()),
             total_prepaid_amount=doc.trade.settlement.monetary_summation.prepaid_total.get_value(),
             due_payable_amount=doc.trade.settlement.monetary_summation.due_amount.get_value(),
@@ -51,11 +51,12 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
             payment_means=cls().map_payment_means(
                 doc.trade.settlement.payment_means) if doc.trade.settlement.payment_means else None,
             payment_terms=doc.trade.settlement.terms.get_string_elements("\n"),
-            seller=cls().map_trade_party(doc.trade.agreement.seller) if hasattr(doc.trade.agreement,
+            sender=cls().map_trade_party(doc.trade.agreement.seller) if hasattr(doc.trade.agreement,
                                                                                 "seller") else None,
             invoicee=cls().map_trade_party(doc.trade.agreement.invoicee) if hasattr(doc.trade.agreement,
                                                                                     "invoicee") else None,
-            buyer=cls().map_trade_party(doc.trade.agreement.buyer) if hasattr(doc.trade.agreement, "buyer") else None,
+            receiver=cls().map_trade_party(doc.trade.agreement.buyer) if hasattr(doc.trade.agreement,
+                                                                                 "buyer") else None,
             payee=cls().map_trade_party(doc.trade.agreement.payee) if hasattr(doc.trade.agreement, "payee") else None,
             trade_line_items=cls().map_trade_line_items(doc.trade.items) if hasattr(doc.trade, "items") else None,
             applicable_trade_taxes=cls().map_trade_taxes(doc.trade.settlement.trade_tax) if hasattr(
@@ -64,9 +65,9 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @classmethod
-    def map_trade_party(cls, trade_party: any) -> XRechnungTradeParty:
+    def map_trade_party(cls, trade_party: any) -> TradeParty:
         _global_id_schema, _global_id = cls().map_first_id(trade_party.global_id)
-        return XRechnungTradeParty(
+        return TradeParty(
             name=trade_party.name.get_string(),
             description=trade_party.description.get_string(),
             global_id=_global_id,
@@ -77,8 +78,8 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
                 trade_party, 'tax_registrations') else None,
             fiscal_registration_number=cls().map_tax_registration(trade_party.tax_registrations, 'FC') if hasattr(
                 trade_party, 'tax_registrations') else None,
-            postal_address=cls().map_trade_address(trade_party.address) if hasattr(trade_party, 'address') else None,
-            trade_contact=cls().map_trade_contact(trade_party.contact) if hasattr(trade_party, 'contact') else None,
+            address=cls().map_trade_address(trade_party.address) if hasattr(trade_party, 'address') else None,
+            contact=cls().map_trade_contact(trade_party.contact) if hasattr(trade_party, 'contact') else None,
             id=trade_party.id.get_string() if hasattr(trade_party, 'id') else None,
         )
 
@@ -111,8 +112,8 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         return None
 
     @staticmethod
-    def map_trade_address(trade_address: any) -> XRechnungTradeAddress:
-        return XRechnungTradeAddress(
+    def map_trade_address(trade_address: any) -> TradePartyAddress:
+        return TradePartyAddress(
             city_name=trade_address.city_name.get_string(),
             country_id=trade_address.country_id.get_string(),
             country_subdivision_id=trade_address.country_subdivision.get_string(),
@@ -123,8 +124,8 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @staticmethod
-    def map_trade_contact(trade_contact: any) -> XRechnungTradeContact:
-        return XRechnungTradeContact(
+    def map_trade_contact(trade_contact: any) -> TradePartyContact:
+        return TradePartyContact(
             name=trade_contact.person_name.get_string(),
             email=trade_contact.email.get_string(),
             telephone=trade_contact.telephone.get_string(),
@@ -133,8 +134,8 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @staticmethod
-    def map_bank_account(payment_means: any) -> XRechnungBankAccount:
-        return XRechnungBankAccount(
+    def map_bank_account(payment_means: any) -> BankAccount:
+        return BankAccount(
             iban="".join(payment_means.payee_account.iban.get_string().split()) if (hasattr(payment_means,
                                                                                             'payee_account')
                                                                                     and payment_means.payee_account.iban.get_string()) else None,
@@ -144,15 +145,15 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @staticmethod
-    def map_financial_card(financial_card: any) -> XRechnungFinancialCard:
-        return XRechnungFinancialCard(
+    def map_financial_card(financial_card: any) -> FinancialCard:
+        return FinancialCard(
             id=financial_card.id.get_string(),
             cardholder_name=financial_card.cardholder_name.get_string(),
         )
 
     @classmethod
-    def map_payment_means(cls, payment_means: any) -> XRechnungPaymentMeans:
-        return XRechnungPaymentMeans(
+    def map_payment_means(cls, payment_means: any) -> TradePaymentMeans:
+        return TradePaymentMeans(
             information=payment_means.information.get_string(),
             type_code=payment_means.type_code.get_string(),
             payee_account=cls().map_bank_account(payment_means) if hasattr(payment_means, 'payee_account') else None,
@@ -161,8 +162,8 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @staticmethod
-    def map_trade_tax(trade_tax: any) -> XRechnungAppliedTradeTax:
-        return XRechnungAppliedTradeTax(
+    def map_trade_tax(trade_tax: any) -> AppliedTradeTax:
+        return AppliedTradeTax(
             type_code=trade_tax.type_code.get_string(),
             name=f"{trade_tax.type_code.get_string()} {trade_tax.rate_applicable_percent.get_value()}",
             category_code=trade_tax.category_code.get_string(),
@@ -172,33 +173,33 @@ class XRechnungCIIXMLParser(XMLAbstractXRechnungParser):
         )
 
     @classmethod
-    def map_trade_taxes(cls, trade_taxes: any) -> [XRechnungTradeLine]:
+    def map_trade_taxes(cls, trade_taxes: any) -> [TradeLine]:
         res = []
         for child in trade_taxes.children:
             res.append(cls().map_trade_tax(child))
         return res
 
     @classmethod
-    def map_trade_line(cls, trade_line: any) -> XRechnungTradeLine:
-        return XRechnungTradeLine(
+    def map_trade_line(cls, trade_line: any) -> TradeLine:
+        return TradeLine(
             name=trade_line.product.name.get_string(),
             description=trade_line.product.description.get_string(),
             line_id=trade_line.document.line_id.get_string(),
-            price_unit=trade_line.agreement.net.amount.get_value(),
-            price_unit_gross=trade_line.agreement.gross.amount.get_value(),
-            quantity_billed=trade_line.delivery.billed_quantity.get_value(),
+            unit_price=trade_line.agreement.net.amount.get_value(),
+            unit_price_gross=trade_line.agreement.gross.amount.get_value(),
+            quantity=trade_line.delivery.billed_quantity.get_value(),
             global_product_id=trade_line.product.global_id.get_string(),
-            total_amount_net=trade_line.settlement.monetary_summation.total_amount.get_value(),
+            total_amount=trade_line.settlement.monetary_summation.total_amount.get_value(),
             total_allowance_charge=trade_line.settlement.monetary_summation.total_allowance_charge.get_value(),
             quantity_unit_code=trade_line.delivery.billed_quantity._unit_code,
             seller_assigned_id=trade_line.product.seller_assigned_id.get_string(),
             buyer_assigned_id=trade_line.product.buyer_assigned_id.get_string(),
             global_product_scheme_id=trade_line.product.global_id._scheme_id,
-            trade_tax=cls().map_trade_tax(trade_line.settlement.trade_tax)
+            tax=cls().map_trade_tax(trade_line.settlement.trade_tax)
         )
 
     @classmethod
-    def map_trade_line_items(cls, trade_line_items: any) -> [XRechnungTradeLine]:
+    def map_trade_line_items(cls, trade_line_items: any) -> [TradeLine]:
         res = []
         for child in trade_line_items.children:
             res.append(cls().map_trade_line(child))

edi_invoice_parser/cross_industry_invoice_mapper.py

@@ -1,14 +1,18 @@
 """
 This implements a mapper from a drafthorse parsed x-rechnung-xml to the internal XRechnung object
 """
+import logging
 from lxml import etree
 
-from .model.x_rechnung import XRechnung
+from .model.trade_document_types import TradeDocument
 from .cii_dom_parser import XRechnungCIIXMLParser
 from .ubl_sax_parser.xml_ubl_sax_parser import XRechnungUblXMLParser
+from .model.xml_abstract_x_rechnung_parser import XMLAbstractXRechnungParser
 
+_logger = logging.getLogger(__name__)
 
-def parse_and_map_x_rechnung(_xml: bytes) -> XRechnung:
+
+def parse_and_map_x_rechnung(_xml: bytes) -> TradeDocument:
     """
 
     Args:
@@ -17,12 +21,24 @@ def parse_and_map_x_rechnung(_xml: bytes) -> XRechnung:
     Returns: XRechnung
 
     """
+    _parser = get_xml_parser_for_doc_type(_xml)
+    if _parser is None:
+        raise ValueError('xml format not supported for any parser"')
+    return _parser.parse_and_map_x_rechnung(_xml)
+
+
+def get_xml_parser_for_doc_type(_xml: bytes) -> XMLAbstractXRechnungParser:
     _parser = None
     tree = etree.fromstring(_xml)
     if tree.tag == '{urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100}CrossIndustryInvoice':
         _parser = XRechnungCIIXMLParser()
     elif tree.tag == '{urn:oasis:names:specification:ubl:schema:xsd:Invoice-2}Invoice':
         _parser = XRechnungUblXMLParser()
-    if _parser is None:
-        raise ValueError(f'xml format not supported: "{tree.tag}"')
-    return _parser.parse_and_map_x_rechnung(_xml)
+    else:
+        _logger.warning(f'No parser found, unsupported XML tag: {tree.tag}')
+    return _parser
+
+
+def check_if_parser_is_available(_xml: bytes) -> bool:
+    return get_xml_parser_for_doc_type(_xml) is not None
+

edi_invoice_parser/model/__init__.py

@@ -1,17 +1,15 @@
-from .x_rechnung import XRechnung
 from .trade_document_types import TradeDocument, TradeParty, TradePartyAddress, TradeCurrency, TradePartyContact, \
-    TradeLine, PaymentMeans, AppliedTradeTax, BankAccount, FinancialCard, ubl_doc_codes
+    TradeLine, TradePaymentMeans, AppliedTradeTax, BankAccount, FinancialCard, ubl_doc_codes
 from .xml_abstract_x_rechnung_parser import XMLAbstractXRechnungParser
 
-__all__ = ["XRechnung",
-           "XMLAbstractXRechnungParser",
+__all__ = ["XMLAbstractXRechnungParser",
            "TradeDocument",
            "TradeParty",
            "TradePartyAddress",
            "TradeCurrency",
            "TradePartyContact",
            "TradeLine",
-           "PaymentMeans",
+           "TradePaymentMeans",
            "AppliedTradeTax",
            "BankAccount",
            "FinancialCard",

edi_invoice_parser/model/trade_document_types.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from decimal import Decimal
 import datetime
 
 """
@@ -38,7 +37,7 @@ class TradePartyAddress:
 
 @dataclass
 class TradePartyContact:
-    name: str
+    name: str = None
     department_name: str = None
     telephone: str = None
     fax: str = None
@@ -47,47 +46,62 @@ class TradePartyContact:
 
 @dataclass
 class TradeParty:
-    name: str
-    vat_registration_number: str = None
-    fiscal_registration_number: str = None
-    legal_registration_number: str = None
-    address: TradePartyAddress = None
-    contact: TradePartyContact = None
+    name: str= None
+    description: str = None  # 'Description'
+    global_id: int = 0  # 'Global ID'
+    global_id_schema: str = None  # 'Global Schema'
+    id: str = None  # 'id'
+    address: TradePartyAddress | None = None
+    contact: TradePartyContact | None = None
+    email: str = None  # 'Email'
+    vat_registration_number: str | None = None
+    fiscal_registration_number: str | None = None
+    legal_registration_number: str | None = None
 
 
 @dataclass
 class AppliedTradeTax:
-    name: str
+    name: str = None
     type_code: str = None
     category_code: str = None
-    applicable_percent: Decimal = None
-    basis_amount: Decimal = None
-    calculated_amount: Decimal = None
+    applicable_percent: float = None
+    basis_amount: float = None
+    calculated_amount: float = None
 
 
 @dataclass
 class TradeLine:
-    pos_number: int
-    article_code: str = None
-    name: str = None
-    description: str = None
-    quantity: Decimal = None
-    unit_of_measure: str = None
-    unit_price: Decimal = None
-    total_net: Decimal = None
-    tax: AppliedTradeTax = None
-    total_amount: Decimal = None
+    line_id: int = 0
+    article_code: str | None = None
+    name: str | None = None
+    description: str | None = None
+    quantity: float = None
+    quantity_unit_code: str = None
+    unit_price: float = None
+    unit_price_gross: float = None
+    tax: AppliedTradeTax | None = None
+    total_amount_net: float = None
+    total_amount: float = None
+    total_allowance_charge: float = None
+    global_product_id: str = None  # 'Global Product ID')
+    global_product_scheme_id: str = None  # 'Global Product Scheme ID')
+    seller_assigned_id: str = None  # 'Seller Assigned ID')
+    buyer_assigned_id: str = None  # 'Buyer Assigned ID')
 
 
 @dataclass
 class TradeCurrency:
-    amount: Decimal
+    amount: float
     currency_code: str
 
+    @staticmethod
+    def from_currency_tuple(currency_tuple: tuple) -> 'TradeCurrency':
+        return TradeCurrency(*currency_tuple)
+
 
 @dataclass
 class BankAccount:
-    iban: str
+    iban: str | None = None
     bic: str = None
     name: str = None
 
@@ -99,7 +113,7 @@ class FinancialCard:
 
 
 @dataclass
-class PaymentMeans:
+class TradePaymentMeans:
     id: str = None
     type_code: str = None
     information: str = None
@@ -112,28 +126,34 @@ class TradeDocument:
     """
     Model of a Trade Document
     """
-    name: str
-    doc_type_code: tuple  # Document Type Code: ubl_doc_codes
+    name: str = None
+    doc_type_code: int = 0  # Document Type Code: ubl_doc_codes
+    doc_type_name: str = None
     doc_id: str = None
+    project: str = None
     issued_date_time: datetime = None  # 'Date'
+    delivered_date_time: datetime = None  # 'Delivered Date'
     languages: str = None  # 'Languages'
     notes: str = None  # 'Notes'
     sender_reference: str = None  # 'Buyer Reference'
-    receiver_reference: str = None
-    dispatch_reference: str = None
-    sales_order_reference: str = None
+    receiver_reference: str | None = None
+    dispatch_reference: str | None = None
+    order_reference: str | None = None
     sender: TradeParty = None
     receiver: TradeParty = None
+    payee: TradeParty = None
+    invoicee: TradeParty = None
     currency_code: str = None  # 'Currency Code'
-    payment_means: PaymentMeans = None
-    payment_terms: str = None  # 'Payment Terms'
-    line_total_amount: Decimal = None  # 'Line Total Amount'
-    charge_total_amount: Decimal = None  # 'Charge Total Amount'
-    allowance_total_amount: Decimal = None  # 'Allowance Total Amount'
-    tax_basis_total_amount: Decimal = None
-    tax_total_amount: Decimal = None  # 'Tax Grand Total Amount'
-    grand_total_amount: Decimal = None  # 'Grand Total Amount'
-    total_prepaid_amount: Decimal = None  # 'Total Prepaid Amount'
-    due_payable_amount: Decimal = None  # 'Due Payable Amount'
+    payment_means: TradePaymentMeans = None
+    payment_terms: str | None = None  # 'Payment Terms'
+    due_date_time: datetime = None
+    line_total_amount: float = None  # 'Line Total Amount'
+    charge_total_amount: float = None  # 'Charge Total Amount'
+    allowance_total_amount: float = None  # 'Allowance Total Amount'
+    tax_basis_total_amount: TradeCurrency = None
+    tax_total_amount: [TradeCurrency] = None  # 'Tax Grand Total Amount'
+    grand_total_amount: TradeCurrency = None  # 'Grand Total Amount'
+    total_prepaid_amount: float = None  # 'Total Prepaid Amount'
+    due_payable_amount: float = None  # 'Due Payable Amount'
     trade_line_items: [TradeLine] = None
     applicable_trade_taxes: [AppliedTradeTax] = None

edi_invoice_parser/model/xml_abstract_x_rechnung_parser.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from ..model.x_rechnung import XRechnung
+from ..model.trade_document_types import TradeDocument
 
 
 class XMLAbstractXRechnungParser(ABC):
@@ -17,5 +17,5 @@ class XMLAbstractXRechnungParser(ABC):
 
     @staticmethod
     @abstractmethod
-    def parse_and_map_x_rechnung(_xml: any) -> XRechnung:
+    def parse_and_map_x_rechnung(_xml: any) -> TradeDocument:
         pass

edi_invoice_parser/tests/__init__.py

@@ -1,3 +1,3 @@
 from ..util.file_helper import get_checked_file_path
-from ..model.x_rechnung import XRechnung
-__all__ = ["get_checked_file_path", "XRechnung"]
+from ..model.trade_document_types import TradeDocument
+__all__ = ["get_checked_file_path", "TradeDocument"]

edi_invoice_parser/tests/test_parse_x_rechnung.py

@@ -6,7 +6,7 @@ from facturx import get_facturx_xml_from_pdf
 
 from . import get_checked_file_path
 from edi_invoice_parser.cross_industry_invoice_mapper import parse_and_map_x_rechnung
-from . import XRechnung
+from . import TradeDocument
 
 
 class XRechnungEinfachTestCase(unittest.TestCase):
@@ -51,10 +51,10 @@ class XRechnungEinfachTestCase(unittest.TestCase):
         else:
             raise AssertionError(f'File type {file_type} not supported')
         assert _parsed is not None
-        res_dict = _parsed.map_to_dict()
-        print(jsonpickle.dumps(res_dict))
+        # res_dict = _parsed.map_to_dict()
+        print(jsonpickle.dumps(_parsed))
 
-    def _parse_xml(self, filepath) -> XRechnung:
+    def _parse_xml(self, filepath) -> TradeDocument:
         _file_path, _exists, _is_dir = get_checked_file_path(filepath, __file__)
         self.assertTrue(_exists)
         print(f"\n_parse_xml: file_path={_file_path}")
@@ -64,7 +64,7 @@ class XRechnungEinfachTestCase(unittest.TestCase):
             self.assertIsNotNone(res)
             return res
 
-    def _parse_pdf(self, filepath) -> XRechnung:
+    def _parse_pdf(self, filepath) -> TradeDocument:
         _file_path, _exists, _is_dir = get_checked_file_path(filepath, __file__)
         self.assertTrue(_exists)
         print(f"\n_parse_pdf: file_path={_file_path}")

edi_invoice_parser/ubl_sax_parser/xml_ubl_sax_parser.py

@@ -7,34 +7,34 @@ from collections import deque
 import xml.sax as sax
 from decimal import Decimal
 
-from ..model.x_rechnung import (XRechnung, XRechnungTradeParty, XRechnungTradeAddress, XRechnungTradeContact,
-                                XRechnungPaymentMeans, XRechnungBankAccount, XRechnungCurrency, XRechnungTradeLine,
-                                XRechnungAppliedTradeTax)
+from ..model.trade_document_types import (TradeDocument, TradeParty, TradeCurrency, TradeLine, TradePaymentMeans,
+                                          AppliedTradeTax, TradePartyAddress, TradePartyContact, BankAccount)
+
 from ..model import XMLAbstractXRechnungParser
 
 
 class UblSaxHandler(sax.ContentHandler):
     def __init__(self):
-        self.x_rechnung: XRechnung = XRechnung()
+        self.x_rechnung: TradeDocument = TradeDocument()
         self.content = ""
         self.stack = deque()
         self.current_attributes = None
-        self.current_trade_party = XRechnungTradeParty()
-        self.current_trade_address: XRechnungTradeAddress = XRechnungTradeAddress()
-        self.current_trade_contact: XRechnungTradeContact = XRechnungTradeContact()
-        self.current_payment_means: XRechnungPaymentMeans = XRechnungPaymentMeans()
-        self.current_payment_means_list: [XRechnungPaymentMeans] = []
-        self.current_currency: XRechnungCurrency | None = None
-        self.current_trade_line: XRechnungTradeLine | None = None
-        self.trade_line_list: [XRechnungTradeLine] = []
-        self.current_trade_tax: XRechnungAppliedTradeTax | None = None
-        self.applicable_trade_taxes: [XRechnungAppliedTradeTax] = []
+        self.current_trade_party = TradeParty()
+        self.current_trade_address: TradePartyAddress = TradePartyAddress()
+        self.current_trade_contact: TradePartyContact = TradePartyContact()
+        self.current_payment_means: TradePaymentMeans = TradePaymentMeans()
+        self.current_payment_means_list: [TradePaymentMeans] = []
+        self.current_currency: TradeCurrency | None = None
+        self.current_trade_line: TradeLine | None = None
+        self.trade_line_list: [TradeLine] = []
+        self.current_trade_tax: AppliedTradeTax | None = None
+        self.applicable_trade_taxes: [AppliedTradeTax] = []
         self.allowance_line_count = 99900
         self.allowance_line_count_incr = 10
 
     def startDocument(self):
         print("------------------------------ Start ---------------------------------------------------")
-        self.x_rechnung = XRechnung()
+        self.x_rechnung = TradeDocument()
         self.stack = deque()
         self.allowance_line_count = 99900
 
@@ -53,38 +53,38 @@ class UblSaxHandler(sax.ContentHandler):
         match _tag_name:
             case "Party":
                 # init all sub entities, if one is missing, so not taking left over
-                self.current_trade_party = XRechnungTradeParty()
-                self.current_trade_address = XRechnungTradeAddress()
-                self.current_trade_contact = XRechnungTradeContact()
+                self.current_trade_party = TradeParty()
+                self.current_trade_address = TradePartyAddress()
+                self.current_trade_contact = TradePartyContact()
             case "Delivery":
-                self.current_trade_party = XRechnungTradeParty()
-                self.current_trade_address = XRechnungTradeAddress()
-                self.current_trade_contact = XRechnungTradeContact()
+                self.current_trade_party = TradeParty()
+                self.current_trade_address = TradePartyAddress()
+                self.current_trade_contact = TradePartyContact()
             case "PostalAddress":
-                self.current_trade_address = XRechnungTradeAddress()
+                self.current_trade_address = TradePartyAddress()
             case "DeliveryLocation":
-                self.current_trade_address = XRechnungTradeAddress()
+                self.current_trade_address = TradePartyAddress()
             case "Contact":
-                self.current_trade_contact = XRechnungTradeContact()
+                self.current_trade_contact = TradePartyContact()
             case "DeliveryParty":
-                self.current_trade_contact = XRechnungTradeContact()
+                self.current_trade_contact = TradePartyContact()
             case "PaymentMeans":
-                self.current_payment_means = XRechnungPaymentMeans()
-                self.current_payment_means.payee_account = XRechnungBankAccount()
+                self.current_payment_means = TradePaymentMeans()
+                self.current_payment_means.payee_account = BankAccount()
             case "InvoiceLine":
-                self.current_trade_line = XRechnungTradeLine()
+                self.current_trade_line = TradeLine()
                 self.current_trade_tax = None
             case "TaxSubtotal":
-                self.current_trade_tax = XRechnungAppliedTradeTax()
+                self.current_trade_tax = AppliedTradeTax()
             case "ClassifiedTaxCategory":
-                self.current_trade_tax = XRechnungAppliedTradeTax()
+                self.current_trade_tax = AppliedTradeTax()
             case "AllowanceCharge":
                 if _path.endswith('Invoice/AllowanceCharge'):
-                    self.current_trade_line = XRechnungTradeLine()
+                    self.current_trade_line = TradeLine()
                     self.current_trade_tax = None
 
         if _path.endswith('/AllowanceCharge/TaxCategory'):
-            self.current_trade_tax = XRechnungAppliedTradeTax()
+            self.current_trade_tax = AppliedTradeTax()
 
         print(f">>>>>>>>>>>>>>> start: {_ns} {_tag_name} >>>>>>>>>>>>>>>>")
         print(_path)
@@ -134,7 +134,7 @@ class UblSaxHandler(sax.ContentHandler):
             self.allowance_line_count += self.allowance_line_count_incr
             self.current_trade_line.seller_assigned_id = "AllowanceCharge"
             self.current_trade_line.total_amount_net = (
-                    self.current_trade_line.price_unit * self.current_trade_line.quantity_billed)
+                    self.current_trade_line.unit_price * self.current_trade_line.quantity)
             self.trade_line_list.append(self.current_trade_line)
 
         # invoice top level properties
@@ -181,14 +181,14 @@ class UblSaxHandler(sax.ContentHandler):
             # case "Invoice/AllowanceCharge/Amount":
             #     self.x_rechnung.allowance_total_amount = Decimal(content)
             case "Invoice/TaxTotal/TaxAmount":
-                self.x_rechnung.tax_total_amount = [XRechnungCurrency(Decimal(content),
-                                                                      attrs.get('currencyID', 'EUR'))]
+                self.x_rechnung.tax_total_amount = [TradeCurrency(float(content),
+                                                                  attrs.get('currencyID', 'EUR'))]
             case "Invoice/TaxTotal/TaxSubtotal/TaxableAmount":
-                self.x_rechnung.tax_basis_total_amount = XRechnungCurrency(Decimal(content),
-                                                                           attrs.get('currencyID', 'EUR'))
-            case "Invoice/LegalMonetaryTotal/TaxInclusiveAmount":
-                self.x_rechnung.grand_total_amount = XRechnungCurrency(Decimal(content),
+                self.x_rechnung.tax_basis_total_amount = TradeCurrency(float(content),
                                                                        attrs.get('currencyID', 'EUR'))
+            case "Invoice/LegalMonetaryTotal/TaxInclusiveAmount":
+                self.x_rechnung.grand_total_amount = TradeCurrency(float(content),
+                                                                   attrs.get('currencyID', 'EUR'))
             case "Invoice/LegalMonetaryTotal/PrepaidAmount":
                 self.x_rechnung.total_prepaid_amount = Decimal(content)
             case "Invoice/LegalMonetaryTotal/PayableAmount":
@@ -256,7 +256,7 @@ class UblSaxHandler(sax.ContentHandler):
         elif path.endswith("/InvoiceLine/Note"):
             self.current_trade_line.note = content
         elif path.endswith("/InvoiceLine/InvoicedQuantity"):
-            self.current_trade_line.quantity_billed = float(content)
+            self.current_trade_line.quantity = float(content)
             self.current_trade_line.quantity_unit_code = attr.get((None, 'unitCode'), None) if attr else None
         elif path.endswith("/InvoiceLine/LineExtensionAmount"):
             self.current_trade_line.total_amount_net = float(content)
@@ -275,18 +275,18 @@ class UblSaxHandler(sax.ContentHandler):
         elif path.endswith("/InvoiceLine/Item/ItemInstance/LotIdentification/ExpiryDate"):
             self.current_trade_line.expiry_date = datetime.fromisoformat(content)
         elif path.endswith("/InvoiceLine/Price/PriceAmount"):
-            self.current_trade_line.price_unit = float(content)
+            self.current_trade_line.unit_price = float(content)
 
     def handle_allowance_charge(self, path: str, tag: str, content: str, attr=None):
         if path.endswith("/AllowanceCharge/AllowanceChargeReason"):
             self.current_trade_line.name = content
         elif path.endswith("/AllowanceCharge/Amount"):
-            self.current_trade_line.price_unit = float(content)
+            self.current_trade_line.unit_price = float(content)
         elif path.endswith("/AllowanceCharge/ChargeIndicator"):
             if content.lower() == "true":
-                self.current_trade_line.quantity_billed = 1.0
+                self.current_trade_line.quantity = 1.0
             else:
-                self.current_trade_line.quantity_billed = -1.0
+                self.current_trade_line.quantity = -1.0
 
     def handle_trade_tax(self, path: str, tag: str, content: str, attr=None):
         if path.endswith("/ClassifiedTaxCategory/ID") or path.endswith("/TaxCategory/ID"):
@@ -304,7 +304,7 @@ class UblSaxHandler(sax.ContentHandler):
 
 class XRechnungUblXMLParser(XMLAbstractXRechnungParser):
     @classmethod
-    def parse_and_map_x_rechnung(cls, _xml: bytes) -> XRechnung:
+    def parse_and_map_x_rechnung(cls, _xml: bytes) -> TradeDocument:
         # create an XMLReader
         parser = sax.make_parser()
         # turn off namespaces

{mikrowerk_edi_invoicing-0.5.0.dist-info → mikrowerk_edi_invoicing-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mikrowerk_edi_invoicing
-Version: 0.5.0
+Version: 0.6.1
 Summary: Parser for EDI invoices in CII or UBL format or plain pdf with LLM support
 Author: Mikrowerk a Gammadata Division
 Author-email: info@mikrowerk.com

{mikrowerk_edi_invoicing-0.5.0.dist-info → mikrowerk_edi_invoicing-0.6.1.dist-info}/RECORD

@@ -1,11 +1,10 @@
-edi_invoice_parser/__init__.py,sha256=1fRVIy_xEyvR5MuiEuZJTxpBTN30uIxAVn_kqervWuM,1386
-edi_invoice_parser/cross_industry_invoice_mapper.py,sha256=viUaEq71xjb9_KUVL9YCqWzfKwSa1ivcWnzb4SFdKCM,905
-edi_invoice_parser/parse_plain_pdf_file.py,sha256=5CWHMHAlmqLzMLrPTLOFQ_liI6LcFFF0thpMF3j1SAk,282
+edi_invoice_parser/__init__.py,sha256=o_oatupAKzFcuuRI1z6Epj8-rIAEsxVCHwmPF0SJgVs,667
+edi_invoice_parser/cross_industry_invoice_mapper.py,sha256=PCByIKH0srVnXqKR3orcQsrAxcqAtp_ljcmhNIv2FS8,1402
 edi_invoice_parser/cii_dom_parser/__init__.py,sha256=J9O0f-t1570oDgC_zWT6-MpjOYA6o3whazbe9ffQqjE,188
 edi_invoice_parser/cii_dom_parser/dom_elements_helper.py,sha256=60_YyI85xWhIa92hHwIr_FLQvFuRcNrlCJjBi9S1s8o,3686
 edi_invoice_parser/cii_dom_parser/pdf.py,sha256=1bbXWdqIGmrnYvkS284oc6ZVvH995vd9qB8-xdcDtf0,13270
 edi_invoice_parser/cii_dom_parser/utils.py,sha256=_ZaPPb1YeDWid3GP-9ojYDwm35HaJyXGGT_nIoiGSMw,624
-edi_invoice_parser/cii_dom_parser/xml_cii_dom_parser.py,sha256=dmAjGVQIe_1vlihDpBBbzgRWdfVnH_boXJHNwTCZ5O8,11322
+edi_invoice_parser/cii_dom_parser/xml_cii_dom_parser.py,sha256=dvO9zvpHK1bAvnBKBAbFhht_yd9XbRprGcHz9FXllzk,11328
 edi_invoice_parser/cii_dom_parser/xmp_schema.py,sha256=UXQnZT3L2PQMendI_vyjemddhw209gMjH5woIK07TEM,4085
 edi_invoice_parser/cii_dom_parser/models/__init__.py,sha256=LANSc9OLmHBP8iv5RKlvvv8ugBGJjWycantnRi5Lt0I,439
 edi_invoice_parser/cii_dom_parser/models/accounting.py,sha256=_ngHDoBruw6v5QbLeA23QarAQ0fOascCz0ISpnD9aPs,6714
@@ -21,23 +20,19 @@ edi_invoice_parser/cii_dom_parser/models/product.py,sha256=WRX0m5u6UTFv6Bvow1pED
 edi_invoice_parser/cii_dom_parser/models/references.py,sha256=2LYJGJU5KkJse-UsUcQitbPWYdlT_lLFL6BvvQmUIoo,4468
 edi_invoice_parser/cii_dom_parser/models/trade.py,sha256=exlMrVMzj9aMb0qI3c610G3GuB6Z5ttM4qkFfK5tn3o,6968
 edi_invoice_parser/cii_dom_parser/models/tradelines.py,sha256=262opVT4pWXKEc_-HTEqVjm4yqQhvz639QNckEQCthY,5650
-edi_invoice_parser/model/__init__.py,sha256=kglbJax0bg64Wb0PIK8Vphdy7ApLiIb2qo23YFH25zg,695
-edi_invoice_parser/model/trade_document_types.py,sha256=DBsdHOeu-W8CEOY7ScUd9yCZjUQFKlzco-om2BJIBSk,4079
-edi_invoice_parser/model/x_rechnung.py,sha256=7RUuWh2STXn1fRNzO2-gP42i0tY1Jj2OBMykIKC3idY,10088
-edi_invoice_parser/model/xml_abstract_x_rechnung_parser.py,sha256=puxCSC02zIXpfMY9xNLqY-w0aRv0y5ROHmNtmaV16o4,673
-edi_invoice_parser/pdf_llm_parser/__init__.py,sha256=hJwV4HialAgphoAZ5SzklXgBrxA7KYfn1edKhUMxpwE,130
-edi_invoice_parser/pdf_llm_parser/google_gemini_parser.py,sha256=Tqo3scK-vz8_r3DHuDmJbf3vLF5l9TGM8kH0f8nwXjw,6183
-edi_invoice_parser/tests/__init__.py,sha256=gnkvp4ZsQ0g1L5r6fbyhvFNsSKp0PegdvVeQP_dVQSw,142
+edi_invoice_parser/model/__init__.py,sha256=gdzehRQK27DRpc-datjXMSkcs5GvxPFtph02wLE1Kns,647
+edi_invoice_parser/model/trade_document_types.py,sha256=nmNzSG0bK9FCUzF1KmR1SUvgEx8ACaXezhLV_a97eYQ,5060
+edi_invoice_parser/model/xml_abstract_x_rechnung_parser.py,sha256=ufkXX4OP0_CjsB9pjF0-h_MJerkOx4JeY54nULi_BUA,691
+edi_invoice_parser/tests/__init__.py,sha256=KhEmBFKreDn5PGQFEnBzTAI7IkxtRj_H0dMxk_tuo54,160
 edi_invoice_parser/tests/test_iban_handling.py,sha256=suRaB9gxbNc2Dc7spjHmQyPBdXva98HF1js85wQWqPM,662
-edi_invoice_parser/tests/test_parse_plain_pdf_invoice.py,sha256=g_oMG-UxlGWiliJw19_Yc6zKuieBKl7v27Oq3J965JM,3473
-edi_invoice_parser/tests/test_parse_x_rechnung.py,sha256=K2g3jjfxh5gsTJtOvjWSzo-lPIdgnpMsuuewQa5BQq4,3591
+edi_invoice_parser/tests/test_parse_x_rechnung.py,sha256=jZK_Gw1yMHV8glR2yc7saC12MkcR4Jk1OqrQlKEvvN4,3604
 edi_invoice_parser/ubl_sax_parser/__init__.py,sha256=P3QhOExirTKDRre-ReGBVv_GFZniEj_kOnWtUSNJGq0,91
-edi_invoice_parser/ubl_sax_parser/xml_ubl_sax_parser.py,sha256=oSwqflp2nf_M5K6_iyAeNTYmDnCKIsgo5LO0BvPxRq0,16911
+edi_invoice_parser/ubl_sax_parser/xml_ubl_sax_parser.py,sha256=eZETsQi0MZ7f0SvyRZBorMUTJkpET9Bi2FDWBFka_qA,16625
 edi_invoice_parser/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 edi_invoice_parser/util/file_helper.py,sha256=4gdWbv8L9LSMraLKvGI1Z3NMcuGGy7JB1qFvNaW-yo4,767
 edi_invoice_parser/util/timer_helper.py,sha256=X1XSV03iLZ4xfjELj_axlvNxzR2sOrJInXiv9HU2Fyg,284
-mikrowerk_edi_invoicing-0.5.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-mikrowerk_edi_invoicing-0.5.0.dist-info/METADATA,sha256=61zrdg24cjGligw2IxwYWEBWz-pOoCwzjYC4juLkM78,1074
-mikrowerk_edi_invoicing-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mikrowerk_edi_invoicing-0.5.0.dist-info/top_level.txt,sha256=OyIJDXDBfR9f0EvTDTmEHdXEFHscjRqX1MxeOeT2VKM,19
-mikrowerk_edi_invoicing-0.5.0.dist-info/RECORD,,
+mikrowerk_edi_invoicing-0.6.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+mikrowerk_edi_invoicing-0.6.1.dist-info/METADATA,sha256=EEEN0GCXPmhTvEFofOhbB8He2YY4UYP5q6_TdSOKJ9Q,1074
+mikrowerk_edi_invoicing-0.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mikrowerk_edi_invoicing-0.6.1.dist-info/top_level.txt,sha256=OyIJDXDBfR9f0EvTDTmEHdXEFHscjRqX1MxeOeT2VKM,19
+mikrowerk_edi_invoicing-0.6.1.dist-info/RECORD,,

edi_invoice_parser/model/x_rechnung.py

@@ -1,265 +0,0 @@
-from datetime import datetime
-from dataclasses import dataclass, asdict
-from decimal import Decimal
-
-__all__ = ['XRechnung', "XRechnungCurrency", "XRechnungTradeParty", "XRechnungTradeAddress", "XRechnungTradeContact",
-           "XRechnungPaymentMeans", "XRechnungBankAccount", "XRechnungAppliedTradeTax", "XRechnungTradeLine",
-           "XRechnungFinancialCard"]
-
-
-@dataclass
-class XRechnungCurrency:
-    amount: Decimal
-    currency_code: str
-
-    @staticmethod
-    def from_currency_tuple(currency_tuple: tuple) -> 'XRechnungCurrency':
-        return XRechnungCurrency(*currency_tuple)
-
-
-@dataclass
-class XRechnungTradeAddress:
-    post_code: str = None  # 'Post-Code'
-    city_name: str = None  # 'City'
-    country_id: str = None  # 'Country ID
-    country_subdivision_id: str = None  # 'Country Subdivision ID'
-    address_line_1: str = None  # 'Address Line 1'
-    address_line_2: str = None  # 'Address Line 2'
-    address_line_3: str = None  # 'Address Line 3'
-
-
-@dataclass
-class XRechnungTradeContact:
-    name: str = None  # 'Person Name'
-    department_name: str = None  # 'Department Name'
-    telephone: str = None  # 'Telephone Number'
-    fax: str = None  # 'Fax'
-    email: str = None  # 'Email'
-
-
-@dataclass
-class XRechnungTradeParty:
-    global_id: int = 0  # 'Global ID'
-    global_id_schema: str = None  # 'Global Schema'
-    id: str = None  # 'id'
-    name: str = None  # 'Name'
-    description: str = None  # 'Description'
-    postal_address: XRechnungTradeAddress = None
-    email: str = None  # 'Email'
-    trade_contact: XRechnungTradeContact = None
-    vat_registration_number: str = None  # 'VAT Registration Number'
-    fiscal_registration_number: str = None  # 'Fiscal Registration Number'
-    legal_registration_number: str = None
-
-
-# @dataclass
-# class XRechnungSpecifiedTradeSettlementPaymentMeans:
-#     name: str = None  # 'Name'
-#     type_code: str = None  # 'Type Code'
-#     information: str = None  # 'Information'
-#     iban: str = None  # 'IBAN'
-#     bicid: str = None  # 'BICID'
-#     account_name: str = None  # 'Account Name'
-
-
-@dataclass
-class XRechnungAppliedTradeTax:
-    name: str = None  # 'Name'
-    type_code: str = None
-    category_code: str = None
-    applicable_percent: float = 0.0
-    basis_amount: float = 0.0  # 'Basis Amount'
-    calculated_amount: float = 0.0  # 'Calculated Tax Amount'
-
-
-@dataclass
-class XRechnungTradeLine:
-    name: str = None  # 'Name')
-    description: str = None
-    line_id: str = None  # 'Line ID')
-    global_product_id: str = None  # 'Global Product ID')
-    global_product_scheme_id: str = None  # 'Global Product Scheme ID')
-    seller_assigned_id: str = None  # 'Seller Assigned ID')
-    buyer_assigned_id: str = None  # 'Buyer Assigned ID')
-    price_unit: float = 0.0  # 'Net Price')
-    quantity_billed: float = 0.0  # 'Billed Quantity')
-    quantity_unit_code: str = None  # 'Quantity Code')
-    total_amount_net: float = 0.0  # 'Total Amount Net')
-    price_unit_gross: float = 0.0
-    total_allowance_charge: float = 0.0
-    trade_tax: any = None
-    note: str = None
-    lot_number_id: str = None
-    expiry_date: datetime = None
-
-
-@dataclass
-class XRechnungFinancialCard:
-    id: str | None = None
-    cardholder_name: str | None = None
-
-
-@dataclass
-class XRechnungBankAccount:
-    iban: str | None = None
-    bic: str | None = None
-
-
-@dataclass
-class XRechnungPaymentMeans:
-    id: str = None
-    type_code: str = None
-    information: str = None
-    financial_card: XRechnungFinancialCard = None
-    payee_account: XRechnungBankAccount = None
-
-
-@dataclass
-class XRechnung:
-    """
-    Model an EDI invoice for mapping CII or UBL Invoices
-    """
-    name: str = None  # 'Name'
-    doc_id: str = None  # 'Document ID'
-    doc_type_code: str = None  # 'Subject Code'
-    issued_date_time: datetime = None  # 'Date'
-    delivered_date_time: datetime = None  # 'Delivered Date'
-    languages: str = None  # 'Languages'
-    notes: str = None  # 'Notes'
-    buyer_reference: str = None  # 'Buyer Reference'
-    order_reference: str = None
-    dispatch_reference: str = None
-    sales_order_reference: str = None
-    seller: XRechnungTradeParty = None
-    payee: XRechnungTradeParty = None
-    buyer: XRechnungTradeParty = None
-    invoicee: XRechnungTradeParty = None
-    currency_code: str = None  # 'Currency Code'
-    payment_means: XRechnungPaymentMeans = None
-    payment_terms: str = None  # 'Payment Terms'
-    line_total_amount: Decimal = None  # 'Line Total Amount'
-    charge_total_amount: Decimal = None  # 'Charge Total Amount'
-    allowance_total_amount: Decimal = None  # 'Allowance Total Amount'
-    tax_basis_total_amount: XRechnungCurrency = None
-    tax_total_amount: [XRechnungCurrency] = None  # 'Tax Grand Total Amount'
-    grand_total_amount: XRechnungCurrency = None  # 'Grand Total Amount'
-    total_prepaid_amount: Decimal = None  # 'Total Prepaid Amount'
-    due_payable_amount: Decimal = None  # 'Due Payable Amount'
-    trade_line_items: [XRechnungTradeLine] = None
-    applicable_trade_taxes: [XRechnungAppliedTradeTax] = None
-
-    def map_to_dict(self) -> dict:
-        """
-        maps a XRechnung to a dict suited for generation odoo entities
-        Note: this is not a 1:1 mapping of the XRechnung model, some adjustments and simplifications made
-        :param self: XRechnung.XRechnung
-        :return: dict
-        """
-
-        _dict = asdict(self)
-        _dict.update({
-            'line_total_amount': float(self.line_total_amount) if self.line_total_amount is not None else 0,
-            'charge_total_amount': float(self.charge_total_amount) if self.charge_total_amount else 0,
-            'allowance_total_amount': float(self.allowance_total_amount) if self.allowance_total_amount else 0,
-            'tax_basis_total_amount': float(
-                self.tax_basis_total_amount.amount) if self.tax_basis_total_amount else 0,
-            'tax_total_amount': self.sum_x_rechnung_currency(self.tax_total_amount) if self.tax_total_amount else 0,
-            'grand_total_amount': float(self.grand_total_amount.amount) if self.grand_total_amount else 0,
-            'total_prepaid_amount': float(self.total_prepaid_amount) if self.total_prepaid_amount else 0.0,
-            'due_payable_amount': float(self.due_payable_amount) if self.due_payable_amount else 0.0,
-            'seller': self.map_trade_party(self.seller) if self.seller else None,
-            'payee': self.map_trade_party(self.payee) if self.payee else None,
-            'buyer': self.map_trade_party(self.buyer) if self.buyer else None,
-            'invoicee': self.map_trade_party(self.invoicee) if self.invoicee else None,
-            'payment_means': self.map_payment_means(self.payment_means) if self.payment_means else None,
-            'trade_line_items': self.map_tradeline_items_to_dict(self.trade_line_items),
-            'applicable_trade_taxes': self.map_trade_taxes_to_dict(self.applicable_trade_taxes),
-        })
-        return _dict
-
-    @classmethod
-    def map_tradeline_to_dict(cls, x_trade_line: XRechnungTradeLine) -> dict:
-        _dict = asdict(x_trade_line)
-        _dict.update(
-            {'trade_tax': asdict(x_trade_line.trade_tax) if x_trade_line.trade_tax is not None else None,
-             'price_unit': float(x_trade_line.price_unit),
-             'quantity_billed': float(x_trade_line.quantity_billed),
-             'total_amount_net': float(x_trade_line.total_amount_net),
-             })
-        return _dict
-
-    @classmethod
-    def map_tradeline_items_to_dict(cls, tradeline_items: list) -> list:
-        res = []
-        if tradeline_items:
-            for tradeline_item in tradeline_items:
-                res.append(cls.map_tradeline_to_dict(tradeline_item))
-        return res
-
-    @classmethod
-    def map_trade_taxes_to_dict(cls, trade_taxes: list) -> list:
-        res = []
-        if trade_taxes:
-            for tax in trade_taxes:
-                res.append(asdict(tax))
-        return res
-
-    @classmethod
-    def map_trade_party(cls, trade_party: XRechnungTradeParty) -> dict:
-        _dict = asdict(trade_party)
-        _dict.update({
-            'postal_address': cls.map_trade_address(trade_party.postal_address),
-            'trade_contact': cls.map_trade_contact(trade_party.trade_contact, trade_party)
-        })
-        return _dict
-
-    @classmethod
-    def map_trade_address(cls, trade_address: XRechnungTradeAddress) -> dict | None:
-        if trade_address is None:
-            return None
-        _dict = asdict(trade_address)
-        return _dict
-
-    @classmethod
-    def map_trade_contact(cls, trade_contact: XRechnungTradeContact, trade_party: XRechnungTradeParty) -> dict | None:
-        if trade_contact is None:
-            return None
-        _dict = asdict(trade_contact)
-        if _dict.get('name', None) is None or _dict.get('name', None) == '':
-            _dict.update({'name': trade_party.name})
-        return _dict
-
-    @classmethod
-    def map_payment_means(cls, payment_means: XRechnungPaymentMeans) -> dict:
-        _dict = {
-            'type_code': payment_means.type_code,
-            'information': payment_means.information,
-            'financial_card': cls.map_financial_card(
-                payment_means.financial_card) if payment_means.financial_card else None,
-            'bank_account': cls.map_bank_account(payment_means.payee_account) if payment_means.payee_account else None,
-        }
-        return _dict
-
-    @classmethod
-    def map_financial_card(cls, card: XRechnungFinancialCard) -> dict:
-        _dict = {
-            'card_number': card.id,
-            'card_holder_name': card.cardholder_name
-        }
-        return _dict
-
-    @classmethod
-    def map_bank_account(cls, bank: XRechnungBankAccount) -> dict:
-        _dict = {
-            'iban': bank.iban,
-            'bic': bank.bic
-        }
-        return _dict
-
-    @classmethod
-    def sum_x_rechnung_currency(cls, x_currencies: [XRechnungCurrency]) -> float:
-        res = 0.0
-        if x_currencies:
-            for x_currency in x_currencies:
-                res += float(x_currency.amount)
-        return res

edi_invoice_parser/parse_plain_pdf_file.py

@@ -1,5 +0,0 @@
-from .pdf_llm_parser.google_gemini_parser import analyze_document as google_analyze_document
-
-
-def analyze_document(pdf_binary: bytes, api_key=None, model: str = None, prompt=None) -> dict:
-    return google_analyze_document(pdf_binary, api_key=api_key, model=model, prompt=prompt)

edi_invoice_parser/pdf_llm_parser/__init__.py

@@ -1,5 +0,0 @@
-from .google_gemini_parser import analyze_document as google_gemini_parser
-
-__all__ = ['google_gemini_parser']
-
-version = "0.0.1"

edi_invoice_parser/pdf_llm_parser/google_gemini_parser.py

@@ -1,145 +0,0 @@
-import json
-import logging
-import os
-
-from google import genai
-from google.genai import types
-
-DEFAULT_LLM_MODEL = "gemini-2.5-flash-lite"
-
-_logger = logging.getLogger(__name__)
-
-DEFAULT_PROMPT = """
-    Bitte analysiere das beigefügte Dokument und extrahiere alle relevanten Informationen als strukturiertes JSON.
-    Verwende exakt das folgende JSON-Schema und beachte die Anweisungen.
-
-    Wichtige Hinweise:
-    - Gib NUR valides JSON zurück. Kein umgebender Text oder Markdown-Formatierung.
-    - Bei fehlenden Werten verwende den JSON-Wert null.
-    - Gib alle Beträge als Zahlen (float oder integer), nicht als Strings.
-    - Formatiere alle Datumsangaben im Format YYYY-MM-DD.
-    - Gib das land als "ISO 3166-2" Code an, wenn nicht angegeben nehme "DE" an.
-    - Erkenne den Dokumententyp und klassifiziere ihn als: "Rechnung", "Gutschrift", "Auftrag", "Angebot", "Anfrage", "Auftragsbestätigung", "Bestellung"
-    - Erkenne für eine Gutschrift auch Varianten wie Credit Note, Rechnungsgutschrift, Erstattung
-    - Erkenne für eine Rechnung auch Varianten wie: "Rechnung","Proforma Rechnung","R-Nr.","Rechnung-Nr.","Rech.-Nr.","Invoice No.","Invoice Number","Kostenrechnung"
-    - Erkenne für eine Auftragsbestätigung auch Varianten wie: "Bestätigung", "Vertrag","Order Acknowledgement", "Order Confirmation"
-    - Erkenne für die Referenz auch Varianten wie: "Projektnummer", "Auftragsnummer", "Bestellnummer", "Referenznummer", "Kundenreferenz", "Reference"
-    - Ist der Dokumententyp nicht erkennbar klassifiziere ihn als: "sonstiges"
-    - Sind keine Positionen vorhanden erstelle eine zusammenfassung des Textes und die Summen oder Beträge, falls vorhanden
-    - Ist der Dokumententyp ist nicht erkennbar erstelle eine Zusammenfassung des Textes
-    - Erkenne auch Varianten wie: "MWST.", "VAT", "Ust.", etc. für die Umsatzsteuer.
-    - Erkenne für die Währung Varianten wie: "EUR", "€", "$", "USD", "CHF" oder sonstige Währungsbezeichnung oder Symbol
-    - Wenn keine Währung abgeben ist nimm "EUR" an
-    - Erkenne für das fälligkeitsdatum auch Varianten wie:  "zahlbar bis", "fällig", "fällig bis", "zu liefern bis", "gültig bis"
-    - Erkenne ob eine Rechnung bereits bezahlt ist, ja oder nein, und vermerke die Zahlungsmethode wie: "Paypal", "Kreditkarte", "Überweisung", "Barzahlung"
-    - Eine Rechnung ist bezahlt "ja", wenn die Zahlungsmethode wie: "Paypal", "Kreditkarte" ist.
-    - Ernenne für die Steuernummer des Absenders auch: "Tax Number", "VAT Number", "VAT ID", "MWST ID", "UST ID", "Ust-id"
-
-    JSON-Schema:
-    {
-      "dokumenttyp": "string",
-      "dokumentnummer": "string",
-      "referenz": "string",
-      "dokumentendatum": "YYYY-MM-DD",
-      "fälligkeitsdatum": "YYYY-MM-DD",
-      "absender": {
-        "name": "string",
-        "adresse": "string",
-        "plz": "string",
-        "ort": "string",
-        "land": "string",
-        "steuernummer": "string",
-      },
-      "empfänger": {
-        "name": "string",
-        "adresse": "string",
-        "plz": "string",
-        "ort": "string",
-        "land": "string",
-      },
-      "positionen": [
-        {
-          "POS": "number",
-          "Bezeichnung": "string",
-          "Menge": "number",
-          "Einheit": "string",
-          "einzelpreis": "number",
-          "Betrag": "number",
-          "mwst_satz": "number"
-        }
-      ],
-      "summen": {
-        "nettobetrag": "number",
-        "umsatzsteuer": "number",
-        "rechnungsbetrag": "number"
-        "währung": "string"
-      },
-      "zahlungshinweise": "string",
-      "zahlungsmethode": "string"
-      "bezahlt": "string",
-      "weitere_info": "string",
-      "bankverbindung": "string"
-      "zusammenfassung": "string",
-    }
-    """
-
-
-def analyze_document(pdf_binary: bytes, api_key, model: str, prompt) -> dict:
-    """
-    Analysiert eine PDF-Rechnung mit Gemini, extrahiert Informationen
-    und gibt sie als Python-Dictionary zurück.
-    """
-
-    if not pdf_binary:
-        _logger.error("Error no binaries supplied")
-        raise ValueError("Error no binaries supplied")
-
-    if api_key:
-        if len(api_key) < 20:
-            raise RuntimeError("Der API Key scheint ungültig oder zu kurz zu sein.")
-    else:
-        api_key = os.environ.get("GEMINI_API_KEY", None)
-        if api_key is None:
-            raise RuntimeError("Die Umgebungsvariable 'GEMINI_API_KEY' wurde nicht gefunden.")
-        if len(api_key) < 20:
-            raise RuntimeError("Der API Key scheint ungültig oder zu kurz zu sein.")
-
-    api_key = api_key.strip()
-    client = genai.Client(api_key=api_key)
-    if not model:
-        model = DEFAULT_LLM_MODEL
-    if not prompt:
-        prompt = DEFAULT_PROMPT
-
-    _logger.info("\nSende Anfrage an die Gemini API...")
-    # Sende die Anfrage mit dem Prompt und der hochgeladenen Datei
-    _logger.info(f"use API-KEY: {api_key} length: {len(api_key)}")
-    try:
-        response = client.models.generate_content(
-            model=model,
-            contents=[
-                types.Part.from_bytes(
-                    data=pdf_binary,
-                    mime_type='application/pdf',
-                ),
-                prompt])
-    except KeyError:
-        raise UserWarning("Fehler: Die Umgebungsvariable GOOGLE_API_KEY wurde nicht gefunden.\n"
-                          "Bitte setzen Sie den Schlüssel, z.B. mit 'export GOOGLE_API_KEY=\"DEIN_API_SCHLÜSSEL\"'")
-
-    except Exception as e:
-        raise UserWarning(f"Ein unerwarteter Fehler ist aufgetreten: {e}")
-
-    # Bereinige und parse die Antwort
-    try:
-        # Manchmal gibt das Modell die Antwort in einem Markdown-Codeblock zurück.
-        # Dieser Code entfernt die Markierungen, um reines JSON zu erhalten.
-        cleaned_response = response.text.strip().replace("```json", "").replace("```", "").strip()
-
-        # Parse den JSON-String in ein Python-Dictionary
-        extracted_data = json.loads(cleaned_response)
-        return extracted_data
-    except json.JSONDecodeError:
-        raise RuntimeError("Fehler beim Parsen der Modell-Antwort:", response.text)
-    except Exception as e:
-        raise RuntimeError(f"Ein unerwarteter Fehler ist aufgetreten: {e}")

edi_invoice_parser/tests/test_parse_plain_pdf_invoice.py

@@ -1,71 +0,0 @@
-import unittest
-import os
-import pathlib
-from parameterized import parameterized
-import json
-
-from . import get_checked_file_path
-from edi_invoice_parser.parse_plain_pdf_file import analyze_document
-
-
-class TestPlainPdfInvoiceParser(unittest.TestCase):
-    @parameterized.expand([
-        ('pdf', 'plain_pdf_invoices/25313 - Rechnung Konzepthausevent - 16-09-2025.pdf'),
-        ('pdf', 'plain_pdf_invoices/57856 - 2509-7377.pdf'),
-        ('pdf', 'plain_pdf_invoices/Bestätigung griffty GmbH VA 150919 SCCON_25.pdf'),
-        # ('pdf', 'plain_pdf_invoices/Invoice INV-1013.pdf'),
-        # ('pdf', 'plain_pdf_invoices/LGM-2509-784_Griffity_GmbH_10_09_2025_Rechnung.pdf'),
-        # ('pdf', 'plain_pdf_invoices/Order GO-0741243.pdf'),
-        # ('pdf', 'plain_pdf_invoices/Rechnung 30250628.pdf'),
-        # ('pdf', 'plain_pdf_invoices/Rechnung-202511899-11267.pdf'),
-        # ('pdf', 'plain_pdf_invoices/TS Rechnung TS2025-10586.pdf'),
-        # ('pdf', 'plain_pdf_invoices/Verkaufsrechnung 01-137334.pdf'),
-    ])
-    def test_parse_pdf_invoice(self, file_type, file_path):
-        _file_path, _exists, _is_dir = get_checked_file_path(file_path, __file__)
-        self.assertEqual(file_type, 'pdf', "Only 'pdf' filetype is supported")
-        self.assertTrue(_exists, f"file does not exist: {_file_path}")
-        self.test_api_key_is_available()
-        api_key = os.environ.get("GEMINI_API_KEY")
-
-        filepath = pathlib.Path(_file_path)
-        binary = filepath.read_bytes()
-        invoice_data = analyze_document(binary, api_key=api_key)
-        self.assertIsNotNone(invoice_data, "No result retrieved")
-        print("\n------------------------------------------------------------")
-        print(f"\nDokument Date: {file_path}")
-        print("\n--- Extrahierte Dokumentdaten ---")
-        # Beispielhafter Zugriff auf einzelne Daten
-        print(f"\nDokumenttyp: {invoice_data.get('dokumenttyp', None)}")
-        print(f"\ndokumentnummer: {invoice_data.get('dokumentnummer', None)}")
-        print(f"\nAbsender: {invoice_data.get('absender', {}).get('name', None)}")
-        print(f"\nEmpfänger: {invoice_data.get('empfänger', {}).get('name', None)}")
-        print(f"Fälligkeitsdatum: {invoice_data.get('fälligkeitsdatum', None)}")
-        print(f"Gesamtbetrag: {invoice_data.get('summen', {}).get('rechnungsbetrag', 'None')} €")
-        print("\n------------------------------------------------------------")
-        # Gib das Dictionary als formatierten JSON-String aus
-        print(json.dumps(invoice_data, indent=2, ensure_ascii=False))
-
-        _out_file_path = _file_path.replace('.pdf', '.json')
-        with open(_out_file_path, "w") as f:
-            f.write(json.dumps(invoice_data, indent=2, ensure_ascii=False))
-            print(f"written result json to {_out_file_path}")
-        print("\n---------------------------------")
-
-    def test_api_key_is_available(self):
-        """
-        Prüft, ob die Umgebungsvariable 'PROD_API_KEY' gesetzt ist.
-
-        WICHTIG: Gib niemals den Inhalt des Keys in Logs aus!
-        Prüfe nur, ob er existiert oder valide aussieht (z.B. Länge).
-        """
-
-        # Hier liest Python die Umgebungsvariable
-        api_key = os.environ.get("GEMINI_API_KEY")
-
-        assert api_key is not None, "Die Umgebungsvariable 'GEMINI_API_KEY' wurde nicht gefunden."
-        assert len(api_key) > 20, "Der API Key scheint ungültig oder zu kurz zu sein."
-
-
-if __name__ == '__main__':
-    unittest.main()