server(api): change default server path (#47)

* change default server path
* tests(server): update tests for configured route_prefix

Author: eliteprox

pytrickle/server.py

@@ -52,7 +52,7 @@ def __init__(
         app_context: Optional[Dict[str, Any]] = None,
         health_check_interval: float = 5.0,
         enable_default_routes: bool = True,
-        route_prefix: str = "/api",
+        route_prefix: str = "/",
         host: str = "0.0.0.0",
         # Startup/shutdown hooks
         on_startup: Optional[List[Callable]] = None,

tests/test_state_integration.py

@@ -16,6 +16,12 @@
 from pytrickle.test_utils import MockFrameProcessor, create_mock_client
 
 
+def get_stream_route(server, endpoint):
+    """Get the full route path for a streaming endpoint."""
+    prefix = server.route_prefix.rstrip('/')
+    return f"{prefix}/stream/{endpoint}"
+
+
 @pytest_asyncio.fixture
 async def server_with_state():
     """Create a server with state for integration testing."""
@@ -308,7 +314,7 @@ async def test_server_stream_state_validation(self, server_with_state):
             client = TestClient(test_server_instance)
             async with client:
                 # Initial state validation
-                resp = await client.get("/api/stream/status")
+                resp = await client.get(get_stream_route(server, "status"))
                 assert resp.status == 200
                 data = await resp.json()
                 assert data["client_active"] is False
@@ -323,7 +329,7 @@ async def test_server_stream_state_validation(self, server_with_state):
                 server.current_client = mock_client
 
                 # Validate state changes are reflected
-                resp = await client.get("/api/stream/status")
+                resp = await client.get(get_stream_route(server, "status"))
                 assert resp.status == 200
                 data = await resp.json()
                 assert data["client_active"] is True
@@ -334,7 +340,7 @@ async def test_server_stream_state_validation(self, server_with_state):
                 server.state.set_active_client(False)
                 server.state.update_active_streams(0)
 
-                resp = await client.get("/api/stream/status")
+                resp = await client.get(get_stream_route(server, "status"))
                 assert resp.status == 200
                 data = await resp.json()
                 assert data["client_active"] is False

tests/test_stream_server.py

@@ -12,9 +12,13 @@
 from unittest.mock import patch, MagicMock, AsyncMock
 
 from pytrickle.server import StreamServer
-from pytrickle.state import PipelineState
 from pytrickle.test_utils import MockFrameProcessor, create_mock_client
 
+def get_stream_route(server, endpoint):
+    """Get the full route path for a streaming endpoint."""
+    prefix = server.route_prefix.rstrip('/')
+    return f"{prefix}/stream/{endpoint}"
+
 
 @pytest_asyncio.fixture
 async def test_server():
@@ -71,7 +75,7 @@ async def test_start_stream_success_with_validation(self, test_server):
                 }
             }
 
-            resp = await client.post("/api/stream/start", json=payload)
+            resp = await client.post(get_stream_route(server, "start"), json=payload)
             assert resp.status == 200
 
             data = await resp.json()
@@ -109,7 +113,7 @@ async def test_stream_state_updates_during_lifecycle(self, test_server):
         assert server.state.active_client is True
 
         # Verify this reflects in status endpoint
-        resp = await client.get("/api/stream/status")
+        resp = await client.get(get_stream_route(server, "status"))
         assert resp.status == 200
         data = await resp.json()
         assert data["active_streams"] == 1
@@ -138,7 +142,7 @@ async def test_start_stream_validation_error(self, test_server):
             # Missing publish_url and gateway_request_id
         }
 
-        resp = await client.post("/api/stream/start", json=payload)
+        resp = await client.post(get_stream_route(server, "start"), json=payload)
         assert resp.status == 400
 
         # Verify state wasn't changed
@@ -160,7 +164,7 @@ async def test_update_params_success_with_monitoring(self, test_server):
 
         payload = {"intensity": 0.9}
 
-        resp = await client.post("/api/stream/params", json=payload)
+        resp = await client.post(get_stream_route(server, "params"), json=payload)
         assert resp.status == 200
 
         data = await resp.json()
@@ -182,7 +186,7 @@ async def test_update_params_no_active_stream(self, test_server):
 
         payload = {"intensity": 0.9}
 
-        resp = await client.post("/api/stream/params", json=payload)
+        resp = await client.post(get_stream_route(server, "params"), json=payload)
         assert resp.status == 400
 
         data = await resp.json()
@@ -194,7 +198,7 @@ async def test_get_status_no_client(self, test_server):
         """Test status endpoint when no client is active."""
         client, server = test_server
 
-        resp = await client.get("/api/stream/status")
+        resp = await client.get(get_stream_route(server, "status"))
         assert resp.status == 200
 
         data = await resp.json()
@@ -218,7 +222,7 @@ async def test_get_status_with_active_client(self, test_server):
             gateway_request_id="status-test"
         )
 
-        resp = await client.get("/api/stream/status")
+        resp = await client.get(get_stream_route(server, "status"))
         assert resp.status == 200
 
         data = await resp.json()
@@ -243,7 +247,7 @@ async def test_stop_stream_success_with_monitoring(self, test_server):
         server.state.set_active_client(True)
         server.state.update_active_streams(1)
 
