Merge pull request #122 from IBM/project-space-override-order

Fix projectId and spaceId override order in service parameters

Author: andreadimaio

modules/watsonx-ai/src/main/java/com/ibm/watsonx/ai/WatsonxService.java

@@ -195,6 +195,9 @@ protected ProjectService(Builder<?> builder) {
         }
 
         protected ProjectSpace resolveProjectSpace(WatsonxParameters parameters) {
+            if (isNull(parameters))
+                return new ProjectSpace(projectId, spaceId);
+
             return nonNull(parameters.getProjectId()) || nonNull(parameters.getSpaceId())
                 ? new ProjectSpace(parameters.getProjectId(), parameters.getSpaceId())
                 : new ProjectSpace(projectId, spaceId);

modules/watsonx-ai/src/main/java/com/ibm/watsonx/ai/chat/ChatService.java

@@ -8,7 +8,6 @@
 import static java.util.Objects.nonNull;
 import static java.util.Objects.requireNonNull;
 import static java.util.Objects.requireNonNullElse;
-import static java.util.Optional.ofNullable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -82,9 +81,10 @@ public ChatResponse chat(ChatRequest chatRequest) {
             && (isNull(chatRequest.getThinking()) || isNull(chatRequest.getThinking().getExtractionTags())))
             throw new IllegalArgumentException("Extraction tags are required when using control messages");
 
+        var projectSpace = resolveProjectSpace(parameters);
+        var projectId = projectSpace.projectId();
+        var spaceId = projectSpace.spaceId();
         var modelId = requireNonNullElse(parameters.getModelId(), this.modelId);
-        var projectId = ofNullable(parameters.getProjectId()).orElse(this.projectId);
-        var spaceId = ofNullable(parameters.getSpaceId()).orElse(this.spaceId);
         var timeout = requireNonNullElse(parameters.getTimeLimit(), this.timeout.toMillis());
 
         Boolean includeReasoning = null;
@@ -143,9 +143,10 @@ public CompletableFuture<Void> chatStreaming(ChatRequest chatRequest, ChatHandle
             && (isNull(chatRequest.getThinking()) || isNull(chatRequest.getThinking().getExtractionTags())))
             throw new IllegalArgumentException("Extraction tags are required when using control messages");
 
+        var projectSpace = resolveProjectSpace(parameters);
+        var projectId = projectSpace.projectId();
+        var spaceId = projectSpace.spaceId();
         var modelId = requireNonNullElse(parameters.getModelId(), this.modelId);
-        var projectId = ofNullable(parameters.getProjectId()).orElse(this.projectId);
-        var spaceId = ofNullable(parameters.getSpaceId()).orElse(this.spaceId);
         var timeout = requireNonNullElse(parameters.getTimeLimit(), this.timeout.toMillis());
 
         Boolean includeReasoning = null;

modules/watsonx-ai/src/main/java/com/ibm/watsonx/ai/embedding/EmbeddingService.java

@@ -7,7 +7,6 @@
 import static java.util.Objects.nonNull;
 import static java.util.Objects.requireNonNull;
 import static java.util.Objects.requireNonNullElse;
-import static java.util.Optional.ofNullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -87,16 +86,15 @@ public EmbeddingResponse embedding(List<String> inputs, EmbeddingParameters para
 
         requireNonNull(inputs, "Inputs cannot be null");
 
+        ProjectSpace projectSpace = resolveProjectSpace(parameters);
+        String projectId = projectSpace.projectId();
+        String spaceId = projectSpace.spaceId();
         String modelId = this.modelId;
-        String projectId = this.projectId;
-        String spaceId = this.spaceId;
         String transactionId = null;
         Parameters requestParameters = null;
 
         if (nonNull(parameters)) {
             modelId = requireNonNullElse(parameters.getModelId(), this.modelId);
-            projectId = ofNullable(parameters.getProjectId()).orElse(this.projectId);
-            spaceId = ofNullable(parameters.getSpaceId()).orElse(this.spaceId);
             transactionId = parameters.getTransactionId();
             requestParameters = parameters.toEmbeddingRequestParameters();
         }

modules/watsonx-ai/src/main/java/com/ibm/watsonx/ai/rerank/RerankService.java

@@ -7,7 +7,6 @@
 import static java.util.Objects.nonNull;
 import static java.util.Objects.requireNonNull;
 import static java.util.Objects.requireNonNullElse;
-import static java.util.Optional.ofNullable;
 import java.util.List;
 import com.ibm.watsonx.ai.WatsonxService.ModelService;
 import com.ibm.watsonx.ai.core.auth.AuthenticationProvider;
@@ -82,16 +81,15 @@ public RerankResponse rerank(String query, List<String> inputs, RerankParameters
         requireNonNull(query, "Query cannot be null");
         requireNonNull(inputs, "Inputs cannot be null");
 
+        ProjectSpace projectSpace = resolveProjectSpace(parameters);
+        String projectId = projectSpace.projectId();
+        String spaceId = projectSpace.spaceId();
         String modelId = this.modelId;
-        String projectId = this.projectId;
-        String spaceId = this.spaceId;
         String transactionId = null;
         Parameters requestParameters = null;
 
         if (nonNull(parameters)) {
             modelId = requireNonNullElse(parameters.getModelId(), this.modelId);
-            projectId = ofNullable(parameters.getProjectId()).orElse(this.projectId);
-            spaceId = ofNullable(parameters.getSpaceId()).orElse(this.spaceId);
             transactionId = parameters.getTransactionId();
             requestParameters = parameters.toRerankRequestParameters();
         }

modules/watsonx-ai/src/main/java/com/ibm/watsonx/ai/textgeneration/TextGenerationService.java

@@ -69,9 +69,10 @@ public TextGenerationResponse generate(TextGenerationRequest textGenerationReque
             logger.warn("Prompt variables are not supported in Text Generation service");
         }
 
+        var projectSpace = resolveProjectSpace(parameters);
+        var projectId = projectSpace.projectId();
+        var spaceId = projectSpace.spaceId();
         var modelId = requireNonNullElse(parameters.getModelId(), this.modelId);
-        var projectId = ofNullable(parameters.getProjectId()).orElse(this.projectId);
-        var spaceId = ofNullable(parameters.getSpaceId()).orElse(this.spaceId);
         var timeout = requireNonNullElse(parameters.getTimeLimit(), this.timeout.toMillis());
         parameters.setTimeLimit(timeout);
 

modules/watsonx-ai/src/main/java/com/ibm/watsonx/ai/timeseries/TimeSeriesService.java

@@ -7,7 +7,6 @@
 import static java.util.Objects.nonNull;
 import static java.util.Objects.requireNonNull;
 import static java.util.Objects.requireNonNullElse;
-import static java.util.Optional.ofNullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.ibm.watsonx.ai.WatsonxService.ModelService;
@@ -79,16 +78,15 @@ public ForecastResponse forecast(TimeSeriesRequest request) {
         var data = request.getData();
         var parameters = request.getParameters();
 
+        ProjectSpace projectSpace = resolveProjectSpace(parameters);
+        String projectId = projectSpace.projectId();
+        String spaceId = projectSpace.spaceId();
         String modelId = this.modelId;
-        String projectId = this.projectId;
-        String spaceId = this.spaceId;
         String transactionId = null;
         Parameters requestParameters = null;
 
         if (nonNull(parameters)) {
             modelId = requireNonNullElse(parameters.getModelId(), this.modelId);
-            projectId = ofNullable(parameters.getProjectId()).orElse(this.projectId);
-            spaceId = ofNullable(parameters.getSpaceId()).orElse(this.spaceId);
             transactionId = parameters.getTransactionId();
             requestParameters = parameters.toParameters();
         }

modules/watsonx-ai/src/main/java/com/ibm/watsonx/ai/tokenization/TokenizationService.java

@@ -7,7 +7,6 @@
 import static java.util.Objects.nonNull;
 import static java.util.Objects.requireNonNull;
 import static java.util.Objects.requireNonNullElse;
-import static java.util.Optional.ofNullable;
 import java.util.concurrent.CompletableFuture;
 import com.ibm.watsonx.ai.WatsonxService.ModelService;
 import com.ibm.watsonx.ai.core.auth.AuthenticationProvider;
@@ -106,15 +105,14 @@ public CompletableFuture<TokenizationResponse> asyncTokenize(String input, Token
     private TokenizationRequest buildTokenizationRequest(String input, TokenizationParameters parameters) {
         requireNonNull(input, "Input cannot be null");
 
+        ProjectSpace projectSpace = resolveProjectSpace(parameters);
+        String projectId = projectSpace.projectId();
+        String spaceId = projectSpace.spaceId();
         String modelId = this.modelId;
-        String projectId = this.projectId;
-        String spaceId = this.spaceId;
         Parameters requestParameters = null;
 
         if (nonNull(parameters)) {
             modelId = requireNonNullElse(parameters.getModelId(), this.modelId);
-            projectId = ofNullable(parameters.getProjectId()).orElse(this.projectId);
-            spaceId = ofNullable(parameters.getSpaceId()).orElse(this.spaceId);
             requestParameters = parameters.toTokenizationRequestParameters();
         }
 

modules/watsonx-ai/src/test/java/com/ibm/watsonx/ai/chat/ChatServiceTest.java

@@ -285,7 +285,7 @@ void text_chat() throws Exception {
         final String REQUEST = """
             {
               "model_id": "meta-llama/llama-3-8b-instruct",
-              "project_id": "63dc4cf1-252f-424b-b52d-5cdd9814987f",
+              "space_id": "space_id",
               "messages": [
                 {
                   "role": "system",
@@ -363,6 +363,7 @@ void text_chat() throws Exception {
                 .timeLimit(Duration.ofMillis(1000))
                 .maxCompletionTokens(100)
                 .temperature(0.0)
+                .spaceId("space_id")
                 .build();
 
             var chatResponse = chatService.chat(messages, parameters);