- Migratie van de test omgeving naar nieuwe realiteit

This commit is contained in:
Josako
2025-09-10 14:59:07 +02:00
parent 6ccba7d1e3
commit 7cb19ca21e
2 changed files with 51 additions and 17 deletions

View File

@@ -368,7 +368,7 @@ class DevConfig(Config):
CHAT_CLIENT_PREFIX = 'chat-client/chat/' CHAT_CLIENT_PREFIX = 'chat-client/chat/'
# Define the static path # Define the static path
STATIC_URL = 'https://evie-staging-static.askeveai.com' STATIC_URL = None
# PATH settings # PATH settings
ffmpeg_path = '/usr/bin/ffmpeg' ffmpeg_path = '/usr/bin/ffmpeg'
@@ -376,7 +376,7 @@ class DevConfig(Config):
# OBJECT STORAGE # OBJECT STORAGE
OBJECT_STORAGE_TYPE = 'MINIO' OBJECT_STORAGE_TYPE = 'MINIO'
OBJECT_STORAGE_TENANT_BASE = 'folder' OBJECT_STORAGE_TENANT_BASE = 'folder'
OBJECT_STORAGE_BUCKET_NAME = ('eveai-tenants') OBJECT_STORAGE_BUCKET_NAME = 'eveai-tenants'
# MINIO # MINIO
MINIO_ENDPOINT = 'minio:9000' MINIO_ENDPOINT = 'minio:9000'
MINIO_ACCESS_KEY = 'minioadmin' MINIO_ACCESS_KEY = 'minioadmin'
@@ -396,15 +396,15 @@ class TestConfig(Config):
CHAT_CLIENT_PREFIX = 'chat-client/chat/' CHAT_CLIENT_PREFIX = 'chat-client/chat/'
# Define the static path # Define the static path
STATIC_URL = 'https://evie-staging-static.askeveai.com' STATIC_URL = None
# PATH settings # PATH settings
ffmpeg_path = '/usr/bin/ffmpeg' ffmpeg_path = '/usr/bin/ffmpeg'
# OBJECT STORAGE # OBJECT STORAGE
OBJECT_STORAGE_TYPE = 'MINIO' OBJECT_STORAGE_TYPE = 'MINIO'
OBJECT_STORAGE_TENANT_BASE = 'bucket' OBJECT_STORAGE_TENANT_BASE = 'folder'
OBJECT_STORAGE_BUCKET_NAME = 'main' OBJECT_STORAGE_BUCKET_NAME = 'eveai-tenants'
# MINIO # MINIO
MINIO_ENDPOINT = 'minio:9000' MINIO_ENDPOINT = 'minio:9000'
MINIO_ACCESS_KEY = 'minioadmin' MINIO_ACCESS_KEY = 'minioadmin'

View File

