diff --git a/CHANGELOG.md b/CHANGELOG.md index 8aaee5c0..640d581f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.0.11] - 2025-05-16 + +### Changed + +- Fixes on email service and client service + ## [0.0.10] - 2025-05-15 ### Added diff --git a/Dockerfile b/Dockerfile index f7dca666..040fc35e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,4 +34,4 @@ ENV PORT=8000 \ # Expose port EXPOSE 8000 -CMD alembic upgrade head && uvicorn src.main:app --host $HOST --port $PORT \ No newline at end of file +CMD alembic upgrade head && python -m scripts.run_seeders && uvicorn src.main:app --host $HOST --port $PORT \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 98458093..07334f1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,19 +3,15 @@ version: "3.8" services: api: image: evo-ai-api:latest - build: . - container_name: evo-ai-api depends_on: - postgres: - condition: service_healthy - redis: - condition: service_healthy + - postgres + - redis ports: - "8000:8000" environment: POSTGRES_CONNECTION_STRING: postgresql://postgres:${POSTGRES_PASSWORD:-postgres}@postgres:5432/evo_ai REDIS_HOST: redis - REDIS_PORT: 6379 + REDIS_PORT: ${REDIS_PORT:-6379} REDIS_PASSWORD: ${REDIS_PASSWORD:-""} REDIS_SSL: "false" REDIS_KEY_PREFIX: "a2a:" @@ -29,7 +25,6 @@ services: volumes: - ./logs:/app/logs - ./static:/app/static - restart: unless-stopped healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/"] interval: 30s @@ -41,12 +36,9 @@ services: limits: cpus: "1" memory: 1G - networks: - - evo-network postgres: image: postgres:14-alpine - container_name: evo-ai-postgres environment: POSTGRES_USER: postgres POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres} @@ -55,15 +47,12 @@ services: - "${POSTGRES_PORT:-5432}:5432" volumes: - postgres_data:/var/lib/postgresql/data - restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] interval: 10s timeout: 5s retries: 5 start_period: 10s - networks: - - evo-network deploy: resources: limits: @@ -72,8 +61,12 @@ services: redis: image: redis:alpine - container_name: evo-ai-redis - command: redis-server --appendonly yes ${REDIS_PASSWORD:+--requirepass ${REDIS_PASSWORD}} + command: + - redis-server + - --appendonly + - "yes" + - --requirepass + - "${REDIS_PASSWORD}" ports: - "${REDIS_PORT:-6379}:6379" volumes: @@ -83,9 +76,6 @@ services: interval: 5s timeout: 30s retries: 50 - restart: unless-stopped - networks: - - evo-network deploy: resources: limits: @@ -97,8 +87,3 @@ volumes: name: ${POSTGRES_VOLUME_NAME:-evo-ai-postgres-data} redis_data: name: ${REDIS_VOLUME_NAME:-evo-ai-redis-data} - -networks: - evo-network: - name: ${NETWORK_NAME:-evo-network} - driver: bridge diff --git a/src/services/client_service.py b/src/services/client_service.py index ad4bed08..9ec0e4d6 100644 --- a/src/services/client_service.py +++ b/src/services/client_service.py @@ -154,7 +154,7 @@ def create_client_with_user( # Use client ID to create the associated user user, message = create_user( - db, user_data, is_admin=False, client_id=client.id, auto_verify=True + db, user_data, is_admin=False, client_id=client.id, auto_verify=False ) if not user: diff --git a/src/services/email_service.py b/src/services/email_service.py index bf234ab7..debd4a3c 100644 --- a/src/services/email_service.py +++ b/src/services/email_service.py @@ -37,7 +37,7 @@ import smtplib from email.mime.text import MIMEText from email.mime.multipart import MIMEMultipart from pathlib import Path -from config.settings import settings +from src.config.settings import settings logger = logging.getLogger(__name__)