diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d55cb90..06e5f79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,6 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5 with: - javaVersion: 21 mvnArgs: -U diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 11284e2..55952aa 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,7 +8,7 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5 with: mvnArgs: -U \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0794da3..30c184b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,5 @@ on: workflow_dispatch jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4 - with: - javaVersion: 21 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5 diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/openai-assistant-product/pom.xml b/openai-assistant-product/pom.xml index 7bfb87b..53b872d 100644 --- a/openai-assistant-product/pom.xml +++ b/openai-assistant-product/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.connector.openai openai-assistant-product - 10.0.17-SNAPSHOT + 12.0.0-SNAPSHOT pom diff --git a/openai-assistant/.classpath b/openai-assistant/.classpath index ceb3713..19506fb 100644 --- a/openai-assistant/.classpath +++ b/openai-assistant/.classpath @@ -1,29 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/openai-assistant/.settings/org.eclipse.jdt.core.prefs b/openai-assistant/.settings/org.eclipse.jdt.core.prefs index f5924b0..cbdeb8b 100644 --- a/openai-assistant/.settings/org.eclipse.jdt.core.prefs +++ b/openai-assistant/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/openai-assistant/META-INF/MANIFEST.MF b/openai-assistant/META-INF/MANIFEST.MF index 5943bf3..d9ae1df 100644 --- a/openai-assistant/META-INF/MANIFEST.MF +++ b/openai-assistant/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Axon Ivy OpenAI assistant Bundle-SymbolicName: openai-assistant;singleton:=true -Bundle-Version: 10.0.17.qualifier +Bundle-Version: 12.0.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.commands, org.eclipse.core.resources, @@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.core.runtime, ch.ivyteam.ivy.jersey.client, javax.ws.rs, ch.ivyteam.ivy.rest.client.exec;resolution:=optional -Bundle-ClassPath: lib/commonmark-0.22.0.jar, . +Bundle-ClassPath: lib/commonmark.jar, . Bundle-ActivationPolicy: lazy diff --git a/openai-assistant/pom.xml b/openai-assistant/pom.xml index a941358..ff27ea7 100644 --- a/openai-assistant/pom.xml +++ b/openai-assistant/pom.xml @@ -3,13 +3,13 @@ com.axonivy.connector.openai openai-assistant - 10.0.17-SNAPSHOT + 12.0.0-SNAPSHOT eclipse-plugin UTF-8 - 17 - 3.0.4 + 21 + 4.0.10 @@ -27,7 +27,7 @@ org.commonmark commonmark - 0.22.0 + 0.24.0 @@ -73,7 +73,8 @@ ${project.basedir}/lib - org.commonmark + org.commonmark + true diff --git a/openai-connector-demo/.classpath b/openai-connector-demo/.classpath index 45a97e4..8228714 100644 --- a/openai-connector-demo/.classpath +++ b/openai-connector-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/openai-connector-demo/.project b/openai-connector-demo/.project index 6ea43bc..fe29080 100644 --- a/openai-connector-demo/.project +++ b/openai-connector-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/openai-connector-demo/.settings/.jsdtscope b/openai-connector-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/openai-connector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index dd82883..1b84748 100644 --- a/openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/openai-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.openai.connector.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.openai.connector.demo -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/openai-connector-demo/.settings/org.eclipse.core.resources.prefs b/openai-connector-demo/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/openai-connector-demo/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/openai-connector-demo/.settings/org.eclipse.jdt.core.prefs b/openai-connector-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/openai-connector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/openai-connector-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/openai-connector-demo/.settings/org.eclipse.wst.common.component b/openai-connector-demo/.settings/org.eclipse.wst.common.component index 5cd1f4d..41e5804 100644 --- a/openai-connector-demo/.settings/org.eclipse.wst.common.component +++ b/openai-connector-demo/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/openai-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/openai-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/openai-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/openai-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/openai-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/openai-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/openai-connector-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/openai-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/openai-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/openai-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/openai-connector-demo/config/variables.yaml b/openai-connector-demo/config/variables.yaml index 64c8fa0..4448394 100644 --- a/openai-connector-demo/config/variables.yaml +++ b/openai-connector-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/openai-connector-demo/dataclasses/com/openai/connector/demo/AIGeneratedMail.d.json b/openai-connector-demo/dataclasses/com/openai/connector/demo/AIGeneratedMail.d.json new file mode 100644 index 0000000..e0a3c65 --- /dev/null +++ b/openai-connector-demo/dataclasses/com/openai/connector/demo/AIGeneratedMail.d.json @@ -0,0 +1,13 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "AIGeneratedMail", + "namespace" : "com.openai.connector.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "subject", + "type" : "String" + }, { + "name" : "content", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/openai-connector-demo/dataclasses/com/openai/connector/demo/AIGeneratedMail.ivyClass b/openai-connector-demo/dataclasses/com/openai/connector/demo/AIGeneratedMail.ivyClass deleted file mode 100644 index 7e350c6..0000000 --- a/openai-connector-demo/dataclasses/com/openai/connector/demo/AIGeneratedMail.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -AIGeneratedMail #class -com.openai.connector.demo #namespace -subject String #field -content String #field diff --git a/openai-connector-demo/dataclasses/com/openai/connector/demo/CandidateInformation.d.json b/openai-connector-demo/dataclasses/com/openai/connector/demo/CandidateInformation.d.json new file mode 100644 index 0000000..76ee893 --- /dev/null +++ b/openai-connector-demo/dataclasses/com/openai/connector/demo/CandidateInformation.d.json @@ -0,0 +1,34 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "CandidateInformation", + "namespace" : "com.openai.connector.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "name", + "type" : "String" + }, { + "name" : "jobPosition", + "type" : "String" + }, { + "name" : "interviewerName", + "type" : "String" + }, { + "name" : "interviewerPosition", + "type" : "String" + }, { + "name" : "company", + "type" : "String" + }, { + "name" : "mostImportantSkill", + "type" : "String" + }, { + "name" : "interviewDate", + "type" : "java.time.LocalDate" + }, { + "name" : "email", + "type" : "String" + }, { + "name" : "decision", + "type" : "com.openai.connector.demo.enums.Decision" + } ] +} \ No newline at end of file diff --git a/openai-connector-demo/dataclasses/com/openai/connector/demo/CandidateInformation.ivyClass b/openai-connector-demo/dataclasses/com/openai/connector/demo/CandidateInformation.ivyClass deleted file mode 100644 index 95945f7..0000000 --- a/openai-connector-demo/dataclasses/com/openai/connector/demo/CandidateInformation.ivyClass +++ /dev/null @@ -1,11 +0,0 @@ -CandidateInformation #class -com.openai.connector.demo #namespace -name String #field -jobPosition String #field -interviewerName String #field -interviewerPosition String #field -company String #field -mostImportantSkill String #field -interviewDate java.time.LocalDate #field -email String #field -decision com.openai.connector.demo.enums.Decision #field diff --git a/openai-connector-demo/dataclasses/com/openai/connector/demo/Data.d.json b/openai-connector-demo/dataclasses/com/openai/connector/demo/Data.d.json new file mode 100644 index 0000000..5f7a850 --- /dev/null +++ b/openai-connector-demo/dataclasses/com/openai/connector/demo/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.openai.connector.demo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/openai-connector-demo/dataclasses/com/openai/connector/demo/Data.ivyClass b/openai-connector-demo/dataclasses/com/openai/connector/demo/Data.ivyClass deleted file mode 100644 index 2e74862..0000000 --- a/openai-connector-demo/dataclasses/com/openai/connector/demo/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.openai.connector.demo #namespace diff --git a/openai-connector-demo/dataclasses/com/openai/connector/demo/Message.d.json b/openai-connector-demo/dataclasses/com/openai/connector/demo/Message.d.json new file mode 100644 index 0000000..286a138 --- /dev/null +++ b/openai-connector-demo/dataclasses/com/openai/connector/demo/Message.d.json @@ -0,0 +1,13 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Message", + "namespace" : "com.openai.connector.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "sender", + "type" : "String" + }, { + "name" : "text", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/openai-connector-demo/dataclasses/com/openai/connector/demo/Message.ivyClass b/openai-connector-demo/dataclasses/com/openai/connector/demo/Message.ivyClass deleted file mode 100644 index 33b095c..0000000 --- a/openai-connector-demo/dataclasses/com/openai/connector/demo/Message.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -Message #class -com.openai.connector.demo #namespace -sender String #field -text String #field diff --git a/openai-connector-demo/pom.xml b/openai-connector-demo/pom.xml index 82929d3..ca93e79 100644 --- a/openai-connector-demo/pom.xml +++ b/openai-connector-demo/pom.xml @@ -1,38 +1,41 @@ - - 4.0.0 - com.axonivy.connector.openai - openai-connector-demo - 10.0.17-SNAPSHOT - iar - - 10.0.16 - - - - sonatype - https://oss.sonatype.org/content/repositories/snapshots - - always - - - - - - com.axonivy.connector.openai - openai-connector - ${project.version} - iar - - - - - - com.axonivy.ivy.ci - project-build-plugin - ${project.build.plugin.version} - true - - - + + 4.0.0 + com.axonivy.connector.openai + openai-connector-demo + 12.0.0-SNAPSHOT + iar + + 12.0.0 + UTF-8 + + + + sonatype + https://oss.sonatype.org/content/repositories/snapshots + + always + + + + + + com.axonivy.connector.openai + openai-connector + ${project.version} + iar + + + + + + com.axonivy.ivy.ci + project-build-plugin + ${project.build.plugin.version} + true + + + diff --git a/openai-connector-demo/processes/MailGenerator.p.json b/openai-connector-demo/processes/MailGenerator.p.json index 9c179f2..f1af3ed 100644 --- a/openai-connector-demo/processes/MailGenerator.p.json +++ b/openai-connector-demo/processes/MailGenerator.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18DEF469FAC93B1E", "config" : { "data" : "com.openai.connector.demo.Data" @@ -9,13 +9,14 @@ "type" : "RequestStart", "name" : "start.ivp", "config" : { - "callSignature" : "start", - "outLink" : "start.ivp" + "signature" : "start" }, "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -27,12 +28,13 @@ "type" : "DialogCall", "name" : "MailGenerator", "config" : { - "dialogId" : "com.openai.connector.demo.MailGenerator", - "startMethod" : "start()" + "dialog" : "com.openai.connector.demo.MailGenerator:start()" }, "visual" : { "at" : { "x" : 224, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/openai-connector-demo/processes/chatGpt.p.json b/openai-connector-demo/processes/chatGpt.p.json index 536e0b7..ff21e56 100644 --- a/openai-connector-demo/processes/chatGpt.p.json +++ b/openai-connector-demo/processes/chatGpt.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18799A8B7D9E41A3", "config" : { "data" : "com.openai.connector.demo.Data" @@ -9,14 +9,17 @@ "type" : "RequestStart", "name" : "chatCompletionDemo.ivp", "config" : { - "callSignature" : "chatCompletionDemo", - "outLink" : "chatCompletionDemo.ivp", - "tags" : "demo" + "signature" : "chatCompletionDemo" }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f3", "to" : "f2" } + "connect" : [ + { "id" : "f3", "to" : "f2" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -28,13 +31,14 @@ "type" : "DialogCall", "name" : "ChatWithAi", "config" : { - "dialogId" : "com.openai.connector.demo.ChatWithAi", - "startMethod" : "start()" + "dialog" : "com.openai.connector.demo.ChatWithAi:start()" }, "visual" : { "at" : { "x" : 248, "y" : 64 }, "icon" : "res:/webContent/logo/OpenAI_Logo.png" }, - "connect" : { "id" : "f4", "to" : "f1" } + "connect" : [ + { "id" : "f4", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAi.rddescriptor b/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAi.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAi.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiData.d.json b/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiData.d.json new file mode 100644 index 0000000..c700448 --- /dev/null +++ b/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiData.d.json @@ -0,0 +1,15 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "ChatWithAiData", + "namespace" : "com.openai.connector.demo.ChatWithAi", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "message", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "conversation", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiData.ivyClass b/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiData.ivyClass deleted file mode 100644 index 40af4ea..0000000 --- a/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiData.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -ChatWithAiData #class -com.openai.connector.demo.ChatWithAi #namespace -message String #field -message PERSISTENT #fieldModifier -conversation java.util.List #field -conversation PERSISTENT #fieldModifier diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiProcess.p.json b/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiProcess.p.json index d29f554..da38902 100644 --- a/openai-connector-demo/src_hd/com/openai/connector/demo/ChatWithAi/ChatWithAiProcess.p.json +++ b/openai-connector-demo/src_hd/com/openai/connector/demo/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" : "0187B20AAAF83538", "kind" : "HTML_DIALOG", "config" : { @@ -10,13 +10,15 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "187B20AAAFB337EB" }, "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", @@ -50,7 +54,9 @@ "visual" : { "at" : { "x" : 96, "y" : 224 } }, - "connect" : { "id" : "f10", "to" : "f9" } + "connect" : [ + { "id" : "f10", "to" : "f9" } + ] }, { "id" : "f7", "type" : "HtmlDialogEnd", @@ -64,9 +70,6 @@ "config" : { "processCall" : "openai:chatGpt(String)", "call" : { - "params" : [ - { "name" : "what", "type" : "String" } - ], "map" : { "param.what" : "in.message" } @@ -93,6 +96,8 @@ "at" : { "x" : 240, "y" : 224 }, "icon" : "res:/webContent/logo/OpenAI_Logo.png" }, - "connect" : { "id" : "f8", "to" : "f7" } + "connect" : [ + { "id" : "f8", "to" : "f7" } + ] } ] } \ No newline at end of file diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.rddescriptor b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.xhtml b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.xhtml index a249233..0fb060f 100644 --- a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.xhtml +++ b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGenerator.xhtml @@ -12,15 +12,15 @@

