Refactor: Update configuration for database ports and remove unused d…

…ependencies; enhance API server settings
digidem · Jan 22, 2025 · 26b7f45 · 26b7f45
1 parent 16e93d2
commit 26b7f45
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 26 deletions.
diff --git a/apps/ai_api/eda_ai_api/main.py b/apps/ai_api/eda_ai_api/main.py
@@ -31,12 +31,15 @@ def run_server() -> None:
 
     # Use localhost for development, configure via config for production
     host = "127.0.0.1"  # Default to localhost
-    if config.services.ai_api.get(
-        "allow_external", False
-    ):  # Only if explicitly enabled
+    if (
+        hasattr(config.services.ai_api, "allow_external")
+        and config.services.ai_api.allow_external
+    ):
         host = "0.0.0.0"  # nosec B104 # Explicitly allowed in config
 
-    uvicorn.run("eda_ai_api.main:app", host=host, port=config.ports.ai_api, reload=True)
+    uvicorn.run(
+        "eda_ai_api.main:app", host=host, port=config.ports.ai_api, reload=True
+    )
 
 
 if __name__ == "__main__":

diff --git a/apps/ai_api/uv.lock b/apps/ai_api/uv.lock
diff --git a/config.example.yaml b/config.example.yaml
@@ -10,7 +10,9 @@ ports:
   landingpage: 8081
   docs: 8082
   db:
-    postgres: 5432
+    postgres: 5439      
+    trigger_postgres: 5440  
+    langtrace_postgres: 5441 
     redis: 6379
     neo4j:
       http: 7474  # Neo4j browser interface
@@ -114,7 +116,7 @@ services:
   trigger:
     project_id: "xxx"
     api_url: "http://localhost:3040"
-    environment: "development"
+    environment: "production"
     runtime: "docker-compose"
     v3_enabled: true
     concurrency:

diff --git a/deploy/trigger-stack/export-config.ts b/deploy/trigger-stack/export-config.ts
@@ -18,7 +18,7 @@ const envVars = {
   DIRECT_URL: `postgresql://${config.databases.trigger_postgres.user}:${config.databases.trigger_postgres.password}@postgres:5432/${config.databases.trigger_postgres.database}`, // Add this line
 
   // Add database ports
-  POSTGRES_PORT: config.ports.db.postgres,
+  POSTGRES_PORT: config.ports.db.trigger_postgres, // Use trigger-specific port
   REDIS_PORT: config.ports.db.redis,
 
   // Redis settings

diff --git a/packages/config/python/eda_config/types.py b/packages/config/python/eda_config/types.py
@@ -64,6 +64,8 @@ class ApiKeys(BaseModel):
 
 class DbPorts(BaseModel):
     postgres: int
+    trigger_postgres: int  # Add new port
+    langtrace_postgres: int  # Add new port
     redis: int
     neo4j: Dict[str, int]
     clickhouse: int

diff --git a/packages/config/python/pyproject.toml b/packages/config/python/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "eda-config"
-version = "0.1.16"
+version = "0.1.19"
 description = "Configuration management for EDA"
 requires-python = ">=3.11"
 dependencies = [

diff --git a/packages/config/typescript/package.json b/packages/config/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eda/config",
-  "version": "0.1.11",
+  "version": "0.1.14",
   "main": "dist/config.js",
   "types": "dist/config.d.ts",
   "type": "module",

diff --git a/packages/config/typescript/src/types.ts b/packages/config/typescript/src/types.ts
@@ -171,6 +171,8 @@ export const ConfigSchema = z.object({
     docs: z.number(),
     db: z.object({
       postgres: z.number(),
+      trigger_postgres: z.number(), // Add new port
+      langtrace_postgres: z.number(), // Add new port
       redis: z.number(),
       neo4j: z.object({
         http: z.number(),