-        resp = await client.post("/api/stream/stop", json={})
+        resp = await client.post(get_stream_route(server, "stop"), json={})
         assert resp.status == 200
 
         data = await resp.json()
@@ -267,7 +271,7 @@ async def test_stop_stream_no_active_stream(self, test_server):
         """Test stop stream when no stream is active."""
         client, server = test_server
 
-        resp = await client.post("/api/stream/stop", json={})
+        resp = await client.post(get_stream_route(server, "stop"), json={})
         assert resp.status == 400
 
         data = await resp.json()
@@ -287,7 +291,7 @@ async def test_direct_state_manipulation(self, test_server):
         server.state.update_active_streams(1)
         server.state.set_active_client(True)
 
-        resp = await client.get("/api/stream/status")
+        resp = await client.get(get_stream_route(server, "status"))
         assert resp.status == 200
         data = await resp.json()
         assert data["active_streams"] == 1
@@ -296,7 +300,7 @@ async def test_direct_state_manipulation(self, test_server):
         server.state.update_active_streams(0)
         server.state.set_active_client(False)
 
-        resp = await client.get("/api/stream/status")
+        resp = await client.get(get_stream_route(server, "status"))
         assert resp.status == 200
         data = await resp.json()
         assert data["active_streams"] == 0
@@ -316,7 +320,7 @@ async def test_error_state_handling_with_validation(self, test_server):
         assert data == {"status": "ERROR"}
 
         # Verify status endpoint reflects error
-        resp = await client.get("/api/stream/status")
+        resp = await client.get(get_stream_route(server, "status"))
         assert resp.status == 200
         data = await resp.json()
         assert server.state.is_error()
@@ -331,6 +335,78 @@ async def test_error_state_handling_with_validation(self, test_server):
         assert data["status"] in ["IDLE", "LOADING"]  # Should be back to normal
 
 
+class TestDynamicRoutes:
+    """Test dynamic route functionality with different prefixes."""
+
+    @pytest.mark.parametrize("route_prefix", ["/", "/api", "/v1", "/custom"])
+    @pytest.mark.asyncio
+    async def test_routes_with_different_prefixes(self, route_prefix):
+        """Test that routes work with different prefixes."""
+        processor = MockFrameProcessor()
+        
+        server = StreamServer(
+            frame_processor=processor,
+            port=0,
+            route_prefix=route_prefix,
+            capability_name="test-model",
+            pipeline="test-pipeline",
+            version="1.0.0",
+        )
+        
+        # Attach state and mark ready
+        processor.attach_state(server.state)
+        server.state.set_startup_complete()
+        
+        # Test that routes are constructed correctly
+        expected_start_route = f"{route_prefix.rstrip('/')}/stream/start"
+        actual_start_route = get_stream_route(server, "start")
+        assert actual_start_route == expected_start_route
+        
+        expected_status_route = f"{route_prefix.rstrip('/')}/stream/status"
+        actual_status_route = get_stream_route(server, "status")
+        assert actual_status_route == expected_status_route
+        
+        expected_params_route = f"{route_prefix.rstrip('/')}/stream/params"
+        actual_params_route = get_stream_route(server, "params")
+        assert actual_params_route == expected_params_route
+        
+        expected_stop_route = f"{route_prefix.rstrip('/')}/stream/stop"
+        actual_stop_route = get_stream_route(server, "stop")
+        assert actual_stop_route == expected_stop_route
+
+    @pytest.mark.asyncio
+    async def test_functional_test_with_custom_prefix(self):
+        """Test that endpoints actually work with a custom prefix."""
+        processor = MockFrameProcessor()
+        
+        server = StreamServer(
+            frame_processor=processor,
+            port=0,
+            route_prefix="/api/v2",
+            capability_name="test-model",
+            pipeline="test-pipeline",
+            version="1.0.0",
+        )
+        
+        # Attach state and mark ready
+        processor.attach_state(server.state)
+        server.state.set_startup_complete()
+
+        app = server.get_app()
+        test_server_instance = TestServer(app)
+        
+        async with test_server_instance:
+            client = TestClient(test_server_instance)
+            async with client:
+                # Test status endpoint with custom prefix
+                resp = await client.get(get_stream_route(server, "status"))
+                assert resp.status == 200
+                
+                data = await resp.json()
+                assert data["client_active"] is False
+                assert data["active_streams"] == 0
+
+
 class TestErrorHandling:
     """Test error handling scenarios with state validation."""
 
@@ -351,7 +427,7 @@ async def test_client_error_state_propagation(self, test_server):
                 "gateway_request_id": "error-test"
             }
 
-            resp = await client.post("/api/stream/start", json=payload)
+            resp = await client.post(get_stream_route(server, "start"), json=payload)
             # API call succeeds, but client will fail in background
             assert resp.status == 200
 
@@ -385,7 +461,7 @@ async def test_concurrent_stream_operations(self, test_server):
 
             # Send multiple concurrent requests
             tasks = [
-                client.post("/api/stream/start", json=payload)
+                client.post(get_stream_route(server, "start"), json=payload)
                 for _ in range(3)
             ]