chore: clean up watsonx urls

clean up watsonx urls

Author: Adam-Aghili

src/lfx/src/lfx/components/ibm/watsonx.py

@@ -6,6 +6,7 @@
 from pydantic.v1 import SecretStr
 
 from lfx.base.models.model import LCModelComponent
+from lfx.base.models.watsonx_constants import IBM_WATSONX_URLS
 from lfx.field_typing import LanguageModel
 from lfx.field_typing.range_spec import RangeSpec
 from lfx.inputs.inputs import BoolInput, DropdownInput, IntInput, SecretStrInput, SliderInput, StrInput
@@ -21,14 +22,7 @@ class WatsonxAIComponent(LCModelComponent):
     beta = False
 
     _default_models = ["ibm/granite-3-2b-instruct", "ibm/granite-3-8b-instruct", "ibm/granite-13b-instruct-v2"]
-    _urls = [
-        "https://us-south.ml.cloud.ibm.com",
-        "https://eu-de.ml.cloud.ibm.com",
-        "https://eu-gb.ml.cloud.ibm.com",
-        "https://au-syd.ml.cloud.ibm.com",
-        "https://jp-tok.ml.cloud.ibm.com",
-        "https://ca-tor.ml.cloud.ibm.com",
-    ]
+    _urls = IBM_WATSONX_URLS
     inputs = [
         *LCModelComponent.get_base_inputs(),
         DropdownInput(

src/lfx/src/lfx/components/ibm/watsonx_embeddings.py

@@ -7,6 +7,7 @@
 from pydantic.v1 import SecretStr
 
 from lfx.base.embeddings.model import LCEmbeddingsModel
+from lfx.base.models.watsonx_constants import IBM_WATSONX_URLS
 from lfx.field_typing import Embeddings
 from lfx.io import BoolInput, DropdownInput, IntInput, SecretStrInput, StrInput
 from lfx.log.logger import logger
@@ -33,14 +34,7 @@ class WatsonxEmbeddingsComponent(LCEmbeddingsModel):
             display_name="watsonx API Endpoint",
             info="The base URL of the API.",
             value=None,
-            options=[
-                "https://us-south.ml.cloud.ibm.com",
-                "https://eu-de.ml.cloud.ibm.com",
-                "https://eu-gb.ml.cloud.ibm.com",
-                "https://au-syd.ml.cloud.ibm.com",
-                "https://jp-tok.ml.cloud.ibm.com",
-                "https://ca-tor.ml.cloud.ibm.com",
-            ],
+            options={IBM_WATSONX_URLS},
             real_time_refresh=True,
         ),
         StrInput(

src/lfx/src/lfx/components/models/embedding_model.py

@@ -157,7 +157,7 @@ def build_embeddings(self) -> Embeddings:
 
             params = {
                 "model_id": model,
-                "url": base_url_ibm_watsonx or "https://us-south.ml.cloud.ibm.com",
+                "url": base_url_ibm_watsonx or IBM_WATSONX_URLS[0],
                 "apikey": api_key,
             }
 

src/lfx/src/lfx/components/models/language_model.py

@@ -13,6 +13,7 @@
 from lfx.base.models.google_generative_ai_model import ChatGoogleGenerativeAIFixed
 from lfx.base.models.model import LCModelComponent
 from lfx.base.models.openai_constants import OPENAI_CHAT_MODEL_NAMES, OPENAI_REASONING_MODEL_NAMES
+from lfx.base.models.watsonx_constants import IBM_WATSONX_URLS
 from lfx.field_typing import LanguageModel
 from lfx.field_typing.range_spec import RangeSpec
 from lfx.inputs.inputs import BoolInput, MessageTextInput, StrInput
@@ -23,14 +24,6 @@
 
 # IBM watsonx.ai constants
 IBM_WATSONX_DEFAULT_MODELS = ["ibm/granite-3-2b-instruct", "ibm/granite-3-8b-instruct", "ibm/granite-13b-instruct-v2"]
-IBM_WATSONX_URLS = [
-    "https://us-south.ml.cloud.ibm.com",
-    "https://eu-de.ml.cloud.ibm.com",
-    "https://eu-gb.ml.cloud.ibm.com",
-    "https://au-syd.ml.cloud.ibm.com",
-    "https://jp-tok.ml.cloud.ibm.com",
-    "https://ca-tor.ml.cloud.ibm.com",
-]
 
 
 class LanguageModelComponent(LCModelComponent):