add all support req generation params (#3)

Author: dzlab

src/main/java/com/github/llmjava/cohere4j/CohereConfig.java

@@ -5,6 +5,7 @@
 import org.apache.commons.configuration2.ex.ConfigurationException;
 
 import java.time.Duration;
+import java.util.*;
 
 public class CohereConfig {
     private final Configuration config;
@@ -29,10 +30,75 @@ public Duration getTimeout() {
         Long timeout = config.getLong(CohereConfig.TIMEOUT, CohereConfig.DEFAULT_TIMEOUT_MILLIS);
         return Duration.ofMillis(timeout);
     }
+    public Integer getTopK() {
+        return config.getInteger("topK", 0);
+    }
+    public Double geTopP() {
+        return config.getDouble("topP", 0.0);
+    }
+    public Double getTemperature() {
+        return config.getDouble("temperature", 0.75);
+    }
+
+    public String getModel() {
+        return config.getString("cohere.model", "command");
+    }
+    public Integer getNumGenerations() {
+        return config.getInteger("num_generations", 1);
+    }
+    public Boolean isStream() {
+        return config.getBoolean("stream", false);
+    }
+    public Integer getMaxTokens() {
+        return config.getInteger("max_tokens", 1024);
+    }
+    public String getTruncate() {
+        return config.getString("truncate", "END");
+    }
+    public String getPreset() {
+        return config.getString("preset");
+    }
+    public List<String> getEndSequences() {
+        List<String> result = new ArrayList<>();
+        String sequences = config.getString("end_sequences");
+        if(sequences!=null) {
+            for(String seq: sequences.split(",")) result.add(seq);
+        }
+        return result;
+    }
+    public List<String> getStopSequences() {
+        List<String> result = new ArrayList<>();
+        String sequences = config.getString("stop_sequences");
+        if(sequences!=null) {
+            for(String seq: sequences.split(",")) result.add(seq);
+        }
+        return result;
+    }
+    public Double getFrequencyPenalty() {
+        return config.getDouble("frequency_penalty", 0.0);
+    }
+    public Double getPresencePenalty() {
+        return config.getDouble("presence_penalty", 0.0);
+    }
+    public String getReturnLikelihoods() {
+        return config.getString("return_likelihoods");
+    }
+    public Map<String, Double> getLogitBias() {
+        Map<String, Double> result = new HashMap<>();
+        String sequences = config.getString("logit_bias");
+        if(sequences!=null) {
+            for(String pair: sequences.split(",")) {
+                String[] kv = pair.split(":");
+                if(kv.length==2) {
+                    result.put(kv[0], Double.valueOf(kv[1]));
+                }
+            }
+        }
+        return result;
+    }
 
     public static CohereConfig fromProperties(String path) throws ConfigurationException {
         Configuration baseConfig = new Configurations().properties(path);
         return new CohereConfig(baseConfig);
     }
-
 }

src/main/java/com/github/llmjava/cohere4j/request/GenerationRequest.java

@@ -1,5 +1,7 @@
 package com.github.llmjava.cohere4j.request;
 
+import com.github.llmjava.cohere4j.CohereConfig;
+
 import java.util.List;
 import java.util.Map;
 
@@ -18,6 +20,11 @@ public class GenerationRequest {
      */
     private String model;
 
+    /**
+     * The maximum number of generations that will be returned. Defaults to 1, min value of 1, max value of 5.
+     */
+    private Integer num_generations;
+
     /**
      * When true, the response will be a JSON stream of events. Streaming is beneficial for user interfaces that render the contents of the response piece by piece, as it gets generated.
      *
@@ -116,12 +123,22 @@ public class GenerationRequest {
     private Map<String, Double> logit_bias;
 
     GenerationRequest(Builder builder) {
-        this.prompt = builder.prompt;
-        this.model = builder.model;
-        this.stream = builder.stream;
-        this.max_tokens = builder.max_tokens;
-        this.truncate = builder.truncate;
-        this.return_likelihoods = builder.return_likelihoods;
+        prompt = builder.prompt;
+        model = builder.model;
+        num_generations = builder.num_generations;
+        stream = builder.stream;
+        max_tokens = builder.max_tokens;
+        truncate = builder.truncate;
+        temperature = builder.temperature;
+        preset = builder.preset;
+        end_sequences = builder.end_sequences;
+        stop_sequences = builder.stop_sequences;
+        k = builder.k;
+        p = builder.p;
+        frequency_penalty = builder.frequency_penalty;
+        presence_penalty = builder.presence_penalty;
+        return_likelihoods = builder.return_likelihoods;
+        logit_bias = builder.logit_bias;
     }
 
     public Boolean isStreaming() {
@@ -131,10 +148,20 @@ public Boolean isStreaming() {
     public static class Builder {
         private String prompt;
         private String model;
+        private Integer num_generations;
         private Boolean stream;
         private Integer max_tokens;
         private String truncate;
+        private Double temperature;
+        private String preset;
+        private List<String> end_sequences;
+        private List<String> stop_sequences;
+        private Integer k;
+        private Double p;
+        private Double frequency_penalty;
+        private Double presence_penalty;
         private String return_likelihoods;
+        private Map<String, Double> logit_bias;
 
         public Builder withPrompt(String prompt) {
             this.prompt = prompt;
@@ -166,6 +193,25 @@ public Builder withLikelihoods(String likelihoods) {
             return this;
         }
 
+        public Builder withConfig(CohereConfig config) {
+            model = config.getModel();
+            num_generations = config.getNumGenerations();
+            stream = config.isStream();
+            max_tokens = config.getMaxTokens();
+            truncate = config.getTruncate();
+            temperature = config.getTemperature();
+            preset = config.getPreset();
+            end_sequences = config.getEndSequences();
+            stop_sequences = config.getStopSequences();
+            k = config.getTopK();
+            p = config.geTopP();
+            frequency_penalty = config.getFrequencyPenalty();
+            presence_penalty = config.getPresencePenalty();
+            return_likelihoods = config.getReturnLikelihoods();
+            logit_bias = config.getLogitBias();
+            return this;
+        }
+
         public GenerationRequest build() {
             return new GenerationRequest(this);
         }

src/test/java/com/github/llmjava/cohere4j/GenerationExample.java

@@ -16,7 +16,7 @@ public static void main(String[] args) throws ConfigurationException {
         String text = "tell a joke";
         GenerationRequest request1 = new GenerationRequest.Builder()
                 .withPrompt(text)
-                .withMaxTokens(1024)
+                .withConfig(config)
                 .build();
 
         System.out.println("--- Sync example");
@@ -37,8 +37,8 @@ public void onFailure(Throwable throwable) {
 
         GenerationRequest request2 = new GenerationRequest.Builder()
                 .withPrompt(text)
+                .withConfig(config)
                 .withStream(true)
-                .withMaxTokens(1024)
                 .build();
         client.generateStream(request2, new StreamingCallback<StreamingGenerationResponse>() {
             @Override

src/test/resources/cohere.properties

@@ -2,4 +2,26 @@
 cohere.apiKey=${env:COHERE_API_KEY}
 
 # timeout in milliseconds
-timeout=10000
+timeout=10000
+
+topK=0
+topP=0.0
+temperature=0.75
+
+cohere.model=command
+num_generations=1
+stream=false
+max_tokens=1024
+truncate=END
+#preset=
+
+# comma separated
+#end_sequences=
+#stop_sequences;
+
+frequency_penalty=0.0
+presence_penalty=0.0
+return_likelihoods=NONE
+
+# comma separated key:value sequence
+#logit_bias=