diff --git a/models/spring-ai-huggingface/pom.xml b/models/spring-ai-huggingface/pom.xml index 9a1d487db..1013ecdd6 100644 --- a/models/spring-ai-huggingface/pom.xml +++ b/models/spring-ai-huggingface/pom.xml @@ -90,7 +90,7 @@ io.swagger.codegen.v3 swagger-codegen-maven-plugin - 3.0.46 + 3.0.64 @@ -100,6 +100,7 @@ ${project.basedir}/src/main/resources/openapi.json java resttemplate + src/main/resources/handlebars/Java org.springframework.ai.huggingface.api org.springframework.ai.huggingface.model org.springframework.ai.huggingface.invoker diff --git a/models/spring-ai-huggingface/src/main/resources/handlebars/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache b/models/spring-ai-huggingface/src/main/resources/handlebars/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache new file mode 100644 index 000000000..966de3cc2 --- /dev/null +++ b/models/spring-ai-huggingface/src/main/resources/handlebars/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache @@ -0,0 +1,38 @@ +package {{invokerPackage}}.auth; + +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +{{>generatedAnnotation}} +public class HttpBasicAuth implements Authentication { + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams) { + if (username == null && password == null) { + return; + } + String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); + headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + java.util.Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8))); + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index fc760168a..ce7cbbc5f 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ 17 - 3.3.4 + 3.3.6 4.3.4 1.0.0-beta.12 1.1.0 @@ -233,6 +233,7 @@ 2.0.1 + 4.12.0 0.0.4 diff --git a/spring-ai-test/pom.xml b/spring-ai-test/pom.xml index 3397a92ae..ff1650db5 100644 --- a/spring-ai-test/pom.xml +++ b/spring-ai-test/pom.xml @@ -70,6 +70,7 @@ com.squareup.okhttp3 mockwebserver + ${okhttp3.version} diff --git a/vector-stores/spring-ai-opensearch-store/pom.xml b/vector-stores/spring-ai-opensearch-store/pom.xml index 7d497b4e2..f41aa7fe2 100644 --- a/vector-stores/spring-ai-opensearch-store/pom.xml +++ b/vector-stores/spring-ai-opensearch-store/pom.xml @@ -71,7 +71,7 @@ org.springframework.ai spring-ai-ollama - ${parent.version} + ${project.parent.version} test