Explore removing agent shims

demo/inngest.ts

@@ -1,13 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import {
-  anthropic,
   createAgent,
   createNetwork,
   createTool,
   defaultRoutingAgent,
-  openai,
-} from "../src/index";
-import { EventSchemas, Inngest } from "inngest";
+} from "@inngest/agent-kit";
+import { EventSchemas, Inngest, openai } from "inngest";
 import { z } from "zod";
 
 export const inngest = new Inngest({
@@ -24,26 +22,12 @@ export const inngest = new Inngest({
 export const fn = inngest.createFunction(
   { id: "agent" },
   { event: "agent/run" },
-  async ({ event, step }) => {
-    const model = openai({ model: "gpt-4", step });
-
+  async ({ event }) => {
     //  1. Single agent
-
     // Run a single agent as a prompt without a network.
-    await codeWritingAgent.run(event.data.input, {
-      model,
-    });
+    await codeWritingAgent.run(event.data.input, { model });
 
     //  2. A network of agents that works together
-    const network = createNetwork({
-      agents: [
-        codeWritingAgent.withModel(model),
-        executingAgent.withModel(model),
-      ],
-      defaultModel: model,
-      maxIter: 4,
-    });
-
     // This uses the defaut agentic router to determine which agent to handle first.  You can
     // optionally specifiy the agent that should execute first, and provide your own logic for
     // handling logic in between agent calls.
@@ -57,9 +41,11 @@ export const fn = inngest.createFunction(
     });
 
     return result;
-  },
+  }
 );
 
+const model = openai({ model: "gpt-4" });
+
 const systemPrompt =
   "You are an expert TypeScript programmer.  You can create files with idiomatic TypeScript code, with comments and associated tests.";
 
@@ -109,7 +95,7 @@ const codeWritingAgent = createAgent({
                 filename: z.string(),
                 content: z.string(),
               })
-              .required(),
+              .required()
           ),
         })
         .required(),
