Added the possibility to configure the path together with the base-url

Signed-off-by: “claudio-code” <[email protected]>

Author: Claudio-code

auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/main/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicChatAutoConfiguration.java

@@ -67,8 +67,9 @@ public AnthropicApi anthropicApi(AnthropicConnectionProperties connectionPropert
 			ObjectProvider<RestClient.Builder> restClientBuilderProvider,
 			ObjectProvider<WebClient.Builder> webClientBuilderProvider, ResponseErrorHandler responseErrorHandler) {
 
-		return new AnthropicApi(connectionProperties.getBaseUrl(), connectionProperties.getApiKey(),
-				connectionProperties.getVersion(), restClientBuilderProvider.getIfAvailable(RestClient::builder),
+		return new AnthropicApi(connectionProperties.getBaseUrl(), connectionProperties.getCompletionsPath(),
+				connectionProperties.getApiKey(), connectionProperties.getVersion(),
+				restClientBuilderProvider.getIfAvailable(RestClient::builder),
 				webClientBuilderProvider.getIfAvailable(WebClient::builder), responseErrorHandler,
 				connectionProperties.getBetaVersion());
 	}

auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/main/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicConnectionProperties.java

@@ -40,6 +40,11 @@ public class AnthropicConnectionProperties {
 	 */
 	private String baseUrl = AnthropicApi.DEFAULT_BASE_URL;
 
+	/**
+	 * Path to append to the base URL
+	 */
+	private String completionsPath = AnthropicApi.DEFAULT_MESSAGE_COMPLETIONS_PATH;
+
 	/**
 	 * Anthropic API version.
 	 */
@@ -67,6 +72,14 @@ public void setBaseUrl(String baseUrl) {
 		this.baseUrl = baseUrl;
 	}
 
+	public String getCompletionsPath() {
+		return this.completionsPath;
+	}
+
+	public void setCompletionsPath(String completionsPath) {
+		this.completionsPath = completionsPath;
+	}
+
 	public String getVersion() {
 		return this.version;
 	}

auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicPropertiesTests.java

@@ -37,6 +37,7 @@ public void connectionProperties() {
 		new ApplicationContextRunner().withPropertyValues(
 		// @formatter:off
 					"spring.ai.anthropic.base-url=TEST_BASE_URL",
+					"spring.ai.anthropic.completions-path=message-path",
 					"spring.ai.anthropic.api-key=abc123",
 					"spring.ai.anthropic.version=6666",
 					"spring.ai.anthropic.beta-version=7777",
@@ -53,6 +54,7 @@ public void connectionProperties() {
 				assertThat(connectionProperties.getBaseUrl()).isEqualTo("TEST_BASE_URL");
 				assertThat(connectionProperties.getVersion()).isEqualTo("6666");
 				assertThat(connectionProperties.getBetaVersion()).isEqualTo("7777");
+				assertThat(connectionProperties.getCompletionsPath()).isEqualTo("message-path");
 
 				assertThat(chatProperties.getOptions().getModel()).isEqualTo("MODEL_XYZ");
 				assertThat(chatProperties.getOptions().getTemperature()).isEqualTo(0.55);

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java

@@ -58,6 +58,7 @@
  * @author Jihoon Kim
  * @author Alexandros Pappas
  * @author Jonghoon Park
+ * @author Claudio Silva Junior
  * @since 1.0.0
  */
 public class AnthropicApi {
@@ -70,6 +71,8 @@ public static Builder builder() {
 
 	public static final String DEFAULT_BASE_URL = "https://api.anthropic.com";
 
+	public static final String DEFAULT_MESSAGE_COMPLETIONS_PATH = "/v1/messages";
+
 	public static final String DEFAULT_ANTHROPIC_VERSION = "2023-06-01";
 
 	public static final String DEFAULT_ANTHROPIC_BETA_VERSION = "tools-2024-04-04,pdfs-2024-09-25";
@@ -84,6 +87,8 @@ public static Builder builder() {
 
 	private static final Predicate<String> SSE_DONE_PREDICATE = "[DONE]"::equals;
 
+	private final String completionsPath;
+
 	private final RestClient restClient;
 
 	private final StreamHelper streamHelper = new StreamHelper();
@@ -122,21 +127,22 @@ public AnthropicApi(String baseUrl, String anthropicApiKey) {
 	public AnthropicApi(String baseUrl, String anthropicApiKey, String anthropicVersion,
 			RestClient.Builder restClientBuilder, WebClient.Builder webClientBuilder,
 			ResponseErrorHandler responseErrorHandler) {
-		this(baseUrl, anthropicApiKey, anthropicVersion, restClientBuilder, webClientBuilder, responseErrorHandler,
-				DEFAULT_ANTHROPIC_BETA_VERSION);
+		this(baseUrl, DEFAULT_MESSAGE_COMPLETIONS_PATH, anthropicApiKey, anthropicVersion, restClientBuilder,
+				webClientBuilder, responseErrorHandler, DEFAULT_ANTHROPIC_BETA_VERSION);
 	}
 
 	/**
 	 * Create a new client api.
 	 * @param baseUrl api base URL.
+	 * @param completionsPath path to append to the base URL.
 	 * @param anthropicApiKey Anthropic api Key.
 	 * @param anthropicVersion Anthropic version.
 	 * @param restClientBuilder RestClient builder.
 	 * @param webClientBuilder WebClient builder.
 	 * @param responseErrorHandler Response error handler.
 	 * @param anthropicBetaFeatures Anthropic beta features.
 	 */
-	public AnthropicApi(String baseUrl, String anthropicApiKey, String anthropicVersion,
+	public AnthropicApi(String baseUrl, String completionsPath, String anthropicApiKey, String anthropicVersion,
 			RestClient.Builder restClientBuilder, WebClient.Builder webClientBuilder,
 			ResponseErrorHandler responseErrorHandler, String anthropicBetaFeatures) {
 
@@ -147,6 +153,8 @@ public AnthropicApi(String baseUrl, String anthropicApiKey, String anthropicVers
 			headers.setContentType(MediaType.APPLICATION_JSON);
 		};
 
+		this.completionsPath = completionsPath;
+
 		this.restClient = restClientBuilder.baseUrl(baseUrl)
 			.defaultHeaders(jsonContentHeaders)
 			.defaultStatusHandler(responseErrorHandler)
@@ -186,7 +194,7 @@ public ResponseEntity<ChatCompletionResponse> chatCompletionEntity(ChatCompletio
 		Assert.notNull(additionalHttpHeader, "The additional HTTP headers can not be null.");
 
 		return this.restClient.post()
-			.uri("/v1/messages")
+			.uri(this.completionsPath)
 			.headers(headers -> headers.addAll(additionalHttpHeader))
 			.body(chatRequest)
 			.retrieve()
@@ -222,7 +230,7 @@ public Flux<ChatCompletionResponse> chatCompletionStream(ChatCompletionRequest c
 		AtomicReference<ChatCompletionResponseBuilder> chatCompletionReference = new AtomicReference<>();
 
 		return this.webClient.post()
-			.uri("/v1/messages")
+			.uri(this.completionsPath)
 			.headers(headers -> headers.addAll(additionalHttpHeader))
 			.body(Mono.just(chatRequest), ChatCompletionRequest.class)
 			.retrieve()
@@ -1335,6 +1343,8 @@ public static class Builder {
 
 		private String baseUrl = DEFAULT_BASE_URL;
 
+		private String completionsPath = DEFAULT_MESSAGE_COMPLETIONS_PATH;
+
 		private String apiKey;
 
 		private String anthropicVersion = DEFAULT_ANTHROPIC_VERSION;
@@ -1353,6 +1363,12 @@ public Builder baseUrl(String baseUrl) {
 			return this;
 		}
 
+		public Builder completionsPath(String completionsPath) {
+			Assert.hasText(completionsPath, "completionsPath cannot be null or empty");
+			this.completionsPath = completionsPath;
+			return this;
+		}
+
 		public Builder apiKey(String apiKey) {
 			Assert.notNull(apiKey, "apiKey cannot be null");
 			this.apiKey = apiKey;
@@ -1391,8 +1407,9 @@ public Builder anthropicBetaFeatures(String anthropicBetaFeatures) {
 
 		public AnthropicApi build() {
 			Assert.notNull(this.apiKey, "apiKey must be set");
-			return new AnthropicApi(this.baseUrl, this.apiKey, this.anthropicVersion, this.restClientBuilder,
-					this.webClientBuilder, this.responseErrorHandler, this.anthropicBetaFeatures);
+			return new AnthropicApi(this.baseUrl, this.completionsPath, this.apiKey, this.anthropicVersion,
+					this.restClientBuilder, this.webClientBuilder, this.responseErrorHandler,
+					this.anthropicBetaFeatures);
 		}
 
 	}