🐛 Fix ID verification exception when updating the model #1311

Author: Phinease

backend/services/model_management_service.py

@@ -195,13 +195,15 @@ async def list_provider_models_for_tenant(tenant_id: str, provider: str, model_t
 async def update_single_model_for_tenant(user_id: str, tenant_id: str, model_data: Dict[str, Any]):
     """Update a single model by its model_id, ensuring display_name uniqueness."""
     try:
-        existing_model_by_display = get_model_by_display_name(
-            model_data["display_name"], tenant_id)
-        if existing_model_by_display and existing_model_by_display["model_id"] != model_data["model_id"]:
+        existing_model_by_display = get_model_by_display_name(model_data["display_name"], tenant_id)
+        current_model_id = int(model_data["model_id"])
+        existing_model_id = existing_model_by_display["model_id"] if existing_model_by_display else None
+        
+        if existing_model_by_display and existing_model_id != current_model_id:
             raise ValueError(
                 f"Name {model_data['display_name']} is already in use, please choose another display name")
 
-        update_model_record(model_data["model_id"], model_data, user_id)
+        update_model_record(current_model_id, model_data, user_id)
         logging.debug(
             f"Model {model_data['display_name']} updated successfully")
     except Exception as e:

frontend/app/[locale]/chat/internal/chatInterface.tsx

@@ -1402,7 +1402,7 @@ export function ChatInterface() {
             );
             if (preprocessStep) {
               const stoppedMessage =
-                (t("chatInterface.filePreprocessingStopped") as string) ||
+                (t("chatInterface.fileProcessingStopped") as string) ||
                 "File preprocessing stopped";
               preprocessStep.content = stoppedMessage;
               if (

frontend/public/locales/en/common.json

@@ -29,7 +29,7 @@
   "chatInterface.truncationSeparator": "; ",
   "chatInterface.fileParsingFailed": "File parsing failed",
   "chatInterface.fileSizeExceeded": "File size exceeds the limit, please upload smaller files",
-  "chatInterface.filePreprocessingStopped": "File parsing stopped",
+  "chatInterface.fileProcessingStopped": "File parsing stopped",
   "chatInterface.conversationStopped": "Conversation stopped",
   "chatInterface.errorProcessingRequest": "An error occurred while processing the request",
   "chatInterface.errorFetchingConversationList": "Failed to fetch conversation list during initialization:",

frontend/public/locales/zh/common.json

@@ -29,7 +29,7 @@
   "chatInterface.truncationSeparator": "；",
   "chatInterface.fileParsingFailed": "文件解析失败",
   "chatInterface.fileSizeExceeded": "文件大小超出限制，请上传更小的文件",
-  "chatInterface.filePreprocessingStopped": "文件解析已停止",
+  "chatInterface.fileProcessingStopped": "文件解析已停止",
   "chatInterface.conversationStopped": "对话已停止",
   "chatInterface.errorProcessingRequest": "处理请求时发生错误",
   "chatInterface.errorFetchingConversationList": "初始化时获取对话列表失败:",

test/backend/services/test_model_management_service.py

@@ -484,12 +484,12 @@ async def test_list_provider_models_for_tenant_exception():
 async def test_update_single_model_for_tenant_success():
     svc = import_svc()
 
-    model = {"model_id": "m1", "display_name": "name"}
+    model = {"model_id": "1", "display_name": "name"}
     with mock.patch.object(svc, "get_model_by_display_name", return_value=None) as mock_get, \
             mock.patch.object(svc, "update_model_record") as mock_update:
         await svc.update_single_model_for_tenant("u1", "t1", model)
         mock_get.assert_called_once_with("name", "t1")
-        mock_update.assert_called_once_with("m1", model, "u1")
+        mock_update.assert_called_once_with(1, model, "u1")
 
 
 async def test_update_single_model_for_tenant_conflict():
@@ -502,6 +502,45 @@ async def test_update_single_model_for_tenant_conflict():
         assert "Failed to update model" in str(exc.value)
 
 
+async def test_update_single_model_for_tenant_same_model_no_conflict():
+    """Test that updating the same model with same display name doesn't raise conflict."""
+    svc = import_svc()
+
+    model = {"model_id": "123", "display_name": "existing_name"}
+    # Return the same model_id (as int) to simulate updating the same model
+    with mock.patch.object(svc, "get_model_by_display_name", return_value={"model_id": 123}) as mock_get, \
+            mock.patch.object(svc, "update_model_record") as mock_update:
+        await svc.update_single_model_for_tenant("u1", "t1", model)
+        mock_get.assert_called_once_with("existing_name", "t1")
+        mock_update.assert_called_once_with(123, model, "u1")
+
+
+async def test_update_single_model_for_tenant_type_conversion():
+    """Test that string model_id is properly converted to int for comparison."""
+    svc = import_svc()
+
+    model = {"model_id": "456", "display_name": "test_name"}
+    # Return the same model_id as int to test type conversion
+    with mock.patch.object(svc, "get_model_by_display_name", return_value={"model_id": 456}) as mock_get, \
+            mock.patch.object(svc, "update_model_record") as mock_update:
+        await svc.update_single_model_for_tenant("u1", "t1", model)
+        mock_get.assert_called_once_with("test_name", "t1")
+        mock_update.assert_called_once_with(456, model, "u1")
+
+
+async def test_update_single_model_for_tenant_different_model_conflict():
+    """Test that updating with a display name used by a different model raises conflict."""
+    svc = import_svc()
+
+    model = {"model_id": "789", "display_name": "conflict_name"}
+    # Return a different model_id to simulate name conflict
+    with mock.patch.object(svc, "get_model_by_display_name", return_value={"model_id": 999}):
+        with pytest.raises(Exception) as exc:
+            await svc.update_single_model_for_tenant("u1", "t1", model)
+        assert "Failed to update model" in str(exc.value)
+        assert "Name conflict_name is already in use" in str(exc.value)
+
+
 async def test_batch_update_models_for_tenant_success():
     svc = import_svc()