From e6a234bcb88d8c43451727e309c2307c8bcb4378 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Fri, 26 Jul 2024 16:10:21 +0200 Subject: [PATCH] fixes - imixs-ai upadte --- RELEASENOTES.md | 1 + docker-compose.yml | 8 +- .../ai/PromptExampleAdapterXML.java | 170 ++++++++++++ .../src/main/resources/imixs.properties | 2 +- .../main/webapp/pages/admin/agl_params.xhtml | 2 +- .../pages/admin/analyse_invoicing.xhtml | 5 +- .../webapp/pages/admin/cargosoft_export.xhtml | 37 +-- .../webapp/pages/admin/document_import.xhtml | 2 +- .../main/webapp/pages/admin/kreditor.xhtml | 4 +- .../webapp/pages/admin/oplist_export.xhtml | 33 +-- .../main/webapp/pages/admin/sepa_config.xhtml | 148 +++++----- .../webapp/pages/workitems/agl_archive.xhtml | 2 +- .../parts/alexander/currency_in.xhtml | 4 +- pom.xml | 2 +- reports/sepa/result_sepa01.xml | 4 +- reports/sepa/result_sepa02.xml | 4 +- workflow/posteingang-de-2.0.0.bpmn | 258 +----------------- workflow/prompts/invoice-extract-EN.xml | 2 +- workflow/rechnungseingang-de-1.2.39.bpmn | 31 ++- 19 files changed, 332 insertions(+), 387 deletions(-) create mode 100644 office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ac9bf6b..5494119 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -8,6 +8,7 @@ - Upgrade Imixs-Workflow 6.7 - Beim XML Invoice Import wird nun auch die Sprache für das Mahnwesen ermittelt (fehlte) - Währungsunabhängigkeit + - Lucen Index: item 'cdtr.name' wurde in den index aufgenommen wegen AI Examples Adapter **Migration** diff --git a/docker-compose.yml b/docker-compose.yml index 24876d8..e6213e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,10 +71,10 @@ services: ############################################### # Imixs-Admin ############################################### - #imixsadmin: - # image: imixs/imixs-admin - # ports: - # - "8888:8080" + imixsadmin: + image: imixs/imixs-admin + ports: + - "8888:8080" ############################################### # Mailgateway 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 new file mode 100644 index 0000000..1f6830d --- /dev/null +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ai/PromptExampleAdapterXML.java @@ -0,0 +1,170 @@ +package com.alexanderlogistics.ai; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.imixs.ai.workflow.ImixsAIPromptEvent; +import org.imixs.workflow.ItemCollection; +import org.imixs.workflow.engine.DocumentService; +import org.imixs.workflow.exceptions.QueryException; + +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; + +/** + * The PromptExampleAdapterXML is a CDI bean that creates XML examples based + * on the last 3 invoices. + * + * The adapter only runs if the prompt template contains + * + * <> + * + * Prompt example generated by this Adapter: + * + * Example: + * + * 
+ * {@code
+ * 1. Company Data:
+ * - Name and address of the supplier
+ * - Supplier contact information (phone number, email, etc.)
+ * 
+ * 2. Invoice Data:
+ * - Invoice number
+ * - Invoice date
+ * - Order number
+ * - Customer number
+ * - Total invoice amount
+ *
+ * 
+ *   ...
+ *   ... 
+ *   2024-12-31
+ *   2024-12-31
+ *   1234.00
+ *   ...
+ *   ...
+ * 
+* }
+*
+ * + */ +public class PromptExampleAdapterXML { + private static Logger logger = Logger.getLogger(PromptExampleAdapterXML.class.getName()); + + @Inject + DocumentService documentService; + + /** + * @param event + */ + public void onEvent(@Observes ImixsAIPromptEvent event) { + if (event.getWorkitem() == null) { + return; + } + + String prompt = event.getPromptTemplate(); + if (!prompt.contains("<>")) { + return; + } + + String exampleHeaderData = "\n\n### Example Invoice Data:\n\n"; + String exampleHeaderXML = "\n\n### Example XML Object:\n\n"; + String cdtrName = event.getWorkitem().getItemValueString("document.company"); + List invoices = findLastInvoices(cdtrName, event.getWorkitem().getUniqueID()); + String promptExamples = ""; + if (invoices != null && invoices.size() > 0) { + // Build an example for each invoice + for (ItemCollection invoice : invoices) { + promptExamples = promptExamples + buildExampleDE(invoice, exampleHeaderData, + exampleHeaderXML); + } + } + prompt = prompt.replace("<>", "" + promptExamples); + + // System.out.println(prompt); + event.setPromptTemplate(prompt); + } + + /** + * Helper Method that builds a prompt example out of an existing invoice: + * + * 
+     * {@code
+     *
+     * 
+     *   ...
+     *   ... 
+     *   2024-12-31
+     *   2024-12-31
+     *   1234.00
+     *   ...
+     *   ...
+     * 
+    * }
+    *
+ * + * @param invoice + * @return + */ + private String buildExampleDE(ItemCollection invoice, String dataExampleHeader, String xmlExampleHeader) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + + StringBuffer example = new StringBuffer(); + + // add the invoice summary and the example code + if (invoice.hasItem("invoice.summary")) { + example.append(dataExampleHeader); + example.append(invoice.getItemValueString("invoice.summary")); + example.append(xmlExampleHeader); + // add JSON result object: + example.append("\n"); + example.append(" " + invoice.getItemValueString("cdtr.name") + "\n"); + example.append( + " " + invoice.getItemValueString("invoice.number") + "\n"); + if (invoice.getItemValueDate("invoice.date") != null) { + example.append( + " " + dateFormat.format(invoice.getItemValueDate("invoice.date")) + + "\n"); + } + if (invoice.getItemValueDate("payment.date") != null) { + example.append( + " " + dateFormat.format(invoice.getItemValueDate("payment.date")) + + "\n"); + } + example.append(" " + invoice.getItemValueDouble("invoice.total") + + "\n"); + example.append(" " + invoice.getItemValueString("cdtr.iban") + "\n"); + example.append(" " + invoice.getItemValueString("cdtr.bic") + "\n"); + example.append("\n"); + } + return example.toString(); + } + + /** + * Helper method to find the last 3 invoices by cdtr.name + * + * @param cdtrName + * @return + */ + private List findLastInvoices(String cdtrName, String currentID) { + List result = new ArrayList<>(); + + String searchTerm = "(type:workitemarchive) AND ($modelversion:rechnungseingang*) AND ($taskid:5900) AND NOT ($uniqueid:" + + currentID + ") AND (cdtr.name:\"" + + cdtrName + "\")"; + try { + result = documentService.find(searchTerm, 3, 0, "$modified", true); + } catch (QueryException e) { + logger.log(Level.SEVERE, "findLastInvoices - invalid query: {0}", e.getMessage()); + } + + logger.info("Found " + result.size() + " examples for '" + cdtrName + "'"); + return result; + + } + +} diff --git a/office-alexander-logistics-app/src/main/resources/imixs.properties b/office-alexander-logistics-app/src/main/resources/imixs.properties index 7b55f60..bcbf27e 100644 --- a/office-alexander-logistics-app/src/main/resources/imixs.properties +++ b/office-alexander-logistics-app/src/main/resources/imixs.properties @@ -4,7 +4,7 @@ lucence.indexDir=${imixs-office.IndexDir} index.fields=txtsearchstring,txtSubject,txtname,txtEmail,txtUserName,namCreator,txtworkflowgroup,txtworkflowstatus,txtWorkflowAbstract,txtWorkflowSummary,txtworkflowhistory,txtspacename,txtprocessname,_subject,_description,_name,_projectnumber,_projectname,_ordernumber,_contractnumber,datDueDate,txtcommentlog,htmldescription,htmldocumentation,dms,dms_names,invoice.number.stripped,_childitems,$file.names,_VENDOR_NAME,dbtr.number,cdtr.number,invoice.positions index.fields.analyze=txtUsername -index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,sequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.date,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop,dbtr.number,cdtr.number,payment.date,invoice.total,invoice.currency,invoice.positions,$lasteventdate,payment.type +index.fields.noanalyze=type,$UniqueIDRef,$created,$modified,$ModelVersion,$participants,namCreator,$ProcessID,datDate,txtWorkflowGroup,txtemail, datdate, datfrom, datto, numsequencenumber,sequencenumber,dms_count,invoice.number,invoice.number.stripped,invoice.date,invoice.duedate,taxonomy.verteilung.stop,taxonomy.sachpruefung.stop,taxonomy.verteilung.start,taxonomy.sachpruefung.start,taxonomy.buchhaltung.start,taxonomy.buchhaltung.stop,dbtr.number,cdtr.number,payment.date,invoice.total,invoice.currency,invoice.positions,$lasteventdate,payment.type,cdtr.name index.fields.store=process.name,txtProcessName,txtWorkflowImageURL,payment.date,invoice.number,invoice.date,invoice.duedate index.fields.category=space.name,space.ref,taxonomy.verteilung.stop.by,taxonomy.sachpruefung.stop.by,taxonomy.buchhaltung.stop.by office.search.noanalyze=invoice.number,invoice.number.stripped,invoice.positions diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml index 611ab2a..3a97ca7 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/agl_params.xhtml @@ -13,7 +13,7 @@ - +

Parameter

diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/analyse_invoicing.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/analyse_invoicing.xhtml index 3d65f45..0adfbc8 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/analyse_invoicing.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/analyse_invoicing.xhtml @@ -35,10 +35,7 @@ - - - - +
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/cargosoft_export.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/cargosoft_export.xhtml index fa5a403..048a005 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/cargosoft_export.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/cargosoft_export.xhtml @@ -1,11 +1,7 @@ - + @@ -30,7 +26,7 @@

Ausgangsrechnungen

- +
@@ -42,7 +38,7 @@
@@ -50,7 +46,7 @@
- +
@@ -76,8 +72,7 @@ / - @@ -94,17 +89,17 @@ - +

- In diesem Verzeichniss werden die Belegdaten + In diesem Verzeichniss werden + die Belegdaten im DATEV Format abgelegt.

Scheduler

- +
@@ -113,8 +108,7 @@
- + @@ -122,8 +116,7 @@
- @@ -138,4 +131,4 @@ - + \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/document_import.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/document_import.xhtml index 74378cf..075a4d7 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/document_import.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/document_import.xhtml @@ -34,7 +34,7 @@ - + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml index 119f932..87dfd18 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/kreditor.xhtml @@ -13,7 +13,7 @@ - + @@ -29,7 +29,7 @@ - +
diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/oplist_export.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/oplist_export.xhtml index 8e83f88..eaa7f35 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/oplist_export.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/oplist_export.xhtml @@ -1,11 +1,7 @@ - + @@ -30,15 +26,15 @@

OP-Listen Verwaltung

- +
-
+

- Die OP-Listen Verwaltung erzeugt regelmäßig - Workitems mit einem aktuellen Abbild der offenen Ausgangsrechnungen, sortiert nach Bereichen. + Die OP-Listen Verwaltung erzeugt regelmäßig + Workitems mit einem aktuellen Abbild der offenen Ausgangsrechnungen, sortiert nach + Bereichen.

@@ -46,8 +42,7 @@

Scheduler

- +
@@ -55,8 +50,7 @@
- + @@ -65,8 +59,7 @@
- @@ -81,4 +74,4 @@ - + \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml index f198630..4327d76 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/admin/sepa_config.xhtml @@ -1,16 +1,12 @@ - - + @@ -49,7 +45,7 @@ - +
@@ -59,7 +55,8 @@
- +

Debitor IBAN/BIC

The Debitor IBAN/BIC configuration list @@ -79,50 +76,57 @@ - + - + + + - + + + - + + + - - - - - + + + + + + + - - + - + + - + - - +

Creditor IBAN/BIC

The Creditor IBAN/BIC configuration list @@ -141,55 +145,60 @@ - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - - - + + +

Model Configuration

@@ -207,20 +216,22 @@
SEPA Model Version
- +
- - + +
SEPA Initial Task
- +
- +
@@ -238,8 +249,7 @@
- + @@ -247,9 +257,7 @@
- + @@ -258,12 +266,12 @@
- - + + - + \ No newline at end of file diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml index c8b0ddb..4547dab 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/agl_archive.xhtml @@ -18,7 +18,7 @@ - + diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/currency_in.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/currency_in.xhtml index c30624d..284a5f4 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/currency_in.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/parts/alexander/currency_in.xhtml @@ -4,12 +4,12 @@ - + - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 05b6562..bdc2e7c 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 6.0.7-SNAPSHOT 5.0.0 3.0.2-SNAPSHOT - 3.0.0 + 3.0.2-SNAPSHOT 2.0.0-SNAPSHOT 6.0 9.9.1-4 diff --git a/reports/sepa/result_sepa01.xml b/reports/sepa/result_sepa01.xml index 98249c1..b82c7c0 100644 --- a/reports/sepa/result_sepa01.xml +++ b/reports/sepa/result_sepa01.xml @@ -6,7 +6,7 @@ bf073e72asdf512c4d60af7740872036 - 2024-07-25T19:03:13 + 2024-07-26T12:04:59 3 655.90 @@ -23,7 +23,7 @@ SEPA - 2024-07-25 + 2024-07-26 Targo Bank diff --git a/reports/sepa/result_sepa02.xml b/reports/sepa/result_sepa02.xml index d0b81a2..cd8b7a9 100644 --- a/reports/sepa/result_sepa02.xml +++ b/reports/sepa/result_sepa02.xml @@ -6,7 +6,7 @@ bf073e72asdf512c4d60af7740872036 - 2024-07-25T19:03:14 + 2024-07-26T12:04:59 3 655.90 @@ -23,7 +23,7 @@ SEPA - 2024-07-25 + 2024-07-26 Targo Bank diff --git a/workflow/posteingang-de-2.0.0.bpmn b/workflow/posteingang-de-2.0.0.bpmn index 4f0ec5b..14e8d49 100644 --- a/workflow/posteingang-de-2.0.0.bpmn +++ b/workflow/posteingang-de-2.0.0.bpmn @@ -81,16 +81,13 @@ Possible ImageTypes are: dataObject_FS1r0Q task_uB6BGQ - event_1Vp9Fg textAnnotation_CtU05A task_PsBytg dataObject_CRa7xA - event_HhuoiQ event_bYlo0w event_za0KnA event_Zxhr0w dataObject_vVKXIg - event_esmWYg event_yQLmNA task_0YaQ2w dataObject_HHM58Q @@ -338,7 +335,6 @@ Betrag: _amount (Brutto € _amount_brutto $workflowgroup - $workflowstatus]]> SequenceFlow_12 - sequenceFlow_zA065w sequenceFlow_gXJm0w @@ -388,80 +384,10 @@ Betrag: _amount (Brutto € _amount_brutto - sequenceFlow_30s7vA sequenceFlow_VlPVJg sequenceFlow_0N8cOQ sequenceFlow_fN22Gg - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - sequenceFlow_30s7vA - - - - @@ -507,7 +433,6 @@ Company: document.company
]]> sequenceFlow_JpNUKg - sequenceFlow_Fdk05g sequenceFlow_lmU9IA sequenceFlow_naZnAA sequenceFlow_8SpIiA @@ -529,75 +454,6 @@ Company: document.company
]]> - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - sequenceFlow_Fdk05g - - - - @@ -694,75 +550,6 @@ Betrag: _amount (Brutto € _amount_brutto ]]> - - - - - - - - - - _subject]]> - - - - - - - - - _amount (Brutto € _amount_brutto) -_description]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - home]]> - - - - - - - - - - - - false - - - - sequenceFlow_zA065w - - - - @@ -833,7 +620,13 @@ Betrag: _amount (Brutto € _amount_brutto https://llama.cpp.imixs.com/ XML + true + + cdtr.name,invoice.number,invoice.date,invoice.total,payment.date,cdtr.iban,cdtr.bic,total + ON + +false ]]> @@ -916,7 +709,7 @@ Transfer the individual invoice data to the XML tags, taking into account the fo - Invoice number ==> "invoice.number" - Invoice Date ==> "invoice.date" - - Total ==> "invoice.total" + - Total ==> "invoice.total" (in EUR or if not available in USD or PLN) - IBAN ==> "cdtr.iban" - BIC or SWIFT ==> "cdtr.bic" @@ -1001,7 +794,7 @@ Transfer the individual invoice data to the XML tags, taking into account the fo rechnungseingang-de-1.2 5000 990 - + ]]> @@ -1083,7 +876,8 @@ Transfer the individual invoice data to the XML tags, taking into account the fo false - + false + https://llama.cpp.imixs.com/ XML @@ -1214,7 +1008,7 @@ Note: Do not generate any other information instead of the XML object. https://llama.cpp.imixs.com/ invoice.summary -document.company +false ]]> @@ -1436,16 +1230,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - - - - - @@ -1482,16 +1266,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - - - - - @@ -1528,16 +1302,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - - - - - - - - diff --git a/workflow/prompts/invoice-extract-EN.xml b/workflow/prompts/invoice-extract-EN.xml index 88c97c9..de7ef92 100644 --- a/workflow/prompts/invoice-extract-EN.xml +++ b/workflow/prompts/invoice-extract-EN.xml @@ -27,7 +27,7 @@ Transfer the individual invoice data to the XML tags, taking into account the fo - Invoice number ==> "invoice.number" - Invoice Date ==> "invoice.date" - - Total ==> "invoice.total" + - Total ==> "invoice.total" (in EUR or if not available in USD or PLN) - IBAN ==> "cdtr.iban" - BIC or SWIFT ==> "cdtr.bic" diff --git a/workflow/rechnungseingang-de-1.2.39.bpmn b/workflow/rechnungseingang-de-1.2.39.bpmn index 44425ae..6cb56a0 100644 --- a/workflow/rechnungseingang-de-1.2.39.bpmn +++ b/workflow/rechnungseingang-de-1.2.39.bpmn @@ -812,6 +812,18 @@ result.isValid=true; + + + + + + + + + + + + @@ -1092,20 +1104,23 @@ Betrag: _amount (Brutto € _amount_brutto false - + @@ -1458,7 +1473,11 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com -Rechnungscontrolling]]> +Rechnungscontrolling + + cdtr.name,invoice.number,invoice.date,invoice.total,payment.date,cdtr.iban,cdtr.bic,total + ON +]]>