From bef528c084ce242aeef691dc8de5ef5f97a8790d Mon Sep 17 00:00:00 2001
From: himavarshagoutham <himavarshajan17@gmail.com>
Date: Tue, 14 Apr 2026 14:01:28 -0400
Subject: [PATCH] fix(wxo): resolve list_llms rebase conflict with adapter seam

Keep release default-model merge behavior while preserving fetch_models_adapter usage, and update list_llms expectations in tests.
---
 .../services/adapters/deployment/watsonx_orchestrate/service.py | 2 +-
 .../tests/unit/services/deployment/test_watsonx_orchestrate.py  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/base/langflow/services/adapters/deployment/watsonx_orchestrate/service.py b/src/backend/base/langflow/services/adapters/deployment/watsonx_orchestrate/service.py
index 6738fbd314..33a83e599d 100644
--- a/src/backend/base/langflow/services/adapters/deployment/watsonx_orchestrate/service.py
+++ b/src/backend/base/langflow/services/adapters/deployment/watsonx_orchestrate/service.py
@@ -106,6 +106,7 @@ from langflow.services.adapters.deployment.watsonx_orchestrate.payloads import (
     WatsonxDeploymentCreatePayload,
     WatsonxDeploymentCreateResultData,
     WatsonxDeploymentLlmListResultData,
+    WatsonxModelOut,
     WatsonxDeploymentUpdatePayload,
     WatsonxDeploymentUpdateResultData,
     WatsonxModelOut,
@@ -305,7 +306,6 @@ class WatsonxOrchestrateDeploymentService(BaseDeploymentService):
             WatsonxModelOut(model_name="groq/openai/gpt-oss-120b"),
             WatsonxModelOut(model_name="bedrock/openai.gpt-oss-120b-1:0"),
         ]
-
         hardcoded_names = {m.model_name for m in raw_models}
 
         try:
diff --git a/src/backend/tests/unit/services/deployment/test_watsonx_orchestrate.py b/src/backend/tests/unit/services/deployment/test_watsonx_orchestrate.py
index 9405d26f03..e9d0bce78b 100644
--- a/src/backend/tests/unit/services/deployment/test_watsonx_orchestrate.py
+++ b/src/backend/tests/unit/services/deployment/test_watsonx_orchestrate.py
@@ -5052,6 +5052,8 @@ async def test_list_llms_returns_normalized_model_names(monkeypatch):
 
     assert result.provider_result == {
         "models": [
+            {"model_name": "groq/openai/gpt-oss-120b"},
+            {"model_name": "bedrock/openai.gpt-oss-120b-1:0"},
             {"model_name": "granite-3.1-8b"},
             {"model_name": "granite-3.3-8b"},
             {"model_name": "granite-3.1-8b"},