update neue AI Version

docker-compose.yml

@@ -41,8 +41,8 @@ services:
       WORKFLOW_SERVICE_USER: "admin"
       WORKFLOW_SERVICE_PASSWORD: "adminadmin"
 
-      LLM_SERVICE_ENDPOINT_USER: "admin"
+      # LLM Integration
-      LLM_SERVICE_ENDPOINT_PASSWORD: "imixs4.null"
+      LLM_CONFIG_FILE: /opt/jboss/imixs-llm.xml
 
       # KSeF - Polen Test
       KSEF_API_NIP: "9552521552"
@@ -57,6 +57,7 @@ services:
       - "8787:8787"
     volumes:
       - ./docker/deployments:/opt/jboss/wildfly/standalone/deployments/
+      - ./docker/keys/imixs-llm.xml:/opt/jboss/imixs-llm.xml
       - ./docker/transfer:/opt/jboss/wildfly/transfer/
 
   ###############################################

pom.xml

@@ -71,7 +71,7 @@
         <net.sf.saxon.version>9.9.1-4</net.sf.saxon.version>
         <apache.pdfbox.version>2.0.24</apache.pdfbox.version>
 		<!-- -->
-		<org.imixs.ai.version>1.1.1</org.imixs.ai.version>
+		<org.imixs.ai.version>1.1.9-SNAPSHOT</org.imixs.ai.version>
 		<custom.webResources>src/main/webapp</custom.webResources>
 
 		<!-- test dependencies -->
@@ -407,6 +407,17 @@
             <version>${apache.pdfbox.version}</version>
         </dependency>
 
+        <!-- Imixs-AI -->
+        <dependency>
+            <groupId>org.imixs.workflow</groupId>
+            <artifactId>imixs-ai-workflow</artifactId>
+            <version>${org.imixs.ai.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.imixs.workflow</groupId>
+            <artifactId>imixs-ai-bpmn</artifactId>
+            <version>${org.imixs.ai.version}</version>
+        </dependency>
 
 		<!-- SEPA -->
 		<dependency>

workflow/posteingang-de-3.0.0.bpmn

@@ -33,7 +33,7 @@
       <imixs:value><![CDATA[org.imixs.marty.profile.MailPlugin]]></imixs:value>
     </imixs:item>
     <imixs:item name="txtworkflowmodelversion" type="xs:string">
-      <imixs:value><![CDATA[posteingang-de-2.0]]></imixs:value>
+      <imixs:value><![CDATA[posteingang-de-3.0]]></imixs:value>
     </imixs:item>
     <open-bpmn:auto-align>true</open-bpmn:auto-align>
   </bpmn2:extensionElements>
@@ -60,7 +60,6 @@
         <bpmn2:flowNodeRef>task_uB6BGQ</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>textAnnotation_CtU05A</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>task_PsBytg</bpmn2:flowNodeRef>
-        <bpmn2:flowNodeRef>dataObject_CRa7xA</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>event_Zxhr0w</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>dataObject_vVKXIg</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>event_yQLmNA</bpmn2:flowNodeRef>
@@ -84,6 +83,8 @@
         <bpmn2:flowNodeRef>event_VEvZRQ</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>event_Xk1mPA</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>event_a1P5WQ</bpmn2:flowNodeRef>
+        <bpmn2:flowNodeRef>dataObject_UIvZkA</bpmn2:flowNodeRef>
+        <bpmn2:flowNodeRef>dataObject_BbVs7w</bpmn2:flowNodeRef>
       </bpmn2:lane>
     </bpmn2:laneSet>
     <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_2" imixs:activityid="10" name="Start">
@@ -183,7 +184,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
         </imixs:item>
       </bpmn2:extensionElements>
       <bpmn2:documentation id="Documentation_13"><![CDATA[<textblock><itemvalue>$workflowgroup</itemvalue> - <itemvalue>$workflowstatus</itemvalue></textblock>]]></bpmn2:documentation>
-      <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_4gpPgw</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_CbkmwA</bpmn2:outgoing>
     </bpmn2:task>
@@ -240,11 +240,18 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
         </imixs:item>
         <imixs:item name="txtactivityresult" type="xs:string">
           <imixs:value><![CDATA[<item name="comment" ignore="true"/>
-<tika name="options">X-Tika-OCRLanguage=eng+deu</tika>
+<item name="process">Empfang</item>
-<tika name="options">X-Tika-PDFocrStrategy=OCR_ONLY</tika>
+
-<tika name="filepattern">(PDF|pdf)$</tika>
+<imixs-ocr name="RMETA">
-<tika name="maxpdfpages">10</tika>
+  <filepattern>(pdf|PDF|eml|msg)$</filepattern>
-<item name="process">Empfang</item>]]></imixs:value>
+  <embeddingsPattern>(pdf|PDF)$</embeddingsPattern>
+  <maxpdfpages>10</maxpdfpages>
+  <option>X-Tika-PDFocrStrategy=OCR_ONLY</option>
+  <option>X-Tika-PDFOcrImageType=RGB</option>
+  <option>X-Tika-PDFOcrDPI=400</option>
+  <debug>true</debug>
+</imixs-ocr> 
+]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtname" type="xs:string">
           <imixs:value><![CDATA[Speichern]]></imixs:value>
@@ -260,7 +267,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
         </imixs:item>
       </bpmn2:extensionElements>
       <bpmn2:documentation id="Documentation_4"><![CDATA[Zwischenspeichern]]></bpmn2:documentation>
-      <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:dataOutput id="DataOutput_1" name="Signal_1_Output"/>
       <bpmn2:dataOutputAssociation id="DataOutputAssociation_1">
@@ -272,9 +278,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
       <bpmn2:signalEventDefinition id="SignalEventDefinition_1" signalRef="Signal_1"/>
       <bpmn2:outgoing>sequenceFlow_VlPVJg</bpmn2:outgoing>
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_9" sourceRef="Task_2" targetRef="IntermediateCatchEvent_3">
-      <bpmn2:documentation id="documentation_jjMshA"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:task id="Task_4" imixs:processid="200" name="Completed">
       <bpmn2:extensionElements>
         <imixs:item name="txtworkflowabstract" type="xs:string">
@@ -323,9 +326,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
       </bpmn2:timerEventDefinition>
       <bpmn2:documentation id="documentation_xBAZWg"/>
     </bpmn2:boundaryEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" sourceRef="BoundaryEvent_1" targetRef="IntermediateCatchEvent_3">
