diff --git a/genkit-tools/common/src/types/eval.ts b/genkit-tools/common/src/types/eval.ts
index 731dc21f97..ac6eddb9dd 100644
--- a/genkit-tools/common/src/types/eval.ts
+++ b/genkit-tools/common/src/types/eval.ts
@@ -23,7 +23,7 @@ import type {
   ListEvalKeysResponse,
   UpdateDatasetRequest,
 } from './apis';
-import { GenerateRequestSchema } from './model';
+import { GenerateActionOptionsSchema, GenerateRequestSchema } from './model';
 
 /**
  * This file defines schema and types that are used by the Eval store.
@@ -56,6 +56,17 @@ export const GenerateRequestJSONSchema = zodToJsonSchema(
   }
 ) as JSONSchema7;
 
+/**
+ * Combined GenerateInput JSON schema to support eval-inference using models
+ */
+export const GenerateInputJSONSchema = zodToJsonSchema(
+  z.union([GenerateRequestSchema, GenerateActionOptionsSchema]),
+  {
+    $refStrategy: 'none',
+    removeAdditionalStrategy: 'strict',
+  }
+) as JSONSchema7;
+
 /**
  * A single sample to be used for inference.
  **/