fetch relevant provider keys

Author: HimavarshaVS

src/backend/base/langflow/api/utils/core.py

@@ -117,9 +117,14 @@ def remove_api_keys(flow: dict):
         node_data = node.get("data").get("node")
         template = node_data.get("template")
         for value in template.values():
-            if isinstance(value, dict) and "name" in value and has_api_terms(value["name"]) and value.get("password"):
-                if value.get("name") != "api_key":
-                    value["value"] = None
+            if (
+                isinstance(value, dict)
+                and "name" in value
+                and has_api_terms(value["name"])
+                and value.get("password")
+                and value.get("name") != "api_key"
+            ):
+                value["value"] = None
 
     return flow
 

src/lfx/src/lfx/base/models/unified_models.py

@@ -229,17 +229,15 @@ def apply_provider_variable_config_to_build_config(
 
         env_var_key = var_info.get("variable_key")
         if env_var_key:
-            current_value = field_config.get("value")
-            if not current_value or (isinstance(current_value, str) and not current_value.strip()):
-                env_value = os.environ.get(env_var_key)
-                if env_value and env_value.strip():
-                    field_config["value"] = env_var_key
-                    field_config["load_from_db"] = True
-                    logger.debug(
-                        "Set field %s to env var name %s (value resolved at runtime)",
-                        field_name,
-                        env_var_key,
-                    )
+            env_value = os.environ.get(env_var_key)
+            if env_value and env_value.strip():
+                field_config["value"] = env_var_key
+                field_config["load_from_db"] = True
+                logger.debug(
+                    "Set field %s to env var name %s (value resolved at runtime)",
+                    field_name,
+                    env_var_key,
+                )
 
     return build_config
 
@@ -268,6 +266,17 @@ def get_model_providers() -> list[str]:
     return sorted({md.get("provider", "Unknown") for group in MODELS_DETAILED for md in group})
 
 
+def get_provider_for_model_name(model_name: str) -> str:
+    """Return the provider for a model name by searching MODELS_DETAILED."""
+    if not model_name or not isinstance(model_name, str):
+        return ""
+    for group in MODELS_DETAILED:
+        for md in group:
+            if md.get("name") == model_name:
+                return md.get("provider", "") or ""
+    return ""
+
+
 def get_unified_models_detailed(
     providers: list[str] | None = None,
     model_name: str | None = None,

src/lfx/src/lfx/components/models_and_agents/agent.py

@@ -18,6 +18,7 @@
     get_language_model_options,
     get_llm,
     get_model_providers,
+    get_provider_for_model_name,
     update_model_options_in_build_config,
 )
 from lfx.base.models.watsonx_constants import IBM_WATSONX_URLS
@@ -495,7 +496,9 @@ def get_tool_calling_model_options(user_id=None):
         provider = ""
         if isinstance(current_model_value, list) and current_model_value:
             selected_model = current_model_value[0]
-            provider = selected_model.get("provider", "") or ""
+            provider = (selected_model.get("provider") or "").strip()
+            if not provider and selected_model.get("name"):
+                provider = get_provider_for_model_name(str(selected_model["name"]))
 
         if provider:
             build_config = apply_provider_variable_config_to_build_config(build_config, provider)

src/lfx/src/lfx/components/models_and_agents/language_model.py

@@ -4,6 +4,7 @@
     get_language_model_options,
     get_llm,
     get_model_providers,
+    get_provider_for_model_name,
     update_model_options_in_build_config,
 )
 from lfx.base.models.watsonx_constants import IBM_WATSONX_URLS
@@ -129,12 +130,13 @@ def update_build_config(self, build_config: dict, field_value: str, field_name:
                 build_config[field]["show"] = False
                 build_config[field]["required"] = False
 
-        # Show/configure provider-specific fields based on selected model
         current_model_value = field_value if field_name == "model" else build_config.get("model", {}).get("value")
         provider = ""
         if isinstance(current_model_value, list) and current_model_value:
             selected_model = current_model_value[0]
-            provider = selected_model.get("provider", "") or ""
+            provider = (selected_model.get("provider") or "").strip()
+            if not provider and selected_model.get("name"):
+                provider = get_provider_for_model_name(str(selected_model["name"]))
 
         if provider:
             build_config = apply_provider_variable_config_to_build_config(build_config, provider)