[WIP] Implicit plugins

js/core/src/config.ts

@@ -20,7 +20,7 @@ import path from 'path';
 import { FlowStateStore } from './flowTypes.js';
 import { LocalFileFlowStateStore } from './localFileFlowStateStore.js';
 import { logger } from './logging.js';
-import { PluginProvider } from './plugin.js';
+import { PluginProvider, PluginProvidesType } from './plugin.js';
 import * as registry from './registry.js';
 import { AsyncProvider } from './registry.js';
 import {
@@ -111,6 +111,9 @@ class Config {
           logger.info(`Initializing plugin ${plugin.name}:`);
           return await plugin.initializer();
         },
+        provides() {
+          return plugin.provides();
+        },
       });
     });
 
@@ -120,6 +123,23 @@ class Config {
       logger.debug(`  - all environments: ${loggerPluginName}`);
       this.loggerConfig = async () =>
         this.resolveLoggerConfig(loggerPluginName);
+    } else {
+      const capablePlugins = registry.lookupPluginsByAbility(
+        PluginProvidesType.TELEMETRY
+      );
+      if (capablePlugins) {
+        if (capablePlugins.length != 1) {
+          logger.error(`More than one plugin implicitly provides telemetry.`);
+          logger.error(
+            `Disambiguate by adding a telemetry {} block to your configuration and specifying one of ${capablePlugins.map((plugin) => plugin.name)}.`
+          );
+        } else {
+          logger.debug('Registering logging exporters...');
+          logger.debug(`  - all environments: ${capablePlugins[0].name}`);
+          this.loggerConfig = async () =>
+            this.resolveLoggerConfig(capablePlugins[0].name);
+        }
+      }
     }
 
     if (this.options.telemetry?.instrumentation) {
@@ -128,6 +148,23 @@ class Config {
       logger.debug(`  - all environments: ${telemetryPluginName}`);
       this.telemetryConfig = async () =>
         this.resolveTelemetryConfig(telemetryPluginName);
+    } else {
+      const capablePlugins = registry.lookupPluginsByAbility(
+        PluginProvidesType.TELEMETRY
+      );
+      if (capablePlugins) {
+        if (capablePlugins.length != 1) {
+          logger.error(`More than one plugin implicitly provides telemetry.`);
+          logger.error(
+            `Disambiguate by adding a telemetry {} block to your configuration and specifying one of ${capablePlugins.map((plugin) => plugin.name)}.`
+          );
+        } else {
+          logger.debug('Registering telemetry exporters...');
+          logger.debug(`  - all environments: ${capablePlugins[0].name}`);
+          this.telemetryConfig = async () =>
+            this.resolveTelemetryConfig(capablePlugins[0].name);
+        }
+      }
     }
 
     logger.debug('Registering flow state stores...');

js/core/src/plugin.ts

@@ -25,12 +25,25 @@ export interface Provider<T> {
   value: T;
 }
 
+export enum PluginProvidesType {
+  UNSPECIFIED = 0x0,
+  MODEL = 0x1,
+  RETRIEVER = 0x2,
+  EMBEDDER = 0x3,
+  INDEXER = 0x4,
+  EVALUATOR = 0x5,
+  FLOW_STATE_STORE = 0x6,
+  TRACE_STORE = 0x7,
+  TELEMETRY = 0x8,
+}
+
 export interface PluginProvider {
   name: string;
   initializer: () =>
     | InitializedPlugin
     | void
     | Promise<InitializedPlugin | void>;
+  provides: () => PluginProvidesType;
 }
 
 export interface InitializedPlugin {
@@ -58,7 +71,8 @@ export type Plugin<T extends any[]> = (...args: T) => PluginProvider;
  */
 export function genkitPlugin<T extends PluginInit>(
   pluginName: string,
-  initFn: T
+  initFn: T,
+  providesFn: () => PluginProvidesType = () => PluginProvidesType.UNSPECIFIED
 ): Plugin<Parameters<T>> {
   return (...args: Parameters<T>) => ({
     name: pluginName,
@@ -67,6 +81,7 @@ export function genkitPlugin<T extends PluginInit>(
       validatePluginActions(pluginName, initializedPlugin);
       return initializedPlugin;
     },
+    provides: () => providesFn(),
   });
 }
 

js/core/src/registry.ts

@@ -18,7 +18,7 @@ import * as z from 'zod';
 import { Action } from './action.js';
 import { FlowStateStore } from './flowTypes.js';
 import { logger } from './logging.js';
-import { PluginProvider } from './plugin.js';
+import { PluginProvider, PluginProvidesType } from './plugin.js';
 import { startReflectionApi } from './reflectionApi.js';
 import { JSONSchema } from './schema.js';
 import { TraceStore } from './tracing/types.js';
@@ -29,6 +29,7 @@ const ACTIONS_BY_ID = 'genkit__ACTIONS_BY_ID';
 const TRACE_STORES_BY_ENV = 'genkit__TRACE_STORES_BY_ENV';
 const FLOW_STATE_STORES_BY_ENV = 'genkit__FLOW_STATE_STORES_BY_ENV';
 const PLUGINS_BY_NAME = 'genkit__PLUGINS_BY_NAME';
+const PLUGINS_BY_ABILITY = 'genkit__PLUGINS_BY_ABILITY';
 const SCHEMAS_BY_NAME = 'genkit__SCHEMAS_BY_NAME';
 
 function actionsById(): Record<string, Action<z.ZodTypeAny, z.ZodTypeAny>> {
@@ -55,6 +56,12 @@ function pluginsByName(): Record<string, PluginProvider> {
   }
   return global[PLUGINS_BY_NAME];
 }
+function pluginsByAbility(): Record<PluginProvidesType, PluginProvider[]> {
+  if (global[PLUGINS_BY_ABILITY] === undefined) {
+    global[PLUGINS_BY_ABILITY] = {};
+  }
+  return global[PLUGINS_BY_ABILITY];
+}
 function schemasByName(): Record<
   string,
   { schema?: z.ZodTypeAny; jsonSchema?: JSONSchema }
@@ -196,7 +203,8 @@ export async function lookupFlowStateStore(
  */
 export function registerPluginProvider(name: string, provider: PluginProvider) {
   let cached;
-  pluginsByName()[name] = {
+
+  const plugin = {
     name: provider.name,
     initializer: () => {
       if (cached) {
@@ -205,13 +213,27 @@ export function registerPluginProvider(name: string, provider: PluginProvider) {
       cached = provider.initializer();
       return cached;
     },
+    provides: () => {
+      return provider.provides();
+    },
   };
+
+  pluginsByName()[plugin.name] = plugin;
+
+  if (plugin.provides() !== PluginProvidesType.UNSPECIFIED) {
+    const plugins = pluginsByAbility()[plugin.provides()] || [];
+    pluginsByAbility()[plugin.provides()] = [...plugins, plugin];
+  }
 }
 
 export function lookupPlugin(name: string) {
   return pluginsByName()[name];
 }
 
+export function lookupPluginsByAbility(ability: PluginProvidesType) {
+  return pluginsByAbility()[ability];
+}
+
 /**
  *
  */

js/plugins/google-cloud/src/index.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { genkitPlugin, Plugin } from '@genkit-ai/core';
+import { genkitPlugin, Plugin, PluginProvidesType } from '@genkit-ai/core';
 import { credentialsFromEnvironment } from './auth.js';
 import { GcpLogger } from './gcpLogger.js';
 import { GcpOpenTelemetry } from './gcpOpenTelemetry.js';
@@ -29,6 +29,13 @@ export const googleCloud: Plugin<[GcpPluginOptions] | []> = genkitPlugin(
   async (options?: GcpPluginOptions) => build(options)
 );
 
+export const googleCloudWithTelemetry: Plugin<[GcpPluginOptions] | []> =
+  genkitPlugin(
+    'googleCloudWithTelemetry',
+    async (options?: GcpPluginOptions) => build(options),
+    () => PluginProvidesType.TELEMETRY
+  );
+
 /**
  * Configures and builds the plugin.
  * Not normally needed, but exposed for use by the firebase plugin.

js/plugins/google-cloud/src/telemetry/flow.ts

@@ -84,7 +84,7 @@ class FlowsTelemetry implements Telemetry {
     }
 
     if (output && logIO) {
-      this.recordIO(span, 'Output', name, path, input, projectId);
+      this.recordIO(span, 'Output', name, path, output, projectId);
     }
 
     if (state === 'success') {

js/testapps/flow-simple-ai/src/index.ts

@@ -20,7 +20,7 @@ import { configureGenkit } from '@genkit-ai/core';
 import { dotprompt, prompt } from '@genkit-ai/dotprompt';
 import { defineFirestoreRetriever, firebase } from '@genkit-ai/firebase';
 import { defineFlow, run } from '@genkit-ai/flow';
-import { googleCloud } from '@genkit-ai/google-cloud';
+import { googleCloudWithTelemetry } from '@genkit-ai/google-cloud';
 import {
   gemini15Flash,
   googleAI,
@@ -32,7 +32,6 @@ import {
   textEmbeddingGecko,
   vertexAI,
 } from '@genkit-ai/vertexai';
-import { AlwaysOnSampler } from '@opentelemetry/sdk-trace-base';
 import { initializeApp } from 'firebase-admin/app';
 import { getFirestore } from 'firebase-admin/firestore';
 import { Allow, parse } from 'partial-json';
@@ -43,33 +42,33 @@ configureGenkit({
     firebase(),
     googleAI(),
     vertexAI(),
-    googleCloud({
+    googleCloudWithTelemetry({
       // These are configured for demonstration purposes. Sensible defaults are
       // in place in the event that telemetryConfig is absent.
-      telemetryConfig: {
-        // Forces telemetry export in 'dev'
-        forceDevExport: true,
-        sampler: new AlwaysOnSampler(),
-        autoInstrumentation: true,
-        autoInstrumentationConfig: {
-          '@opentelemetry/instrumentation-fs': { enabled: false },
-          '@opentelemetry/instrumentation-dns': { enabled: false },
-          '@opentelemetry/instrumentation-net': { enabled: false },
-        },
-        metricExportIntervalMillis: 5_000,
-        metricExportTimeoutMillis: 5_000,
-      },
+      //   telemetryConfig: {
+      //     // Forces telemetry export in 'dev'
+      //     forceDevExport: true,
+      //     sampler: new AlwaysOnSampler(),
+      //     autoInstrumentation: true,
+      //     autoInstrumentationConfig: {
+      //       '@opentelemetry/instrumentation-fs': { enabled: false },
+      //       '@opentelemetry/instrumentation-dns': { enabled: false },
+      //       '@opentelemetry/instrumentation-net': { enabled: false },
+      //     },
+      //     metricExportIntervalMillis: 5_000,
+      //     metricExportTimeoutMillis: 5_000,
+      //   },
     }),
     dotprompt(),
   ],
   flowStateStore: 'firebase',
   traceStore: 'firebase',
   enableTracingAndMetrics: true,
   logLevel: 'debug',
-  telemetry: {
-    instrumentation: 'googleCloud',
-    logger: 'googleCloud',
-  },
+  //   telemetry: {
+  //     instrumentation: 'googleCloud',
+  //     logger: 'googleCloud',
+  //   },
 });
 
 const app = initializeApp();