Makes inputSchema optional for tools.

js/ai/src/generate.ts

@@ -16,19 +16,19 @@
 
 import {
   Action,
-  GenkitError,
-  StreamingCallback,
   config as genkitConfig,
+  GenkitError,
   runWithStreamingCallback,
+  StreamingCallback,
 } from '@genkit-ai/core';
 import { lookupAction } from '@genkit-ai/core/registry';
 import { toJsonSchema, validateSchema } from '@genkit-ai/core/schema';
 import { z } from 'zod';
 import { DocumentData } from './document.js';
 import { extractJson } from './extract.js';
 import {
-  GenerateUtilParamSchema,
   generateAction,
+  GenerateUtilParamSchema,
   inferRoleFromParts,
 } from './generateAction.js';
 import {
@@ -47,7 +47,7 @@ import {
   ToolRequestPart,
   ToolResponsePart,
 } from './model.js';
-import { ToolArgument, resolveTools, toToolDefinition } from './tool.js';
+import { resolveTools, ToolArgument, toToolDefinition } from './tool.js';
 
 /**
  * Message represents a single role's contribution to a generation. Each message
@@ -610,7 +610,11 @@ export async function generate<
 
   return await runWithStreamingCallback(
     resolvedOptions.streamingCallback,
-    async () => new GenerateResponse<O>(await generateAction(params))
+    async () =>
+      new GenerateResponse<O>(
+        await generateAction(params),
+        await toGenerateRequest(resolvedOptions)
+      )
   );
 }
 

js/ai/src/model.ts

@@ -153,11 +153,12 @@ export const ToolDefinitionSchema = z.object({
   description: z.string(),
   inputSchema: z
     .record(z.any())
-    .describe('Valid JSON Schema representing the input of the tool.'),
+    .describe('Valid JSON Schema representing the input of the tool.')
+    .nullish(),
   outputSchema: z
     .record(z.any())
     .describe('Valid JSON Schema describing the output of the tool.')
-    .optional(),
+    .nullish(),
 });
 export type ToolDefinition = z.infer<typeof ToolDefinitionSchema>;
 

js/plugins/vertexai/src/openai_compatibility.ts

@@ -75,7 +75,7 @@ function toOpenAiTool(tool: ToolDefinition): ChatCompletionTool {
     type: 'function',
     function: {
       name: tool.name,
-      parameters: tool.inputSchema,
+      parameters: tool.inputSchema || undefined,
     },
   };
 }

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

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { generate, generateStream, retrieve } from '@genkit-ai/ai';
-import { defineTool } from '@genkit-ai/ai/tool';
+import { defineTool, generate, generateStream, retrieve } from '@genkit-ai/ai';
 import { configureGenkit } from '@genkit-ai/core';
 import { dotprompt, prompt } from '@genkit-ai/dotprompt';
 import { defineFirestoreRetriever, firebase } from '@genkit-ai/firebase';
@@ -429,6 +428,7 @@ export const invalidOutput = defineFlow(
   }
 );
 
+import { MessageSchema } from '@genkit-ai/ai/model';
 import { GoogleAIFileManager } from '@google/generative-ai/server';
 const fileManager = new GoogleAIFileManager(
   process.env.GOOGLE_GENAI_API_KEY || process.env.GOOGLE_API_KEY!
@@ -465,3 +465,38 @@ export const fileApi = defineFlow(
     return result.text();
   }
 );
+
+export const testTools = [
+  // test a tool with no input / output schema
+  defineTool(
+    { name: 'getColor', description: 'gets a random color' },
+    async () => {
+      const colors = [
+        'red',
+        'orange',
+        'yellow',
+        'blue',
+        'green',
+        'indigo',
+        'violet',
+      ];
+      return colors[Math.floor(Math.random() * colors.length)];
+    }
+  ),
+];
+
+export const toolTester = defineFlow(
+  {
+    name: 'toolTester',
+    inputSchema: z.string(),
+    outputSchema: z.array(MessageSchema),
+  },
+  async (query) => {
+    const result = await generate({
+      model: gemini15Flash,
+      prompt: query,
+      tools: testTools,
+    });
+    return result.toHistory();
+  }
+);