@aifabrix/builder 2.0.0 → 2.0.2

package/templates/python/docker-compose.hbs

@@ -8,11 +8,12 @@ services:
   {{app.key}}:
     image: {{image.name}}:{{image.tag}}
     container_name: aifabrix-{{app.key}}
-    env_file: .env
+    env_file:
+      - {{envFile}}
     ports:
       - "{{build.localPort}}:{{port}}"
     networks:
-      - aifabrix-network
+      - infra_aifabrix-network
     {{#if requiresStorage}}
     volumes:
       - "{{mountVolume}}:/mnt/data"
@@ -39,31 +40,37 @@ services:
       - ${ADMIN_SECRETS_PATH}
     environment:
       POSTGRES_DB: postgres
+      PGHOST: postgres
+      PGPORT: "5432"
+      PGUSER: pgadmin
     networks:
-      - aifabrix-network
+      - infra_aifabrix-network
     command: >
       sh -c "
-        echo 'Creating {{app.key}} database and user...' &&
-        psql -d postgres -c 'CREATE DATABASE {{app.key}};' || echo '{{app.key}} database exists' &&
-        psql -d postgres -c \"CREATE USER {{app.key}}_user WITH PASSWORD '{{app.key}}_pass123';\" || echo '{{app.key}}_user exists' &&
-        psql -d postgres -c 'GRANT ALL PRIVILEGES ON DATABASE {{app.key}} TO {{app.key}}_user;' &&
-        psql -d {{app.key}} -c 'ALTER SCHEMA public OWNER TO {{app.key}}_user;' &&
-        psql -d {{app.key}} -c 'GRANT ALL ON SCHEMA public TO {{app.key}}_user;' &&
+        export PGHOST=postgres PGPORT=5432 PGUSER=pgadmin &&
+        export PGPASSWORD="${POSTGRES_PASSWORD}" &&
+        {{#if databases}}
         {{#each databases}}
-        {{#unless @first}}
         echo 'Creating {{name}} database and user...' &&
         psql -d postgres -c 'CREATE DATABASE {{name}};' || echo '{{name}} database exists' &&
         psql -d postgres -c \"CREATE USER {{name}}_user WITH PASSWORD '{{name}}_pass123';\" || echo '{{name}}_user exists' &&
         psql -d postgres -c 'GRANT ALL PRIVILEGES ON DATABASE {{name}} TO {{name}}_user;' &&
         psql -d {{name}} -c 'ALTER SCHEMA public OWNER TO {{name}}_user;' &&
         psql -d {{name}} -c 'GRANT ALL ON SCHEMA public TO {{name}}_user;' &&
-        {{/unless}}
         {{/each}}
+        {{else}}
+        echo 'Creating {{app.key}} database and user...' &&
+        psql -d postgres -c 'CREATE DATABASE {{app.key}};' || echo '{{app.key}} database exists' &&
+        psql -d postgres -c \"CREATE USER {{app.key}}_user WITH PASSWORD '{{app.key}}_pass123';\" || echo '{{app.key}}_user exists' &&
+        psql -d postgres -c 'GRANT ALL PRIVILEGES ON DATABASE {{app.key}} TO {{app.key}}_user;' &&
+        psql -d {{app.key}} -c 'ALTER SCHEMA public OWNER TO {{app.key}}_user;' &&
+        psql -d {{app.key}} -c 'GRANT ALL ON SCHEMA public TO {{app.key}}_user;' &&
+        {{/if}}
         echo 'Database initialization complete!'
       "
     restart: "no"
   {{/if}}
 
 networks:
-  aifabrix-network:
+  infra_aifabrix-network:
     external: true

package/templates/python/main.py

@@ -0,0 +1,80 @@
+import os
+from datetime import datetime
+from flask import Flask, jsonify
+
+app = Flask(__name__)
+PORT = int(os.environ.get('PORT', 3000))
+
+def check_database():
+    """Check database connection"""
+    database_url = os.environ.get('DATABASE_URL')
+    
+    try:
+        import psycopg2
+        
+        # If DATABASE_URL is set, use it
+        if database_url:
+            from urllib.parse import urlparse
+            # Parse DATABASE_URL (format: postgresql://user:password@host:port/database)
+            parsed = urlparse(database_url)
+            
+            conn = psycopg2.connect(
+                host=parsed.hostname or os.environ.get('DATABASE_HOST', 'postgres'),
+                port=parsed.port or int(os.environ.get('DATABASE_PORT', 5432)),
+                database=parsed.path[1:] if parsed.path else os.environ.get('DATABASE_NAME', 'postgres'),
+                user=parsed.username or os.environ.get('DATABASE_USER', 'pgadmin'),
+                password=parsed.password or os.environ.get('DATABASE_PASSWORD', 'admin123')
+            )
+        else:
+            # Fallback to individual environment variables
+            conn = psycopg2.connect(
+                host=os.environ.get('DATABASE_HOST', os.environ.get('DB_HOST', 'postgres')),
+                port=int(os.environ.get('DATABASE_PORT', os.environ.get('DB_PORT', 5432))),
+                database=os.environ.get('DATABASE_NAME', os.environ.get('DB_NAME', 'postgres')),
+                user=os.environ.get('DATABASE_USER', os.environ.get('DB_USER', 'pgadmin')),
+                password=os.environ.get('DATABASE_PASSWORD', os.environ.get('DB_PASSWORD', 'admin123'))
+            )
+        
+        conn.close()
+        return True
+    except ImportError:
+        return 'psycopg2 not installed'
+    except Exception as e:
+        return str(e)
+
+@app.route('/health', methods=['GET'])
+def health():
+    """Health check endpoint with database connectivity check"""
+    health_status = {
+        'status': 'ok',
+        'timestamp': datetime.utcnow().isoformat() + 'Z'
+    }
+    
+    # Check database connection if database is configured (DATABASE_URL or individual vars)
+    database_url = os.environ.get('DATABASE_URL')
+    database_host = os.environ.get('DATABASE_HOST') or os.environ.get('DB_HOST')
+    database_name = os.environ.get('DATABASE_NAME') or os.environ.get('DB_NAME')
+    
+    # Only check database if database is configured
+    if database_url or database_host or database_name:
+        db_check = check_database()
+        if db_check is True:
+            health_status['database'] = 'connected'
+        else:
+            health_status['database'] = 'error'
+            health_status['database_error'] = str(db_check)
+            return jsonify(health_status), 503
+    
+    return jsonify(health_status), 200
+
+@app.route('/', methods=['GET'])
+def root():
+    """Root endpoint"""
+    return jsonify({
+        'message': 'AI Fabrix Application',
+        'version': '1.0.0'
+    }), 200
+
+if __name__ == '__main__':
+    app.run(host='0.0.0.0', port=PORT, debug=False)
+

package/templates/python/requirements.txt

@@ -0,0 +1,4 @@
+Flask==3.0.0
+gunicorn==21.2.0
+psycopg2-binary==2.9.9
+

package/templates/typescript/Dockerfile.hbs

@@ -16,8 +16,8 @@ RUN apk add --no-cache \
 # Copy package files first for better layer caching
 COPY package*.json ./
 
-# Install dependencies
-RUN npm ci --only=production && npm cache clean --force
+# Install dependencies (including devDependencies for ts-node)
+RUN npm install && npm cache clean --force
 
 # Copy application code
 COPY . .

package/templates/typescript/docker-compose.hbs

@@ -8,11 +8,12 @@ services:
   {{app.key}}:
     image: {{image.name}}:{{image.tag}}
     container_name: aifabrix-{{app.key}}
-    env_file: .env
+    env_file:
+      - {{envFile}}
     ports:
       - "{{build.localPort}}:{{port}}"
     networks:
-      - aifabrix-network
+      - infra_aifabrix-network
     {{#if requiresStorage}}
     volumes:
       - "{{mountVolume}}:/mnt/data"
@@ -39,31 +40,37 @@ services:
       - ${ADMIN_SECRETS_PATH}
     environment:
       POSTGRES_DB: postgres
+      PGHOST: postgres
+      PGPORT: "5432"
+      PGUSER: pgadmin
     networks:
-      - aifabrix-network
+      - infra_aifabrix-network
     command: >
       sh -c "
-        echo 'Creating {{app.key}} database and user...' &&
-        psql -d postgres -c 'CREATE DATABASE {{app.key}};' || echo '{{app.key}} database exists' &&
-        psql -d postgres -c \"CREATE USER {{app.key}}_user WITH PASSWORD '{{app.key}}_pass123';\" || echo '{{app.key}}_user exists' &&
-        psql -d postgres -c 'GRANT ALL PRIVILEGES ON DATABASE {{app.key}} TO {{app.key}}_user;' &&
-        psql -d {{app.key}} -c 'ALTER SCHEMA public OWNER TO {{app.key}}_user;' &&
-        psql -d {{app.key}} -c 'GRANT ALL ON SCHEMA public TO {{app.key}}_user;' &&
+        export PGHOST=postgres PGPORT=5432 PGUSER=pgadmin &&
+        export PGPASSWORD="${POSTGRES_PASSWORD}" &&
+        {{#if databases}}
         {{#each databases}}
-        {{#unless @first}}
         echo 'Creating {{name}} database and user...' &&
         psql -d postgres -c 'CREATE DATABASE {{name}};' || echo '{{name}} database exists' &&
         psql -d postgres -c \"CREATE USER {{name}}_user WITH PASSWORD '{{name}}_pass123';\" || echo '{{name}}_user exists' &&
         psql -d postgres -c 'GRANT ALL PRIVILEGES ON DATABASE {{name}} TO {{name}}_user;' &&
         psql -d {{name}} -c 'ALTER SCHEMA public OWNER TO {{name}}_user;' &&
         psql -d {{name}} -c 'GRANT ALL ON SCHEMA public TO {{name}}_user;' &&
-        {{/unless}}
         {{/each}}
+        {{else}}
+        echo 'Creating {{app.key}} database and user...' &&
+        psql -d postgres -c 'CREATE DATABASE {{app.key}};' || echo '{{app.key}} database exists' &&
+        psql -d postgres -c \"CREATE USER {{app.key}}_user WITH PASSWORD '{{app.key}}_pass123';\" || echo '{{app.key}}_user exists' &&
+        psql -d postgres -c 'GRANT ALL PRIVILEGES ON DATABASE {{app.key}} TO {{app.key}}_user;' &&
+        psql -d {{app.key}} -c 'ALTER SCHEMA public OWNER TO {{app.key}}_user;' &&
+        psql -d {{app.key}} -c 'GRANT ALL ON SCHEMA public TO {{app.key}}_user;' &&
+        {{/if}}
         echo 'Database initialization complete!'
       "
     restart: "no"
   {{/if}}
 
 networks:
-  aifabrix-network:
+  infra_aifabrix-network:
     external: true

package/templates/typescript/index.ts

@@ -0,0 +1,116 @@
+import express from 'express';
+import { Pool } from 'pg';
+import { Request, Response } from 'express';
+
+const app = express();
+const PORT = process.env.PORT || 3000;
+
+app.use(express.json());
+
+// Database connection pool
+let dbPool: Pool | null = null;
+
+function initDatabase() {
+  const databaseUrl = process.env.DATABASE_URL;
+  if (!databaseUrl) {
+    return null;
+  }
+
+  try {
+    dbPool = new Pool({
+      connectionString: databaseUrl,
+      connectionTimeoutMillis: 5000,
+    });
+    return dbPool;
+  } catch (error) {
+    console.error('Failed to initialize database pool:', error);
+    return null;
+  }
+}
+
+async function checkDatabase(): Promise<{ connected: boolean; error?: string }> {
+  // If DATABASE_URL is not set, try to connect using individual environment variables
+  if (!dbPool && process.env.DATABASE_URL) {
+    // DATABASE_URL was set but pool initialization failed
+    return { connected: false, error: 'Database pool not initialized' };
+  }
+  
+  // If no DATABASE_URL, try to create connection from individual vars
+  if (!dbPool) {
+    const host = process.env.DATABASE_HOST || process.env.DB_HOST || 'postgres';
+    const port = parseInt(process.env.DATABASE_PORT || process.env.DB_PORT || '5432', 10);
+    const database = process.env.DATABASE_NAME || process.env.DB_NAME || 'postgres';
+    const user = process.env.DATABASE_USER || process.env.DB_USER || 'pgadmin';
+    const password = process.env.DATABASE_PASSWORD || process.env.DB_PASSWORD || 'admin123';
+    
+    if (!host && !database) {
+      return { connected: false, error: 'Database not configured' };
+    }
+    
+    try {
+      const tempPool = new Pool({
+        host,
+        port,
+        database,
+        user,
+        password,
+        connectionTimeoutMillis: 5000,
+      });
+      const client = await tempPool.connect();
+      await client.query('SELECT 1');
+      client.release();
+      await tempPool.end();
+      return { connected: true };
+    } catch (error: any) {
+      return { connected: false, error: error.message || 'Database connection failed' };
+    }
+  }
+
+  try {
+    const client = await dbPool.connect();
+    await client.query('SELECT 1');
+    client.release();
+    return { connected: true };
+  } catch (error: any) {
+    return { connected: false, error: error.message || 'Database connection failed' };
+  }
+}
+
+// Initialize database on startup
+initDatabase();
+
+// Health check endpoint with database connectivity check
+app.get('/health', async (req: Request, res: Response) => {
+  const healthStatus: any = {
+    status: 'ok',
+    timestamp: new Date().toISOString()
+  };
+
+  // Check database connection if database is configured (DATABASE_URL or individual vars)
+  const databaseUrl = process.env.DATABASE_URL;
+  const databaseHost = process.env.DATABASE_HOST || process.env.DB_HOST;
+  const databaseName = process.env.DATABASE_NAME || process.env.DB_NAME;
+  
+  // Only check database if database is configured
+  if (databaseUrl || databaseHost || databaseName) {
+    const dbCheck = await checkDatabase();
+    if (dbCheck.connected) {
+      healthStatus.database = 'connected';
+    } else {
+      healthStatus.database = 'error';
+      healthStatus.database_error = dbCheck.error;
+      return res.status(503).json(healthStatus);
+    }
+  }
+
+  res.status(200).json(healthStatus);
+});
+
+// Root endpoint
+app.get('/', (req: Request, res: Response) => {
+  res.json({ message: 'AI Fabrix Application', version: '1.0.0' });
+});
+
+app.listen(PORT, () => {
+  console.log(`Server running on port ${PORT}`);
+});

package/templates/typescript/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "aifabrix-app",
+  "version": "1.0.0",
+  "description": "AI Fabrix application",
+  "main": "index.js",
+  "scripts": {
+    "start": "ts-node --transpile-only index.ts",
+    "build": "tsc",
+    "dev": "ts-node --transpile-only index.ts"
+  },
+  "dependencies": {
+    "express": "^4.18.2",
+    "pg": "^8.11.3"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.21",
+    "@types/node": "^20.10.0",
+    "@types/pg": "^8.10.9",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  }
+}
+

package/templates/typescript/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "lib": ["ES2020"],
+    "outDir": "./dist",
+    "rootDir": "./",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "moduleResolution": "node",
+    "types": ["node"]
+  },
+  "ts-node": {
+    "transpileOnly": true,
+    "compilerOptions": {
+      "module": "commonjs"
+    }
+  },
+  "include": ["*.ts"],
+  "exclude": ["node_modules", "dist"]
+}