Merge branch '3.5.x'

Author: CodeCasterX

framework/elsa/fit-elsa-react/src/common/Consts.js

@@ -204,4 +204,16 @@ export const DEFAULT_LOOP_NODE_CONTEXT = {
     referenceNode: VIRTUAL_CONTEXT_NODE.id,
     value: [VIRTUAL_CONTEXT_NODE_VARIABLES.INSTANCE_ID],
   }],
+};
+
+export const DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID = {
+  id: `userId_${uuidv4()}`,
+  name: 'userId',
+  type: 'String',
+  from: 'Reference',
+  referenceNode: VIRTUAL_CONTEXT_NODE.id,
+  referenceId: VIRTUAL_CONTEXT_NODE_VARIABLES.USER_ID,
+  referenceKey: VIRTUAL_CONTEXT_NODE_VARIABLES.USER_ID,
+  editable: false,
+  value: [VIRTUAL_CONTEXT_NODE_VARIABLES.USER_ID],
 };

framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/knowledgeRetrievalComponent.jsx

@@ -7,7 +7,7 @@
 import {v4 as uuidv4} from 'uuid';
 import {KnowledgeRetrievalWrapper} from '@/components/knowledgeRetrieval/KnowledgeRetrievalWrapper.jsx';
 import {retrievalComponent} from '@/components/retrieval/retrievalComponent.jsx';
-import {DATA_TYPES, DEFAULT_KNOWLEDGE_REPO_GROUP, FROM_TYPE} from '@/common/Consts.js';
+import {DATA_TYPES, DEFAULT_KNOWLEDGE_REPO_GROUP, DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID, FROM_TYPE, VIRTUAL_CONTEXT_NODE} from '@/common/Consts.js';
 import {
   UpdateGroupIdReducer,
   UpdateInputParamReducer,
@@ -138,7 +138,8 @@ export const knowledgeRetrievalComponent = (jadeConfig, shape) => {
             from: FROM_TYPE.INPUT,
             value: DEFAULT_KNOWLEDGE_REPO_GROUP,
           }],
-      }],
+      },
+        DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID],
       outputParams: [{
         id: `output_${uuidv4()}`,
         name: 'output',

framework/elsa/fit-elsa-react/src/components/knowledgeRetrieval/knowledgeRetrievalNodeState.jsx

@@ -39,6 +39,9 @@ export const knowledgeRetrievalNodeState = (id, x, y, width, height, parent, dra
           {
             name: 'option',
           },
+          {
+            name: 'userId',
+          },
         ],
         return: {
           type: 'object',

framework/elsa/fit-elsa-react/src/flow/compatibility/compatibilityProcessors.js

@@ -9,8 +9,10 @@ import {getDefaultReference} from '@/components/util/ReferenceUtil.js';
 import {
   DATA_TYPES,
   DEFAULT_KNOWLEDGE_REPO_GROUP_STRUCT,
+  DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID,
   DEFAULT_LLM_KNOWLEDGE_BASES,
-  DEFAULT_LLM_REFERENCE_OUTPUT, DEFAULT_LOOP_NODE_CONTEXT,
+  DEFAULT_LLM_REFERENCE_OUTPUT,
+  DEFAULT_LOOP_NODE_CONTEXT,
   DEFAULT_MAX_MEMORY_ROUNDS,
   END_NODE_TYPE,
   FLOW_TYPE,
@@ -390,10 +392,32 @@ export const knowledgeRetrievalCompatibilityProcessor = (shapeData, graph, pageH
   const process = self.process;
   self.process = () => {
     process.apply(self);
-    const optionValue = self.shapeData.flowMeta.jober.converter.entity.inputParams.find(inputParam => inputParam.name === 'option').value;
-    if (!optionValue.find(v => v.name === 'groupId')) {
-      optionValue.push(DEFAULT_KNOWLEDGE_REPO_GROUP_STRUCT);
-    }
+
+    const optionParamProcess = () => {
+      const optionValue = self.shapeData.flowMeta.jober.converter.entity.inputParams
+        .find(inputParam => inputParam.name === 'option')?.value;
+
+      if (Array.isArray(optionValue) && !optionValue.some(v => v.name === 'groupId')) {
+        optionValue.push(DEFAULT_KNOWLEDGE_REPO_GROUP_STRUCT);
+      }
+    };
+
+    const userIdParamProcess = () => {
+      const inputParams = self.shapeData.flowMeta.jober.converter.entity.inputParams;
+      const userIdParam = inputParams.find(inputParam => inputParam.name === 'userId');
+      if (!userIdParam) {
+        inputParams.push(DEFAULT_KNOWLEDGE_RETRIEVAL_NODE_USER_ID);
+      }
+      const entityParams = self.shapeData.flowMeta.jober.entity.params;
+      if (!entityParams.find(param => param.name === 'userId')) {
+        const optionIndex = entityParams.findIndex(param => param.name === 'option');
+        const insertIndex = optionIndex !== -1 ? optionIndex + 1 : entityParams.length;
+        entityParams.splice(insertIndex, 0, {name: 'userId'});
+      }
+    };
+
+    optionParamProcess();
+    userIdParamProcess();
   };
 
   return self;

framework/fel/java/maven-plugins/tool-maven-plugin/pom.xml

@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>

framework/fel/java/pom.xml

@@ -63,8 +63,7 @@
         <!-- Test framework versions -->
         <assertj.version>3.27.3</assertj.version>
         <junit5.version>5.12.2</junit5.version>
-        <mockito.version>5.15.2</mockito.version>
-        <mockito.inline.version>4.11.0</mockito.inline.version>
+        <mockito.version>5.17.0</mockito.version>
 
         <!-- Jacoco version -->
         <jacoco.version>0.8.10</jacoco.version>
@@ -173,12 +172,6 @@
                 <version>${junit5.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-inline</artifactId>
-                <version>${mockito.inline.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>

framework/fit/java/fit-dependency/pom.xml

@@ -47,7 +47,7 @@
         <!-- Test framework versions -->
         <assertj.version>3.27.3</assertj.version>
         <junit5.version>5.12.2</junit5.version>
-        <mockito.version>5.15.2</mockito.version>
+        <mockito.version>5.17.0</mockito.version>
         <h2.version>2.3.232</h2.version>
 
         <!-- Maven plugin versions -->

framework/fit/java/fit-test/fit-test-framework/pom.xml

@@ -15,7 +15,7 @@
         <!-- Third-party versions -->
         <junit5.version>5.12.2</junit5.version>
         <h2.version>2.3.232</h2.version>
-        <mockito.version>5.15.2</mockito.version>
+        <mockito.version>5.17.0</mockito.version>
     </properties>
 
     <dependencies>

framework/fit/python/requirements.txt

@@ -1,4 +1,4 @@
 numpy==1.25.2
 PyYAML==6.0.1
-requests==2.31.0
-tornado==6.3.2
+requests==2.32.0
+tornado==6.4.2

framework/ohscript/pom.xml

@@ -58,7 +58,7 @@
         <!-- Test framework versions -->
         <assertj.version>3.27.3</assertj.version>
         <junit5.version>5.12.2</junit5.version>
-        <mockito.version>5.15.2</mockito.version>
+        <mockito.version>5.17.0</mockito.version>
 
         <!-- Maven plugin versions -->
         <maven.compiler.version>3.14.0</maven.compiler.version>