Merge branch 'next' into develop

ProcessMaker · Jun 10, 2024 · 8c6a091 · 8c6a091
2 parents 78536dd + cdca348
commit 8c6a091
Show file tree

Hide file tree

Showing 417 changed files with 41,888 additions and 67,027 deletions.
diff --git a/.env.example b/.env.example
@@ -41,3 +41,7 @@ VUE_APP_WEBSOCKET_PROVIDER=socket.io
 VUE_APP_WEBSOCKET_PROVIDER_URL=ws:127.0.0.1:1234
 VUE_APP_COLLABORATIVE_ENABLED=true
 SAML_SP_DESTINATION="https://keycloak.processmaker.net/realms/realmname/broker/saml/endpoint"
+OPEN_AI_NLQ_TO_PMQL_ENABLED=true
+OPEN_AI_PROCESS_TRANSLATIONS_ENABLED=true
+OPEN_AI_SECRET="sk-O2D..."
+AI_MICROSERVICE_HOST="http://localhost:8010"
diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml
@@ -121,7 +121,7 @@ jobs:
               sed -i "s/{{pmai-system}}/pmai-system/" template-instance.yaml
             else
               sed -i "s/{{pmai-system}}/pmai-system-next/" template-instance.yaml
-            fi            
+            fi
             sed -i "s/{{instance}}/ci-$deploy/" template-instance.yaml
             sed -i "s/{{image}}/${{env.IMAGE_TAG}}/" template-instance.yaml
             cat template-instance.yaml         

diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,7 @@ storage/api-docs/api-docs.json
 storage/ssl
 storage/api/*
 storage/data-sources/logs/*
+storage/decision-tables/*
 npm.sh
 laravel-echo-server.lock
 public/.htaccess

diff --git a/ProcessMaker/Ai/Handlers/LanguageTranslationHandler.php b/ProcessMaker/Ai/Handlers/LanguageTranslationHandler.php
diff --git a/ProcessMaker/Ai/Handlers/OpenAiHandler.php b/ProcessMaker/Ai/Handlers/OpenAiHandler.php
diff --git a/ProcessMaker/Ai/Prompts/language_translation_html.md b/ProcessMaker/Ai/Prompts/language_translation_html.md
diff --git a/ProcessMaker/Ai/Prompts/language_translation_regular.md b/ProcessMaker/Ai/Prompts/language_translation_regular.md
diff --git a/ProcessMaker/Ai/TokensCalculation/LICENSE b/ProcessMaker/Ai/TokensCalculation/LICENSE