Refactor service registry and load balancer integration

- Pass service registry to load balancer for dependency injection -
Remove dynamic imports of service registry in load balancer - Update
service registration and health check logic - Enable token-service in
docker-compose and service config - Add room names and rooms proxy
endpoints - Improve logging for proxy requests and health checks -
Update deploy script project name to sa4cps - Add test script for
coroutine fix - Minor code cleanup and formatting

microservices/api-gateway/main.py

@@ -64,47 +64,17 @@ app.add_middleware(
 
 # Service registry and load balancer
 service_registry = ServiceRegistry()
-load_balancer = LoadBalancer()
+load_balancer = LoadBalancer(service_registry)
 auth_middleware = AuthMiddleware()
 
 # Service configuration
 SERVICES = {
-    # "token-service": ServiceConfig(
-    #     name="token-service",
-    #     base_url=os.getenv("TOKEN_SERVICE_URL", "http://token-service:8001"),
-    #     health_endpoint="/health",
-    #     auth_required=False
-    # ),
-    # "battery-service": ServiceConfig(
-    #     name="battery-service",
-    #     base_url=os.getenv("BATTERY_SERVICE_URL", "http://battery-service:8002"),
-    #     health_endpoint="/health",
-    #     auth_required=True
-    # ),
-    # "demand-response-service": ServiceConfig(
-    #     name="demand-response-service",
-    #     base_url=os.getenv("DEMAND_RESPONSE_SERVICE_URL", "http://demand-response-service:8003"),
-    #     health_endpoint="/health",
-    #     auth_required=True
-    # ),
-    # "p2p-trading-service": ServiceConfig(
-    #     name="p2p-trading-service",
-    #     base_url=os.getenv("P2P_TRADING_SERVICE_URL", "http://p2p-trading-service:8004"),
-    #     health_endpoint="/health",
-    #     auth_required=True
-    # ),
-    # "forecasting-service": ServiceConfig(
-    #     name="forecasting-service",
-    #     base_url=os.getenv("FORECASTING_SERVICE_URL", "http://forecasting-service:8005"),
-    #     health_endpoint="/health",
-    #     auth_required=True
-    # ),
-    # "iot-control-service": ServiceConfig(
-    #     name="iot-control-service",
-    #     base_url=os.getenv("IOT_CONTROL_SERVICE_URL", "http://iot-control-service:8006"),
-    #     health_endpoint="/health",
-    #     auth_required=True
-    # ),
+    "token-service": ServiceConfig(
+        name="token-service",
+        base_url=os.getenv("TOKEN_SERVICE_URL", "http://token-service:8001"),
+        health_endpoint="/health",
+        auth_required=False
+    ),
     "sensor-service": ServiceConfig(
         name="sensor-service",
         base_url=os.getenv("SENSOR_SERVICE_URL", "http://sensor-service:8007"),
@@ -187,7 +157,7 @@ async def get_gateway_stats():
 @app.api_route("/api/v1/tokens/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
 async def token_service_proxy(request: Request, path: str):
     """Proxy requests to token service"""
-    return await proxy_request(request, "token-service", f"/{path}")
+    return await proxy_request(request, "token-service", f"/tokens/{path}")
 
 # Battery Service Routes
 @app.api_route("/api/v1/batteries/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
@@ -241,6 +211,16 @@ async def data_sources_list_proxy(request: Request):
     """Proxy requests to data ingestion service for sources list"""
     return await proxy_request(request, "data-ingestion-service", "/sources")
 
+@app.get("/api/v1/rooms/names")
+async def room_names_proxy(request: Request):
+    """Proxy requests to sensor service for room names list"""
+    return await proxy_request(request, "sensor-service", "/rooms/names")
+
+@app.get("/api/v1/rooms")
+async def rooms_list_proxy(request: Request):
+    """Proxy requests to sensor service for rooms list"""
+    return await proxy_request(request, "sensor-service", "/rooms")
+
 @app.api_route("/api/v1/rooms/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
 async def room_service_proxy(request: Request, path: str):
     """Proxy requests to sensor service for room management"""
@@ -302,6 +282,7 @@ async def websocket_proxy(websocket: WebSocket):
 async def proxy_request(request: Request, service_name: str, path: str):
     """Generic request proxy function"""
     try:
+        logger.info(f"Proxying request to {service_name} at {path}")
         # Update request statistics
         request_stats["total_requests"] += 1
         request_stats["service_requests"][service_name] += 1