Merge branch 'main' into ktlo/ts-5.7

.changeset/clever-jobs-hammer.md

@@ -0,0 +1,5 @@
+---
+"inngest": patch
+---
+
+Fix OpenAI `tools` types - not properly scoped

.changeset/sharp-donuts-float.md

@@ -0,0 +1,5 @@
+---
+"inngest": patch
+---
+
+Fix false indeterminate function warning

.changeset/warm-cameras-yell.md

@@ -0,0 +1,5 @@
+---
+"inngest": patch
+---
+
+Expose a type that lists the `AiAdapter` for each format

packages/inngest/src/components/InngestStepTools.ts

@@ -38,7 +38,29 @@ export interface FoundStep extends HashedOp {
   hashedId: string;
   fn?: (...args: unknown[]) => unknown;
   rawArgs: unknown[];
+
+  /**
+   * A boolean representing whether the step has been fulfilled, either
+   * resolving or rejecting the `Promise` returned to userland code.
+   *
+   * Note that this is distinct from {@link hasStepState}, which instead tracks
+   * whether the step has been given some state from the Executor. State from
+   * the Executor could be data other than a resolution or rejection, such as
+   * inputs.
+   */
   fulfilled: boolean;
+
+  /**
+   * A boolean representing whether the step has been given some state from the
+   * Executor. State from the Executor could be data other than a resolution or
+   * rejection, such as inputs.
+   *
+   * This is distinct from {@link fulfilled}, which instead tracks whether the
+   * step has been fulfilled, either resolving or rejecting the `Promise`
+   * returned to userland code.
+   */
+  hasStepState: boolean;
+
   handled: boolean;
 
   /**

packages/inngest/src/components/ai/adapter.ts

@@ -1,3 +1,5 @@
+import { type OpenAiAiAdapter } from "./adapters/openai.js";
+
 /**
  * A symbol used internally to define the types for a model whilst keeping
  * generics clean. Must not be exported outside of this module.
@@ -60,7 +62,7 @@ export interface AiAdapter {
     /**
      * The model to use for the inference.
      */
-    model: this,
+    model: AiAdapter,
 
     /**
      * The input to pass to the model.
@@ -100,3 +102,15 @@ export namespace AiAdapter {
     TOutput extends AiAdapter,
   > = (...args: TInput) => TOutput;
 }
+
+/**
+ * A cheeky hack to ensure we account for all AI adapters.
+ */
+const adapters = {
+  "openai-chat": null as unknown as OpenAiAiAdapter,
+} satisfies Record<AiAdapter.Format, AiAdapter>;
+
+/**
+ * All AI adapters available for use.
+ */
+export type AiAdapters = typeof adapters;

packages/inngest/src/components/ai/adapters/openai.ts

@@ -270,40 +270,47 @@ export interface OpenAiAiAdapter extends AiAdapter {
        */
       tools?: {
         /**
-         * The name of the function to be called. Must be a-z, A-Z, 0-9, or
-         * contain underscores and dashes, with a maximum length of 64.
+         * The type of the tool.
          */
-        name: string;
+        type: "function";
 
-        /**
-         * A description of what the function does, used by the model to choose
-         * when and how to call the function.
-         */
-        description?: string;
+        function: {
+          /**
+           * The name of the function to be called. Must be a-z, A-Z, 0-9, or
+           * contain underscores and dashes, with a maximum length of 64.
+           */
+          name: string;
 
-        /**
-         * The parameters the functions accepts, described as a JSON Schema
-         * object. See the
-         * [guide](https://platform.openai.com/docs/guides/function-calling) for
-         * examples, and the [JSON Schema
-         * reference](https://json-schema.org/understanding-json-schema/) for
-         * documentation about the format.
-         *
-         * Omitting `parameters` defines a function with an empty parameter
-         * list.
-         */
-        parameters?: Record<string, unknown>;
+          /**
+           * A description of what the function does, used by the model to choose
+           * when and how to call the function.
+           */
+          description?: string;
 
-        /**
-         * Whether to enable strict schema adherence when generating the
-         * function call. If set to true, the model will follow the exact schema
-         * defined in the `parameters field`. Only a subset of JSON Schema is
-         * supported when `strict` is `true`. Learn more about Structured
-         * Outputs in the function calling guide.
-         *
-         * @default false
-         */
-        strict?: boolean;
+          /**
+           * The parameters the functions accepts, described as a JSON Schema
+           * object. See the
+           * [guide](https://platform.openai.com/docs/guides/function-calling) for
+           * examples, and the [JSON Schema
+           * reference](https://json-schema.org/understanding-json-schema/) for
+           * documentation about the format.
+           *
+           * Omitting `parameters` defines a function with an empty parameter
+           * list.
+           */
+          parameters?: Record<string, unknown>;
+
+          /**
+           * Whether to enable strict schema adherence when generating the
+           * function call. If set to true, the model will follow the exact schema
+           * defined in the `parameters field`. Only a subset of JSON Schema is
+           * supported when `strict` is `true`. Learn more about Structured
+           * Outputs in the function calling guide.
+           *
+           * @default false
+           */
+          strict?: boolean;
+        };
       }[];
 
       /**

packages/inngest/src/components/ai/index.ts

@@ -1,4 +1,4 @@
-export type { AiAdapter } from "./adapter.ts";
+export type { AiAdapter, AiAdapters } from "./adapter.ts";
 
 // Adapters
 export * from "./adapters/openai.ts";

packages/inngest/src/components/execution/v1.ts

@@ -283,7 +283,7 @@ class V1InngestExecution extends InngestExecution implements IInngestExecution {
   }
 
   private async filterNewSteps(
-    steps: FoundStep[]
+    foundSteps: FoundStep[]
   ): Promise<[OutgoingOp, ...OutgoingOp[]] | void> {
     if (this.options.requestedRunStep) {
       return;
@@ -292,7 +292,7 @@ class V1InngestExecution extends InngestExecution implements IInngestExecution {
     /**
      * Gather any steps that aren't memoized and report them.
      */
-    const newSteps = steps.filter((step) => !step.fulfilled);
+    const newSteps = foundSteps.filter((step) => !step.fulfilled);
 
     if (!newSteps.length) {
       return;
@@ -303,8 +303,8 @@ class V1InngestExecution extends InngestExecution implements IInngestExecution {
      * steps. This may indicate that step presence isn't determinate.
      */
     const stepsToFulfil = Object.keys(this.state.stepState).length;
-    const fulfilledSteps = steps.filter((step) => step.fulfilled).length;
-    const foundAllCompletedSteps = stepsToFulfil === fulfilledSteps;
+    const knownSteps = foundSteps.filter((step) => step.hasStepState).length;
+    const foundAllCompletedSteps = stepsToFulfil === knownSteps;
 
     if (!foundAllCompletedSteps) {
       // TODO Tag
@@ -908,6 +908,7 @@ class V1InngestExecution extends InngestExecution implements IInngestExecution {
         fn: opts?.fn ? () => opts.fn?.(...fnArgs) : undefined,
         promise,
         fulfilled: isFulfilled,
+        hasStepState: Boolean(stepState),
         displayName: opId.displayName ?? opId.id,
         handled: false,
         handle: async () => {