Fix secret update logic

fastagency/studio/app.py

@@ -102,8 +102,10 @@ async def validate_secret_model(
     type: str = "secret"
 
     found_model = await DefaultDB.backend().find_model(model_uuid=model_uuid)
-    if "api_key" in found_model["json_str"]:
+
+    if "api_key" not in model:
         model["api_key"] = found_model["json_str"]["api_key"]
+
     try:
         validated_model = Registry.get_default().validate(type, name, model)
         return validated_model.model_dump()

tests/studio/app/test_openai_extensively.py

@@ -68,14 +68,29 @@ async def test_validate_secret_model(
             background_tasks=BackgroundTasks(),
         )
 
-        # Remove api_key and send name alone to validate route
-        model_dict.pop("api_key")
+        # Pass only name in the request, this should only update the name and retain the existing api_key
+        model_dict_with_updated_name = {"name": "Hello World! Updated"}
 
         response = client.post(
             f"/user/{user_uuid}/models/secret/OpenAIAPIKey/{api_key_model_uuid}/validate",
-            json=model_dict,
+            json=model_dict_with_updated_name,
+        )
+        assert response.status_code == 200
+
+        expected = {"name": "Hello World! Updated", "api_key": model_dict["api_key"]}
+        assert response.json() == expected
+
+        # Pass both name and api_key in the request, this should update both name and api_key
+        model_dict_with_updated_name_and_api_key = {
+            "name": "Hello World! Updated Again",
+            "api_key": "sk-proj-SomeLengthStringWhichCanHave-and_inItAndTheLengthCanBeChangedAtAnyTime",  # pragma: allowlist secret
+        }
+        response = client.post(
+            f"/user/{user_uuid}/models/secret/OpenAIAPIKey/{api_key_model_uuid}/validate",
+            json=model_dict_with_updated_name_and_api_key,
         )
         assert response.status_code == 200
+        assert response.json() == model_dict_with_updated_name_and_api_key
 
 
 # we will do this for OpenAI only, the rest should be the same