Merge branch 'master' into Add-label-option

seqeralabs · May 15, 2024 · 77bb073 · 77bb073
2 parents 5935aaa + f7823d7
commit 77bb073
Show file tree

Hide file tree

Showing 26 changed files with 938 additions and 417 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -62,7 +62,7 @@ jobs:
         if: ${{ matrix.fatjar }}
         uses: actions/upload-artifact@v4
         with:
-          name: wave_jar
+          name: wave-jar
           path: ./app/build/libs/wave.jar
 
       - name: Build static native
@@ -128,7 +128,7 @@ jobs:
           fetch-depth: 0
 
       - name: Download all build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
 
       - name: Setup Java for JReleaser
         uses: actions/setup-java@v4

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.0
+1.3.1
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,24 +21,25 @@ repositories {
 }
 
 dependencies {
-    implementation 'io.seqera:wave-api:0.7.1'
-    implementation 'io.seqera:wave-utils:0.9.0'
+    implementation 'io.seqera:wave-api:0.9.1'
+    implementation 'io.seqera:wave-utils:0.12.0'
     implementation 'info.picocli:picocli:4.6.1'
     implementation 'com.squareup.moshi:moshi:1.15.0'
     implementation 'com.squareup.moshi:moshi-adapters:1.14.0'
     implementation 'dev.failsafe:failsafe:3.1.0'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'org.yaml:snakeyaml:2.1'
+    implementation 'dev.langchain4j:langchain4j-open-ai:0.29.0'
     annotationProcessor 'info.picocli:picocli-codegen:4.6.1'
 
-    testImplementation "org.codehaus.groovy:groovy:3.0.15"
-    testImplementation "org.codehaus.groovy:groovy-nio:3.0.15"
-    testImplementation ("org.codehaus.groovy:groovy-test:3.0.17")
+    testImplementation "org.codehaus.groovy:groovy:3.0.21"
+    testImplementation "org.codehaus.groovy:groovy-nio:3.0.21"
+    testImplementation ("org.codehaus.groovy:groovy-test:3.0.21")
+    testImplementation ("org.codehaus.groovy:groovy-json:3.0.21")
     testImplementation ("cglib:cglib-nodep:3.3.0")
     testImplementation ("org.objenesis:objenesis:3.2")
     testImplementation ("org.spockframework:spock-core:2.3-groovy-3.0") { exclude group: 'org.codehaus.groovy'; exclude group: 'net.bytebuddy' }
     testImplementation ('org.spockframework:spock-junit4:2.3-groovy-3.0') { exclude group: 'org.codehaus.groovy'; exclude group: 'net.bytebuddy' }
-    testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
 }
 
 test {
@@ -76,7 +77,7 @@ graalvmNative {
             configurationFileDirectories.from(file('conf'))
 
             if (System.env.getOrDefault("PLATFORM", "") == "linux-x86_64") {
-                buildArgs(['--static', '--libc=musl'])
+                buildArgs(['--static', '--libc=musl', '--gc=G1'])
             }
 
             javaLauncher = javaToolchains.launcherFor {

diff --git a/app/conf/proxy-config.json b/app/conf/proxy-config.json
@@ -1,2 +1,5 @@
 [
+  {
+    "interfaces":["dev.ai4j.openai4j.OpenAiApi"]
+  }
 ]
diff --git a/app/conf/reflect-config.json b/app/conf/reflect-config.json
@@ -140,6 +140,71 @@
   "name":"com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"dev.ai4j.openai4j.chat.AssistantMessage",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.ChatCompletionChoice",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.ChatCompletionRequest",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.ChatCompletionResponse",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.Delta",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.Function",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.FunctionCall",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.Parameters",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.ResponseFormat",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.Tool",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.ToolCall",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.chat.ToolChoice",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"dev.ai4j.openai4j.shared.Usage",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"groovy.lang.Closure"
 },
@@ -148,6 +213,16 @@
   "allDeclaredFields":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"io.seqera.wave.api.BuildStatusResponse",
+  "allDeclaredFields":true,
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.wave.api.BuildStatusResponse$Status",
+  "fields":[{"name":"COMPLETED"}, {"name":"PENDING"}]
+},
 {
   "name":"io.seqera.wave.api.ContainerConfig",
   "allDeclaredFields":true,
@@ -175,6 +250,15 @@
   "allDeclaredFields":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"io.seqera.wave.api.PackagesSpec",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.wave.api.PackagesSpec$Type",
+  "fields":[{"name":"CONDA"}, {"name":"SPACK"}]
+},
 {
   "name":"io.seqera.wave.api.ServiceInfo",
   "allDeclaredFields":true,
@@ -196,6 +280,12 @@
   "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"io.seqera.wave.api.SubmitContainerTokenResponseBeanInfo"
+},
+{
+  "name":"io.seqera.wave.api.SubmitContainerTokenResponseCustomizer"
+},
 {
   "name":"io.seqera.wave.cli.App",
   "allDeclaredFields":true,
@@ -208,18 +298,40 @@
 {
   "name":"io.seqera.wave.cli.json.DateTimeAdapter",
   "queryAllDeclaredMethods":true,
-  "methods":[{"name":"deserializeInstant","parameterTypes":["java.lang.String"] }, {"name":"serializeInstant","parameterTypes":["java.time.Instant"] }]
+  "methods":[{"name":"deserializeDuration","parameterTypes":["java.lang.String"] }, {"name":"deserializeInstant","parameterTypes":["java.lang.String"] }, {"name":"serializeInstant","parameterTypes":["java.time.Instant"] }]
 },
 {
   "name":"io.seqera.wave.cli.json.PathAdapter",
   "queryAllDeclaredMethods":true
 },
+{
+  "name":"io.seqera.wave.cli.model.ContainerInspectResponseEx",
+  "allDeclaredFields":true
+},
+{
+  "name":"io.seqera.wave.cli.model.ContainerSpecEx",
+  "allDeclaredFields":true
+},
+{
+  "name":"io.seqera.wave.cli.model.LayerRef",
+  "allDeclaredFields":true
+},
 {
   "name":"io.seqera.wave.cli.util.CliVersionProvider",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"io.seqera.wave.config.CondaOpts",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"io.seqera.wave.config.SpackOpts",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"io.seqera.wave.core.spec.ConfigSpec",
   "allDeclaredFields":true,
@@ -263,6 +375,10 @@
 {
   "name":"java.io.FilePermission"
 },
+{
+  "name":"java.lang.Class",
+  "methods":[{"name":"getRecordComponents","parameterTypes":[] }, {"name":"isRecord","parameterTypes":[] }]
+},
 {
   "name":"java.lang.Object",
   "allDeclaredFields":true,
@@ -289,6 +405,14 @@
   "name":"java.lang.Thread",
   "fields":[{"name":"threadLocalRandomProbe"}]
 },
+{
+  "name":"java.lang.invoke.MethodHandles$Lookup",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Class","int"] }]
+},
+{
+  "name":"java.lang.reflect.RecordComponent",
+  "methods":[{"name":"getName","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
+},
 {
   "name":"java.net.NetPermission"
 },
@@ -416,6 +540,10 @@
 {
   "name":"java.util.Date"
 },
+{
+  "name":"java.util.ImmutableCollections$MapN",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"java.util.PropertyPermission"
 },
@@ -554,6 +682,10 @@
   "name":"sun.security.ssl.SSLContextImpl$DefaultSSLContext",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"sun.security.ssl.SSLContextImpl$TLSContext",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"sun.security.ssl.TrustManagerFactoryImpl$PKIXFactory",
   "methods":[{"name":"<init>","parameterTypes":[] }]

diff --git a/app/conf/resource-config.json b/app/conf/resource-config.json
@@ -4,6 +4,10 @@
     "pattern":"\\QMETA-INF/build-info.properties\\E"
   }, {
     "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/dev.ai4j.openai4j.spi.OpenAiClientBuilderFactory\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/dev.langchain4j.model.openai.spi.OpenAiChatModelBuilderFactory\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
   }, {
@@ -18,6 +22,8 @@
     "pattern":"\\QMETA-INF/services/javax.xml.parsers.SAXParserFactory\\E"
   }, {
     "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E"
+  }, {
+    "pattern":"\\Qcom/knuddels/jtokkit/cl100k_base.tiktoken\\E"
   }, {
     "pattern":"\\Qio/seqera/wave/cli/usage-examples.txt\\E"
   }, {