@karmaniverous/jeeves-watcher 0.9.2 → 0.9.4

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

@@ -25,7 +25,7 @@ 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 https from 'node:https';
 import pino from 'pino';
 import { v5 } from 'uuid';
 import * as cheerio from 'cheerio';
@@ -3897,10 +3897,43 @@ function getLogger(logger) {
 
 /**
  * @module embedding/geminiProvider
- * Gemini embedding provider using Google Generative AI.
- */
+ * Gemini embedding provider using the Google Generative AI REST API directly.
+ * Uses node:https with a keep-alive agent for reliable performance in
+ * long-running processes (avoids undici/fetch event-loop contention).
+ */
+const GEMINI_API_BASE = 'https://generativelanguage.googleapis.com/v1beta';
+/** Persistent HTTPS agent for connection reuse. */
+const agent = new https.Agent({ keepAlive: true });
+/** Make an HTTPS POST request using node:https (bypasses undici/fetch). */
+function httpsPost(url, body) {
+    return new Promise((resolve, reject) => {
+        const parsed = new URL(url);
+        const req = https.request({
+            hostname: parsed.hostname,
+            path: parsed.pathname + parsed.search,
+            method: 'POST',
+            agent,
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(body),
+            },
+        }, (res) => {
+            const chunks = [];
+            res.on('data', (chunk) => chunks.push(chunk));
+            res.on('end', () => {
+                resolve({
+                    status: res.statusCode ?? 0,
+                    body: Buffer.concat(chunks).toString('utf8'),
+                });
+            });
+        });
+        req.on('error', reject);
+        req.write(body);
+        req.end();
+    });
+}
 /**
- * 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.
@@ -3912,20 +3945,27 @@ 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 httpsPost(url, JSON.stringify({ requests }));
+                if (response.status < 200 || response.status >= 300) {
+                    throw new Error(`Gemini API error ${String(response.status)}: ${response.body}`);
                 }
-                // embedDocuments returns vectors for multiple texts
-                return embedder.embedDocuments(texts);
+                const data = JSON.parse(response.body);
+                return data.embeddings.map((e) => e.values);
             }, {
                 attempts: 5,
                 baseDelayMs: 500,
@@ -3936,7 +3976,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,7 @@ import { createHash } from 'node:crypto';
 import crypto from 'crypto';
 import chokidar from 'chokidar';
 import { cosmiconfig } from 'cosmiconfig';
-import { GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
+import https from 'node:https';
 import pino from 'pino';
 import { v5 } from 'uuid';
 import * as cheerio from 'cheerio';
@@ -3873,10 +3873,43 @@ function getLogger(logger) {
 
 /**
  * @module embedding/geminiProvider
- * Gemini embedding provider using Google Generative AI.
- */
+ * Gemini embedding provider using the Google Generative AI REST API directly.
+ * Uses node:https with a keep-alive agent for reliable performance in
+ * long-running processes (avoids undici/fetch event-loop contention).
+ */
+const GEMINI_API_BASE = 'https://generativelanguage.googleapis.com/v1beta';
+/** Persistent HTTPS agent for connection reuse. */
+const agent = new https.Agent({ keepAlive: true });
+/** Make an HTTPS POST request using node:https (bypasses undici/fetch). */
+function httpsPost(url, body) {
+    return new Promise((resolve, reject) => {
+        const parsed = new URL(url);
+        const req = https.request({
+            hostname: parsed.hostname,
+            path: parsed.pathname + parsed.search,
+            method: 'POST',
+            agent,
+            headers: {
+                'Content-Type': 'application/json',
+                'Content-Length': Buffer.byteLength(body),
+            },
+        }, (res) => {
+            const chunks = [];
+            res.on('data', (chunk) => chunks.push(chunk));
+            res.on('end', () => {
+                resolve({
+                    status: res.statusCode ?? 0,
+                    body: Buffer.concat(chunks).toString('utf8'),
+                });
+            });
+        });
+        req.on('error', reject);
+        req.write(body);
+        req.end();
+    });
+}
 /**
- * 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.
@@ -3888,20 +3921,27 @@ 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 httpsPost(url, JSON.stringify({ requests }));
+                if (response.status < 200 || response.status >= 300) {
+                    throw new Error(`Gemini API error ${String(response.status)}: ${response.body}`);
                 }
-                // embedDocuments returns vectors for multiple texts
-                return embedder.embedDocuments(texts);
+                const data = JSON.parse(response.body);
+                return data.embeddings.map((e) => e.values);
             }, {
                 attempts: 5,
                 baseDelayMs: 500,
@@ -3912,7 +3952,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.2",
+  "version": "0.9.4",
   "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",