-      <bpmn2:documentation id="documentation_yRaNRg"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:dataObject id="dataObject_FS1r0Q" imixs:datatype="form-data" name="Form">
       <bpmn2:documentation id="documentation_ccrk4A"><![CDATA[<?xml version="1.0"?>
 <imixs-form>
@@ -356,7 +356,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
         </imixs:item>
       </bpmn2:extensionElements>
       <bpmn2:documentation id="documentation_A2VzkA"/>
-      <bpmn2:outgoing>sequenceFlow_fN22Gg</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_bh4DIw</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_ofQKHg</bpmn2:outgoing>
     </bpmn2:task>
@@ -372,9 +371,6 @@ Assign invoice to process 'Front Desk']]></bpmn2:text>
     <bpmn2:sequenceFlow id="sequenceFlow_4gpPgw" sourceRef="IntermediateCatchEvent_2" targetRef="Task_2">
       <bpmn2:documentation id="documentation_AbaSMw"/>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="sequenceFlow_VlPVJg" sourceRef="IntermediateCatchEvent_3" targetRef="gateway_gd9zQQ">
-      <bpmn2:documentation id="documentation_mCzUDA"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:association id="association_hnK1FQ" sourceRef="dataObject_FS1r0Q" targetRef="Task_2">
       <bpmn2:documentation id="documentation_jpgiPw"/>
     </bpmn2:association>
@@ -407,27 +403,9 @@ Company: <itemvalue>document.company</itemvalue><br />]]></imixs:value>
       </bpmn2:extensionElements>
       <bpmn2:documentation id="documentation_7BnjJw"/>
       <bpmn2:incoming>sequenceFlow_JpNUKg</bpmn2:incoming>
-      <bpmn2:outgoing>sequenceFlow_8SpIiA</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_I8o4DA</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_KKWo0w</bpmn2:outgoing>
     </bpmn2:task>
-    <bpmn2:dataObject id="dataObject_CRa7xA" imixs:datatype="form-data" name="Form">
-      <bpmn2:documentation id="documentation_bNoo3Q"><![CDATA[<?xml version="1.0"?>
-<imixs-form>
-  <imixs-form-section columns="3"  readonly="true" >
-    <item name="document.company" type="text" label="Company: "  />
-    <item name="document.type" type="text" label="Doument Type: " />
-    <item name="document.language" type="text" label="Language: " />
-  </imixs-form-section>
-
-  <imixs-form-section columns="1" label="Document Summary" readonly="true" >
-    <item name="invoice.summary" type="custom" path="markdown" />
-  </imixs-form-section>
-</imixs-form>]]></bpmn2:documentation>
-    </bpmn2:dataObject>
-    <bpmn2:association id="association_hZu4qg" sourceRef="dataObject_CRa7xA" targetRef="task_PsBytg">
-      <bpmn2:documentation id="documentation_du0vPw"/>
-    </bpmn2:association>
     <bpmn2:intermediateCatchEvent id="event_Zxhr0w" name="TIMEOUT">
       <bpmn2:documentation id="documentation_4QQS4w"/>
       <bpmn2:linkEventDefinition id="linkEventDefinition_DDmpAw"/>
@@ -511,9 +489,9 @@ Company: <itemvalue>document.company</itemvalue><br />]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtactivityresult" type="xs:string">
           <imixs:value><![CDATA[<imixs-ai name="PROMPT">
- <endpoint>https://llama.cpp.imixs.com/</endpoint>
+ <endpoint>api.llama.cpp.imixs.com</endpoint>
  <result-event>XML</result-event>
- <debug>false</debug>
+ <debug>true</debug>
 </imixs-ai>
 <imixs-ai name="SUGGEST"> 
    <items>cdtr.name,invoice.number,invoice.date,invoice.total,payment.date,cdtr.iban,cdtr.bic,total</items>
@@ -533,7 +511,6 @@ Company: <itemvalue>document.company</itemvalue><br />]]></imixs:value>
         <bpmn2:dataOutputRefs>DataOutput_2</bpmn2:dataOutputRefs>
       </bpmn2:outputSet>
       <bpmn2:signalEventDefinition id="signalEventDefinition_qwJlxA" signalRef="signal_3"/>
-      <bpmn2:incoming>sequenceFlow_aC0skQ</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_YMtfiw</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_PWXjog</bpmn2:incoming>
     </bpmn2:intermediateCatchEvent>
@@ -563,56 +540,25 @@ Company: <itemvalue>document.company</itemvalue><br />]]></imixs:value>
       <bpmn2:documentation id="documentation_M3GYlw"/>
       <bpmn2:incoming>sequenceFlow_JpNUKg</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_lmU9IA</bpmn2:outgoing>
-      <bpmn2:outgoing>sequenceFlow_aC0skQ</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_A62nqQ</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_DdWK6A</bpmn2:outgoing>
     </bpmn2:task>
-    <bpmn2:sequenceFlow id="sequenceFlow_aC0skQ" sourceRef="task_0YaQ2w" targetRef="event_yQLmNA">
-      <bpmn2:documentation id="documentation_RwnEbw"/>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="sequenceFlow_YMtfiw" sourceRef="event_yQLmNA" targetRef="gateway_MgL04w">
-      <bpmn2:documentation id="documentation_t74new"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:dataObject id="dataObject_HHM58Q" imixs:datatype="prompt-data" name="Prompt  Extract">
-      <bpmn2:documentation id="documentation_X7T0uA" open-bpmn:file-link="file://prompts/invoice-extract-en-debug.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+      <bpmn2:documentation id="documentation_X7T0uA"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <PromptDefinition>
-  <prompt_options>{"n_predict": 4096, "temperature": 0 }</prompt_options>
+  <options>{"n_predict": 4096, "temperature": 0 }</options>
-  <prompt><![CDATA[[INST]You are a clerk at the logistic company 'Alexander Global Logistics'. Your task is to check incoming invoices. [/INST]
+  <prompt role="system"><![CDATA[You are a clerk at the logistic company 'Alexander Global Logistics'. Your task is to check incoming invoices.
 
-<itemvalue>invoice.summary</itemvalue>
+<bpmn.form />
 
-</s>[INST]Transfer the invoice data into an XML object with the following structure:
+Note: The Reference Number in the format [2 letters][3 letters][4-digit booking period YYMM][3-digit sequence number]  ==> "invoice.positions"
 
-<invoice>
-  <cdtr.name>...</cdtr.name>
-  <invoice.number>...</invoice.number> 
-  <invoice.date type="date">2024-12-31</invoice.date>
-  <invoice.duedate type="date">2024-12-31</invoice.duedate>
-  <invoice.total type="double">1234.00</invoice.total>
-  <cdtr.iban>...</cdtr.iban>
-  <cdtr.bic>...</cdtr.bic>
-  <invoice.positions>...</invoice.positions>
-</invoice>
-
-Transfer the individual invoice data to the XML tags, taking into account the following suggestions for mapping:
-
- - Company name ==> "cdtr.name" (the name of the company that issued the invoice document, not the recipient)
- - Invoice number ==> "invoice.number"
- - Invoice Date ==> "invoice.date"
- - 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 ==> "invoice.duedate"
- - The Reference Number in the format [2 letters][3 letters][4-digit booking period YYMM][3-digit sequence number]  ==> "invoice.positions"
-
-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. 
 
 <<EXAMPLES_XML>>
 
-[/INST]
+]]]]><![CDATA[></prompt>
+  <prompt role="user"><itemvalue>invoice.summary</itemvalue></prompt>
 
-]]]]><![CDATA[>
-</prompt>
 </PromptDefinition>    ]]></bpmn2:documentation>
     </bpmn2:dataObject>
     <bpmn2:association id="association_Xrb1Cg" sourceRef="event_yQLmNA" targetRef="dataObject_HHM58Q">