@@ -18,10 +18,6 @@ x-common-variables: &common-variables
FLASK_DEBUG: true FLASK_DEBUG: true
SECRET_KEY: '31f87c24d691a5ee8e6a36eb14bf7ba6a19ff53ab1b37ecba140d0f7e577e41' SECRET_KEY: '31f87c24d691a5ee8e6a36eb14bf7ba6a19ff53ab1b37ecba140d0f7e577e41'
SECURITY_PASSWORD_SALT: '331694859419473264015565568764321607531' SECURITY_PASSWORD_SALT: '331694859419473264015565568764321607531'
MAIL_USERNAME: evie_test@askeveai.be
MAIL_PASSWORD: '8pF6AucbXi9Rt6R'
MAIL_SERVER: mail.flow-it.net
MAIL_PORT: 465
REDIS_URL: redis REDIS_URL: redis
REDIS_PORT: '6379' REDIS_PORT: '6379'
FLOWER_USER: 'Felucia' FLOWER_USER: 'Felucia'
@@ -32,11 +28,10 @@ x-common-variables: &common-variables
MINIO_ENDPOINT: minio:9000 MINIO_ENDPOINT: minio:9000
MINIO_ACCESS_KEY: minioadmin MINIO_ACCESS_KEY: minioadmin
MINIO_SECRET_KEY: minioadmin MINIO_SECRET_KEY: minioadmin
NGINX_SERVER_NAME: 'localhost http://macstudio.ask-eve-ai-local.com/' NGINX_SERVER_NAME: 'localhost http://test.ask-eve-ai-local.com/'
CREWAI_STORAGE_DIR: "/app/crewai_storage" CREWAI_STORAGE_DIR: "/app/crewai_storage"
PUSH_GATEWAY_HOST: "pushgateway" PUSH_GATEWAY_HOST: "pushgateway"
PUSH_GATEWAY_PORT: "9091" PUSH_GATEWAY_PORT: "9091"
COMPONENT_NAME: ${COMPONENT_NAME:-unknown}
SW_EMAIL_ACCESS_KEY: "SCWFMQ871RE4XGF04SW0" SW_EMAIL_ACCESS_KEY: "SCWFMQ871RE4XGF04SW0"
SW_EMAIL_SECRET_KEY: "ec84604c-e2d4-4b0d-a120-40420693f42a" SW_EMAIL_SECRET_KEY: "ec84604c-e2d4-4b0d-a120-40420693f42a"
SW_EMAIL_SENDER: "admin_test@mail.askeveai.be" SW_EMAIL_SENDER: "admin_test@mail.askeveai.be"
@@ -62,6 +57,42 @@ services:
- eveai-test-network - eveai-test-network
restart: unless-stopped restart: unless-stopped
eveai_ops:
image: ${REGISTRY_PREFIX:-}josakola/eveai_ops:latest
build:
context: ..
dockerfile: ./docker/eveai_ops/Dockerfile
ports:
- 4002:8080 # Dev app volgens port schema
expose:
- 8000
environment:
<<: *common-variables
COMPONENT_NAME: eveai_ops
ROLE: web
PORT: 8080
WORKERS: 1 # Dev: lagere concurrency
WORKER_CLASS: gevent
WORKER_CONN: 100
LOGLEVEL: debug # Lowercase voor gunicorn
MAX_REQUESTS: 1000
MAX_REQUESTS_JITTER: 100
volumes:
- ./eveai_logs:/app/logs
depends_on:
redis:
condition: service_healthy
minio:
condition: service_healthy
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost:8080/healthz/ready" ]
interval: 30s
timeout: 10s
retries: 3
start_period: 60s
networks:
- eveai-test-network
eveai_app: eveai_app:
image: ${REGISTRY_PREFIX:-}josakola/eveai_app:latest image: ${REGISTRY_PREFIX:-}josakola/eveai_app:latest
ports: ports:
@@ -76,7 +107,7 @@ services:
WORKERS: 2 # Test: hogere concurrency WORKERS: 2 # Test: hogere concurrency
WORKER_CLASS: gevent WORKER_CLASS: gevent
WORKER_CONN: 100 WORKER_CONN: 100
LOGLEVEL: info # Lowercase voor gunicorn LOGLEVEL: debug # Lowercase voor gunicorn
MAX_REQUESTS: 1000 MAX_REQUESTS: 1000
MAX_REQUESTS_JITTER: 100 MAX_REQUESTS_JITTER: 100
volumes: volumes:
@@ -105,9 +136,10 @@ services:
COMPONENT_NAME: eveai_workers COMPONENT_NAME: eveai_workers
ROLE: worker ROLE: worker
CELERY_CONCURRENCY: 2 # Test: hogere concurrency CELERY_CONCURRENCY: 2 # Test: hogere concurrency
CELERY_LOGLEVEL: INFO # Uppercase voor celery CELERY_LOGLEVEL: DEBUG # Uppercase voor celery
CELERY_MAX_TASKS_PER_CHILD: 1000 CELERY_MAX_TASKS_PER_CHILD: 1000
CELERY_PREFETCH: 1 CELERY_PREFETCH: 1
CELERY_QUEUE_NAME: embeddings
volumes: volumes:
- test_eveai_logs:/app/logs - test_eveai_logs:/app/logs
depends_on: depends_on:
@@ -133,7 +165,7 @@ services:
WORKERS: 2 # Test: hogere concurrency WORKERS: 2 # Test: hogere concurrency
WORKER_CLASS: gevent WORKER_CLASS: gevent
WORKER_CONN: 100 WORKER_CONN: 100
LOGLEVEL: info # Lowercase voor gunicorn LOGLEVEL: debug # Lowercase voor gunicorn
MAX_REQUESTS: 1000 MAX_REQUESTS: 1000
MAX_REQUESTS_JITTER: 100 MAX_REQUESTS_JITTER: 100
volumes: volumes:
@@ -162,9 +194,10 @@ services:
COMPONENT_NAME: eveai_chat_workers COMPONENT_NAME: eveai_chat_workers
ROLE: worker ROLE: worker
CELERY_CONCURRENCY: 2 # Test: hogere concurrency CELERY_CONCURRENCY: 2 # Test: hogere concurrency
CELERY_LOGLEVEL: INFO # Uppercase voor celery CELERY_LOGLEVEL: DEBUG # Uppercase voor celery
CELERY_MAX_TASKS_PER_CHILD: 1000 CELERY_MAX_TASKS_PER_CHILD: 1000
CELERY_PREFETCH: 1 CELERY_PREFETCH: 1
CELERY_QUEUE_NAME: llm_interactions
volumes: volumes:
- test_eveai_logs:/app/logs - test_eveai_logs:/app/logs
depends_on: depends_on:
@@ -188,7 +221,7 @@ services:
WORKERS: 2 # Test: hogere concurrency WORKERS: 2 # Test: hogere concurrency
WORKER_CLASS: gevent WORKER_CLASS: gevent
WORKER_CONN: 100 WORKER_CONN: 100
LOGLEVEL: info # Lowercase voor gunicorn LOGLEVEL: debug # Lowercase voor gunicorn
MAX_REQUESTS: 1000 MAX_REQUESTS: 1000
MAX_REQUESTS_JITTER: 100 MAX_REQUESTS_JITTER: 100
volumes: volumes:
@@ -233,9 +266,10 @@ services:
COMPONENT_NAME: eveai_entitlements COMPONENT_NAME: eveai_entitlements
ROLE: worker ROLE: worker
CELERY_CONCURRENCY: 2 # Test: hogere concurrency CELERY_CONCURRENCY: 2 # Test: hogere concurrency
CELERY_LOGLEVEL: INFO # Uppercase voor celery CELERY_LOGLEVEL: DEBUG # Uppercase voor celery
CELERY_MAX_TASKS_PER_CHILD: 1000 CELERY_MAX_TASKS_PER_CHILD: 1000
CELERY_PREFETCH: 1 CELERY_PREFETCH: 1
CELERY_QUEUE_NAME: entitlements
volumes: volumes:
- test_eveai_logs:/app/logs - test_eveai_logs:/app/logs
depends_on: depends_on: