common region-to-url function and localize more strings

Author: PrasangAPrajapati

src/api/providers/fetchers/ibm-watsonx.ts

@@ -147,3 +147,22 @@ export async function getWatsonxModels(
 		)
 	}
 }
+
+/**
+ * Returns the base URL for IBM Watsonx services corresponding to the given region.
+ *
+ * @param region - The region identifier (e.g., "us-south", "eu-de").
+ * @returns The base URL as a string for the specified region, or `undefined` if the region is not recognized.
+ */
+export function regionToWatsonxBaseUrl(region: string): string {
+	const regionToUrl: Record<string, string> = {
+		"us-south": "https://us-south.ml.cloud.ibm.com",
+		"eu-de": "https://eu-de.ml.cloud.ibm.com",
+		"eu-gb": "https://eu-gb.ml.cloud.ibm.com",
+		"jp-tok": "https://jp-tok.ml.cloud.ibm.com",
+		"au-syd": "https://au-syd.ml.cloud.ibm.com",
+		"ca-tor": "https://ca-tor.ml.cloud.ibm.com",
+		"ap-south-1": "https://ap-south-1.aws.wxai.ibm.com",
+	}
+	return regionToUrl[region]
+}

src/api/providers/ibm-watsonx.ts

@@ -1,4 +1,3 @@
-import * as vscode from "vscode"
 import { Anthropic } from "@anthropic-ai/sdk"
 import { ModelInfo, watsonxDefaultModelId, watsonxModels, WatsonxAIModelId } from "@roo-code/types"
 import type { ApiHandlerOptions } from "../../shared/api"
@@ -9,6 +8,7 @@ import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from ".
 import { WatsonXAI } from "@ibm-cloud/watsonx-ai"
 import { calculateApiCostOpenAI } from "../../shared/cost"
 import { convertToOpenAiMessages } from "../transform/openai-format"
+import { regionToWatsonxBaseUrl } from "./fetchers/ibm-watsonx"
 
 export class WatsonxAIHandler extends BaseProvider implements SingleCompletionHandler {
 	private options: ApiHandlerOptions
@@ -24,12 +24,17 @@ export class WatsonxAIHandler extends BaseProvider implements SingleCompletionHa
 			throw new Error("You must provide a valid IBM watsonx project ID.")
 		}
 
-		const serviceUrl = this.options.watsonxBaseUrl
+		let serviceUrl = this.options.watsonxBaseUrl
 		const platform = this.options.watsonxPlatform
 
+		if (platform === "ibmCloud" && !serviceUrl && this.options.watsonxRegion) {
+			serviceUrl = regionToWatsonxBaseUrl(this.options.watsonxRegion)
+		}
+
 		if (!platform) {
 			throw new Error("Platform selection is required for IBM watsonx AI provider")
 		}
+
 		if (!serviceUrl) {
 			throw new Error("Base URL in IBM watsonx AI provider is required")
 		}

src/core/webview/webviewMessageHandler.ts

@@ -60,7 +60,7 @@ const ALLOWED_VSCODE_SETTINGS = new Set(["terminal.integrated.inheritEnv"])
 
 import { MarketplaceManager, MarketplaceItemType } from "../../services/marketplace"
 import { setPendingTodoList } from "../tools/updateTodoListTool"
-import { getWatsonxModels } from "../../api/providers/fetchers/ibm-watsonx"
+import { getWatsonxModels, regionToWatsonxBaseUrl } from "../../api/providers/fetchers/ibm-watsonx"
 
 export const webviewMessageHandler = async (
 	provider: ClineProvider,
@@ -1014,8 +1014,10 @@ export const webviewMessageHandler = async (
 								"Missing IBM Cloud authentication credentials in IBM watsonx AI provider for IBM watsonx models",
 							)
 							provider.postMessageToWebview({
-								type: "watsonxModels",
-								watsonxModels: {},
+								type: "singleRouterModelFetchResponse",
+								success: false,
+								error: "Missing IBM Cloud authentication credentials for IBM watsonx models",
+								values: { provider: "ibm-watsonx" },
 							})
 							return
 						}
