@karmaniverous/jeeves-watcher 0.9.1 → 0.9.3

package/dist/cli/jeeves-watcher/index.js

@@ -25,7 +25,6 @@ import { JSONPath } from 'jsonpath-plus';
 import { createHash } from 'node:crypto';
 import crypto from 'crypto';
 import { cosmiconfig } from 'cosmiconfig';
-import { GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
 import pino from 'pino';
 import { v5 } from 'uuid';
 import * as cheerio from 'cheerio';
@@ -2785,6 +2784,16 @@ function isFacetable(prop) {
         return false;
     return prop.uiHint !== undefined || prop.enum !== undefined;
 }
+/** uiHint types that represent enumerated value selection. */
+const ENUMERATED_HINTS = new Set(['dropdown', 'tags', 'select', 'multiselect']);
+/**
+ * Check whether a uiHint type supports value enumeration.
+ * Non-enumerated hints (text, number, date, range, etc.) should not
+ * aggregate live values — the client uses free-form input instead.
+ */
+function isEnumeratedHint(uiHint) {
+    return ENUMERATED_HINTS.has(uiHint);
+}
 /**
  * Build the schema-derived facet structure from inference rules.
  *
@@ -2846,20 +2855,31 @@ function createFacetsHandler(deps) {
         const allValues = valuesManager.getAll();
         const facets = [];
         for (const [field, schema] of cached.fields) {
-            // Collect live values from all rules that define this field
-            const liveValues = new Set();
-            for (const ruleName of schema.rules) {
-                const fieldValues = allValues[ruleName]?.[field];
-                if (fieldValues) {
-                    for (const v of fieldValues)
-                        liveValues.add(v);
+            // Only aggregate live values for enumerated hint types (dropdown, tags, etc.)
+            // Non-enumerated types (text, number, date, range) use free-form input.
+            let values;
+            if (schema.enumValues) {
+                values = schema.enumValues;
+            }
+            else if (isEnumeratedHint(schema.uiHint)) {
+                const liveValues = new Set();
+                for (const ruleName of schema.rules) {
+                    const fieldValues = allValues[ruleName]?.[field];
+                    if (fieldValues) {
+                        for (const v of fieldValues)
+                            liveValues.add(v);
+                    }
                 }
+                values = [...liveValues].sort();
+            }
+            else {
+                values = [];
             }
             facets.push({
                 field,
                 type: schema.type,
                 uiHint: schema.uiHint,
-                values: schema.enumValues ?? [...liveValues].sort(),
+                values,
                 rules: schema.rules,
             });
         }
@@ -3876,10 +3896,11 @@ function getLogger(logger) {
 
 /**
  * @module embedding/geminiProvider
- * Gemini embedding provider using Google Generative AI.
+ * Gemini embedding provider using the Google Generative AI REST API directly.
  */
+const GEMINI_API_BASE = 'https://generativelanguage.googleapis.com/v1beta';
 /**
- * Create a Gemini embedding provider using the Google Generative AI SDK.
+ * Create a Gemini embedding provider using the Google Generative AI REST API.
  *
  * @param config - The embedding configuration.
  * @param logger - Optional pino logger for retry warnings.
@@ -3891,20 +3912,32 @@ function createGeminiProvider(config, logger) {
         throw new Error('Gemini embedding provider requires config.embedding.apiKey');
     }
     const dimensions = config.dimensions ?? 3072;
+    const model = config.model;
+    const apiKey = config.apiKey;
     const log = getLogger(logger);
-    const embedder = new GoogleGenerativeAIEmbeddings({
-        apiKey: config.apiKey,
-        model: config.model,
-    });
+    const url = `${GEMINI_API_BASE}/models/${model}:batchEmbedContents?key=${apiKey}`;
     return {
         dimensions,
         async embed(texts) {
             const vectors = await retry(async (attempt) => {
                 if (attempt > 1) {
-                    log.warn({ attempt, provider: 'gemini', model: config.model }, 'Retrying embedding request');
+                    log.warn({ attempt, provider: 'gemini', model }, 'Retrying embedding request');
+                }
+                const requests = texts.map((text) => ({
+                    model: `models/${model}`,
+                    content: { parts: [{ text }] },
+                }));
+                const response = await fetch(url, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ requests }),
+                });
+                if (!response.ok) {
+                    const body = await response.text();
+                    throw new Error(`Gemini API error ${String(response.status)}: ${body}`);
                 }
-                // embedDocuments returns vectors for multiple texts
-                return embedder.embedDocuments(texts);
+                const data = (await response.json());
+                return data.embeddings.map((e) => e.values);
             }, {
                 attempts: 5,
                 baseDelayMs: 500,
@@ -3915,7 +3948,7 @@ function createGeminiProvider(config, logger) {
                         attempt,
                         delayMs,
                         provider: 'gemini',
-                        model: config.model,
+                        model,
                         err: normalizeError(error),
                     }, 'Embedding call failed; will retry');
                 },

package/dist/index.js

@@ -22,7 +22,6 @@ import { createHash } from 'node:crypto';
 import crypto from 'crypto';
 import chokidar from 'chokidar';
 import { cosmiconfig } from 'cosmiconfig';
-import { GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
 import pino from 'pino';
 import { v5 } from 'uuid';
 import * as cheerio from 'cheerio';
@@ -2471,6 +2470,16 @@ function isFacetable(prop) {
         return false;
     return prop.uiHint !== undefined || prop.enum !== undefined;
 }
+/** uiHint types that represent enumerated value selection. */
+const ENUMERATED_HINTS = new Set(['dropdown', 'tags', 'select', 'multiselect']);
+/**
+ * Check whether a uiHint type supports value enumeration.
+ * Non-enumerated hints (text, number, date, range, etc.) should not
+ * aggregate live values — the client uses free-form input instead.
+ */
+function isEnumeratedHint(uiHint) {
+    return ENUMERATED_HINTS.has(uiHint);
+}
 /**
  * Build the schema-derived facet structure from inference rules.
  *
@@ -2532,20 +2541,31 @@ function createFacetsHandler(deps) {
         const allValues = valuesManager.getAll();
         const facets = [];
         for (const [field, schema] of cached.fields) {
-            // Collect live values from all rules that define this field
-            const liveValues = new Set();
-            for (const ruleName of schema.rules) {
-                const fieldValues = allValues[ruleName]?.[field];
-                if (fieldValues) {
-                    for (const v of fieldValues)
-                        liveValues.add(v);
+            // Only aggregate live values for enumerated hint types (dropdown, tags, etc.)
+            // Non-enumerated types (text, number, date, range) use free-form input.
+            let values;
+            if (schema.enumValues) {
+                values = schema.enumValues;
+            }
+            else if (isEnumeratedHint(schema.uiHint)) {
+                const liveValues = new Set();
+                for (const ruleName of schema.rules) {
+                    const fieldValues = allValues[ruleName]?.[field];
+                    if (fieldValues) {
+                        for (const v of fieldValues)
+                            liveValues.add(v);
+                    }
                 }
+                values = [...liveValues].sort();
+            }
+            else {
+                values = [];
             }
             facets.push({
                 field,
                 type: schema.type,
                 uiHint: schema.uiHint,
-                values: schema.enumValues ?? [...liveValues].sort(),
+                values,
                 rules: schema.rules,
             });
         }
@@ -3852,10 +3872,11 @@ function getLogger(logger) {
 
 /**
  * @module embedding/geminiProvider
- * Gemini embedding provider using Google Generative AI.
+ * Gemini embedding provider using the Google Generative AI REST API directly.
  */
+const GEMINI_API_BASE = 'https://generativelanguage.googleapis.com/v1beta';
 /**
- * Create a Gemini embedding provider using the Google Generative AI SDK.
+ * Create a Gemini embedding provider using the Google Generative AI REST API.
  *
  * @param config - The embedding configuration.
  * @param logger - Optional pino logger for retry warnings.
@@ -3867,20 +3888,32 @@ function createGeminiProvider(config, logger) {
         throw new Error('Gemini embedding provider requires config.embedding.apiKey');
     }
     const dimensions = config.dimensions ?? 3072;
+    const model = config.model;
+    const apiKey = config.apiKey;
     const log = getLogger(logger);
-    const embedder = new GoogleGenerativeAIEmbeddings({
-        apiKey: config.apiKey,
-        model: config.model,
-    });
+    const url = `${GEMINI_API_BASE}/models/${model}:batchEmbedContents?key=${apiKey}`;
     return {
         dimensions,
         async embed(texts) {
             const vectors = await retry(async (attempt) => {
                 if (attempt > 1) {
-                    log.warn({ attempt, provider: 'gemini', model: config.model }, 'Retrying embedding request');
+                    log.warn({ attempt, provider: 'gemini', model }, 'Retrying embedding request');
+                }
+                const requests = texts.map((text) => ({
+                    model: `models/${model}`,
+                    content: { parts: [{ text }] },
+                }));
+                const response = await fetch(url, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ requests }),
+                });
+                if (!response.ok) {
+                    const body = await response.text();
+                    throw new Error(`Gemini API error ${String(response.status)}: ${body}`);
                 }
-                // embedDocuments returns vectors for multiple texts
-                return embedder.embedDocuments(texts);
+                const data = (await response.json());
+                return data.embeddings.map((e) => e.values);
             }, {
                 attempts: 5,
                 baseDelayMs: 500,
@@ -3891,7 +3924,7 @@ function createGeminiProvider(config, logger) {
                         attempt,
                         delayMs,
                         provider: 'gemini',
-                        model: config.model,
+                        model,
                         err: normalizeError(error),
                     }, 'Embedding call failed; will retry');
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karmaniverous/jeeves-watcher",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "author": "Jason Williscroft",
   "description": "Filesystem watcher that keeps a Qdrant vector store in sync with document changes",
   "license": "BSD-3-Clause",
@@ -52,8 +52,6 @@
   "dependencies": {
     "@commander-js/extra-typings": "^14.0.0",
     "@karmaniverous/jsonmap": "^2.1.1",
-    "@langchain/google-genai": "*",
-    "@langchain/qdrant": "*",
     "@langchain/textsplitters": "*",
     "@qdrant/js-client-rest": "*",
     "ajv": "^8.18.0",