diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java index 74d9505..243bd2e 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java @@ -43,7 +43,7 @@ import jakarta.inject.Inject; * ... * ... * 2024-12-31 - * 2024-12-31 + * 2024-12-31 * 1234.00 * ... * ... @@ -99,7 +99,7 @@ public class PromptExampleAdapterXML { * ... * ... * 2024-12-31 - * 2024-12-31 + * 2024-12-31 * 1234.00 * ... * ... @@ -130,10 +130,10 @@ public class PromptExampleAdapterXML { " " + dateFormat.format(invoice.getItemValueDate("invoice.date")) + "\n"); } - if (invoice.getItemValueDate("payment.date") != null) { + if (invoice.getItemValueDate("invoice.duedate") != null) { example.append( - " " + dateFormat.format(invoice.getItemValueDate("payment.date")) - + "\n"); + " " + dateFormat.format(invoice.getItemValueDate("invoice.duedate")) + + "\n"); } example.append(" " + invoice.getItemValueDouble("invoice.total") + "\n"); diff --git a/workflow/posteingang-de-2.0.0.bpmn b/workflow/posteingang-de-2.0.0.bpmn index 8a4cb2d..cacf60d 100644 --- a/workflow/posteingang-de-2.0.0.bpmn +++ b/workflow/posteingang-de-2.0.0.bpmn @@ -689,7 +689,7 @@ Betrag: _amount (Brutto € _amount_brutto... ... 2024-12-31 - 2024-12-31 + 2024-12-31 1234.00 ... ... @@ -703,9 +703,9 @@ Transfer the individual invoice data to the XML tags, taking into account the fo - Total ==> "invoice.total" (in EUR or if not available in USD or PLN) - IBAN ==> "cdtr.iban" - BIC or SWIFT ==> "cdtr.bic" - - Payment date / Due date ==> "payment.date" + - Payment date / Due date ==> "invoice.duedate" -Note: Output only the XML object! Don't add explanations or comments. Use only the XML structure specified in this example and do not create any other XML tags. If you don't have data for some fields, leave the corresponding XML tags blank. Format date values (invoice.date, payment.date) into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217. +Note: Output only the XML object! Don't add explanations or comments. Use only the XML structure specified in this example and do not create any other XML tags. If you don't have data for some fields, leave the corresponding XML tags blank. Format date values (invoice.date, invoice.duedate) into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217. <> @@ -874,6 +874,7 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t https://llama.cpp.imixs.com/ XML +Empfang ]]> @@ -908,7 +909,7 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t Extract also the company name and the language the invoice is written in. -Note: The company name is the name of the company that issued the invoice document, not the recipient. The company name is usually at the beginning or end of the invoice document. +Note: The company name is the name of the company that issued the invoice document and not the name of the recipient. As a rule, it is not Alexander Global Logistics either. The company name is often at the beginning or end of the invoice document. Output the infromation as one XML object that has the following structure: @@ -1004,7 +1005,6 @@ Note: Do not generate any other information instead of the XML object. Do not ge true false - ]]> @@ -1031,7 +1031,7 @@ Note: Do not generate any other information instead of the XML object. Do not ge {"n_predict": 4096, "temperature": 0} - ^.+\.([pP][dD][fF])$ @@ -1039,17 +1039,18 @@ Note: Do not generate any other information instead of the XML object. Do not ge Summarize the data from this invoice document: - - Company information + - Vendor information - General Billing data - Invoice total information - - Payment summary + - Payment summary (including bank data) - Invoice items -The company name is the name of the company that issued the invoice document, not the recipient. The company name is usually at the beginning or end of the invoice document. +Note: The vendor information refers to the sender of the invoice. The company name is the name of the company that issued the invoice document and not the name of the recipient. As a rule, it is not Alexander Global Logistics either. The company name is often at the beginning or end of the invoice document. -Summarize the invoice lines in a table. Use only the default values and do not perform any calculations, summing or changes to these values yourself. Format numbers and amounts according to ISO 4217. +If possible summarize the invoice lines in a table. + [/INST] ]]]]> diff --git a/workflow/posteingang-en-2.0.0.bpmn b/workflow/posteingang-en-2.0.0.bpmn index f8f9e34..08702a6 100644 --- a/workflow/posteingang-en-2.0.0.bpmn +++ b/workflow/posteingang-en-2.0.0.bpmn @@ -689,7 +689,7 @@ Betrag: _amount (Brutto € _amount_brutto... ... 2024-12-31 - 2024-12-31 + 2024-12-31 1234.00 ... ... @@ -703,9 +703,9 @@ Transfer the individual invoice data to the XML tags, taking into account the fo - Total ==> "invoice.total" (in EUR or if not available in USD or PLN) - IBAN ==> "cdtr.iban" - BIC or SWIFT ==> "cdtr.bic" - - Payment date / Due date ==> "payment.date" + - Payment date / Due date ==> "invoice.duedate" -Note: Output only the XML object! Don't add explanations or comments. Use only the XML structure specified in this example and do not create any other XML tags. If you don't have data for some fields, leave the corresponding XML tags blank. Format date values (invoice.date, payment.date) into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217. +Note: Output only the XML object! Don't add explanations or comments. Use only the XML structure specified in this example and do not create any other XML tags. If you don't have data for some fields, leave the corresponding XML tags blank. Format date values (invoice.date, invoice.duedate) into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217. <> @@ -908,7 +908,7 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t Extract also the company name and the language the invoice is written in. -Note: The company name is the name of the company that issued the invoice document, not the recipient. The company name is usually at the beginning or end of the invoice document. +Note: The company name is the name of the company that issued the invoice document and not the name of the recipient. As a rule, it is not Alexander Global Logistics either. The company name is often at the beginning or end of the invoice document. Output the infromation as one XML object that has the following structure: @@ -1031,7 +1031,7 @@ Note: Do not generate any other information instead of the XML object. Do not ge {"n_predict": 4096, "temperature": 0} - ^.+\.([pP][dD][fF])$ @@ -1039,17 +1039,18 @@ Note: Do not generate any other information instead of the XML object. Do not ge Summarize the data from this invoice document: - - Company information + - Vendor information - General Billing data - Invoice total information - - Payment summary + - Payment summary (including bank data) - Invoice items -The company name is the name of the company that issued the invoice document, not the recipient. The company name is usually at the beginning or end of the invoice document. +Note: The vendor information refers to the sender of the invoice. The company name is the name of the company that issued the invoice document and not the name of the recipient. As a rule, it is not Alexander Global Logistics either. The company name is often at the beginning or end of the invoice document. -Summarize the invoice lines in a table. Use only the default values and do not perform any calculations, summing or changes to these values yourself. Format numbers and amounts according to ISO 4217. +If possible summarize the invoice lines in a table. + [/INST] ]]]]> diff --git a/workflow/prompts/categorize-en.xml b/workflow/prompts/categorize-en.xml index 568900e..f210152 100644 --- a/workflow/prompts/categorize-en.xml +++ b/workflow/prompts/categorize-en.xml @@ -13,7 +13,7 @@ Extract also the company name and the language the invoice is written in. -Note: The company name is the name of the company that issued the invoice document, not the recipient. The company name is usually at the beginning or end of the invoice document. +Note: The company name is the name of the company that issued the invoice document and not the name of the recipient. As a rule, it is not Alexander Global Logistics either. The company name is often at the beginning or end of the invoice document. Output the infromation as one XML object that has the following structure: diff --git a/workflow/prompts/invoice-extract-en.xml b/workflow/prompts/invoice-extract-en.xml index 8d49957..0a170d7 100644 --- a/workflow/prompts/invoice-extract-en.xml +++ b/workflow/prompts/invoice-extract-en.xml @@ -11,7 +11,7 @@ ... ... 2024-12-31 - 2024-12-31 + 2024-12-31 1234.00 ... ... @@ -25,9 +25,9 @@ Transfer the individual invoice data to the XML tags, taking into account the fo - Total ==> "invoice.total" (in EUR or if not available in USD or PLN) - IBAN ==> "cdtr.iban" - BIC or SWIFT ==> "cdtr.bic" - - Payment date / Due date ==> "payment.date" + - Payment date / Due date ==> "invoice.duedate" -Note: Output only the XML object! Don't add explanations or comments. Use only the XML structure specified in this example and do not create any other XML tags. If you don't have data for some fields, leave the corresponding XML tags blank. Format date values (invoice.date, payment.date) into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217. +Note: Output only the XML object! Don't add explanations or comments. Use only the XML structure specified in this example and do not create any other XML tags. If you don't have data for some fields, leave the corresponding XML tags blank. Format date values (invoice.date, invoice.duedate) into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217. <> diff --git a/workflow/prompts/invoice-summarize-en.xml b/workflow/prompts/invoice-summarize-en.xml index a6ceacf..7b1abad 100644 --- a/workflow/prompts/invoice-summarize-en.xml +++ b/workflow/prompts/invoice-summarize-en.xml @@ -1,7 +1,7 @@ {"n_predict": 4096, "temperature": 0} - ^.+\.([pP][dD][fF])$ @@ -9,17 +9,18 @@ Summarize the data from this invoice document: - - Company information + - Vendor information - General Billing data - Invoice total information - - Payment summary + - Payment summary (including bank data) - Invoice items -The company name is the name of the company that issued the invoice document, not the recipient. The company name is usually at the beginning or end of the invoice document. +Note: The vendor information refers to the sender of the invoice. The company name is the name of the company that issued the invoice document and not the name of the recipient. As a rule, it is not Alexander Global Logistics either. The company name is often at the beginning or end of the invoice document. -Summarize the invoice lines in a table. Use only the default values and do not perform any calculations, summing or changes to these values yourself. Format numbers and amounts according to ISO 4217. +If possible summarize the invoice lines in a table. + [/INST] ]]> diff --git a/workflow/rechnungseingang-de-1.2.39.bpmn b/workflow/rechnungseingang-de-1.2.39.bpmn index 681f0d4..67d2ddb 100644 --- a/workflow/rechnungseingang-de-1.2.39.bpmn +++ b/workflow/rechnungseingang-de-1.2.39.bpmn @@ -5489,7 +5489,7 @@ result.isValid=true; - +