Skip to content

refactor: Refactors AAI PostgreSQL fallback configuration (#541) #542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ct3685 merged 1 commit into from
Sep 15, 2025
Merged

refactor: Refactors AAI PostgreSQL fallback configuration (#541) #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 18 additions & 25 deletions packages/server/src/commands/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,34 +176,27 @@ export abstract class BaseCommand extends Command {
process.env.DATABASE_USER = username
process.env.DATABASE_PASSWORD = password
process.env.DATABASE_TYPE = engine
}

// Set AAI PostgreSQL variables from the shared secret (fallback for individual variables)
// Precedence order: Individual AAI secrets > Individual AAI variables > Shared DATABASE_SECRET
// If you want to manage AAI services individually, set AAI_DEFAULT_POSTGRES_*_SECRET variables
if (!process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_HOST) {
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_HOST = host
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_PORT = port
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_DATABASE = dbname
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_USER = username
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_PASSWORD = password
}
// AAI PostgreSQL fallbacks - Individual variable fallbacks using shorthand
// Precedence order: Individual AAI secrets > Individual AAI variables > Shared DATABASE_SECRET
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_HOST ||= process.env.DATABASE_HOST
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_PORT ||= process.env.DATABASE_PORT
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_DATABASE ||= process.env.DATABASE_NAME
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_USER ||= process.env.DATABASE_USER
process.env.AAI_DEFAULT_POSTGRES_RECORDMANAGER_PASSWORD ||= process.env.DATABASE_PASSWORD

if (!process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_HOST) {
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_HOST = host
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_PORT = port
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_DATABASE = dbname
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_USER = username
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_PASSWORD = password
}
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_HOST ||= process.env.DATABASE_HOST
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_PORT ||= process.env.DATABASE_PORT
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_DATABASE ||= process.env.DATABASE_NAME
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_USER ||= process.env.DATABASE_USER
process.env.AAI_DEFAULT_POSTGRES_AGENTMEMORY_PASSWORD ||= process.env.DATABASE_PASSWORD

if (!process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_HOST) {
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_HOST = host
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_PORT = port
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_DATABASE = dbname
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_USER = username
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_PASSWORD = password
}
}
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_HOST ||= process.env.DATABASE_HOST
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_PORT ||= process.env.DATABASE_PORT
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_DATABASE ||= process.env.DATABASE_NAME
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_USER ||= process.env.DATABASE_USER
process.env.AAI_DEFAULT_POSTGRES_VECTORSTORE_PASSWORD ||= process.env.DATABASE_PASSWORD

// Parse individual AAI secrets if they exist (highest precedence)
// This allows managing each AAI service with its own database/credentials
Expand Down
2 changes: 0 additions & 2 deletions render.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@ services:
fromDatabase:
name: aai-unified3-database
property: password
- key: DATABASE_SECRET
value: '{"engine":"postgres","host":"${DATABASE_HOST}","port":"${DATABASE_PORT}","dbname":"${DATABASE_NAME}","username":"${DATABASE_USER}","password":"${DATABASE_PASSWORD}"}'

# =========================================
# Flowise Auth0 Configuration (Must Match Frontend)
Expand Down
Loading