Merge pull request #162 from CodeForPhilly/feat/zbl-enahancedsearch

Feat/zbl enahancedsearch

Author: ZacharyLeahan

lib/db.js

@@ -8,15 +8,16 @@ const {
   MONGODB_DATABASE,
   MONGODB_DOCKER_PORT,
   // Traditional environment variables
-  DB_HOST='localhost',
+  DB_HOST,
   DB_PORT=27017,
   DB_NAME='pa-wildflower-selector',
   DB_USER,
   DB_PASSWORD
 } = process.env;
 
 // Use Docker variables if available, fall back to traditional ones
-const host = DB_HOST || 'mongodb'; // Use 'mongodb' as default in Docker
+// 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;
 const dbName = MONGODB_DATABASE || DB_NAME;
 const user = MONGODB_USER || DB_USER;

lib/embeddings.js

@@ -1,15 +1,25 @@
-const { pipeline } = require('@xenova/transformers');
-
-// Cache the model to avoid reloading
+// Cache the transformers module and model to avoid reloading
+let transformersModule = null;
 let embeddingModel = null;
 
+/**
+ * Get the transformers module using dynamic import (required for ES modules)
+ */
+async function getTransformersModule() {
+  if (!transformersModule) {
+    transformersModule = await import('@xenova/transformers');
+  }
+  return transformersModule;
+}
+
 /**
  * Initialize the embedding model
  * Uses a lightweight sentence transformer model optimized for search
  */
 async function getEmbeddingModel() {
   if (!embeddingModel) {
     console.log('Loading embedding model...');
+    const { pipeline } = await getTransformersModule();
     embeddingModel = await pipeline(
       'feature-extraction',
       'Xenova/all-MiniLM-L6-v2' // Lightweight model, ~80MB, good for semantic search

scripts/check-mongodb.js

@@ -16,15 +16,16 @@ const {
   MONGODB_DATABASE,
   MONGODB_DOCKER_PORT,
   // Traditional environment variables
-  DB_HOST = 'localhost',
+  DB_HOST,
   DB_PORT = 27017,
   DB_NAME = 'pa-wildflower-selector',
   DB_USER,
   DB_PASSWORD
 } = process.env;
 
 // Use Docker variables if available, fall back to traditional ones
-const host = DB_HOST || 'mongodb'; // Use 'mongodb' as default in Docker
+// 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;
 const dbName = MONGODB_DATABASE || DB_NAME;
 const user = MONGODB_USER || DB_USER;

scripts/dev-setup.js

@@ -20,7 +20,7 @@ const requiredEnvVars = [
 
 // MongoDB connection variables
 const {
-  DB_HOST = 'localhost',
+  DB_HOST,
   MONGODB_USER,
   MONGODB_PASSWORD,
   MONGODB_DATABASE,
@@ -31,8 +31,8 @@ const {
   DB_PASSWORD
 } = process.env;
 
-// Detect mode
-const host = DB_HOST || 'mongodb';
+// Detect mode - default to Docker unless explicitly localhost
+const host = DB_HOST === 'localhost' ? 'localhost' : (DB_HOST || 'mongodb');
 const isDockerMode = host === 'mongodb';
 const mode = isDockerMode ? 'Docker' : 'Local';
 

scripts/sync-down.js

@@ -22,7 +22,7 @@ const {
   LINODE_BUCKET_NAME,
   LINODE_ENDPOINT_URL = 'https://us-east-1.linodeobjects.com',
   // MongoDB connection settings
-  DB_HOST = 'localhost',
+  DB_HOST,
   DB_PORT = 27017,
   MONGODB_USER,
   MONGODB_PASSWORD,
@@ -40,7 +40,8 @@ if (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY || !LINODE_BUCKET_NAME) {
 }
 
 // MongoDB connection settings
-const host = DB_HOST;
+// 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;
 const user = MONGODB_USER || DB_USER;
 const password = MONGODB_PASSWORD || DB_PASSWORD;