move back to the zod to json schema package

package.json

@@ -37,6 +37,9 @@
     "url": "https://github.com/jxnl/instructor-js/issues"
   },
   "homepage": "https://github.com/jxnl/instructor-js#readme",
+  "dependencies": {
+    "zod-to-json-schema": "^3.22.3"
+  },
   "peerDependencies": {
     "openai": ">=4.24.1",
     "zod": ">=3.22.4"

src/instructor.ts

@@ -1,7 +1,7 @@
-import { createSchemaFunction } from "@/oai/fns/schema"
 import OpenAI from "openai"
 import { ChatCompletion, ChatCompletionCreateParamsNonStreaming } from "openai/resources/index.mjs"
 import { ZodObject } from "zod"
+import zodToJsonSchema from "zod-to-json-schema"
 
 import { MODE } from "@/constants/modes"
 
@@ -138,12 +138,17 @@ export default class Instructor {
     response_model,
     ...params
   }: PatchedChatCompletionCreateParams): ChatCompletionCreateParamsNonStreaming => {
-    const { definition } = createSchemaFunction({ schema: response_model })
+    const jsonSchema = zodToJsonSchema(response_model, "response_model")
+
+    const definition = {
+      name: "response_model",
+      ...jsonSchema.definitions.response_model
+    }
 
     const paramsForMode = MODE_TO_PARAMS[this.mode](definition, params)
 
     return {
-      stream: false, //TODO: not sure what streaming support looks like TBH
+      stream: false,
       ...paramsForMode
     }
   }

src/oai/params.ts

@@ -1,52 +1,25 @@
-import { FunctionPayload } from "./fns"
-
-export function OAIBuildFunctionParams(definition: FunctionPayload, params) {
+export function OAIBuildFunctionParams(definition, params) {
   return {
     ...params,
     function_call: {
       name: definition.name
     },
-    functions: [
-      ...(params?.functions ?? []),
-      {
-        name: definition.name,
-        description: definition.description,
-        parameters: {
-          type: "object",
-          properties: definition.parameters,
-          required: definition.required
-        }
-      }
-    ]
+    functions: [...(params?.functions ?? []), definition]
   }
 }
 
-export function OAIBuildToolFunctionParams(definition: FunctionPayload, params) {
+export function OAIBuildToolFunctionParams(definition, params) {
   return {
     ...params,
     tool_choice: {
       type: "function",
       function: { name: definition.name }
     },
-    tools: [
-      ...(params?.tools ?? []),
-      {
-        type: "function",
-        function: {
-          name: definition.name,
-          description: definition.description,
-          parameters: {
-            type: "object",
-            properties: definition.parameters,
-            required: definition.required
-          }
-        }
-      }
-    ]
+    tools: [...(params?.tools ?? []), definition]
   }
 }
 
-export function OAIBuildMessageBasedParams(definition: FunctionPayload, params) {
+export function OAIBuildMessageBasedParams(definition, params) {
   return {
     ...params,
     messages: [
@@ -58,8 +31,8 @@ export function OAIBuildMessageBasedParams(definition: FunctionPayload, params)
           You will return no other prose. You will take into account the descriptions for each paramater within the schema
           and return a valid JSON object that matches the schema and those instructions.
 
-          description: ${definition.description}
-          paramaters: ${JSON.stringify(definition.parameters)}
+          description: ${definition?.description}
+          json schema: ${JSON.stringify(definition)}
         `
       }
     ]