AI Mail Generator

-
+
-
+
*
-
+
@@ -28,13 +28,13 @@
-
+
*
-
+
@@ -43,13 +43,13 @@
-
+
*
-
+
@@ -61,14 +61,14 @@
-
+
*
-
+
@@ -77,13 +77,13 @@
-
+
*
-
+
@@ -91,13 +91,13 @@
-
+
*
-
+
-
+
*
-
+
@@ -129,13 +129,13 @@
-
+
*
-
+
@@ -144,13 +144,13 @@
-
+
*
-
+
-
+
-
+
-
+
-
+
-
+
-
- + + icon="pi pi-check" styleClass="mr-2" /> + update="content-form" icon="pi pi-check" styleClass="mr-2" />
diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorData.d.json b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorData.d.json new file mode 100644 index 0000000..e8bb0cf --- /dev/null +++ b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorData.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "MailGeneratorData", + "namespace" : "com.openai.connector.demo.MailGenerator", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "mail", + "type" : "com.openai.connector.demo.AIGeneratedMail", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "message", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "candidateInformation", + "type" : "com.openai.connector.demo.CandidateInformation", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorData.ivyClass b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorData.ivyClass deleted file mode 100644 index 06a0b10..0000000 --- a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorData.ivyClass +++ /dev/null @@ -1,8 +0,0 @@ -MailGeneratorData #class -com.openai.connector.demo.MailGenerator #namespace -mail com.openai.connector.demo.AIGeneratedMail #field -mail PERSISTENT #fieldModifier -message String #field -message PERSISTENT #fieldModifier -candidateInformation com.openai.connector.demo.CandidateInformation #field -candidateInformation PERSISTENT #fieldModifier diff --git a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorProcess.p.json b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorProcess.p.json index 3cd5a08..dcebba2 100644 --- a/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorProcess.p.json +++ b/openai-connector-demo/src_hd/com/openai/connector/demo/MailGenerator/MailGeneratorProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18DEF4D0C97AC6D0", "kind" : "HTML_DIALOG", "config" : { @@ -10,13 +10,15 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "18DEF4D0C97D09AC" }, "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", @@ -50,7 +54,9 @@ "visual" : { "at" : { "x" : 96, "y" : 256 } }, - "connect" : { "id" : "f8", "to" : "f7" } + "connect" : [ + { "id" : "f8", "to" : "f7" } + ] }, { "id" : "f7", "type" : "Script", @@ -67,7 +73,9 @@ "visual" : { "at" : { "x" : 248, "y" : 256 } }, - "connect" : { "id" : "f10", "to" : "f9" } + "connect" : [ + { "id" : "f10", "to" : "f9" } + ] }, { "id" : "f9", "type" : "SubProcessCall", @@ -75,9 +83,6 @@ "config" : { "processCall" : "openai:chatGpt(String)", "call" : { - "params" : [ - { "name" : "what", "type" : "String" } - ], "map" : { "param.what" : "in.message" } @@ -98,7 +103,9 @@ "at" : { "x" : 424, "y" : 256 }, "icon" : "res:/webContent/logo/OpenAI_Logo.png" }, - "connect" : { "id" : "f12", "to" : "f11" } + "connect" : [ + { "id" : "f12", "to" : "f11" } + ] }, { "id" : "f11", "type" : "HtmlDialogEnd", @@ -115,22 +122,28 @@ "visual" : { "at" : { "x" : 96, "y" : 392 } }, - "connect" : { "id" : "f15", "to" : "f18" } + "connect" : [ + { "id" : "f15", "to" : "f18" } + ] }, { "id" : "f17", "type" : "EMail", "name" : "Send mail to candidate", "config" : { "headers" : { - "emailSubject" : "<%=in.mail.subject%>", - "emailTo" : "<%=in.candidateInformation.email%>" + "subject" : "<%=in.mail.subject%>", + "to" : "<%=in.candidateInformation.email%>" }, - "message" : "<%=in.mail.content%>" + "message" : { + "body" : "<%=in.mail.content%>" + } }, "visual" : { "at" : { "x" : 456, "y" : 392 } }, - "connect" : { "id" : "f16", "to" : "f14" } + "connect" : [ + { "id" : "f16", "to" : "f14" } + ] }, { "id" : "f14", "type" : "HtmlDialogExit", @@ -141,12 +154,17 @@ "id" : "f18", "type" : "Alternative", "name" : "canSend?", + "config" : { + "conditions" : { + "f19" : "com.openai.connector.demo.utils.MailUtils.isCanSendMail(in.mail, in.candidateInformation)" + } + }, "visual" : { "at" : { "x" : 264, "y" : 392 }, "labelOffset" : { "x" : 14, "y" : 34 } }, "connect" : [ - { "id" : "f19", "to" : "f17", "condition" : "com.openai.connector.demo.utils.MailUtils.isCanSendMail(in.mail, in.candidateInformation)" }, + { "id" : "f19", "to" : "f17" }, { "id" : "f20", "to" : "f14", "via" : [ { "x" : 264, "y" : 512 }, { "x" : 680, "y" : 512 } ] } ] } ] diff --git a/openai-connector-demo/webContent/layouts/frame-10-full-width.xhtml b/openai-connector-demo/webContent/layouts/frame-10-full-width.xhtml index 768d89e..e92e01a 100644 --- a/openai-connector-demo/webContent/layouts/frame-10-full-width.xhtml +++ b/openai-connector-demo/webContent/layouts/frame-10-full-width.xhtml @@ -32,7 +32,7 @@ and refence it below in the head part. - + - openai-connector - openai-connector-modules - 10.0.17-SNAPSHOT - pom + + 4.0.0 + com.axonivy.connector.openai + openai-connector + openai-connector-modules + 12.0.0-SNAPSHOT + pom - - openai-assistant - openai-assistant-product - ${project.name} - ${project.name}-demo - ${project.name}-test - ${project.name}-product - + + openai-assistant + openai-assistant-product + ${project.name} + ${project.name}-demo + ${project.name}-test + ${project.name}-product + - - scm:git:https://github.com/axonivy-market/${project.name}.git - HEAD - + + + scm:git:https://github.com/axonivy-market/${project.name}.git + HEAD + - - 3.0.4 - 2.0.1 - org.eclipse.tycho:tycho-versions-plugin:${tycho.version}:update-eclipse-metadata org.apache.maven.plugins:maven-scm-plugin:${maven.scm.plugin}:add org.apache.maven.plugins:maven-scm-plugin:${maven.scm.plugin}:checkin - + + 3.0.4 + 2.0.1 + + org.eclipse.tycho:tycho-versions-plugin:${tycho.version}:update-eclipse-metadata + org.apache.maven.plugins:maven-scm-plugin:${maven.scm.plugin}:add + org.apache.maven.plugins:maven-scm-plugin:${maven.scm.plugin}:checkin + UTF-8 + - - - - - maven-deploy-plugin - 3.0.0-M1 - - true - - - - org.apache.maven.plugins - maven-release-plugin - 3.0.0-M4 - - v@{project.version} - ${release.goals} - ${release.goals} - - - - org.apache.maven.plugins - maven-scm-plugin - ${maven.scm.plugin} - - - default-cli - - add - checkin - - - **/META-INF/MANIFEST.MF,pom.xml - **/target/** - Changing the version to reflect the pom versions for the release - - - - - - - + + + + + maven-deploy-plugin + 3.0.0-M1 + + true + + + + org.apache.maven.plugins + maven-release-plugin + 3.0.0-M4 + + v@{project.version} + ${release.goals} + ${release.goals} + + + + org.apache.maven.plugins + maven-scm-plugin + ${maven.scm.plugin} + + + default-cli + + add + checkin + + + **/META-INF/MANIFEST.MF,pom.xml + **/target/** + Changing the version to reflect the pom + versions for the release + + + + + + +