Merge pull request #167 from CodeForPhilly/feat/zbl-plannerv1

Feat/zbl plannerv1

Author: ZacharyLeahan

.eslintrc.js

@@ -0,0 +1,54 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+    browser: true,
+    es2020: true
+  },
+  extends: [
+    'plugin:vue/vue3-essential',
+    'eslint:recommended'
+  ],
+  parserOptions: {
+    ecmaVersion: 2021,
+    sourceType: 'module',
+    parser: 'babel-eslint'
+  },
+  globals: {
+    // Vue 3 script setup compiler macros
+    defineProps: 'readonly',
+    defineEmits: 'readonly',
+    defineExpose: 'readonly',
+    withDefaults: 'readonly'
+  },
+  // Exclude TypeScript files from ESLint - TypeScript compiler handles them
+  ignorePatterns: ['*.ts', '*.tsx'],
+  rules: {
+    // Disable rules that conflict with TypeScript syntax in Vue files
+    'no-unused-vars': ['error', { 
+      argsIgnorePattern: '^_',
+      varsIgnorePattern: '^_',
+      ignoreRestSiblings: true
+    }],
+    // Allow TypeScript type assertions (handled by TypeScript compiler)
+    'no-undef': 'off' // TypeScript handles this
+  },
+  overrides: [
+    {
+      files: ['*.vue'],
+      parser: 'vue-eslint-parser',
+      parserOptions: {
+        parser: 'babel-eslint',
+        ecmaVersion: 2021,
+        sourceType: 'module'
+      },
+      rules: {
+        // In Vue files, be more lenient since TypeScript handles type checking
+        'no-undef': 'off',
+        // Disable parsing errors - TypeScript compiler handles syntax checking
+        'no-unused-vars': 'off'
+      }
+    }
+  ]
+};
+

Dockerfile

