move grpc to proper location
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -26,3 +26,6 @@ MPR_EXECUTOR=local
|
||||
GRPC_HOST=grpc
|
||||
GRPC_PORT=50051
|
||||
GRPC_MAX_WORKERS=10
|
||||
|
||||
# Vite
|
||||
VITE_ALLOWED_HOSTS=your-domain.local
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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!"
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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__)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user