diff --git a/api/routes/system.py b/api/routes/system.py index 461daef..3ae477a 100644 --- a/api/routes/system.py +++ b/api/routes/system.py @@ -25,7 +25,7 @@ def system_status(): def worker_status(): """Worker status from gRPC.""" try: - from mpr.grpc.client import get_client + from grpc.client import get_client client = get_client() status = client.get_worker_status() diff --git a/ctrl/.env.template b/ctrl/.env.template index f003074..6a4be58 100644 --- a/ctrl/.env.template +++ b/ctrl/.env.template @@ -26,3 +26,6 @@ MPR_EXECUTOR=local GRPC_HOST=grpc GRPC_PORT=50051 GRPC_MAX_WORKERS=10 + +# Vite +VITE_ALLOWED_HOSTS=your-domain.local diff --git a/ctrl/docker-compose.yml b/ctrl/docker-compose.yml index 465cdb1..1870233 100644 --- a/ctrl/docker-compose.yml +++ b/ctrl/docker-compose.yml @@ -99,7 +99,7 @@ services: build: context: .. dockerfile: ctrl/Dockerfile - command: python -m mpr.grpc.server + command: python -m grpc.server ports: - "50052:50051" environment: diff --git a/ctrl/generate.sh b/ctrl/generate.sh index 38f764b..3d91f20 100755 --- a/ctrl/generate.sh +++ b/ctrl/generate.sh @@ -29,18 +29,18 @@ python -m modelgen from-schema \ # Protobuf for gRPC python -m modelgen from-schema \ --schema schema/models \ - --output mpr/grpc/protos/worker.proto \ + --output grpc/protos/worker.proto \ --targets proto # Generate gRPC stubs from proto echo "Generating gRPC stubs..." python -m grpc_tools.protoc \ - -I mpr/grpc/protos \ - --python_out=mpr/grpc \ - --grpc_python_out=mpr/grpc \ - mpr/grpc/protos/worker.proto + -I grpc/protos \ + --python_out=grpc \ + --grpc_python_out=grpc \ + grpc/protos/worker.proto # Fix relative import in generated grpc stub -sed -i 's/^import worker_pb2/from . import worker_pb2/' mpr/grpc/worker_pb2_grpc.py +sed -i 's/^import worker_pb2/from . import worker_pb2/' grpc/worker_pb2_grpc.py echo "Done!" diff --git a/mpr/grpc/__init__.py b/grpc/__init__.py similarity index 100% rename from mpr/grpc/__init__.py rename to grpc/__init__.py diff --git a/mpr/grpc/client.py b/grpc/client.py similarity index 100% rename from mpr/grpc/client.py rename to grpc/client.py diff --git a/mpr/grpc/protos/worker.proto b/grpc/protos/worker.proto similarity index 100% rename from mpr/grpc/protos/worker.proto rename to grpc/protos/worker.proto diff --git a/mpr/grpc/server.py b/grpc/server.py similarity index 100% rename from mpr/grpc/server.py rename to grpc/server.py diff --git a/mpr/grpc/worker_pb2.py b/grpc/worker_pb2.py similarity index 100% rename from mpr/grpc/worker_pb2.py rename to grpc/worker_pb2.py diff --git a/mpr/grpc/worker_pb2_grpc.py b/grpc/worker_pb2_grpc.py similarity index 100% rename from mpr/grpc/worker_pb2_grpc.py rename to grpc/worker_pb2_grpc.py diff --git a/ui/timeline/vite.config.ts b/ui/timeline/vite.config.ts index 300f1ab..e38695c 100644 --- a/ui/timeline/vite.config.ts +++ b/ui/timeline/vite.config.ts @@ -6,6 +6,7 @@ export default defineConfig({ server: { host: "0.0.0.0", port: 5173, + allowedHosts: process.env.VITE_ALLOWED_HOSTS?.split(",") || [], proxy: { "/api": { target: "http://fastapi:8702", diff --git a/worker/tasks.py b/worker/tasks.py index b4f4e2e..6a37e09 100644 --- a/worker/tasks.py +++ b/worker/tasks.py @@ -8,8 +8,8 @@ from typing import Any, Dict, Optional from celery import shared_task +from grpc.server import update_job_progress from worker.executor import get_executor -from worker_grpc.server import update_job_progress logger = logging.getLogger(__name__)