@@ -1026,8 +1028,10 @@ export const webviewMessageHandler = async (
 									"Missing IBM Cloud Pak for Data authentication credentials in IBM watsonx AI provider for IBM watsonx models",
 								)
 								provider.postMessageToWebview({
-									type: "watsonxModels",
-									watsonxModels: {},
+									type: "singleRouterModelFetchResponse",
+									success: false,
+									error: "Missing IBM Cloud Pak for Data authentication credentials for IBM watsonx models",
+									values: { provider: "ibm-watsonx" },
 								})
 								return
 							}
@@ -1037,8 +1041,10 @@ export const webviewMessageHandler = async (
 									"Missing IBM Cloud Pak for Data authentication credentials in IBM watsonx AI provider for IBM watsonx models",
 								)
 								provider.postMessageToWebview({
-									type: "watsonxModels",
-									watsonxModels: {},
+									type: "singleRouterModelFetchResponse",
+									success: false,
+									error: "Missing IBM Cloud Pak for Data authentication credentials for IBM watsonx models",
+									values: { provider: "ibm-watsonx" },
 								})
 								return
 							}
@@ -1047,16 +1053,7 @@ export const webviewMessageHandler = async (
 
 					let effectiveBaseUrl = baseUrl
 					if (platform === "ibmCloud" && region && !baseUrl) {
-						const regionToUrl: Record<string, string> = {
-							"us-south": "https://us-south.ml.cloud.ibm.com",
-							"eu-de": "https://eu-de.ml.cloud.ibm.com",
-							"eu-gb": "https://eu-gb.ml.cloud.ibm.com",
-							"jp-tok": "https://jp-tok.ml.cloud.ibm.com",
-							"au-syd": "https://au-syd.ml.cloud.ibm.com",
-							"ca-tor": "https://ca-tor.ml.cloud.ibm.com",
-							"ap-south-1": "https://ap-south-1.aws.wxai.ibm.com",
-						}
-						effectiveBaseUrl = regionToUrl[region]
+						effectiveBaseUrl = regionToWatsonxBaseUrl(region)
 					}
 
 					const watsonxModels = await getWatsonxModels(

webview-ui/src/components/settings/providers/ibm-watsonx.tsx

@@ -287,7 +287,8 @@ export const WatsonxAI = ({
 						</SelectContent>
 					</Select>
 					<div className="text-sm text-vscode-descriptionForeground mt-1">
-						Selected endpoint: {REGION_TO_URL[selectedRegion as keyof typeof REGION_TO_URL]}
+						{t("settings:providers.watsonx.selectedEndpoint")}:{" "}
+						{REGION_TO_URL[selectedRegion as keyof typeof REGION_TO_URL]}
 					</div>
 				</div>
 			)}
@@ -423,7 +424,7 @@ export const WatsonxAI = ({
 						) : (
 							<span className="codicon codicon-refresh" />
 						)}
-						{"Retrieve Models"}
+						{t("settings:providers.watsonx.retrieveModels")}
 					</div>
 				</Button>
 			</div>
@@ -434,11 +435,13 @@ export const WatsonxAI = ({
 				</div>
 			)}
 			{refreshStatus === "success" && (
-				<div className="text-sm text-vscode-foreground mb-1">{"Models retrieved successfully"}</div>
+				<div className="text-sm text-vscode-foreground mb-1">
+					{t("settings:providers.watsonx.retrieveSuccessful")}
+				</div>
 			)}
 			{refreshStatus === "error" && (
 				<div className="text-sm text-vscode-errorForeground mb-1">
-					{refreshError || "Failed to retrieve models"}
+					{refreshError || t("settings:providers.watsonx.retrieveError")}
 				</div>
 			)}
 

webview-ui/src/i18n/locales/ca/settings.json

@@ -502,7 +502,11 @@
 			"apiKey": "API Key",
 			"authType": "Authentication type",
 			"projectId": "Project ID",
-			"urlDescription": "Enter the full URL of your IBM Cloud Pak for Data instance"
+			"urlDescription": "Enter the full URL of your IBM Cloud Pak for Data instance",
+			"selectedEndpoint": "Selected endpoint",
+			"retrieveModels": "Retrieve Models",
+			"retrieveSuccessful": "Models retrieved successfully",
+			"retrieveError": "Failed to retrieve models. Please check your credentials and try again"
 		}
 	},
 	"browser": {