More formatting fixes, add tests for not found and fail exception

florist/api/client.py

@@ -88,12 +88,12 @@ def check_status(client_uuid: str, redis_host: str, redis_port: str) -> JSONResp
         redis_connection = redis.Redis(host=redis_host, port=redis_port)
 
         result = redis_connection.get(client_uuid)
-        assert isinstance(result, bytes)
 
         if result is not None:
+            assert isinstance(result, bytes)
             return JSONResponse(json.loads(result))
 
         return JSONResponse({"error": f"Client {client_uuid} Not Found"}, status_code=404)
 
     except Exception as ex:
-        return JSONResponse({"error": str(ex)}, status_code=500)
+        return JSONResponse({"error": str(ex)}, status_code=500)

florist/tests/integration/api/test_train.py

@@ -13,19 +13,9 @@
 
 def test_train():
     # Define services
-    server_config = uvicorn.Config(
-        "florist.api.server:app", 
-        host="localhost", 
-        port=8000, 
-        log_level="debug"
-    )
+    server_config = uvicorn.Config("florist.api.server:app", host="localhost", port=8000, log_level="debug")
     server_service = TestUvicornServer(config=server_config)
-    client_config = uvicorn.Config(
-        "florist.api.client:app", 
-        host="localhost", 
-        port=8001, 
-        log_level="debug"
-    )
+    client_config = uvicorn.Config("florist.api.client:app", host="localhost", port=8001, log_level="debug")
     client_service = TestUvicornServer(config=client_config)
 
     # Start services
@@ -74,14 +64,7 @@ def test_train():
                 client_uuid = response.json()["client_uuids"][0]
 
                 # Wait for training to finish
-                wait_for_metric(
-                    server_uuid, 
-                    "fit_end", 
-                    test_redis_host,
-                    test_redis_port, 
-                    LOGGER, 
-                    max_retries=80
-                )
+                wait_for_metric(server_uuid, "fit_end", test_redis_host,test_redis_port, LOGGER, max_retries=80)
 
                 # Check server metrics
                 server_metrics_result = redis_conn.get(server_uuid)

florist/tests/unit/api/test_client.py

@@ -92,4 +92,34 @@ def test_check_status(mock_redis: Mock) -> None:
 
     response = client.check_status(test_uuid, test_redis_host, test_redis_port)
 
+    mock_redis.Redis.assert_called_with(host=test_redis_host, port=test_redis_port)
     assert json.loads(response.body.decode()) == {"info": "test"}
+
+@patch("florist.api.client.redis")
+def test_check_status_not_found(mock_redis: Mock) -> None:
+    mock_redis_connection = Mock()
+    mock_redis_connection.get.return_value = None
+
+    test_uuid = "test_uuid"
+    test_redis_host = "localhost"
+    test_redis_port = "testport"
+
+    mock_redis.Redis.return_value = mock_redis_connection
+
+    response = client.check_status(test_uuid, test_redis_host, test_redis_port)
+
+    mock_redis.Redis.assert_called_with(host=test_redis_host, port=test_redis_port)
+    assert response.status_code == 404
+    assert json.loads(response.body.decode()) == {"error": f"Client {test_uuid} Not Found"}
+
+@patch("florist.api.client.redis.Redis", side_effect=Exception("test exception"))
+def test_check_status_fail_exception(mock_redis: Mock) -> None:
+
+    test_uuid = "test_uuid"
+    test_redis_host = "localhost"
+    test_redis_port = "testport"
+
+    response = client.check_status(test_uuid, test_redis_host, test_redis_port)
+
+    assert response.status_code == 500
+    assert json.loads(response.body.decode()) == {"error": "test exception"}