@@ -702,9 +648,6 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t
       <bpmn2:incoming>sequenceFlow_gpPDLg</bpmn2:incoming>
       <bpmn2:incoming>sequenceFlow_eccehA</bpmn2:incoming>
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:sequenceFlow id="sequenceFlow_gXJm0w" sourceRef="event_xOeBKg" targetRef="Task_4">
-      <bpmn2:documentation id="documentation_9d0URg"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:intermediateCatchEvent id="event_pDFoXg" imixs:activityid="100" name="Prompt Category">
       <bpmn2:extensionElements>
         <imixs:item name="keylogtimeformat" type="xs:string">
@@ -771,7 +714,7 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t
         <imixs:item name="txtactivityresult" type="xs:string">
           <imixs:value><![CDATA[<validation name="required">false</validation>
 <imixs-ai name="PROMPT">
- <endpoint>https://llama.cpp.imixs.com/</endpoint>
+ <endpoint>api.llama.cpp.imixs.com</endpoint>
  <result-event>XML</result-event>
 </imixs-ai>
 <item name="process">Empfang</item>
@@ -789,19 +732,16 @@ Note: Output only the XML object! Don't add explanations or comments. Use only t
         <bpmn2:dataOutputRefs>DataOutput_2</bpmn2:dataOutputRefs>
       </bpmn2:outputSet>
       <bpmn2:signalEventDefinition id="signalEventDefinition_0Bm7IA" signalRef="signal_3"/>
-      <bpmn2:incoming>sequenceFlow_fN22Gg</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_naZnAA</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_PgyOMw</bpmn2:incoming>
     </bpmn2:intermediateCatchEvent>
     <bpmn2:dataObject id="dataObject_ZhBiZg" imixs:datatype="prompt-data" name="Prompt Category">
-      <bpmn2:documentation id="documentation_K0KMVw" open-bpmn:file-link="file://prompts/categorize-en.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+      <bpmn2:documentation id="documentation_K0KMVw"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <PromptDefinition>
-  <prompt_options>{"n_predict": 512, "temperature": 0 }</prompt_options>
+  <options>{"n_predict": 512, "temperature": 0 }</options>
-  <prompt><![CDATA[[INST] You are an employee at the logistic company 'Alexander Global Logistics GmbH'. Your job is to check incoming invoice documents and forward them internally to employees. [/INST]
+  <prompt role="system"><![CDATA[You are an employee at the logistic company 'Alexander Global Logistics GmbH'. Your job is to check incoming invoice documents and forward them internally to employees. 
     
-<FILECONTEXT>^.+\.([pP][dD][fF])$</FILECONTEXT>
+Assign the invoice to one of the following categories:
-    
-</s>[INST] Assign the invoice to one of the following categories:
 
 - Cargo-Invoice - in case the invoice is about cargo and logistic services
 - Credit - in case of a credit note
@@ -821,20 +761,14 @@ Output the infromation as one XML object that has the following structure:
 
 Note: Do not generate any other information instead of the XML object. Do not generate more than one XML Object.
 
-[/INST]
+
-]]]]><![CDATA[>
+]]]]><![CDATA[></prompt>
-</prompt>
+  <prompt role="user"><FILECONTEXT>(?i)^.+\.(eml|msg|pdf)$</FILECONTEXT></prompt> 
 </PromptDefinition>    ]]></bpmn2:documentation>
     </bpmn2:dataObject>
     <bpmn2:association id="association_zuMlDA" sourceRef="dataObject_ZhBiZg" targetRef="event_pDFoXg">
       <bpmn2:documentation id="documentation_DCG0pQ"/>
     </bpmn2:association>
-    <bpmn2:sequenceFlow id="sequenceFlow_fN22Gg" sourceRef="task_uB6BGQ" targetRef="event_pDFoXg">
-      <bpmn2:documentation id="documentation_Pn3E1g"/>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="sequenceFlow_naZnAA" sourceRef="event_pDFoXg" targetRef="gateway_qDAhHw">
-      <bpmn2:documentation id="documentation_8TapMg"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:intermediateCatchEvent id="event_4DNGzg" imixs:activityid="101" name="Prompt Summary">
       <bpmn2:extensionElements>
         <imixs:item name="keylogtimeformat" type="xs:string">
