diff --git a/deploy.env b/deploy.env index 74df73e79..a4eaa32c1 100644 --- a/deploy.env +++ b/deploy.env @@ -158,10 +158,9 @@ AI_SERVER_HOST=ai AI_DATABASE_URL=postgresql+psycopg://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} AI_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT} LOCAL_AI_TEST_ENABLED=false -AI_APPFLOWY_BUCKET_NAME=appflowy +AI_APPFLOWY_BUCKET_NAME=${APPFLOWY_S3_BUCKET} AI_APPFLOWY_HOST=${FQDN} -AI_AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY} -AI_AWS_SECRET_ACCESS_KEY=${AWS_SECRET} +AI_MINIO_URL=http://${MINIO_HOST}:${MINIO_PORT} # AppFlowy Indexer APPFLOWY_INDEXER_ENABLED=true diff --git a/dev.env b/dev.env index 24a12cd69..b08fced2c 100644 --- a/dev.env +++ b/dev.env @@ -123,10 +123,9 @@ AI_SERVER_HOST=localhost AI_DATABASE_URL=postgresql+psycopg://postgres:password@localhost:5432/postgres AI_REDIS_URL=redis://localhost:6379 LOCAL_AI_TEST_ENABLED=false -AI_APPFLOWY_BUCKET_NAME=appflowy +AI_APPFLOWY_BUCKET_NAME=${APPFLOWY_S3_BUCKET} AI_APPFLOWY_HOST=http://localhost:8000 -AI_AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY} -AI_AWS_SECRET_ACCESS_KEY=${AWS_SECRET} +AI_MINIO_URL=http://localhost:9000 # AppFlowy Indexer APPFLOWY_INDEXER_ENABLED=true diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index a21747e98..9cf610218 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -173,14 +173,15 @@ services: - "5001:5001" environment: - OPENAI_API_KEY=${AI_OPENAI_API_KEY} - - AI_AWS_ACCESS_KEY_ID=${AI_AWS_ACCESS_KEY_ID} - - AI_AWS_SECRET_ACCESS_KEY=${AI_AWS_SECRET_ACCESS_KEY} + - AI_AWS_ACCESS_KEY_ID=${APPFLOWY_S3_ACCESS_KEY} + - AI_AWS_SECRET_ACCESS_KEY=${APPFLOWY_S3_SECRET_KEY} + - AI_APPFLOWY_BUCKET_NAME=${AI_APPFLOWY_BUCKET_NAME} - AI_SERVER_PORT=${AI_SERVER_PORT} - AI_DATABASE_URL=${AI_DATABASE_URL} - AI_REDIS_URL=${AI_REDIS_URL} - - AI_APPFLOWY_BUCKET_NAME=${AI_APPFLOWY_BUCKET_NAME} - - AI_APPFLOWY_HOST=${AI_APPFLOWY_HOST} - AI_USE_MINIO=${APPFLOWY_S3_USE_MINIO} + - AI_MINIO_URL=${AI_MINIO_URL} + - AI_APPFLOWY_HOST=${AI_APPFLOWY_HOST} - SUPPORT_OPENAI_V3_IMAGE_MODEL=false appflowy_worker: diff --git a/src/api/file_storage.rs b/src/api/file_storage.rs index 03fc9b082..dd0f2862e 100644 --- a/src/api/file_storage.rs +++ b/src/api/file_storage.rs @@ -389,6 +389,7 @@ async fn get_blob_by_object_key( } } + trace!("Get blob data from bucket storage: {:?}", key.object_key()); let blob_result = state.bucket_storage.get_blob(key).await; match blob_result { Ok(blob) => {