diff --git a/dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoEventScheduler.java b/_OLD/cognition/CognitoEventScheduler.java similarity index 100% rename from dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoEventScheduler.java rename to _OLD/cognition/CognitoEventScheduler.java diff --git a/dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoEventService.java b/_OLD/cognition/CognitoEventService.java similarity index 100% rename from dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoEventService.java rename to _OLD/cognition/CognitoEventService.java diff --git a/dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoLockHandler.java b/_OLD/cognition/CognitoLockHandler.java similarity index 100% rename from dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoLockHandler.java rename to _OLD/cognition/CognitoLockHandler.java diff --git a/dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoPlugin.java b/_OLD/cognition/CognitoPlugin.java similarity index 98% rename from dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoPlugin.java rename to _OLD/cognition/CognitoPlugin.java index ab155d9..642b4e5 100644 --- a/dynamixs-ai-app/src/main/java/ai/dynamixs/cognition/CognitoPlugin.java +++ b/_OLD/cognition/CognitoPlugin.java @@ -50,7 +50,7 @@ import jakarta.inject.Inject; * @author rsoika * */ -public class CognitoPlugin extends org.imixs.ai.rag.RAGIndexPlugin { +public class CognitoPlugin extends org.imixs.ai.rag.workflow.RAGIndexPlugin { private static final Logger logger = Logger.getLogger(CognitoPlugin.class.getName()); diff --git a/dynamixs-ai-app/src/main/java/ai/dynamixs/ConditionalAIAdapter.java b/_OLD/cognition/ConditionalAIAdapter.java similarity index 100% rename from dynamixs-ai-app/src/main/java/ai/dynamixs/ConditionalAIAdapter.java rename to _OLD/cognition/ConditionalAIAdapter.java diff --git a/dynamixs-ai-app/src/main/java/ai/dynamixs/OrderPlugin.java b/dynamixs-ai-app/src/main/java/ai/dynamixs/OrderPlugin.java index 4c4156c..9724740 100644 --- a/dynamixs-ai-app/src/main/java/ai/dynamixs/OrderPlugin.java +++ b/dynamixs-ai-app/src/main/java/ai/dynamixs/OrderPlugin.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import org.imixs.ai.rag.RAGService; +import org.imixs.ai.rag.index.IndexService; import org.imixs.workflow.ItemCollection; import org.imixs.workflow.WorkflowKernel; import org.imixs.workflow.engine.WorkflowService; @@ -54,7 +54,7 @@ import jakarta.inject.Inject; * @author rsoika * */ -public class OrderPlugin extends org.imixs.ai.rag.RAGIndexPlugin { +public class OrderPlugin extends org.imixs.ai.rag.workflow.RAGIndexPlugin { private static final Logger logger = Logger.getLogger(OrderPlugin.class.getName()); public static final String LINK_PROPERTY = "$workitemref"; @@ -63,7 +63,7 @@ public class OrderPlugin extends org.imixs.ai.rag.RAGIndexPlugin { private WorkflowService workflowService; @Inject - private RAGService ragService; + private IndexService ragService; @Override public ItemCollection run(ItemCollection workitem, ItemCollection event) throws PluginException { @@ -81,7 +81,7 @@ public class OrderPlugin extends org.imixs.ai.rag.RAGIndexPlugin { // read optional configuration form the model or imixs.properties.... List ragIndexDefinitions = workflowService.evalWorkflowResultXML(event, "dynamixs-ai", - RAGService.RAG_INDEX, workitem, false); + IndexService.RAG_INDEX, workitem, false); try { // INDEX Mode? @@ -96,7 +96,10 @@ public class OrderPlugin extends org.imixs.ai.rag.RAGIndexPlugin { promptTemplate = chronicleTextBuilder.build(); workitem.setItemValue("ai.chronicle.summary", promptTemplate); indexDefinition.setItemValue("promptTemplate", embedTemplate(promptTemplate)); - ragService.createIndex(ragIndexDefinitions, workitem, event); + + loadPromptDefinition(indexDefinition, event); + + ragService.indexWorkitem(indexDefinition, workitem); } } } catch (AdapterException e) { diff --git a/workflow/en/customer-en-1.0.0.bpmn b/workflow/en/customer-en-1.0.0.bpmn index 3669c17..f8df838 100644 --- a/workflow/en/customer-en-1.0.0.bpmn +++ b/workflow/en/customer-en-1.0.0.bpmn @@ -34,7 +34,7 @@ - + true @@ -1050,9 +1050,6 @@ Betrag: _amount (Brutto € _amount_brutto - - - diff --git a/workflow/en/offer-en-1.0.1.bpmn b/workflow/en/offer-en-1.0.1.bpmn index c65907c..3567f60 100644 --- a/workflow/en/offer-en-1.0.1.bpmn +++ b/workflow/en/offer-en-1.0.1.bpmn @@ -22,7 +22,6 @@ - @@ -37,7 +36,6 @@ - true @@ -1597,7 +1595,7 @@ Product Details: sequenceFlow_4DWhfA sequenceFlow_5oxu0g sequenceFlow_4DUFiA - + @@ -2639,11 +2637,12 @@ Create a short briefing (3-5 bullet points): - + + @@ -2806,9 +2805,9 @@ Create a short briefing (3-5 bullet points): - + - + @@ -3122,8 +3121,8 @@ Create a short briefing (3-5 bullet points): - - + + @@ -3156,7 +3155,7 @@ Create a short briefing (3-5 bullet points): - + diff --git a/workflow/en/product-en-1.0.0.bpmn b/workflow/en/product-en-1.0.0.bpmn index 5f233a2..b44e08e 100644 --- a/workflow/en/product-en-1.0.0.bpmn +++ b/workflow/en/product-en-1.0.0.bpmn @@ -34,7 +34,7 @@ - + true @@ -1016,7 +1016,6 @@ result.isValid=true; - sequenceFlow_ppv0Qw sequenceFlow_crpgGw sequenceFlow_N5KIRQ @@ -1311,8 +1310,6 @@ Betrag: _amount (Brutto € _amount_brutto - - @@ -1409,9 +1406,9 @@ Betrag: _amount (Brutto € _amount_brutto - + - + @@ -1488,10 +1485,8 @@ Betrag: _amount (Brutto € _amount_brutto - - - - + + @@ -1514,9 +1509,9 @@ Betrag: _amount (Brutto € _amount_brutto - + - + @@ -1526,19 +1521,21 @@ Betrag: _amount (Brutto € _amount_brutto - - + + - + - + - + + + @@ -1555,10 +1552,10 @@ Betrag: _amount (Brutto € _amount_brutto - + - + diff --git a/workflow/office/rechnungseingang-de-1.0.1.bpmn b/workflow/office/rechnungseingang-de-1.0.1.bpmn index 7790094..848e36a 100644 --- a/workflow/office/rechnungseingang-de-1.0.1.bpmn +++ b/workflow/office/rechnungseingang-de-1.0.1.bpmn @@ -518,7 +518,8 @@ result.isValid=true; false -suggest]]> +suggest +Finance]]> @@ -1074,7 +1075,7 @@ result.isValid=true; -Management]]> +Finance]]> @@ -2509,9 +2510,6 @@ if ( workitem.getItemValueString('txtcomment')==='') { - - -