Merge pull request #21 from Martin7-1/ollama-custom-headers

add Ollama SB starter custom headers
langchain4j · May 10, 2024 · ba95eac · ba95eac
2 parents 07d4114 + 0a5d4ec
commit ba95eac
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/...4j-ollama-spring-boot-starter/src/main/java/dev/langchain4j/ollama/spring/AutoConfig.java b/...4j-ollama-spring-boot-starter/src/main/java/dev/langchain4j/ollama/spring/AutoConfig.java
@@ -29,6 +29,7 @@ OllamaChatModel ollamaChatModel(Properties properties) {
                 .format(chatModelProperties.getFormat())
                 .timeout(chatModelProperties.getTimeout())
                 .maxRetries(chatModelProperties.getMaxRetries())
+                .customHeaders(chatModelProperties.getCustomHeaders())
                 .build();
     }
 
@@ -48,6 +49,7 @@ OllamaStreamingChatModel ollamaStreamingChatModel(Properties properties) {
                 .stop(chatModelProperties.getStop())
                 .format(chatModelProperties.getFormat())
                 .timeout(chatModelProperties.getTimeout())
+                .customHeaders(chatModelProperties.getCustomHeaders())
                 .build();
     }
 
@@ -68,6 +70,7 @@ OllamaLanguageModel ollamaLanguageModel(Properties properties) {
                 .format(languageModelProperties.getFormat())
                 .timeout(languageModelProperties.getTimeout())
                 .maxRetries(languageModelProperties.getMaxRetries())
+                .customHeaders(languageModelProperties.getCustomHeaders())
                 .build();
     }
 
@@ -87,6 +90,7 @@ OllamaStreamingLanguageModel ollamaStreamingLanguageModel(Properties properties)
                 .stop(languageModelProperties.getStop())
                 .format(languageModelProperties.getFormat())
                 .timeout(languageModelProperties.getTimeout())
+                .customHeaders(languageModelProperties.getCustomHeaders())
                 .build();
     }
 
@@ -99,6 +103,7 @@ OllamaEmbeddingModel ollamaEmbeddingModel(Properties properties) {
                 .modelName(embeddingModelProperties.getModelName())
                 .timeout(embeddingModelProperties.getTimeout())
                 .maxRetries(embeddingModelProperties.getMaxRetries())
+                .customHeaders(embeddingModelProperties.getCustomHeaders())
                 .build();
     }
 }
diff --git a/...-spring-boot-starter/src/main/java/dev/langchain4j/ollama/spring/ChatModelProperties.java b/...-spring-boot-starter/src/main/java/dev/langchain4j/ollama/spring/ChatModelProperties.java
@@ -5,6 +5,7 @@
 
 import java.time.Duration;
 import java.util.List;
+import java.util.Map;
 
 @Getter
 @Setter
@@ -22,4 +23,5 @@ class ChatModelProperties {
     String format;
     Duration timeout;
     Integer maxRetries;
+    Map<String, String> customHeaders;
 }
diff --git a/...ng-boot-starter/src/main/java/dev/langchain4j/ollama/spring/EmbeddingModelProperties.java b/...ng-boot-starter/src/main/java/dev/langchain4j/ollama/spring/EmbeddingModelProperties.java
@@ -4,6 +4,7 @@
 import lombok.Setter;
 
 import java.time.Duration;
+import java.util.Map;
 
 @Getter
 @Setter
@@ -13,4 +14,5 @@ class EmbeddingModelProperties {
     String modelName;
     Duration timeout;
     Integer maxRetries;
+    Map<String, String> customHeaders;
 }
diff --git a/...ing-boot-starter/src/main/java/dev/langchain4j/ollama/spring/LanguageModelProperties.java b/...ing-boot-starter/src/main/java/dev/langchain4j/ollama/spring/LanguageModelProperties.java
@@ -5,6 +5,7 @@
 
 import java.time.Duration;
 import java.util.List;
+import java.util.Map;
 
 @Getter
 @Setter
@@ -22,4 +23,5 @@ class LanguageModelProperties {
     String format;
     Duration timeout;
     Integer maxRetries;
+    Map<String, String> customHeaders;
 }
diff --git a/mvnw b/mvnw