Merge branch 'main' into 56-oracle-db-integration

Author: corradodebari

src/client/content/config/tabs/models.py

@@ -86,7 +86,7 @@ def _initialize_model(action: str, model_type: str, model_id: str = None, model_
         quoted_model_id = urllib.parse.quote(model_id, safe="")
         model = api_call.get(endpoint=f"v1/models/{model_provider}/{quoted_model_id}")
     else:
-        model = {"id": "unset", "type": model_type, "provider": "unset", "status": "CUSTOM"}
+        model = {"id": "", "type": model_type, "provider": "unset", "status": "CUSTOM"}
 
     if action == "add":
         model["enabled"] = True
@@ -128,6 +128,11 @@ def _render_model_selection(model: dict, provider_models: list, action: str) ->
     model_keys = [m["key"] for m in provider_models]
     model_index = next((i for i, key in enumerate(model_keys) if key == model["id"]), None)
 
+    # If the current model ID is not in the supported list, add it to the options
+    if model_index is None and model["id"] not in model_keys:
+        model_keys.append(model["id"])
+        model_index = len(model_keys) - 1
+
     model["id"] = st.selectbox(
         "Model (Required):",
         help=help_text.help_dict["model_id"],
@@ -145,8 +150,7 @@ def _render_model_selection(model: dict, provider_models: list, action: str) ->
 def _render_api_configuration(model: dict, provider_models: list, disable_for_oci: bool) -> dict:
     """Render API configuration UI and return updated model"""
     api_base = next(
-        (m.get("api_base", "") for m in provider_models if m.get("key") == model["id"]),
-        model.get("api_base", "")
+        (m.get("api_base", "") for m in provider_models if m.get("key") == model["id"]), model.get("api_base", "")
     )
 
     model["api_base"] = st.text_input(
@@ -218,6 +222,8 @@ def _handle_form_submission(model: dict, action: str) -> bool:
 
     try:
         if action == "add" and action_button.button(label="Add", type="primary", width="stretch"):
+            if not all([model["id"], model["provider"]]):
+                raise ValueError
             create_model(model=model)
             return True
         if action == "edit" and action_button.button(label="Save", type="primary", width="stretch"):
@@ -228,6 +234,11 @@ def _handle_form_submission(model: dict, action: str) -> bool:
             return True
     except api_call.ApiError as ex:
         st.error(f"Failed to {action} model: {ex}")
+    except ValueError:
+        if not model["id"]:
+            st.error("Model name is required.")
+        if not model["provider"]:
+            st.error("Provider name is required.")
 
     if cancel_button.button(label="Cancel", type="secondary"):
         st_common.clear_state_key("model_configs")

src/server/api/utils/models.py

@@ -92,7 +92,7 @@ def update(payload: schema.Model) -> schema.Model:
     """Update an existing Model definition"""
 
     model_upd = get(model_provider=payload.provider, model_id=payload.id)
-    if payload.enabled and not is_url_accessible(model_upd.api_base)[0]:
+    if payload.enabled and model_upd.api_base and not is_url_accessible(model_upd.api_base)[0]:
         model_upd.enabled = False
         raise URLUnreachableError("Model: Unable to update.  API URL is inaccessible.")
 

src/server/api/v1/models.py

@@ -87,7 +87,7 @@ async def models_update(payload: schema.Model) -> schema.Model:
 async def models_create(
     payload: schema.Model,
 ) -> schema.Model:
-    """Update a model"""
+    """Create a model"""
     logger.debug("Received model_create - payload: %s", payload)
 
     try:

tests/client/content/config/tabs/test_models.py

@@ -367,3 +367,41 @@ def test_embedding_model_specific_fields(self, app_server, app_test):
             # Embedding model specific fields might be present
             if "max_chunk_size" in model:
                 assert isinstance(model["max_chunk_size"], int)
+
+    def test_render_model_selection_with_custom_model_id(self, app_server, app_test):
+        """Test that _render_model_selection handles custom model IDs not in supported models list"""
+        from client.content.config.tabs.models import _render_model_selection, get_supported_models
+
+        assert app_server is not None
+        at = self._setup_function_test(app_test)
+
+        # Get actual supported models from API
+        with patch("client.utils.api_call.state", at.session_state):
+            supported_models = get_supported_models("ll")
+
+        # Find a provider and create a model with a custom ID not in their supported list
+        openai_provider = next((p for p in supported_models if p["provider"] == "openai"), None)
+        assert openai_provider is not None, "OpenAI provider should be available in supported models"
+
+        provider_models = openai_provider["models"]
+        model_keys = [m["key"] for m in provider_models]
+
+        # Create a custom model ID that definitely won't be in the supported list
+        custom_model_id = "custom-fine-tuned-model-12345"
+        assert custom_model_id not in model_keys, f"Custom model ID {custom_model_id} should not be in supported models"
+
+        # Test model with custom ID
+        model = {
+            "id": custom_model_id,
+            "provider": "openai",
+            "type": "ll"
+        }
+
+        action = "edit"
+
+        with patch("client.content.config.tabs.models.state", at.session_state):
+            # This should preserve the custom model ID even though it's not in provider models
+            result_model = _render_model_selection(model, provider_models, action)
+
+            # The model ID should be preserved
+            assert result_model["id"] == custom_model_id