diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 8df3fa61..afabe12a 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -28,7 +28,7 @@ dependencies = [ "numpy>=2.0.0", "scikit-learn>=1.5.0", "sentry-sdk[fastapi]>=2.10.0", - "rosreestr2coord>=5.0.0", + "rosreestr2coord>=4.0.0", ] [dependency-groups] diff --git a/backend/uv.lock b/backend/uv.lock index 1422c133..8bd2a644 100644 --- a/backend/uv.lock +++ b/backend/uv.lock @@ -616,7 +616,7 @@ requires-dist = [ { name = "pydantic-settings", specifier = ">=2.3.0" }, { name = "pyproj", specifier = ">=3.6.0" }, { name = "redis", specifier = ">=5.0.0" }, - { name = "rosreestr2coord", specifier = ">=5.0.0" }, + { name = "rosreestr2coord", specifier = ">=4.0.0" }, { name = "scikit-learn", specifier = ">=1.5.0" }, { name = "sentry-sdk", extras = ["fastapi"], specifier = ">=2.10.0" }, { name = "shapely", specifier = ">=2.0.0" }, diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index d017afc7..54fc3668 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -58,7 +58,7 @@ services: postgres: condition: service_healthy redis: - condition: service_healthy + condition: service_started ports: - "127.0.0.1:8000:8000" healthcheck: @@ -75,12 +75,6 @@ services: - "127.0.0.1:3000:3000" depends_on: - backend - healthcheck: - test: ["CMD-SHELL", "wget --quiet --tries=1 --spider http://localhost:3000/ || exit 1"] - interval: 10s - timeout: 5s - retries: 5 - start_period: 30s worker: # Отдельный chromium-образ (+200 МБ Playwright). См. backend/Dockerfile target=runner-with-chromium. @@ -94,7 +88,7 @@ services: postgres: condition: service_healthy redis: - condition: service_healthy + condition: service_started volumes: - ./data:/app/data # playwright_state.json + photo binaries # Read-only bind-mount Антоновского /sf/ SQLite — для objective_etl task. @@ -114,7 +108,7 @@ services: required: false depends_on: redis: - condition: service_healthy + condition: service_started command: ["celery", "-A", "app.workers.celery_app", "beat", "--loglevel=info"] caddy: @@ -128,10 +122,8 @@ services: - caddy_data:/data - caddy_config:/config depends_on: - backend: - condition: service_healthy - frontend: - condition: service_healthy + - backend + - frontend networks: - default # shared — для маршрута obsidian.gendsgn.ru → couchdb (отдельный stack).