triggerdotdev#344 Upgrading the openai package to v4 (triggerdotdev#383)

ericallam · web-flow · commit 403acac5ef4b · 2023-08-24T11:48:39.000+01:00
* triggerdotdev#344 Upgrading the openai package to v4 * Create neat-roses-wait.md * Fixed a couple of issues with the openai v4 upgrade * Added fine tuning job tasks
diff --git a/.changeset/neat-roses-wait.md b/.changeset/neat-roses-wait.md
@@ -0,0 +1,5 @@
+---
+"@trigger.dev/openai": patch
+---
+
+#344 Upgrading the openai package to v4
diff --git a/examples/job-catalog/src/openai.ts b/examples/job-catalog/src/openai.ts
@@ -28,9 +28,9 @@ client.defineJob({
   run: async (payload, io, ctx) => {
     const models = await io.openai.listModels("list-models");
 
-    if (models.data.length > 0) {
+    if (models.length > 0) {
       await io.openai.retrieveModel("get-model", {
-        model: models.data[0].id,
+        model: models[0].id,
       });
     }
 
diff --git a/integrations/openai/package.json b/integrations/openai/package.json
@@ -24,12 +24,11 @@
     "build:tsup": "tsup"
   },
   "dependencies": {
-    "openai": "^3.3.0",
+    "openai": "^4.2.0",
     "@trigger.dev/sdk": "workspace:^2.0.10",
-    "@trigger.dev/integration-kit": "workspace:^2.0.10",
-    "zod": "3.21.4"
+    "@trigger.dev/integration-kit": "workspace:^2.0.10"
   },
   "engines": {
     "node": ">=16.8.0"
   }
-}
+}
diff --git a/integrations/openai/src/index.ts b/integrations/openai/src/index.ts
@@ -1,5 +1,5 @@
 import type { IntegrationClient, TriggerIntegration } from "@trigger.dev/sdk";
-import { Configuration, OpenAIApi } from "openai";
+import OpenAIApi from "openai";
 import * as tasks from "./tasks";
 import { OpenAIIntegrationOptions } from "./types";
 
@@ -28,12 +28,10 @@ export class OpenAI implements TriggerIntegration<IntegrationClient<OpenAIApi, t
       throw `Can't create OpenAI integration (${options.id}) as apiKey was undefined`;
     }
 
-    this.native = new OpenAIApi(
-      new Configuration({
-        apiKey: options.apiKey,
-        organization: options.organization,
-      })
-    );
+    this.native = new OpenAIApi({
+      apiKey: options.apiKey,
+      organization: options.organization,
+    });
 
     this.client = {
       tasks,
diff --git a/integrations/openai/src/taskUtils.ts b/integrations/openai/src/taskUtils.ts
@@ -1,8 +1,7 @@
-import { CreateCompletionResponseUsage, CreateEmbeddingResponseUsage } from "openai";
-import { z } from "zod";
+import OpenAI from "openai";
 
 export function createTaskUsageProperties(
-  usage: CreateCompletionResponseUsage | CreateEmbeddingResponseUsage | undefined
+  usage: OpenAI.Completions.CompletionUsage | OpenAI.CreateEmbeddingResponse.Usage | undefined
 ) {
   if (!usage) {
     return;
@@ -28,26 +27,6 @@ export function createTaskUsageProperties(
   ];
 }
 
-const OpenAIErrorSchema = z.object({
-  response: z.object({
-    data: z.object({
-      error: z.object({
-        code: z.string().nullable().optional(),
-        message: z.string(),
-        type: z.string(),
-      }),
-    }),
-  }),
-});
-
 export function onTaskError(error: unknown) {
-  const openAIError = OpenAIErrorSchema.safeParse(error);
-
-  if (!openAIError.success) {
-    return;
-  }
-
-  const { message, code, type } = openAIError.data.response.data.error;
-
-  return new Error(`${type}: ${message}${code ? ` (${code})` : ""}`);
+  return;
 }
diff --git a/integrations/openai/src/tasks.ts b/integrations/openai/src/tasks.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@trigger.dev/openai": patch
 +---
++
 +#344 Upgrading the openai package to v4