@@ -157,3 +143,12 @@ Think carefully about the request that the user is asking for. Do not respond wi
 </command>
 `,
 });
+
+const network = createNetwork({
+  agents: [
+    codeWritingAgent.withModel(model),
+    executingAgent.withModel(model),
+  ],
+  defaultModel: model,
+  maxIter: 4,
+});

demo/mw.ts

@@ -1,20 +1,22 @@
-import { agenticOpenai, createAgent, createNetwork } from "@inngest/agent-kit";
-import { InngestMiddleware, type OpenAi } from "inngest";
+import { createAgent, createNetwork } from "@inngest/agent-kit";
+import { InngestMiddleware, openai, type OpenAi } from "inngest";
 
 export const codeWritingNetworkMiddleware = (
   defaultModelOptions: OpenAi.AiModelOptions,
 ) => {
   return new InngestMiddleware({
     name: "Code Writing Agent Middleware",
     init() {
+      const model = openai({ ...defaultModelOptions });
+
       return {
         onFunctionRun() {
           return {
-            transformInput({ ctx: { step } }) {
+            transformInput() {
               const codeWritingNetwork = createNetwork({
                 agents: [codeWritingAgent, executingAgent],
                 maxIter: 4,
-                defaultModel: agenticOpenai({ ...defaultModelOptions, step }),
+                defaultModel: model,
               });
 
               return {

demo/package.json

@@ -9,9 +9,9 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@inngest/agent-kit": "~0.0.1",
+    "@inngest/agent-kit": "file:../inngest-agent-kit-0.0.3.tgz",
     "express": "^4.21.1",
-    "inngest": "^3.27.3"
+    "inngest": "^3.27.6-pr-776.2"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",

package.json

@@ -39,8 +39,8 @@
     }
   },
   "dependencies": {
-    "inngest": "^3.27.4",
     "express": "^4.21.1",
+    "inngest": "3.27.6-pr-776.2",
     "openai-zod-to-json-schema": "^1.0.3",
     "zod": "^3.23.8"
   },

src/adapters/index.ts

@@ -0,0 +1,22 @@
+import { type AiAdapter, type AiAdapters } from "inngest";
+import { type AgenticModel } from "../model";
+import * as openai from "./openai";
+import * as anthropic from "./anthropic";
+
+export type Adapters = {
+  [Format in AiAdapter.Format]: {
+    request: AgenticModel.RequestParser<AiAdapters[Format]>;
+    response: AgenticModel.ResponseParser<AiAdapters[Format]>;
+  };
+};
+
+export const adapters: Adapters = {
+  "openai-chat": {
+    request: openai.requestParser,
+    response: openai.responseParser,
+  },
+  anthropic: {
+    request: anthropic.requestParser,
+    response: anthropic.responseParser,
+  },
+};

src/agent.ts

@@ -1,4 +1,5 @@
-import { type AgenticModel } from "./model";
+import { type AiAdapter } from "inngest";
+import { createAgenticModelFromAiAdapter, type AgenticModel } from "./model";
 import { type Network } from "./network";
 import {
   type State,
@@ -11,7 +12,7 @@ import {
   type ResultLifecycleArgs,
   type Tool,
 } from "./types";
-import { type AnyZodType, type MaybePromise } from "./util";
+import { getStepTools, type AnyZodType, type MaybePromise } from "./util";
 
 /**
  * createTool is a helper that properly types the input argument for a handler
@@ -72,15 +73,15 @@ export class Agent {
     this.assistant = opts.assistant || "";
     this.tools = new Map();
     this.lifecycles = opts.lifecycle;
-    this.model = opts.model;
+    this.model = opts.model && createAgenticModelFromAiAdapter(opts.model);
 
     for (const tool of opts.tools || []) {
       this.tools.set(tool.name, tool);
     }
   }
 
-  withModel(model: AgenticModel.Any): Agent {
-    this.model = model;
+  withModel(model: AiAdapter.Any): Agent {
+    this.model = createAgenticModelFromAiAdapter(model);
     return this; // for chaining
   }
 
@@ -97,7 +98,11 @@ export class Agent {
       maxIter = 0,
     }: Agent.RunOptions | undefined = {},
   ): Promise<InferenceResult> {
-    const p = model || this.model || network?.defaultModel;
+    const p =
+      (model && createAgenticModelFromAiAdapter(model)) ||
+      this.model ||
+      (network?.defaultModel &&
+        createAgenticModelFromAiAdapter(network.defaultModel));
     if (!p) {
       throw new Error("No step caller provided to agent");
     }
@@ -226,7 +231,7 @@ export class Agent {
         const result = await found.handler(tool.input, {
           agent: this,
           network,
-          step: p.step,
+          step: await getStepTools(),
         });
 
         // TODO: handle error and send them back to the LLM
@@ -288,11 +293,11 @@ export namespace Agent {
     assistant?: string;
     tools?: Tool.Any[];
     lifecycle?: Lifecycle;
-    model?: AgenticModel.Any;
+    model?: AiAdapter.Any;
   }
 
   export interface RunOptions {
-    model?: AgenticModel.Any;
+    model?: AiAdapter.Any;
     network?: Network;
     /**
      * State allows you to pass custom state into a single agent run call.  This should only

src/error.ts

@@ -0,0 +1,6 @@
+export class AIGatewayError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "AIGatewayError";
+  }
+}

src/index.ts

@@ -5,8 +5,3 @@ export * from "./network";
 export * from "./state";
 export * from "./types";
 export * from "./util";
-
-// Models
-export * from "./models/gemini";
-export * from "./models/openai";
-export * from "./models/anthropic";

src/model.ts

@@ -1,22 +1,36 @@
-import { type AiAdapter, type GetStepTools, type Inngest } from "inngest";
+import { type AiAdapter } from "inngest";
 import { type InternalNetworkMessage } from "./state";
 import { type Tool } from "./types";
+import { getStepTools } from "./util";
+import { adapters } from "./adapters";
+
+export const createAgenticModelFromAiAdapter = <
+  TAiAdapter extends AiAdapter.Any,
+>(
+  adapter: TAiAdapter,
+): AgenticModel<TAiAdapter> => {
+  const opts = adapters[adapter.format as AiAdapter.Format];
+
+  return new AgenticModel({
+    model: adapter,
+    requestParser:
+      opts.request as unknown as AgenticModel.RequestParser<TAiAdapter>,
+    responseParser:
+      opts.response as unknown as AgenticModel.ResponseParser<TAiAdapter>,
+  });
+};
 
 export class AgenticModel<TAiAdapter extends AiAdapter.Any> {
   #model: TAiAdapter;
-
-  step: GetStepTools<Inngest.Any>;
   requestParser: AgenticModel.RequestParser<TAiAdapter>;
   responseParser: AgenticModel.ResponseParser<TAiAdapter>;
 
   constructor({
     model,
-    step,
     requestParser,
     responseParser,
   }: AgenticModel.Constructor<TAiAdapter>) {
     this.#model = model;
-    this.step = step;
     this.requestParser = requestParser;
     this.responseParser = responseParser;
   }
@@ -26,7 +40,9 @@ export class AgenticModel<TAiAdapter extends AiAdapter.Any> {
     input: InternalNetworkMessage[],
     tools: Tool.Any[],
   ): Promise<AgenticModel.InferenceResponse> {
-    const result = (await this.step.ai.infer(stepID, {
+    const step = await getStepTools();
+
+    const result = (await step.ai.infer(stepID, {
       model: this.#model,
       body: this.requestParser(this.#model, input, tools),
     })) as AiAdapter.Input<TAiAdapter>;
@@ -50,7 +66,6 @@ export namespace AgenticModel {
 
   export interface Constructor<TAiAdapter extends AiAdapter.Any> {
     model: TAiAdapter;
-    step: GetStepTools<Inngest.Any>;
     requestParser: RequestParser<TAiAdapter>;
     responseParser: ResponseParser<TAiAdapter>;
   }