Moves firestoreTraceStore to firebase plugin, cleans up unused deps and outdated examples.

js/ai/package.json

@@ -28,11 +28,9 @@
     "@genkit-ai/core": "workspace:*",
     "@opentelemetry/api": "^1.7.0",
     "@types/node": "^20.11.19",
-    "front-matter": "^4.0.2",
     "json5": "^2.2.3",
     "node-fetch": "^3.3.2",
-    "zod": "^3.22.4",
-    "zod-to-json-schema": "^3.21.4"
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "npm-run-all": "^4.1.5",

js/core/package.json

@@ -15,7 +15,7 @@
     "build:clean": "rm -rf ./lib",
     "build": "npm-run-all build:clean check compile",
     "build:watch": "tsup-node --watch",
-    "test": "node --import tsx --test tests/*_test.ts tests/**/*_test.ts"
+    "test": "node --import tsx --test tests/*_test.ts"
   },
   "repository": {
     "type": "git",
@@ -25,10 +25,6 @@
   "author": "genkit",
   "license": "Apache-2.0",
   "dependencies": {
-    "@google-cloud/firestore": "^7.5.0",
-    "@google-cloud/monitoring": "^4.0.0",
-    "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.17.0",
-    "@google-cloud/trace-agent": "^7.1.2",
     "@opentelemetry/api": "^1.7.0",
     "@opentelemetry/context-async-hooks": "^1.20.0",
     "@opentelemetry/core": "^1.22.0",
@@ -38,9 +34,7 @@
     "ajv": "^8.12.0",
     "async-mutex": "^0.5.0",
     "express": "^4.19.2",
-    "express-openapi-validator": "^5.1.3",
     "json-schema": "^0.4.0",
-    "winston": "^3.12.0",
     "zod": "^3.22.4",
     "zod-to-json-schema": "^3.22.4"
   },

js/core/src/tracing.ts

@@ -28,7 +28,6 @@ import { TraceStoreExporter } from './tracing/exporter.js';
 import { MultiSpanProcessor } from './tracing/multiSpanProcessor.js';
 
 export * from './tracing/exporter.js';
-export * from './tracing/firestoreTraceStore.js';
 export * from './tracing/instrumentation.js';
 export * from './tracing/localFileTraceStore.js';
 export * from './tracing/processor.js';

js/flow/package.json

@@ -36,8 +36,7 @@
     "firebase-admin": "^12.1.0",
     "firebase-functions": "^4.3.1",
     "uuid": "^9.0.1",
-    "zod": "^3.22.4",
-    "zod-to-json-schema": "^3.21.4"
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",

js/plugins/dotprompt/package.json

@@ -32,8 +32,7 @@
     "front-matter": "^4.0.2",
     "handlebars": "^4.7.8",
     "node-fetch": "^3.3.2",
-    "zod": "^3.22.4",
-    "zod-to-json-schema": "^3.22.4"
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@types/node": "^20.11.16",

js/plugins/firebase/package.json

@@ -20,7 +20,8 @@
     "compile": "tsup-node",
     "build:clean": "rm -rf ./lib",
     "build": "npm-run-all build:clean check compile",
-    "build:watch": "tsup-node --watch"
+    "build:watch": "tsup-node --watch",
+    "test": "node --import tsx --test tests/*_test.ts"
   },
   "repository": {
     "type": "git",
@@ -33,13 +34,15 @@
     "@genkit-ai/ai": "workspace:*",
     "@genkit-ai/core": "workspace:*",
     "@genkit-ai/flow": "workspace:*",
-    "@google-cloud/firestore": "^7.6.0",
     "express": "^4.19.2",
-    "firebase-admin": "^12.1.0",
-    "firebase-functions": "^4.3.1",
     "google-auth-library": "^9.6.3",
     "zod": "^3.22.4"
   },
+  "peerDependencies": {
+    "@google-cloud/firestore": "^7.6.0",
+    "firebase-admin": "^12.1.0",
+    "firebase-functions": "^4.3.1"
+  },
   "devDependencies": {
     "@types/node": "^20.11.16",
     "npm-run-all": "^4.1.5",

js/plugins/firebase/src/firestoreRetriever.ts

@@ -15,13 +15,18 @@
  */
 
 import { embed, EmbedderArgument } from '@genkit-ai/ai/embedder';
-import { defineRetriever, DocumentData, Part } from '@genkit-ai/ai/retriever';
-import { VectorQuerySnapshot } from '@google-cloud/firestore';
+import {
+  defineRetriever,
+  DocumentData,
+  Part,
+  RetrieverAction,
+} from '@genkit-ai/ai/retriever';
 import {
   Firestore,
   Query,
   QueryDocumentSnapshot,
-} from 'firebase-admin/firestore';
+  VectorQuerySnapshot,
+} from '@google-cloud/firestore';
 import z from 'zod';
 
 function toContent(
@@ -95,7 +100,7 @@ export function defineFirestoreRetriever(config: {
   metadataFields?:
     | string[]
     | ((snap: QueryDocumentSnapshot) => Record<string, any>);
-}) {
+}): RetrieverAction {
   const {
     name,
     label,

js/core/src/tracing/firestoreTraceStore.ts → js/plugins/firebase/src/firestoreTraceStore.ts

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import { Firestore } from '@google-cloud/firestore';
-import { randomUUID } from 'crypto';
-import { logger } from '../logging.js';
+import { logger } from '@genkit-ai/core/logging';
 import {
   SpanData,
   SpanDataSchema,
@@ -25,7 +23,9 @@ import {
   TraceQuery,
   TraceQueryResponse,
   TraceStore,
-} from './types.js';
+} from '@genkit-ai/core/tracing';
+import { Firestore } from '@google-cloud/firestore';
+import { randomUUID } from 'crypto';
 
 const DOC_MAX_SIZE = 1_000_000;
 

js/plugins/firebase/src/index.ts

@@ -15,8 +15,8 @@
  */
 
 import { genkitPlugin, Plugin } from '@genkit-ai/core';
-import { FirestoreTraceStore } from '@genkit-ai/core/tracing';
 import { FirestoreStateStore } from '@genkit-ai/flow';
+import { FirestoreTraceStore } from './firestoreTraceStore';
 export { defineFirestoreRetriever } from './firestoreRetriever.js';
 
 interface FirestorePluginParams {

js/core/tests/tracing/firestoreTraceStore_test.ts → js/plugins/firebase/tests/firestoreTraceStore_test.ts

@@ -16,7 +16,7 @@
 
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
-import { rebatchSpans } from '../../src/tracing.js';
+import { rebatchSpans } from '../src/firestoreTraceStore';
 
 const TRACE_ID = '1234';
 const SPAN_A = 'abc';