diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 23a45bf..9c67d59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,4 +9,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v3 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5 \ No newline at end of file diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index ff2bd24..ae5e6c3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,4 +8,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 128a183..bc801b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,4 +4,4 @@ on: workflow_dispatch jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/release.yml@v2 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5 diff --git a/pom.xml b/pom.xml index 555efb0..67a17ef 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.axonivy.connector.vertexai vertexai-google vertexai-google-modules - 10.0.25-SNAPSHOT + 12.0.0-SNAPSHOT pom diff --git a/vertexai-google-demo/.classpath b/vertexai-google-demo/.classpath index 45a97e4..8228714 100644 --- a/vertexai-google-demo/.classpath +++ b/vertexai-google-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/vertexai-google-demo/.gitignore b/vertexai-google-demo/.gitignore index 9b0d458..6414f96 100644 --- a/vertexai-google-demo/.gitignore +++ b/vertexai-google-demo/.gitignore @@ -17,3 +17,4 @@ classes/ src_dataClasses/ src_wsproc/ logs/ +/bin/ diff --git a/vertexai-google-demo/.project b/vertexai-google-demo/.project index 84d976e..c56ffa9 100644 --- a/vertexai-google-demo/.project +++ b/vertexai-google-demo/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder @@ -44,6 +49,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/vertexai-google-demo/.settings/.jsdtscope b/vertexai-google-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/vertexai-google-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/vertexai-google-demo/.settings/ch.ivyteam.ivy.designer.prefs b/vertexai-google-demo/.settings/ch.ivyteam.ivy.designer.prefs index 7b82060..24823d4 100644 --- a/vertexai-google-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/vertexai-google-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.vertexai.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.vertexai -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 diff --git a/vertexai-google-demo/.settings/org.eclipse.jdt.core.prefs b/vertexai-google-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/vertexai-google-demo/.settings/org.eclipse.jdt.core.prefs +++ b/vertexai-google-demo/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/vertexai-google-demo/.settings/org.eclipse.wst.common.component b/vertexai-google-demo/.settings/org.eclipse.wst.common.component index 22afeac..960e39e 100644 --- a/vertexai-google-demo/.settings/org.eclipse.wst.common.component +++ b/vertexai-google-demo/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/vertexai-google-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/vertexai-google-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/vertexai-google-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/vertexai-google-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/vertexai-google-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/vertexai-google-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/vertexai-google-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/vertexai-google-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/vertexai-google-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/vertexai-google-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/vertexai-google-demo/config/variables.yaml b/vertexai-google-demo/config/variables.yaml index 64c8fa0..4448394 100644 --- a/vertexai-google-demo/config/variables.yaml +++ b/vertexai-google-demo/config/variables.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json # == Variables == # # You can define here your project Variables. diff --git a/vertexai-google-demo/dataclasses/com/axonivy/connector/vertexai/Data.d.json b/vertexai-google-demo/dataclasses/com/axonivy/connector/vertexai/Data.d.json new file mode 100644 index 0000000..146eab0 --- /dev/null +++ b/vertexai-google-demo/dataclasses/com/axonivy/connector/vertexai/Data.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.vertexai", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/vertexai-google-demo/dataclasses/com/axonivy/connector/vertexai/Data.ivyClass b/vertexai-google-demo/dataclasses/com/axonivy/connector/vertexai/Data.ivyClass deleted file mode 100644 index 8956988..0000000 --- a/vertexai-google-demo/dataclasses/com/axonivy/connector/vertexai/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.vertexai #namespace diff --git a/vertexai-google-demo/pom.xml b/vertexai-google-demo/pom.xml index 6a49398..c908ad0 100644 --- a/vertexai-google-demo/pom.xml +++ b/vertexai-google-demo/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.connector.vertexai vertexai-google-demo - 10.0.25-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 diff --git a/vertexai-google-demo/processes/vertexAi.p.json b/vertexai-google-demo/processes/vertexAi.p.json index d7a23d3..f266e82 100644 --- a/vertexai-google-demo/processes/vertexAi.p.json +++ b/vertexai-google-demo/processes/vertexAi.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18FBD17FA8E55D35", "config" : { "data" : "com.axonivy.connector.vertexai.Data" @@ -9,16 +9,18 @@ "type" : "RequestStart", "name" : "chatWithAi.ivp", "config" : { - "callSignature" : "chatWithAi", - "outLink" : "chatWithAi.ivp", - "tags" : "demo", - "case" : { } + "signature" : "chatWithAi" }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 136, "y" : 64 }, "icon" : "res:/webContent/icons/logo.png?small" }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -30,13 +32,14 @@ "type" : "DialogCall", "name" : "chatWithAi", "config" : { - "dialogId" : "com.axonivy.connector.vertexai.chatWithAi", - "startMethod" : "start()" + "dialog" : "com.axonivy.connector.vertexai.chatWithAi:start()" }, "visual" : { "at" : { "x" : 264, "y" : 64 }, "icon" : "res:/webContent/icons/logo.png" }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAi.rddescriptor b/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAi.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAi.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiData.d.json b/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiData.d.json new file mode 100644 index 0000000..a4aaa40 --- /dev/null +++ b/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "chatWithAiData", + "namespace" : "com.axonivy.connector.vertexai.chatWithAi", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiData.ivyClass b/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiData.ivyClass deleted file mode 100644 index 4c00719..0000000 --- a/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiData.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -chatWithAiData #class -com.axonivy.connector.vertexai.chatWithAi #namespace diff --git a/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiProcess.p.json b/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiProcess.p.json index 7170d08..30fde06 100644 --- a/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiProcess.p.json +++ b/vertexai-google-demo/src_hd/com/axonivy/connector/vertexai/chatWithAi/chatWithAiProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18FBD13F8FD6EB9F", "kind" : "HTML_DIALOG", "config" : { @@ -10,13 +10,15 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "18FBD13F904A0877" }, "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -33,7 +35,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", diff --git a/vertexai-google-demo/webContent/layouts/basic-10.xhtml b/vertexai-google-demo/webContent/layouts/basic-10.xhtml index 7f2dffa..f50207c 100644 --- a/vertexai-google-demo/webContent/layouts/basic-10.xhtml +++ b/vertexai-google-demo/webContent/layouts/basic-10.xhtml @@ -27,7 +27,7 @@ and refence it below in the head part. - + diff --git a/vertexai-google/.classpath b/vertexai-google/.classpath index 45a97e4..8228714 100644 --- a/vertexai-google/.classpath +++ b/vertexai-google/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/vertexai-google/.project b/vertexai-google/.project index 5e505f8..6cccdb0 100644 --- a/vertexai-google/.project +++ b/vertexai-google/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder @@ -44,6 +49,5 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/vertexai-google/.settings/.jsdtscope b/vertexai-google/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/vertexai-google/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/vertexai-google/.settings/ch.ivyteam.ivy.designer.prefs b/vertexai-google/.settings/ch.ivyteam.ivy.designer.prefs index 7b82060..24823d4 100644 --- a/vertexai-google/.settings/ch.ivyteam.ivy.designer.prefs +++ b/vertexai-google/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.vertexai.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.vertexai -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 diff --git a/vertexai-google/.settings/org.eclipse.jdt.core.prefs b/vertexai-google/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/vertexai-google/.settings/org.eclipse.jdt.core.prefs +++ b/vertexai-google/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/vertexai-google/.settings/org.eclipse.wst.common.component b/vertexai-google/.settings/org.eclipse.wst.common.component index 3973fe1..fcdb657 100644 --- a/vertexai-google/.settings/org.eclipse.wst.common.component +++ b/vertexai-google/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/vertexai-google/.settings/org.eclipse.wst.common.project.facet.core.xml b/vertexai-google/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/vertexai-google/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/vertexai-google/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/vertexai-google/.settings/org.eclipse.wst.jsdt.ui.superType.container b/vertexai-google/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/vertexai-google/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/vertexai-google/.settings/org.eclipse.wst.jsdt.ui.superType.name b/vertexai-google/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/vertexai-google/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/vertexai-google/config/variables.yaml b/vertexai-google/config/variables.yaml index 95f8b3f..eebed3a 100644 --- a/vertexai-google/config/variables.yaml +++ b/vertexai-google/config/variables.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json # == Variables == # # You can define here your project Variables. diff --git a/vertexai-google/dataclasses/com/axonivy/connector/vertexai/Data.d.json b/vertexai-google/dataclasses/com/axonivy/connector/vertexai/Data.d.json new file mode 100644 index 0000000..146eab0 --- /dev/null +++ b/vertexai-google/dataclasses/com/axonivy/connector/vertexai/Data.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.vertexai", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/vertexai-google/dataclasses/com/axonivy/connector/vertexai/Data.ivyClass b/vertexai-google/dataclasses/com/axonivy/connector/vertexai/Data.ivyClass deleted file mode 100644 index 8956988..0000000 --- a/vertexai-google/dataclasses/com/axonivy/connector/vertexai/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.vertexai #namespace diff --git a/vertexai-google/pom.xml b/vertexai-google/pom.xml index 141da1a..f3a685e 100644 --- a/vertexai-google/pom.xml +++ b/vertexai-google/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.connector.vertexai vertexai-google - 10.0.25-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 @@ -22,7 +22,7 @@ com.google.cloud google-cloud-aiplatform - 2.1.0 + 3.55.0 com.google.code.gson