@@ -6,8 +6,8 @@ RUN apt-get update && apt-get install -y \
     awscli \
     && rm -rf /var/lib/apt/lists/*
 
-# Set NODE_OPTIONS for OpenSSL compatibility and limit memory usage
-ENV NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=768"
+# Set NODE_OPTIONS for OpenSSL compatibility and increase heap size for embedding model operations
+ENV NODE_OPTIONS="--openssl-legacy-provider --max-old-space-size=3072"
 
 WORKDIR /app
 COPY package.json package-lock.json ./

download.js

@@ -1,3 +1,4 @@
+require('dotenv').config();
 const VERSION = '1.2.0';
 const fs = require('fs');
 const path = require('path');
@@ -10,10 +11,10 @@ const { RateLimiter } = require('limiter');
 function log(message) {
     const timestamp = new Date().toISOString();
     const logMessage = `${timestamp}: ${message}\n`;
-    
+
     // Log to console
     console.log(message);
-    
+
     // Log to file
     const logPath = path.join(__dirname, 'download.log');
     fs.appendFileSync(logPath, logMessage);
@@ -61,7 +62,7 @@ async function go() {
         log(`Initial database count: ${initialCount} plants`);
 
         await downloadMain();
-        
+
         // Get final count
         const finalCount = await plants.countDocuments({});
         log(`Final database count: ${finalCount} plants`);
@@ -75,11 +76,11 @@ async function go() {
 
 async function downloadMain() {
     const limiter = new RateLimiter({ tokensPerInterval: 1, interval: "second" });
-    
+
     log('Fetching spreadsheet data...');
     const body = await get(process.env.MASTER_CSV_URL);
     const articlesBody = await get(process.env.ARTICLES_CSV_URL);
-    
+
     // Initialize empty rowsByName object
     let rowsByName = {};
 
@@ -88,48 +89,48 @@ async function downloadMain() {
         columns: true,
         skip_empty_lines: true
     });
-    
+
     // Parse articles CSV
     const articleRecords = parse(articlesBody, {
         columns: true,
         skip_empty_lines: true
     });
-    
+
     // Remove plants that are not in the latest CSV
     await plants.deleteMany({
         _id: { $nin: records.map(record => record['Scientific Name']) }
     });
 
     log(`Processing ${records.length} plants from master CSV`);
-    
+
     let i = 0;
     for (const record of records) {
         i++;
         // Clean up data by trimming whitespace
         const clean = Object.fromEntries(
-            Object.entries(record).map(([ key, value ]) => {
-                return [ key.trim(), value.trim() ];
+            Object.entries(record).map(([key, value]) => {
+                return [key.trim(), value.trim()];
             })
         );
-        
+
         let name = clean['Scientific Name'];
         log(`${name} (${i} of ${records.length})`);
-        
+
         // Set _id to the scientific name
         clean._id = name;
-        
+
         // Handle superplant status
         let sp = (clean['Super Plant'] && clean['Super Plant'].trim() === 'Yes');
-        
+
         // Get existing plant record if available
         const existing = await plants.findOne({
             _id: name
         });
-        
+
         // Set Superplant and Showy flags
         clean.Superplant = sp;
         clean.Showy = clean.Showy === 'Yes';
-        
+
         // Process articles for this plant
         clean.Articles = [];
         for (const record of articleRecords) {
@@ -144,7 +145,7 @@ async function downloadMain() {
                 }
             }
         }
-        
+
         // Update the plant in the database
         await update(plants, clean);
     }
@@ -157,22 +158,22 @@ async function downloadMain() {
 async function updateNurseries() {
     // Remove all existing nurseries
     await nurseries.deleteMany({});
-    
+
     // Fetch and parse nursery data
     const body = await get(process.env.LOCAL_MAP_CSV_URL);
     const records = parse(body, {
         columns: true,
         skip_empty_lines: true
     });
-    
+
     // Insert nurseries into database
     for (const record of records) {
         const address = `${record.ADDRESS} ${record.CITY}, ${record.STATE} ${record.ZIP}`;
         record.lon = parseFloat(record.Long);
         record.lat = parseFloat(record.Lat);
         await nurseries.insertOne(record);
     }
-    
+
     log(`Added ${records.length} nurseries to database`);
 }
 
@@ -183,7 +184,7 @@ async function updateOnlineStores() {
         columns: true,
         skip_empty_lines: true
     });
-    
+
     // Remove existing online stores data
     await plants.updateMany({},
         {
@@ -192,7 +193,7 @@ async function updateOnlineStores() {
             }
         }
     );
-    
+
     // Add online stores to plants
     let updateCount = 0;
     for (const record of records) {
@@ -206,12 +207,12 @@ async function updateOnlineStores() {
                 }
             }
         });
-        
+
         if (result.modifiedCount > 0) {
             updateCount++;
         }
     }
-    
+
     log(`Updated ${updateCount} plants with online store information`);
 }
 

helm-chart/values.yaml

@@ -12,7 +12,7 @@ app:
     tag: "2.0.7"
   env:
     - name: NODE_OPTIONS
-      value: "--openssl-legacy-provider --max-old-space-size=768"
+      value: "--openssl-legacy-provider --max-old-space-size=3072"
 
 db:
   name: pa-wildflower-selector
@@ -65,9 +65,9 @@ ingress:
 
 resources:
   limits:
-    memory: 1Gi
+    memory: 4Gi
   requests:
-    memory: 512Mi
+    memory: 1Gi
   # Additional resource settings can be added as needed
   # limits:
   #   cpu: 100m

lib/db.js

@@ -1,3 +1,4 @@
+require("dotenv").config();
 const { MongoClient } = require('mongodb');
 
 // Support both traditional DB_* variables and Docker MONGODB_* variables
@@ -7,33 +8,82 @@ const {
   MONGODB_PASSWORD,
   MONGODB_DATABASE,
   MONGODB_DOCKER_PORT,
+  MONGODB_LOCAL_PORT,
   // Traditional environment variables
   DB_HOST,
-  DB_PORT=27017,
-  DB_NAME='pa-wildflower-selector',
+  DB_PORT = 27017,
+  DB_NAME = 'pa-wildflower-selector',
   DB_USER,
   DB_PASSWORD
 } = process.env;
 
 // Use Docker variables if available, fall back to traditional ones
 // Default to 'mongodb' (Docker mode) unless DB_HOST is explicitly 'localhost'
 const host = DB_HOST === 'localhost' ? 'localhost' : (DB_HOST || 'mongodb');
-const port = MONGODB_DOCKER_PORT || DB_PORT;
+// For localhost: prefer DB_PORT (local MongoDB), fall back to MONGODB_LOCAL_PORT (Docker port mapping)
+// For Docker service: use MONGODB_DOCKER_PORT or DB_PORT
+const port = host === 'localhost' 
+  ? (DB_PORT || MONGODB_LOCAL_PORT || 27017)
+  : (MONGODB_DOCKER_PORT || DB_PORT || 27017);
 const dbName = MONGODB_DATABASE || DB_NAME;
 const user = MONGODB_USER || DB_USER;
 const password = MONGODB_PASSWORD || DB_PASSWORD;
 
+const isLocalhost = host === 'localhost';
 const credentials = user ? `${user}:${password}@` : '';
-const uri = `mongodb://${credentials}${host}:${port}`;
+const authSource = user ? '?authSource=admin' : '';
+const uriWithAuth = `mongodb://${credentials}${host}:${port}${authSource}`;
+const uriWithoutAuth = `mongodb://${host}:${port}`;
 
 console.log(`Connecting to MongoDB at ${host}:${port}/${dbName} ${user ? 'with authentication' : 'without authentication'}`);
 
 module.exports = async () => {
-  const client = new MongoClient(uri, {
-    useNewUrlParser: true,
-    useUnifiedTopology: true,
-  });
-  await client.connect();
+  let client;
+  let uri = user ? uriWithAuth : uriWithoutAuth;
+  
+  // Try with authentication first if credentials are provided
+  if (user) {
+    client = new MongoClient(uri, {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+    });
+    
+    try {
+      await client.connect();
+      // Test the connection
+      await client.db(dbName).admin().ping();
+    } catch (error) {
+      // If authentication fails and we're in local mode, try without auth
+      // Check for various authentication-related error messages (case-insensitive)
+      const errorMessage = error.message.toLowerCase();
+      const isAuthError = errorMessage.includes('authentication') || 
+                         errorMessage.includes('auth') ||
+                         error.code === 18 || // Authentication failed error code
+                         error.code === 8000; // Authentication mechanism failed
+      
+      if (isLocalhost && isAuthError) {
+        console.log('⚠️  Authentication failed. Trying without authentication for local development...');
+        await client.close();
+        uri = uriWithoutAuth;
+        client = new MongoClient(uri, {
+          useNewUrlParser: true,
+          useUnifiedTopology: true,
+        });
+        await client.connect();
+        // Verify the connection works without auth
+        await client.db(dbName).admin().ping();
+      } else {
+        throw error;
+      }
+    }
+  } else {
+    client = new MongoClient(uri, {
+      useNewUrlParser: true,
+      useUnifiedTopology: true,
+    });
+    await client.connect();
+  }
+  
   const db = client.db(dbName);
   const plants = db.collection('plants');
   const nurseries = db.collection('nurseries');