fix: fix types to use ZodType<any, any, any>

EnjoinHQ · Nov 8, 2023 · d3c6ecf · d3c6ecf
1 parent 9b975f8
commit d3c6ecf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/.changeset/nasty-fans-argue.md b/.changeset/nasty-fans-argue.md
@@ -0,0 +1,5 @@
+---
+"hopfield": patch
+---
+
+**Fix:** fix types to use `ZodType<any, any, any>`.
diff --git a/src/function.ts b/src/function.ts
@@ -4,12 +4,7 @@ import { zodToJsonSchema } from 'zod-to-json-schema';
 
 import type { BaseHopfieldChatTemplate, TypeTemplates } from './template.js';
 import type { IsEmptyArray } from './type-utils.js';
-import {
-  type AnyZodObject,
-  ZodFirstPartyTypeKind,
-  type ZodTypeDef,
-  z,
-} from 'zod';
+import { ZodFirstPartyTypeKind, type ZodTypeDef, z, type ZodType } from 'zod';
 import type { Refs } from 'zod-to-json-schema/src/Refs.js';
 import type { JsonSchema7Type } from 'zod-to-json-schema/src/parseDef.js';
 
@@ -118,7 +113,7 @@ const DescriptionSchema = z.string().min(1).max(500);
 export type BaseHopfieldFunctionProps<
   FName extends string,
   FDescription extends string,
-  FParams extends AnyZodObject,
+  FParams extends ZodType<any, any, any>,
   DTypes extends DisabledTypes,
   TTemplates extends TypeTemplates,
   Template extends BaseHopfieldChatTemplate<TTemplates>,
@@ -133,7 +128,7 @@ export type BaseHopfieldFunctionProps<
 export abstract class BaseHopfieldFunction<
   FName extends string,
   FDescription extends string,
-  FParams extends AnyZodObject,
+  FParams extends ZodType<any, any, any>,
   DTypes extends DisabledTypes,
   TTemplates extends TypeTemplates,
   Template extends BaseHopfieldChatTemplate<TTemplates>,

diff --git a/src/openai/function.ts b/src/openai/function.ts
@@ -6,18 +6,18 @@ import {
 import type { TypeTemplates } from '../template.js';
 
 import {
-  type DefaultOpenAITypeTemplates,
-  OpenAIChatTemplate,
-  defaultOpenAITypeTemplates,
-} from './template.js';
-import {
-  type AnyZodObject,
   ZodArray,
   ZodDefault,
   ZodFirstPartyTypeKind,
+  ZodType,
   ZodUnion,
   z,
 } from 'zod';
+import {
+  OpenAIChatTemplate,
+  defaultOpenAITypeTemplates,
+  type DefaultOpenAITypeTemplates,
+} from './template.js';
 
 export type OpenAIFunctionsTuple = [
   OpenAIFunctionSchema,
@@ -60,7 +60,7 @@ export type FunctionSchemasArray<T extends OpenAIFunctionsTuple> = ZodDefault<
 export type OpenAIFunctionProps<
   FName extends string,
   FDescription extends string,
-  FParams extends AnyZodObject,
+  FParams extends ZodType<any, any, any>,
   DTypes extends DisabledTypes,
 > = {
   name: FName;
@@ -72,7 +72,7 @@ export type OpenAIFunctionProps<
 export class OpenAIFunction<
   FName extends string,
   FDescription extends string,
-  FParams extends AnyZodObject,
+  FParams extends ZodType<any, any, any>,
   DTypes extends DisabledTypes = typeof disallowedTypes,
 > extends BaseHopfieldFunction<
   FName,
@@ -120,7 +120,7 @@ export class OpenAIFunction<
   static function<
     FName extends string,
     FDescription extends string,
-    FParams extends AnyZodObject,
+    FParams extends ZodType<any, any, any>,
     DTypes extends DisabledTypes,
   >(opts: OpenAIFunctionProps<FName, FDescription, FParams, DTypes>) {
     return new OpenAIFunction(opts);

diff --git a/src/openai/provider.ts b/src/openai/provider.ts
@@ -2,30 +2,30 @@ import type OpenAI from 'openai';
 
 import { OpenAIEmbedding, OpenAIEmbeddingSchema } from './embedding.js';
 
-import { type DefaultChatN, defaultChatN } from '../chat.js';
+import type { ZodType } from 'zod';
+import { defaultChatN, type DefaultChatN } from '../chat.js';
 import {
-  type DefaultEmbeddingCount,
   defaultEmbeddingCount,
+  type DefaultEmbeddingCount,
 } from '../embedding.js';
 import type { DisabledTypes } from '../function.js';
 import { BaseHopfield } from '../provider.js';
 import type { TypeTemplates } from '../template.js';
 import { OpenAIChat, OpenAIChatSchema } from './chat/non-streaming.js';
 import { OpenAIFunction, type OpenAIFunctionProps } from './function.js';
 import {
+  defaultOpenAIChatModelName,
+  defaultOpenAIEmbeddingModelName,
   type DefaultOpenAIChatModelName,
   type DefaultOpenAIEmbeddingModelName,
   type OpenAIChatModelName,
   type OpenAIEmbeddingModelName,
-  defaultOpenAIChatModelName,
-  defaultOpenAIEmbeddingModelName,
 } from './models.js';
 import {
-  type DefaultOpenAITypeTemplates,
   OpenAIChatTemplate,
   defaultOpenAITypeTemplates,
+  type DefaultOpenAITypeTemplates,
 } from './template.js';
-import type { AnyZodObject } from 'zod';
 
 export class OpenAIHopfield<
   Provider extends OpenAI,
@@ -79,7 +79,7 @@ export class OpenAIHopfield<
   override function<
     FName extends string,
     FDescription extends string,
-    FParams extends AnyZodObject,
+    FParams extends ZodType<any, any, any>,
     DTypes extends DisabledTypes, // = typeof disallowedTypes,
   >(opts: OpenAIFunctionProps<FName, FDescription, FParams, DTypes>) {
     return new OpenAIFunction(opts);