@@ -900,7 +834,7 @@ Note: Do not generate any other information instead of the XML object. Do not ge
         </imixs:item>
         <imixs:item name="txtactivityresult" type="xs:string">
           <imixs:value><![CDATA[<imixs-ai name="PROMPT">
- <endpoint>https://llama.cpp.imixs.com/</endpoint>
+  <endpoint>api.llama.cpp.imixs.com</endpoint>
   <result-item>invoice.summary</result-item>
   <debug>false</debug>
 </imixs-ai>
@@ -917,25 +851,14 @@ Note: Do not generate any other information instead of the XML object. Do not ge
         <bpmn2:dataOutputRefs>DataOutput_2</bpmn2:dataOutputRefs>
       </bpmn2:outputSet>
       <bpmn2:signalEventDefinition id="signalEventDefinition_aDhonQ" signalRef="signal_3"/>
-      <bpmn2:incoming>sequenceFlow_8SpIiA</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_A62nqQ</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_Di4BQA</bpmn2:incoming>
     </bpmn2:intermediateCatchEvent>
-    <bpmn2:sequenceFlow id="sequenceFlow_8SpIiA" sourceRef="task_PsBytg" targetRef="event_4DNGzg">
-      <bpmn2:documentation id="documentation_C7j5lg"/>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="sequenceFlow_A62nqQ" sourceRef="event_4DNGzg" targetRef="task_0YaQ2w">
-      <bpmn2:documentation id="documentation_IIBe3g"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:dataObject id="dataObject_KPUiiw" imixs:datatype="prompt-data" name="Prompt  Summary">
-      <bpmn2:documentation id="documentation_8puQcA" open-bpmn:file-link="file://prompts/invoice-summarize-en-debug.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+      <bpmn2:documentation id="documentation_8puQcA"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <PromptDefinition>
-	<prompt_options>{"n_predict": 2048, "temperature": 0}</prompt_options>
+  <options>{"n_predict": 2048, "temperature": 0}</options>
-	<prompt><![CDATA[[INST]You are an employee at the logistic company 'Alexander Global Logistics'. Your job is to check incoming invoice documents and forward them internally to employees. [/INST]
+  <prompt role="system"><![CDATA[You are an employee at the logistic company 'Alexander Global Logistics'. Your job is to check incoming invoice documents and forward them internally to employees. 
-
-<FILECONTEXT>^.+\.([pP][dD][fF])$</FILECONTEXT>
-
-</s>[INST]
 
 Summarize the data from this invoice document.
 
@@ -1005,9 +928,9 @@ XX-XXX-YYMM-NNN (e.g. "EXGCA2608009" → "EX-GCA-2608-009").
 Do not confuse this number with other codes, order numbers, or customer
 numbers that may appear on the invoice.
 
-[/INST]
 ]]]]><![CDATA[>
 </prompt>
+ <prompt role="user"><FILECONTEXT>(?i)^.+\.(eml|msg|pdf)$</FILECONTEXT></prompt> 
 </PromptDefinition>    ]]></bpmn2:documentation>
     </bpmn2:dataObject>
     <bpmn2:association id="association_IKW0SQ" sourceRef="dataObject_KPUiiw" targetRef="event_4DNGzg">
@@ -1091,9 +1014,6 @@ numbers that may appear on the invoice.
       <bpmn2:linkEventDefinition id="linkEventDefinition_uLt3YQ"/>
       <bpmn2:incoming>sequenceFlow_DdWK6A</bpmn2:incoming>
     </bpmn2:intermediateThrowEvent>
-    <bpmn2:association id="association_yhU4Yg" sourceRef="dataObject_CRa7xA" targetRef="task_uB6BGQ">
-      <bpmn2:documentation id="documentation_qGutpA"/>
-    </bpmn2:association>
     <bpmn2:boundaryEvent attachedToRef="task_uB6BGQ" id="event_88sCAA" name="">
       <bpmn2:documentation id="documentation_J4Umow"/>
       <bpmn2:timerEventDefinition id="timerEventDefinition_UEHZCQ"/>
@@ -1104,20 +1024,11 @@ numbers that may appear on the invoice.
       <bpmn2:timerEventDefinition id="timerEventDefinition_ewF0bg"/>
       <bpmn2:outgoing>sequenceFlow_Di4BQA</bpmn2:outgoing>
     </bpmn2:boundaryEvent>
-    <bpmn2:sequenceFlow id="sequenceFlow_PgyOMw" sourceRef="event_88sCAA" targetRef="event_pDFoXg">
-      <bpmn2:documentation id="documentation_8vVNCA"/>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="sequenceFlow_Di4BQA" sourceRef="event_T901Jg" targetRef="event_4DNGzg">
-      <bpmn2:documentation id="documentation_SYe0IA"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:boundaryEvent attachedToRef="task_0YaQ2w" id="event_7rbeVA" name="">
       <bpmn2:documentation id="documentation_8PWhGA"/>
       <bpmn2:timerEventDefinition id="timerEventDefinition_OrqrJg"/>
       <bpmn2:outgoing>sequenceFlow_PWXjog</bpmn2:outgoing>
     </bpmn2:boundaryEvent>
-    <bpmn2:sequenceFlow id="sequenceFlow_PWXjog" sourceRef="event_7rbeVA" targetRef="event_yQLmNA">
-      <bpmn2:documentation id="documentation_00yeUQ"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:exclusiveGateway default="sequenceFlow_I8o4DA" gatewayDirection="Diverging" id="gateway_qDAhHw" name="">
       <bpmn2:documentation id="documentation_Cg34hg"/>
       <bpmn2:incoming>sequenceFlow_naZnAA</bpmn2:incoming>
@@ -1205,9 +1116,6 @@ numbers that may appear on the invoice.
       <bpmn2:documentation id="documentation_jE0MLA"/>
       <bpmn2:conditionExpression id="formalExpression_fidF0g" xsi:type="bpmn2:tFormalExpression"><![CDATA[''!=workitem.getItemValueString('adapter.error_code'); ]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="sequenceFlow_gpPDLg" sourceRef="event_9mJrhQ" targetRef="event_xOeBKg">
-      <bpmn2:documentation id="documentation_ykXPyg"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="sequenceFlow_I8o4DA" sourceRef="gateway_qDAhHw" targetRef="task_PsBytg">
       <bpmn2:documentation id="documentation_NJDLLQ"/>
     </bpmn2:sequenceFlow>
@@ -1218,14 +1126,7 @@ numbers that may appear on the invoice.
       <bpmn2:outgoing>sequenceFlow_bh4DIw</bpmn2:outgoing>
       <bpmn2:outgoing>sequenceFlow_d0zSHA</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="sequenceFlow_bh4DIw" sourceRef="gateway_gd9zQQ" targetRef="task_uB6BGQ">
+    <bpmn2:association id="association_w5HwVg" sourceRef="dataObject_UIvZkA" targetRef="task_0YaQ2w">
-      <bpmn2:documentation id="documentation_0EzFwA"/>
-    </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="sequenceFlow_d0zSHA" name="DOCUMENT Error" sourceRef="gateway_gd9zQQ" targetRef="event_9mJrhQ">
-      <bpmn2:documentation id="documentation_AJkXtg"/>
-      <bpmn2:conditionExpression id="formalExpression_WutmBw" xsi:type="bpmn2:tFormalExpression"><![CDATA[''!=workitem.getItemValueString('adapter.error_code'); ]]></bpmn2:conditionExpression>
-    </bpmn2:sequenceFlow>
-    <bpmn2:association id="association_w5HwVg" sourceRef="dataObject_CRa7xA" targetRef="task_0YaQ2w">
       <bpmn2:documentation id="documentation_Z1YkeA"/>
     </bpmn2:association>
     <bpmn2:textAnnotation id="TextAnnotation_1">
@@ -1258,9 +1159,6 @@ Possible ImageTypes are:
       <bpmn2:outgoing>sequenceFlow_eccehA</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_p0asUQ</bpmn2:incoming>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="sequenceFlow_eccehA" sourceRef="gateway_MgL04w" targetRef="event_xOeBKg">
-      <bpmn2:documentation id="documentation_0XAjOQ"/>
-    </bpmn2:sequenceFlow>
     <bpmn2:sequenceFlow id="sequenceFlow_3YcMGQ" sourceRef="event_Zxhr0w" targetRef="event_wmNwPA">
       <bpmn2:documentation id="documentation_hoWA6g"/>
     </bpmn2:sequenceFlow>
@@ -1294,11 +1192,124 @@ Possible ImageTypes are:
     <bpmn2:sequenceFlow id="sequenceFlow_CbkmwA" sourceRef="Task_2" targetRef="event_a1P5WQ">
       <bpmn2:documentation id="documentation_FDT0AA"/>
     </bpmn2:sequenceFlow>
+    <bpmn2:dataObject id="dataObject_UIvZkA" imixs:datatype="form-data" name="Form">
+      <bpmn2:documentation id="documentation_bNoo3Q"><![CDATA[<?xml version="1.0"?>
+<imixs-form>
+  <imixs-form-section label="AI Assistant" path="ai/agent_status" />
+  <imixs-form-section columns="3"  readonly="true" >
+    <item name="document.company" type="text" label="Company: "  />
+    <item name="document.type" type="text" label="Document Type: " />
+    <item name="document.language" type="text" label="Language: " />
+  </imixs-form-section>
+
+  <imixs-form-section columns="3"  readonly="true" >
+    <item name="cdtr.name" type="text" label="Lieferant:" />
+    <item name="invoice.number" type="text" label="Rechnungsnummer:" /> 
+    <item name="invoice.date" type="date" label="Rechnungsdatum:" />
+    <item name="invoice.duedate" type="date" label="Fälligkeitsdatum:"  />
+    <item name="invoice.total" type="double" label="Rechnungsbetrag:" />
+    <item name="cdtr.iban" type="text" label="IBAN" />
+    <item name="cdtr.bic" type="text" label="BIC" />
+    <item name="invoice.positions" type="text" label="Referenznummer:" />
+  </imixs-form-section>
+
+
+ 
+</imixs-form>]]></bpmn2:documentation>
+      <bpmn2:outgoing>association_w5HwVg</bpmn2:outgoing>
+    </bpmn2:dataObject>
+    <bpmn2:dataObject id="dataObject_BbVs7w" imixs:datatype="prompt-data" name="Prompt  Extract">
+      <bpmn2:documentation id="documentation_X7T0uA"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<PromptDefinition>
+  <prompt_options>{"n_predict": 4096, "temperature": 0 }</prompt_options>
+  <prompt role="system"><![CDATA[You are a clerk at the logistic company 'Alexander Global Logistics'. Your task is to check incoming invoices.
+
+Transfer the invoice data into an XML object with the following structure:
+
+<invoice>
+  <cdtr.name>...</cdtr.name>
+  <invoice.number>...</invoice.number> 
+  <invoice.date type="date">2024-12-31</invoice.date>
+  <invoice.duedate type="date">2024-12-31</invoice.duedate>
+  <invoice.total type="double">1234.00</invoice.total>
+  <cdtr.iban>...</cdtr.iban>
+  <cdtr.bic>...</cdtr.bic>
+  <invoice.positions>...</invoice.positions>
+</invoice>
+
+Transfer the individual invoice data to the XML tags, taking into account the following suggestions for mapping:
+
+ - Company name ==> "cdtr.name" (the name of the company that issued the invoice document, not the recipient)
+ - Invoice number ==> "invoice.number"
+ - Invoice Date ==> "invoice.date"
+ - 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 ==> "invoice.duedate"
+ - The Reference Number in the format [2 letters][3 letters][4-digit booking period YYMM][3-digit sequence number]  ==> "invoice.positions"
+
+
+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 (type="date") into the ISO 8601 format (YYYY-MM-DD). Format numbers and amounts (type="double") according to ISO 4217.
+
+
+<<EXAMPLES_XML>>
+
+]]]]><![CDATA[></prompt>
+  <prompt role="user"><itemvalue>invoice.summary</itemvalue></prompt>
+
+</PromptDefinition>    ]]></bpmn2:documentation>
+    </bpmn2:dataObject>
+    <bpmn2:sequenceFlow id="sequenceFlow_naZnAA" sourceRef="event_pDFoXg" targetRef="gateway_qDAhHw">
+      <bpmn2:documentation id="documentation_8TapMg"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_PgyOMw" sourceRef="event_88sCAA" targetRef="event_pDFoXg">
+      <bpmn2:documentation id="documentation_8vVNCA"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_d0zSHA" name="DOCUMENT Error" sourceRef="gateway_gd9zQQ" targetRef="event_9mJrhQ">
+      <bpmn2:documentation id="documentation_AJkXtg"/>
+      <bpmn2:conditionExpression id="formalExpression_WutmBw" xsi:type="bpmn2:tFormalExpression"><![CDATA[''!=workitem.getItemValueString('adapter.error_code'); ]]></bpmn2:conditionExpression>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_bh4DIw" sourceRef="gateway_gd9zQQ" targetRef="task_uB6BGQ">
+      <bpmn2:documentation id="documentation_0EzFwA"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_A62nqQ" sourceRef="event_4DNGzg" targetRef="task_0YaQ2w">
+      <bpmn2:documentation id="documentation_IIBe3g"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_Di4BQA" sourceRef="event_T901Jg" targetRef="event_4DNGzg">
+      <bpmn2:documentation id="documentation_SYe0IA"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" sourceRef="BoundaryEvent_1" targetRef="IntermediateCatchEvent_3">
+      <bpmn2:documentation id="documentation_yRaNRg"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_VlPVJg" sourceRef="IntermediateCatchEvent_3" targetRef="gateway_gd9zQQ">
+      <bpmn2:documentation id="documentation_mCzUDA"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_YMtfiw" sourceRef="event_yQLmNA" targetRef="gateway_MgL04w">
+      <bpmn2:documentation id="documentation_t74new"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_PWXjog" sourceRef="event_7rbeVA" targetRef="event_yQLmNA">
+      <bpmn2:documentation id="documentation_00yeUQ"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_gXJm0w" sourceRef="event_xOeBKg" targetRef="Task_4">
+      <bpmn2:documentation id="documentation_9d0URg"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_gpPDLg" sourceRef="event_9mJrhQ" targetRef="event_xOeBKg">
+      <bpmn2:documentation id="documentation_ykXPyg"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:sequenceFlow id="sequenceFlow_eccehA" sourceRef="gateway_MgL04w" targetRef="event_xOeBKg">
+      <bpmn2:documentation id="documentation_0XAjOQ"/>
+    </bpmn2:sequenceFlow>
+    <bpmn2:association id="association_Uc6nuQ" sourceRef="task_PsBytg" targetRef="dataObject_UIvZkA">
+      <bpmn2:documentation id="documentation_bxoEjA"/>
+    </bpmn2:association>
+    <bpmn2:association id="association_ApEaCQ" sourceRef="task_uB6BGQ" targetRef="dataObject_UIvZkA">
+      <bpmn2:documentation id="documentation_WAiEfQ"/>
+    </bpmn2:association>
   </bpmn2:process>
   <bpmn2:process id="process_2" name="Imixs AI" processType="Public">
     <bpmn2:documentation id="documentation_dDLFbw"/>
     <bpmn2:extensionElements>
-      <open-bpmn:auto-align/>
+      <open-bpmn:auto-align>true</open-bpmn:auto-align>
     </bpmn2:extensionElements>
   </bpmn2:process>
   <bpmn2:signal id="signal_3" name="org.imixs.ai.workflow.OpenAIAPIAdapter"/>
@@ -1332,9 +1343,9 @@ Possible ImageTypes are:
         <dc:Bounds height="50.0" width="110.0" x="390.0" y="520.0"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="IntermediateCatchEvent_3" id="BPMNShape_IntermediateCatchEvent_3">
-        <dc:Bounds height="36.0" width="36.0" x="537.0" y="527.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="547.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_14" labelStyle="BPMNLabelStyle_1">
-          <dc:Bounds height="20.0" width="100.0" x="508.5" y="566.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="518.5" y="566.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="Task_4" id="BPMNShape_Task_4">
@@ -1347,29 +1358,34 @@ Possible ImageTypes are:
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="BoundaryEvent_1" id="BPMNShape_BoundaryEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="437.0" y="497.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="477.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_11" labelStyle="BPMNLabelStyle_1">
-          <dc:Bounds height="20.0" width="100.0" x="405.0" y="536.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="445.0" y="566.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="TextAnnotation_1" id="BPMNShape_TextAnnotation_1">
         <dc:Bounds height="321.0" width="541.0" x="170.0" y="730.0"/>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="SequenceFlow_9" id="BPMNEdge_SequenceFlow_9" sourceElement="BPMNShape_Task_2" targetElement="BPMNShape_IntermediateCatchEvent_3">
+      <bpmndi:BPMNShape bpmnElement="dataObject_UIvZkA" id="BPMNShape_OyWydw">
-        <di:waypoint x="500.0" y="545.0"/>
+        <dc:Bounds height="50.0" width="35.0" x="1450.0" y="710.0"/>
-        <di:waypoint x="537.0" y="545.0"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_uBpUdg">
-        <bpmndi:BPMNLabel id="BPMNLabel_21"/>
+          <dc:Bounds height="20.0" width="100.0" x="1417.5" y="765.0"/>
-      </bpmndi:BPMNEdge>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="dataObject_BbVs7w" id="BPMNShape_Y0zosA">
+        <dc:Bounds height="50.0" width="35.0" x="1724.0" y="686.0"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_Qcfy9Q">
+          <dc:Bounds height="20.0" width="100.0" x="1691.5" y="741.0"/>
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="SequenceFlow_12" id="BPMNEdge_SequenceFlow_12" sourceElement="BPMNShape_Task_4" targetElement="BPMNShape_EndEvent_1">
         <di:waypoint x="2030.0" y="545.0"/>
         <di:waypoint x="2117.0" y="545.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_27"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="SequenceFlow_2" id="BPMNEdge_SequenceFlow_2" sourceElement="BPMNShape_BoundaryEvent_1" targetElement="BPMNShape_IntermediateCatchEvent_3">
-        <di:waypoint x="454.0" y="497.0"/>
+        <di:waypoint x="513.0" y="545.0"/>
-        <di:waypoint x="454.0" y="474.0"/>
+        <di:waypoint x="547.0" y="545.0"/>
-        <di:waypoint x="555.0" y="474.0"/>
-        <di:waypoint x="555.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_20"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="dataObject_FS1r0Q" id="BPMNShape_Cn1HMQ">
@@ -1393,8 +1409,8 @@ Possible ImageTypes are:
         <di:waypoint x="390.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_VlPVJg" id="BPMNEdge_RLNCCQ" sourceElement="BPMNShape_IntermediateCatchEvent_3" targetElement="BPMNShape_PyGqlg">
-        <di:waypoint x="573.0" y="545.0"/>
+        <di:waypoint x="583.0" y="545.0"/>
-        <di:waypoint x="620.0" y="545.0"/>
+        <di:waypoint x="630.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="association_hnK1FQ" id="BPMNEdge_d0BSMg" sourceElement="BPMNShape_Cn1HMQ" targetElement="BPMNShape_Task_2">
         <di:waypoint x="375.0" y="447.0"/>
@@ -1404,17 +1420,6 @@ Possible ImageTypes are:
       <bpmndi:BPMNShape bpmnElement="task_PsBytg" id="BPMNShape_AJWuJw">
         <dc:Bounds height="50.0" width="110.0" x="1100.0" y="520.0"/>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="dataObject_CRa7xA" id="BPMNShape_FhS9qQ">
-        <dc:Bounds height="50.0" width="35.0" x="870.0" y="730.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_TDgVFA">
-          <dc:Bounds height="20.0" width="100.0" x="837.5" y="785.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="association_hZu4qg" id="BPMNEdge_k4KP0A" sourceElement="BPMNShape_FhS9qQ" targetElement="BPMNShape_AJWuJw">
-        <di:waypoint x="905.0" y="755.0"/>
-        <di:waypoint x="1109.0" y="755.0"/>
-        <di:waypoint x="1109.0" y="570.0"/>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event_Zxhr0w" id="BPMNShape_tDdvzQ">
         <dc:Bounds height="36.0" width="36.0" x="1597.0" y="447.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_n8dGow">
@@ -1434,31 +1439,27 @@ Possible ImageTypes are:
         <di:waypoint x="1969.0" y="520.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event_yQLmNA" id="BPMNShape_sGRa6w">
-        <dc:Bounds height="36.0" width="36.0" x="1517.0" y="527.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="1537.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_csHjuw">
-          <dc:Bounds height="20.0" width="100.0" x="1488.5" y="566.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="1508.5" y="566.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="task_0YaQ2w" id="BPMNShape_bynHqw">
         <dc:Bounds height="50.0" width="110.0" x="1350.0" y="520.0"/>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sequenceFlow_aC0skQ" id="BPMNEdge_hkcAJA" sourceElement="BPMNShape_bynHqw" targetElement="BPMNShape_sGRa6w">
-        <di:waypoint x="1460.0" y="545.0"/>
-        <di:waypoint x="1517.0" y="545.0"/>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_YMtfiw" id="BPMNEdge_aaVXOw" sourceElement="BPMNShape_sGRa6w" targetElement="BPMNShape_3dBYIA">
-        <di:waypoint x="1553.0" y="545.0"/>
+        <di:waypoint x="1573.0" y="545.0"/>
         <di:waypoint x="1680.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="dataObject_HHM58Q" id="BPMNShape_hIerPQ">
         <dc:Bounds height="50.0" width="35.0" x="1520.0" y="620.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_QgYnNw">
-          <dc:Bounds height="20.0" width="100.0" x="1487.5" y="675.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="1492.5" y="676.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="association_Xrb1Cg" id="BPMNEdge_fjQJbw" sourceElement="BPMNShape_sGRa6w" targetElement="BPMNShape_hIerPQ">
-        <di:waypoint x="1535.0" y="563.0"/>
+        <di:waypoint x="1555.0" y="563.0"/>
-        <di:waypoint x="1535.0" y="592.0"/>
+        <di:waypoint x="1555.0" y="592.0"/>
         <di:waypoint x="1538.0" y="592.0"/>
         <di:waypoint x="1538.0" y="620.0"/>
       </bpmndi:BPMNEdge>
@@ -1473,9 +1474,9 @@ Possible ImageTypes are:
         <di:waypoint x="1920.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event_pDFoXg" id="BPMNShape_g0M0zg">
-        <dc:Bounds height="36.0" width="36.0" x="887.0" y="527.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="907.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_j0UwmA">
-          <dc:Bounds height="20.0" width="100.0" x="858.5" y="566.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="880.5" y="566.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="dataObject_ZhBiZg" id="BPMNShape_z0cKCQ">
@@ -1487,29 +1488,21 @@ Possible ImageTypes are:
       <bpmndi:BPMNEdge bpmnElement="association_zuMlDA" id="BPMNEdge_Lx0Sxw" sourceElement="BPMNShape_z0cKCQ" targetElement="BPMNShape_g0M0zg">
         <di:waypoint x="908.0" y="620.0"/>
         <di:waypoint x="908.0" y="592.0"/>
-        <di:waypoint x="905.0" y="592.0"/>
+        <di:waypoint x="927.0" y="592.0"/>
-        <di:waypoint x="905.0" y="563.0"/>
+        <di:waypoint x="927.0" y="563.0"/>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="sequenceFlow_fN22Gg" id="BPMNEdge_wLfXxw" sourceElement="BPMNShape_027JKQ" targetElement="BPMNShape_g0M0zg">
-        <di:waypoint x="850.0" y="545.0"/>
-        <di:waypoint x="887.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_naZnAA" id="BPMNEdge_p0VSbQ" sourceElement="BPMNShape_g0M0zg" targetElement="BPMNShape_UxYL0A">
-        <di:waypoint x="923.0" y="545.0"/>
+        <di:waypoint x="943.0" y="545.0"/>
         <di:waypoint x="980.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event_4DNGzg" id="BPMNShape_JQcpbg">
-        <dc:Bounds height="36.0" width="36.0" x="1257.0" y="527.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="1277.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_V5YzNw">
-          <dc:Bounds height="20.0" width="100.0" x="1228.5" y="566.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="1248.5" y="566.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="sequenceFlow_8SpIiA" id="BPMNEdge_0tNVog" sourceElement="BPMNShape_AJWuJw" targetElement="BPMNShape_JQcpbg">
-        <di:waypoint x="1210.0" y="545.0"/>
-        <di:waypoint x="1257.0" y="545.0"/>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_A62nqQ" id="BPMNEdge_l84nPQ" sourceElement="BPMNShape_JQcpbg" targetElement="BPMNShape_bynHqw">
-        <di:waypoint x="1293.0" y="545.0"/>
+        <di:waypoint x="1313.0" y="545.0"/>
         <di:waypoint x="1350.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="dataObject_KPUiiw" id="BPMNShape_PoxSHA">
@@ -1521,8 +1514,8 @@ Possible ImageTypes are:
       <bpmndi:BPMNEdge bpmnElement="association_IKW0SQ" id="BPMNEdge_yt0pwA" sourceElement="BPMNShape_PoxSHA" targetElement="BPMNShape_JQcpbg">
         <di:waypoint x="1278.0" y="620.0"/>
         <di:waypoint x="1278.0" y="592.0"/>
-        <di:waypoint x="1275.0" y="592.0"/>
+        <di:waypoint x="1295.0" y="592.0"/>
-        <di:waypoint x="1275.0" y="563.0"/>
+        <di:waypoint x="1295.0" y="563.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event_wmNwPA" id="BPMNShape_miMI9A">
         <dc:Bounds height="36.0" width="36.0" x="1687.0" y="447.0"/>
@@ -1536,46 +1529,35 @@ Possible ImageTypes are:
           <dc:Bounds height="20.0" width="100.0" x="1355.0" y="666.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="association_yhU4Yg" id="BPMNEdge_xyoZUg" sourceElement="BPMNShape_FhS9qQ" targetElement="BPMNShape_027JKQ">
-        <di:waypoint x="870.0" y="755.0"/>
-        <di:waypoint x="750.0" y="755.0"/>
-        <di:waypoint x="750.0" y="570.0"/>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event_88sCAA" id="BPMNShape_0FB0cg">
-        <dc:Bounds height="36.0" width="36.0" x="787.0" y="497.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="827.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_OSIhZg">
-          <dc:Bounds height="20.0" width="100.0" x="755.0" y="536.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="795.0" y="566.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="event_T901Jg" id="BPMNShape_Jc5h4g">
-        <dc:Bounds height="36.0" width="36.0" x="1147.0" y="497.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="1187.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_Y0hU4w">
-          <dc:Bounds height="20.0" width="100.0" x="1115.0" y="536.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="1155.0" y="566.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_PgyOMw" id="BPMNEdge_kptDVQ" sourceElement="BPMNShape_0FB0cg" targetElement="BPMNShape_g0M0zg">
-        <di:waypoint x="805.0" y="497.0"/>
+        <di:waypoint x="863.0" y="545.0"/>
-        <di:waypoint x="805.0" y="487.0"/>
+        <di:waypoint x="907.0" y="545.0"/>
-        <di:waypoint x="905.0" y="487.0"/>
-        <di:waypoint x="905.0" y="527.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_Di4BQA" id="BPMNEdge_07rOoQ" sourceElement="BPMNShape_Jc5h4g" targetElement="BPMNShape_JQcpbg">
-        <di:waypoint x="1165.0" y="497.0"/>
+        <di:waypoint x="1223.0" y="545.0"/>
-        <di:waypoint x="1165.0" y="476.0"/>
+        <di:waypoint x="1277.0" y="545.0"/>
-        <di:waypoint x="1275.0" y="476.0"/>
-        <di:waypoint x="1275.0" y="527.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="event_7rbeVA" id="BPMNShape_ShOR1w">
-        <dc:Bounds height="36.0" width="36.0" x="1407.0" y="497.0"/>
+        <dc:Bounds height="36.0" width="36.0" x="1437.0" y="527.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_8q5sXA">
-          <dc:Bounds height="20.0" width="100.0" x="1375.0" y="536.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="1405.0" y="566.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_PWXjog" id="BPMNEdge_0u97cA" sourceElement="BPMNShape_ShOR1w" targetElement="BPMNShape_sGRa6w">
-        <di:waypoint x="1426.0" y="497.0"/>
+        <di:waypoint x="1473.0" y="545.0"/>
-        <di:waypoint x="1426.0" y="476.0"/>
+        <di:waypoint x="1537.0" y="545.0"/>
-        <di:waypoint x="1536.0" y="476.0"/>
-        <di:waypoint x="1536.0" y="527.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="gateway_qDAhHw" id="BPMNShape_UxYL0A">
         <dc:Bounds height="50.0" width="50.0" x="980.0" y="520.0"/>
@@ -1604,25 +1586,26 @@ Possible ImageTypes are:
         <di:waypoint x="1100.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="gateway_gd9zQQ" id="BPMNShape_PyGqlg">
-        <dc:Bounds height="50.0" width="50.0" x="620.0" y="520.0"/>
+        <dc:Bounds height="50.0" width="50.0" x="630.0" y="520.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_B6j38A">
-          <dc:Bounds height="20.0" width="100.0" x="595.0" y="573.0"/>
+          <dc:Bounds height="20.0" width="100.0" x="605.0" y="573.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_bh4DIw" id="BPMNEdge_cjFGmA" sourceElement="BPMNShape_PyGqlg" targetElement="BPMNShape_027JKQ">
-        <di:waypoint x="670.0" y="545.0"/>
+        <di:waypoint x="680.0" y="545.0"/>
         <di:waypoint x="740.0" y="545.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="sequenceFlow_d0zSHA" id="BPMNEdge_YVrWMA" sourceElement="BPMNShape_PyGqlg" targetElement="BPMNShape_JG1UQQ">
-        <di:waypoint x="645.0" y="520.0"/>
+        <di:waypoint x="655.0" y="520.0"/>
-        <di:waypoint x="645.0" y="374.0"/>
+        <di:waypoint x="655.0" y="374.0"/>
-        <di:waypoint x="1811.0" y="374.0"/>
+        <di:waypoint x="1815.0" y="374.0"/>
-        <di:waypoint x="1811.0" y="407.0"/>
+        <di:waypoint x="1815.0" y="407.0"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="association_w5HwVg" id="BPMNEdge_ia3uKg" sourceElement="BPMNShape_FhS9qQ" targetElement="BPMNShape_bynHqw">
+      <bpmndi:BPMNEdge bpmnElement="association_w5HwVg" id="BPMNEdge_ia3uKg" sourceElement="BPMNShape_OyWydw" targetElement="BPMNShape_bynHqw">
-        <di:waypoint x="905.0" y="769.0"/>
+        <di:waypoint x="1468.0" y="710.0"/>
-        <di:waypoint x="1370.0" y="769.0"/>
+        <di:waypoint x="1468.0" y="650.0"/>
-        <di:waypoint x="1370.0" y="570.0"/>
+        <di:waypoint x="1405.0" y="650.0"/>
+        <di:waypoint x="1405.0" y="570.0"/>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape bpmnElement="gateway_MgL04w" id="BPMNShape_3dBYIA">
         <dc:Bounds height="50.0" width="50.0" x="1680.0" y="520.0"/>
@@ -1676,6 +1659,17 @@ Possible ImageTypes are:
         <di:waypoint x="445.0" y="570.0"/>
         <di:waypoint x="445.0" y="627.0"/>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="association_Uc6nuQ" id="BPMNEdge_j0l7hQ" sourceElement="BPMNShape_AJWuJw" targetElement="BPMNShape_OyWydw">
+        <di:waypoint x="1110.0" y="570.0"/>
+        <di:waypoint x="1110.0" y="735.0"/>
+        <di:waypoint x="1450.0" y="735.0"/>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge bpmnElement="association_ApEaCQ" id="BPMNEdge_Sz93tQ" sourceElement="BPMNShape_027JKQ" targetElement="BPMNShape_OyWydw">
+        <di:waypoint x="766.0" y="570.0"/>
+        <di:waypoint x="766.0" y="800.0"/>
+        <di:waypoint x="1468.0" y="800.0"/>
+        <di:waypoint x="1468.0" y="760.0"/>
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
     <bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
       <dc:Font name="arial" size="9.0"/>