remove optional base wso implementation

langchain-ai · Jun 12, 2024 · b92a5f7 · b92a5f7
1 parent e00b73c
commit b92a5f7
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 57 deletions.
diff --git a/langchain-core/src/language_models/chat_models.ts b/langchain-core/src/language_models/chat_models.ts
@@ -730,7 +730,7 @@ export abstract class BaseChatModel<
     return result.content;
   }
 
-  withStructuredOutput?<
+  withStructuredOutput<
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     RunOutput extends Record<string, any> = Record<string, any>
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -742,7 +742,7 @@ export abstract class BaseChatModel<
     config?: StructuredOutputMethodOptions<false>
   ): Runnable<BaseLanguageModelInput, RunOutput>;
 
-  withStructuredOutput?<
+  withStructuredOutput<
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     RunOutput extends Record<string, any> = Record<string, any>
   >(
@@ -753,7 +753,7 @@ export abstract class BaseChatModel<
     config?: StructuredOutputMethodOptions<true>
   ): Runnable<BaseLanguageModelInput, { raw: BaseMessage; parsed: RunOutput }>;
 
-  withStructuredOutput?<
+  withStructuredOutput<
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     RunOutput extends Record<string, any> = Record<string, any>
   >(

diff --git a/libs/langchain-community/src/chat_models/bedrock/web.ts b/libs/langchain-community/src/chat_models/bedrock/web.ts
@@ -763,60 +763,60 @@ export class BedrockChat
     return this;
   }
 
-  withStructuredOutput<
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    RunOutput extends Record<string, any> = Record<string, any>
-  >(
-    outputSchema:
-      | z.ZodType<RunOutput>
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      | Record<string, any>,
-    config?: StructuredOutputMethodOptions<false>
-  ): Runnable<BaseLanguageModelInput, RunOutput>;
-
-  withStructuredOutput<
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    RunOutput extends Record<string, any> = Record<string, any>
-  >(
-    outputSchema:
-      | z.ZodType<RunOutput>
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      | Record<string, any>,
-    config?: StructuredOutputMethodOptions<true>
-  ): Runnable<BaseLanguageModelInput, { raw: BaseMessage; parsed: RunOutput }>;
-
-  withStructuredOutput<
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    RunOutput extends Record<string, any> = Record<string, any>
-  >(
-    outputSchema:
-      | z.ZodType<RunOutput>
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      | Record<string, any>,
-    config?: StructuredOutputMethodOptions<boolean>
-  ):
-    | Runnable<BaseLanguageModelInput, RunOutput>
-    | Runnable<
-        BaseLanguageModelInput,
-        { raw: BaseMessage; parsed: RunOutput }
-      > {
-    if (!super.withStructuredOutput) {
-      throw new Error(`withStructuredOutput is not implemented in the base class.
-This is likely due to an outdated version of "@langchain/core".
-Please upgrade to the latest version.`);
-    }
-    if (config?.includeRaw) {
-      return super.withStructuredOutput(outputSchema, {
-        ...config,
-        includeRaw: true,
-      });
-    } else {
-      return super.withStructuredOutput(outputSchema, {
-        ...config,
-        includeRaw: false,
-      });
-    }
-  }
+//   withStructuredOutput<
+//     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//     RunOutput extends Record<string, any> = Record<string, any>
+//   >(
+//     outputSchema:
+//       | z.ZodType<RunOutput>
+//       // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//       | Record<string, any>,
+//     config?: StructuredOutputMethodOptions<false>
+//   ): Runnable<BaseLanguageModelInput, RunOutput>;
+
+//   withStructuredOutput<
+//     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//     RunOutput extends Record<string, any> = Record<string, any>
+//   >(
+//     outputSchema:
+//       | z.ZodType<RunOutput>
+//       // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//       | Record<string, any>,
+//     config?: StructuredOutputMethodOptions<true>
+//   ): Runnable<BaseLanguageModelInput, { raw: BaseMessage; parsed: RunOutput }>;
+
+//   withStructuredOutput<
+//     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//     RunOutput extends Record<string, any> = Record<string, any>
+//   >(
+//     outputSchema:
+//       | z.ZodType<RunOutput>
+//       // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//       | Record<string, any>,
+//     config?: StructuredOutputMethodOptions<boolean>
+//   ):
+//     | Runnable<BaseLanguageModelInput, RunOutput>
+//     | Runnable<
+//         BaseLanguageModelInput,
+//         { raw: BaseMessage; parsed: RunOutput }
+//       > {
+//     if (!super.withStructuredOutput) {
+//       throw new Error(`withStructuredOutput is not implemented in the base class.
+// This is likely due to an outdated version of "@langchain/core".
+// Please upgrade to the latest version.`);
+//     }
+//     if (config?.includeRaw) {
+//       return super.withStructuredOutput(outputSchema, {
+//         ...config,
+//         includeRaw: true,
+//       });
+//     } else {
+//       return super.withStructuredOutput(outputSchema, {
+//         ...config,
+//         includeRaw: false,
+//       });
+//     }
+//   }
 }
 
 function isChatGenerationChunk(