feat: implement chat completion n param to all models

Author: astappiev

interweb-core/src/main/java/de/l3s/interweb/core/chat/Duration.java

@@ -60,6 +60,21 @@ public void setCompletionGeneration(Long completionGeneration) {
         this.completionGeneration = completionGeneration;
     }
 
+    public void add(Duration other) {
+        if (total != null && other.total != null) {
+            total += other.total;
+        }
+        if (load != null && other.load != null) {
+            load += other.load;
+        }
+        if (promptEvaluation != null && other.promptEvaluation != null) {
+            promptEvaluation += other.promptEvaluation;
+        }
+        if (completionGeneration != null && other.completionGeneration != null) {
+            completionGeneration += other.completionGeneration;
+        }
+    }
+
     public static Duration of(long ns) {
         Duration duration = new Duration();
         duration.setTotal(ns);

interweb-core/src/main/java/de/l3s/interweb/core/chat/Usage.java

@@ -45,4 +45,10 @@ public int getTotalTokens() {
     public void setTotalTokens(int totalTokens) {
         this.totalTokens = totalTokens;
     }
+
+    public void add(Usage other) {
+        this.promptTokens += other.promptTokens;
+        this.completionTokens += other.completionTokens;
+        this.totalTokens += other.totalTokens;
+    }
 }

interweb-core/src/main/java/de/l3s/interweb/core/chat/UsageCost.java

@@ -45,4 +45,11 @@ public double getChatTotal() {
     public void setChatTotal(double chatTotal) {
         this.chatTotal = chatTotal;
     }
+
+    public void add(UsageCost other) {
+        this.prompt += other.prompt;
+        this.completion += other.completion;
+        this.total += other.total;
+        this.chatTotal += other.chatTotal;
+    }
 }

interweb-server/src/main/java/de/l3s/interweb/server/features/openai/OpenaiV1Resource.java

@@ -57,7 +57,21 @@ public Uni<CompletionsResults> chatCompletions(@Valid CompletionsQuery query) {
 
         return chatService.completions(query, apikey).chain(results -> {
             results.setChatId(null); // reset chatId if it was set
+            return populateMoreChoices(apikey, query, results);
+        });
+    }
+
+    public Uni<CompletionsResults> populateMoreChoices(ApiKey apikey, CompletionsQuery query, CompletionsResults results) {
+        if (query.getN() == null || query.getN() <= 1 || results.getChoices().size() >= query.getN()) {
             return Uni.createFrom().item(results);
+        }
+
+        return chatService.completions(query, apikey).chain(newResults -> {
+            results.getChoices().addAll(newResults.getChoices());
+            results.getCost().add(newResults.getCost());
+            results.getUsage().add(newResults.getUsage());
+            results.getDuration().add(newResults.getDuration());
+            return populateMoreChoices(apikey, query, results);
         });
     }
 

pom.xml

@@ -19,14 +19,14 @@
 
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.16.4</quarkus.platform.version>
+        <quarkus.platform.version>3.17.3</quarkus.platform.version>
 
         <surefire-plugin.version>3.5.2</surefire-plugin.version>
         <enforcer-plugin.version>3.5.0</enforcer-plugin.version>
         <dependency-plugin.version>3.8.1</dependency-plugin.version>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>
         <source-plugin.version>3.3.1</source-plugin.version>
-        <javadoc-plugin.version>3.11.1</javadoc-plugin.version>
+        <javadoc-plugin.version>3.11.2</javadoc-plugin.version>
         <gpg-plugin.version>3.2.7</gpg-plugin.version>
         <sonatype-plugin.version>0.6.0</sonatype-plugin.version>
         <resources-plugin.version>3.3.1</resources-plugin.version>