0c975bb8f1
- **Common Contracts**: Updated DTOs and models to support workflow history; removed legacy analysis result DTOs.
- **Data Persistence Service**:
- Removed `analysis_results` table logic and API endpoints.
- Implemented `workflow_history` API and DB access (`history.rs`).
- Fixed compilation errors and updated tests.
- Exposed Postgres port in `docker-compose.yml` for easier debugging/offline checks.
- **API Gateway**:
- Implemented `history` endpoints (get history list, get by ID).
- Removed legacy `analysis-results` endpoints.
- Fixed routing and handler logic in `api.rs`.
- **Report Generator Service**:
- Removed dependency on legacy `analysis-results` persistence calls.
- Fixed compilation errors.
- **Workflow Orchestrator**: Fixed warnings and minor logic issues.
- **Providers**: Updated provider services (alphavantage, tushare, finnhub, yfinance, mock) to align with contract changes.
- **Frontend**:
- Updated `ReportPage` and stores to use new workflow history.
- Added `RecentReportsDropdown` component.
- Cleaned up `RealtimeLogs` component.
- **Documentation**: Moved completed design tasks to `completed/` and added refactoring context docs.
Confirmed all services pass `cargo check`.
301 lines
8.7 KiB
YAML
301 lines
8.7 KiB
YAML
services:
|
||
postgres-db:
|
||
image: timescale/timescaledb:2.15.2-pg16
|
||
container_name: fundamental-postgres
|
||
command: -c shared_preload_libraries=timescaledb
|
||
environment:
|
||
POSTGRES_USER: postgres
|
||
POSTGRES_PASSWORD: postgres
|
||
POSTGRES_DB: fundamental
|
||
volumes:
|
||
- pgdata:/var/lib/postgresql/data
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "pg_isready -U postgres -d fundamental"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 10
|
||
networks:
|
||
- app-network
|
||
ports:
|
||
- "5434:5432"
|
||
nats:
|
||
image: nats:2.9
|
||
volumes:
|
||
- nats_data:/data
|
||
networks:
|
||
- app-network
|
||
|
||
data-persistence-service:
|
||
build:
|
||
context: .
|
||
dockerfile: services/data-persistence-service/Dockerfile
|
||
# Override build context to ensure ignored files are included if needed, or rely on .dockerignore
|
||
container_name: data-persistence-service
|
||
environment:
|
||
HOST: 0.0.0.0
|
||
PORT: 3000
|
||
# Rust service connects to the internal DB service name
|
||
DATABASE_URL: postgresql://postgres:postgres@postgres-db:5432/fundamental
|
||
RUST_LOG: info
|
||
RUST_BACKTRACE: "1"
|
||
depends_on:
|
||
postgres-db:
|
||
condition: service_healthy
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "curl -fsS http://localhost:3000/health >/dev/null || exit 1"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 10
|
||
# If you prefer live-reload or local code mount, consider switching to a dev Dockerfile.
|
||
# volumes:
|
||
# - ./:/workspace
|
||
networks:
|
||
- app-network
|
||
|
||
|
||
frontend:
|
||
build:
|
||
context: .
|
||
dockerfile: frontend/Dockerfile
|
||
container_name: fundamental-frontend
|
||
working_dir: /workspace/frontend
|
||
command: ["/workspace/frontend/scripts/docker-dev-entrypoint.sh"]
|
||
environment:
|
||
# Vite Proxy Target
|
||
VITE_API_TARGET: http://api-gateway:4000
|
||
# 让 Next 的 API 路由代理到新的 api-gateway
|
||
NEXT_PUBLIC_BACKEND_URL: http://api-gateway:4000/v1
|
||
# SSR 内部访问自身 API 的内部地址，避免使用 x-forwarded-host 导致访问宿主机端口
|
||
FRONTEND_INTERNAL_URL: http://fundamental-frontend:3001
|
||
BACKEND_INTERNAL_URL: http://api-gateway:4000/v1
|
||
NODE_ENV: development
|
||
NEXT_TELEMETRY_DISABLED: "1"
|
||
volumes:
|
||
- ./:/workspace
|
||
# 隔离 node_modules，避免与宿主机冲突
|
||
- frontend_node_modules:/workspace/frontend/node_modules
|
||
ports:
|
||
- "13001:3001"
|
||
depends_on:
|
||
api-gateway:
|
||
condition: service_healthy
|
||
networks:
|
||
- app-network
|
||
|
||
|
||
api-gateway:
|
||
build:
|
||
context: .
|
||
dockerfile: services/api-gateway/Dockerfile
|
||
container_name: api-gateway
|
||
restart: unless-stopped
|
||
ports:
|
||
- "4000:4000"
|
||
environment:
|
||
SERVER_PORT: 4000
|
||
NATS_ADDR: nats://nats:4222
|
||
DATA_PERSISTENCE_SERVICE_URL: http://data-persistence-service:3000/api/v1
|
||
REPORT_GENERATOR_SERVICE_URL: http://report-generator-service:8004
|
||
RUST_LOG: info,axum=info
|
||
RUST_BACKTRACE: "1"
|
||
depends_on:
|
||
nats:
|
||
condition: service_started
|
||
data-persistence-service:
|
||
condition: service_healthy
|
||
alphavantage-provider-service:
|
||
condition: service_started
|
||
tushare-provider-service:
|
||
condition: service_started
|
||
finnhub-provider-service:
|
||
condition: service_started
|
||
yfinance-provider-service:
|
||
condition: service_started
|
||
report-generator-service:
|
||
condition: service_started
|
||
networks:
|
||
- app-network
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "curl -fsS http://localhost:4000/health >/dev/null || exit 1"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 12
|
||
|
||
alphavantage-provider-service:
|
||
build:
|
||
context: .
|
||
dockerfile: services/alphavantage-provider-service/Dockerfile
|
||
container_name: alphavantage-provider-service
|
||
volumes:
|
||
- workflow_data:/mnt/workflow_data
|
||
environment:
|
||
SERVER_PORT: 8000
|
||
NATS_ADDR: nats://nats:4222
|
||
DATA_PERSISTENCE_SERVICE_URL: http://data-persistence-service:3000/api/v1
|
||
API_GATEWAY_URL: http://api-gateway:4000
|
||
WORKFLOW_DATA_PATH: /mnt/workflow_data
|
||
SERVICE_HOST: alphavantage-provider-service
|
||
RUST_LOG: info,axum=info
|
||
RUST_BACKTRACE: "1"
|
||
depends_on:
|
||
- nats
|
||
- data-persistence-service
|
||
networks:
|
||
- app-network
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "curl -fsS http://localhost:8000/health >/dev/null || exit 1"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 12
|
||
|
||
tushare-provider-service:
|
||
build:
|
||
context: .
|
||
dockerfile: services/tushare-provider-service/Dockerfile
|
||
container_name: tushare-provider-service
|
||
volumes:
|
||
- workflow_data:/mnt/workflow_data
|
||
environment:
|
||
SERVER_PORT: 8001
|
||
NATS_ADDR: nats://nats:4222
|
||
DATA_PERSISTENCE_SERVICE_URL: http://data-persistence-service:3000/api/v1
|
||
TUSHARE_API_URL: http://api.waditu.com
|
||
API_GATEWAY_URL: http://api-gateway:4000
|
||
WORKFLOW_DATA_PATH: /mnt/workflow_data
|
||
SERVICE_HOST: tushare-provider-service
|
||
RUST_LOG: info,axum=info
|
||
RUST_BACKTRACE: "1"
|
||
depends_on:
|
||
- nats
|
||
- data-persistence-service
|
||
networks:
|
||
- app-network
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "curl -fsS http://localhost:8001/health >/dev/null || exit 1"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 12
|
||
|
||
finnhub-provider-service:
|
||
build:
|
||
context: .
|
||
dockerfile: services/finnhub-provider-service/Dockerfile
|
||
container_name: finnhub-provider-service
|
||
volumes:
|
||
- workflow_data:/mnt/workflow_data
|
||
environment:
|
||
SERVER_PORT: 8002
|
||
NATS_ADDR: nats://nats:4222
|
||
DATA_PERSISTENCE_SERVICE_URL: http://data-persistence-service:3000/api/v1
|
||
FINNHUB_API_URL: https://finnhub.io/api/v1
|
||
API_GATEWAY_URL: http://api-gateway:4000
|
||
WORKFLOW_DATA_PATH: /mnt/workflow_data
|
||
SERVICE_HOST: finnhub-provider-service
|
||
RUST_LOG: info,axum=info
|
||
RUST_BACKTRACE: "1"
|
||
depends_on:
|
||
- nats
|
||
- data-persistence-service
|
||
networks:
|
||
- app-network
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "curl -fsS http://localhost:8002/health >/dev/null || exit 1"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 12
|
||
|
||
yfinance-provider-service:
|
||
build:
|
||
context: .
|
||
dockerfile: services/yfinance-provider-service/Dockerfile
|
||
container_name: yfinance-provider-service
|
||
volumes:
|
||
- workflow_data:/mnt/workflow_data
|
||
environment:
|
||
SERVER_PORT: 8003
|
||
NATS_ADDR: nats://nats:4222
|
||
DATA_PERSISTENCE_SERVICE_URL: http://data-persistence-service:3000/api/v1
|
||
API_GATEWAY_URL: http://api-gateway:4000
|
||
WORKFLOW_DATA_PATH: /mnt/workflow_data
|
||
SERVICE_HOST: yfinance-provider-service
|
||
RUST_LOG: info,axum=info
|
||
RUST_BACKTRACE: "1"
|
||
depends_on:
|
||
- nats
|
||
- data-persistence-service
|
||
networks:
|
||
- app-network
|
||
dns:
|
||
- 8.8.8.8
|
||
- 8.8.4.4
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "curl -fsS http://localhost:8003/health >/dev/null || exit 1"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 12
|
||
|
||
report-generator-service:
|
||
build:
|
||
context: .
|
||
dockerfile: services/report-generator-service/Dockerfile
|
||
container_name: report-generator-service
|
||
volumes:
|
||
- workflow_data:/mnt/workflow_data
|
||
environment:
|
||
SERVER_PORT: 8004
|
||
NATS_ADDR: nats://nats:4222
|
||
DATA_PERSISTENCE_SERVICE_URL: http://data-persistence-service:3000/api/v1
|
||
WORKFLOW_DATA_PATH: /mnt/workflow_data
|
||
RUST_LOG: info,axum=info
|
||
RUST_BACKTRACE: "1"
|
||
depends_on:
|
||
- nats
|
||
- data-persistence-service
|
||
networks:
|
||
- app-network
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "curl -fsS http://localhost:8004/health >/dev/null || exit 1"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 12
|
||
|
||
workflow-orchestrator-service:
|
||
build:
|
||
context: .
|
||
dockerfile: services/workflow-orchestrator-service/Dockerfile
|
||
container_name: workflow-orchestrator-service
|
||
volumes:
|
||
- workflow_data:/mnt/workflow_data
|
||
environment:
|
||
SERVER_PORT: 8005
|
||
NATS_ADDR: nats://nats:4222
|
||
DATA_PERSISTENCE_SERVICE_URL: http://data-persistence-service:3000/api/v1
|
||
WORKFLOW_DATA_PATH: /mnt/workflow_data
|
||
RUST_LOG: info
|
||
RUST_BACKTRACE: "1"
|
||
depends_on:
|
||
- nats
|
||
- data-persistence-service
|
||
networks:
|
||
- app-network
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "curl -fsS http://localhost:8005/health >/dev/null || exit 1"]
|
||
interval: 5s
|
||
timeout: 5s
|
||
retries: 12
|
||
|
||
# =================================================================
|
||
# Python Services (Legacy - to be replaced)
|
||
# =================================================================
|
||
|
||
volumes:
|
||
workflow_data:
|
||
pgdata:
|
||
frontend_node_modules:
|
||
nats_data:
|
||
|
||
networks:
|
||
app-network:
|
||
|
||
|