IaC - Server Settings (#129)

* Fix for settings and test

* Update test content api_call

Author: gotsysdba

.gitignore

@@ -14,6 +14,7 @@ sbin/**
 !opentofu/templates/cloudinit-oke.sh
 !src/entrypoint.sh
 !src/client/spring_ai/templates/env.sh
+tests/db_startup_temp/**
 
 ##############################################################################
 # Environment (PyVen, IDE, etc.)

src/client/content/api_server.py

@@ -40,11 +40,11 @@ def copy_user_settings(new_client: ClientIdType) -> None:
         api_call.patch(
             endpoint="v1/settings",
             payload={"json": state.user_settings},
+            params={"client": new_client},
         )
-        st.success(f"Settings for {new_client} - Updated", icon="✅")
         st_common.clear_state_key(f"{new_client}_settings")
     except api_call.ApiError as ex:
-        st.success(f"Settings for {new_client} - Update Failed", icon="❌")
+        st.error(f"Settings for {new_client} - Update Failed", icon="❌")
         logger.error("%s Settings Update failed: %s", new_client, ex)
 
 
@@ -131,3 +131,4 @@ async def main() -> None:
 
 if __name__ == "__main__" or "page.py" in inspect.stack()[1].filename:
     asyncio.run(main())
+

src/client/utils/client.py

@@ -40,25 +40,21 @@ def __init__(
             "timeout": timeout,
         }
 
-        def settings_request(method, extra_params=None):
+        def settings_request(method):
             """Send Settings to Server"""
-            request_options = self.request_defaults.copy()  # Copy defaults to avoid modifying the original
-            if extra_params:
-                request_options.update(extra_params)
-
             with httpx.Client() as client:
                 return client.request(
                     method=method,
                     url=f"{self.server_url}/v1/settings",
                     json=self.settings,
-                    **request_options,
+                    **self.request_defaults,
                 )
 
         response = settings_request("PATCH")
         if response.status_code != 200:
             logger.error("Error updating settings with PATCH: %i - %s", response.status_code, response.text)
             # Retry with POST if PATCH fails
-            response = settings_request("POST", {"params": {"client": self.settings["client"]}})
+            response = settings_request("POST")
             if response.status_code != 200:
                 logger.error("Error updating settings with POST: %i - %s", response.status_code, response.text)
         logger.info("Established Client")
@@ -99,3 +95,4 @@ async def get_history(self) -> list[ChatMessage]:
             return f"Error: {response.status_code} - {error_msg}"
         except httpx.ConnectError:
             logger.error("Unable to contact the API Server; will try again later.")
+

src/server/endpoints.py

@@ -557,7 +557,7 @@ async def settings_get(client: schema.ClientIdType) -> schema.Settings:
         return get_client_settings(client)
 
     @auth.patch("/v1/settings", description="Update client settings")
-    async def settings_update(payload: schema.Settings, client: schema.ClientIdType = Header(...)) -> schema.Settings:
+    async def settings_update(payload: schema.Settings, client: schema.ClientIdType) -> schema.Settings:
         """Update a single client settings"""
         logger.debug("Received %s Client Payload: %s", client, payload)
         client_settings = get_client_settings(client)

tests/client/content/test_api_server.py

@@ -56,10 +56,9 @@ def test_copy_user_settings_success(self, monkeypatch, app_test):
         mock_api_call.patch.assert_called_once_with(
             endpoint="v1/settings",
             payload={"json": {"key": "value"}},
+            params={"client": "test_client"}
         )
 
-        # Verify success message was shown
-        mock_st.success.assert_called_once_with("Settings for test_client - Updated", icon="✅")
         # Verify state was cleared
         mock_st_common.clear_state_key.assert_called_once_with("test_client_settings")
 
@@ -92,7 +91,7 @@ def test_copy_user_settings_error(self, monkeypatch, app_test):
         copy_user_settings("test_client")
 
         # Verify error message was shown
-        mock_st.success.assert_called_once_with("Settings for test_client - Update Failed", icon="❌")
+        mock_st.error.assert_called_once_with("Settings for test_client - Update Failed", icon="❌")
         # Verify error was logged
         mock_logger.error.assert_called_once()
 
@@ -116,11 +115,14 @@ def test_copy_user_settings_real_api(self, monkeypatch, app_test):
         monkeypatch.setattr("client.content.api_server.state", at.session_state)
         monkeypatch.setattr("client.utils.api_call.state", at.session_state)
 
-        # Call the function
-        copy_user_settings(TEST_CONFIG["test_client"])
-
-        # Assert that st.success was called (don't check the exact message)
-        assert mock_st.success.called
+        try:
+            # Call the function
+            copy_user_settings(TEST_CONFIG["test_client"])
+            # If no exception was raised, the test passes
+            assert True
+        except Exception as e:
+            # If an exception was raised, the test fails
+            assert False, f"copy_user_settings raised an exception: {str(e)}"
 
     @patch("launch_server.stop_server")
     @patch("launch_server.start_server")

tests/server/test_endpoints_settings.py

@@ -117,7 +117,12 @@ def test_settings_update(self, client: TestClient) -> None:
         )
 
         # Update the settings
-        response = client.patch("/v1/settings", headers=TEST_HEADERS, json=updated_settings.model_dump())
+        response = client.patch(
+            "/v1/settings",
+            headers=TEST_HEADERS,
+            json=updated_settings.model_dump(),
+            params={"client": TEST_CONFIG["test_client"]},
+        )
         assert response.status_code == 200
         updated = response.json()
 
@@ -131,13 +136,45 @@ def test_settings_update(self, client: TestClient) -> None:
         assert updated["rag"]["top_k"] == 5
         assert updated["oci"]["auth_profile"] == "UPDATED"
 
+    def test_settings_copy(self, client: TestClient) -> None:
+        """Test copying settings for a client"""
+        # First get the current settings for the test_client
+        response = client.get("/v1/settings", params={"client": TEST_CONFIG["test_client"]}, headers=TEST_HEADERS)
+        assert response.status_code == 200
+        client_settings = response.json()
+
+        response = client.get("/v1/settings", params={"client": "server"}, headers=TEST_HEADERS)
+        assert response.status_code == 200
+        old_server_settings = response.json()
+
+        # Copy the client settings to the server settings
+        response = client.patch(
+            "/v1/settings",
+            headers=TEST_HEADERS,
+            json=client_settings,
+            params={"client": "server"},
+        )
+        assert response.status_code == 200
+        response = client.get("/v1/settings", params={"client": "server"}, headers=TEST_HEADERS)
+        new_server_settings = response.json()
+        assert old_server_settings != new_server_settings
+
+        del new_server_settings['client']
+        del client_settings['client']
+        assert new_server_settings == client_settings
+
     def test_settings_update_nonexistent_client(self, client: TestClient) -> None:
         """Test updating settings for a non-existent client"""
         headers = TEST_HEADERS.copy()
         headers["client"] = "nonexistent_client"
 
         updated_settings = Settings(client="nonexistent_client", ll_model=LargeLanguageSettings(model="test-model"))
 
-        response = client.patch("/v1/settings", headers=headers, json=updated_settings.model_dump())
+        response = client.patch(
+            "/v1/settings",
+            headers=headers,
+            json=updated_settings.model_dump(),
+            params={"client": "nonexistent_client"},
+        )
         assert response.status_code == 404
         assert response.json() == {"detail": "Client: nonexistent_client not found."}