reorg bc circular dep

langchain-core/src/runnables/base.ts

@@ -29,7 +29,6 @@ import {
   atee,
   pipeGeneratorWithSetup,
   AsyncGeneratorWithSetup,
-  pickRunnableConfigKeys,
 } from "../utils/stream.js";
 import { raceWithSignal } from "../utils/signal.js";
 import {
@@ -56,6 +55,7 @@ import {
 } from "./iter.js";
 import { _isToolCall, ToolInputParsingException } from "../tools/utils.js";
 import { ToolCall } from "../messages/tool.js";
+import { pickRunnableConfigKeys } from "./types.js";
 
 export { type RunnableInterface, RunnableBatchOptions };
 

langchain-core/src/runnables/iter.ts

@@ -1,6 +1,5 @@
 import { AsyncLocalStorageProviderSingleton } from "../singletons/index.js";
-import { pickRunnableConfigKeys } from "../utils/stream.js";
-import { RunnableConfig } from "./config.js";
+import { pickRunnableConfigKeys, type RunnableConfig } from "./types.js";
 
 export function isIterableIterator(
   thing: unknown

langchain-core/src/runnables/types.ts

@@ -1,7 +1,7 @@
 import type { z } from "zod";
-import type { IterableReadableStreamInterface } from "../utils/stream.js";
 import type { SerializableInterface } from "../load/serializable.js";
 import type { BaseCallbackConfig } from "../callbacks/manager.js";
+import type { IterableReadableStreamInterface } from "../types/stream.js";
 
 export type RunnableBatchOptions = {
   /** @deprecated Pass in via the standard runnable config object instead */
@@ -108,3 +108,21 @@ export interface RunnableConfig<
    */
   signal?: AbortSignal;
 }
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function pickRunnableConfigKeys<CallOptions extends Record<string, any>>(
+  config?: CallOptions
+): RunnableConfig | undefined {
+  return config
+    ? {
+        configurable: config.configurable,
+        recursionLimit: config.recursionLimit,
+        callbacks: config.callbacks,
+        tags: config.tags,
+        metadata: config.metadata,
+        maxConcurrency: config.maxConcurrency,
+        timeout: config.timeout,
+        signal: config.signal,
+      }
+    : undefined;
+}

langchain-core/src/tools/index.ts

@@ -20,7 +20,7 @@ import { MessageContent } from "../messages/base.js";
 import { AsyncLocalStorageProviderSingleton } from "../singletons/index.js";
 import { _isToolCall, ToolInputParsingException } from "./utils.js";
 import { isZodSchema } from "../utils/types/is_zod_schema.js";
-import { pickRunnableConfigKeys } from "../utils/stream.js";
+import { pickRunnableConfigKeys } from "../runnables/types.js";
 
 export { ToolInputParsingException };
 

langchain-core/src/types/stream.ts

@@ -0,0 +1,5 @@
+// Make this a type to override ReadableStream's async iterator type in case
+// the popular web-streams-polyfill is imported - the supplied types
+// in that case don't quite match.
+export type IterableReadableStreamInterface<T> = ReadableStream<T> &
+  AsyncIterable<T>;

langchain-core/src/utils/stream.ts

@@ -1,12 +1,11 @@
-import { RunnableConfig } from "../../runnables.js";
+import { pickRunnableConfigKeys } from "../runnables/types.js";
 import { AsyncLocalStorageProviderSingleton } from "../singletons/index.js";
+import { IterableReadableStreamInterface } from "../types/stream.js";
 import { raceWithSignal } from "./signal.js";
 
-// Make this a type to override ReadableStream's async iterator type in case
-// the popular web-streams-polyfill is imported - the supplied types
-// in that case don't quite match.
-export type IterableReadableStreamInterface<T> = ReadableStream<T> &
-  AsyncIterable<T>;
+// Re-exported for backwards compatibility
+// Do NOT import this type from this file inside the project. Instead, always import from `types/stream.js`
+export { IterableReadableStreamInterface };
 
 /*
  * Support async iterator syntax for ReadableStreams in all environments.
@@ -181,24 +180,6 @@ export function concat<
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function pickRunnableConfigKeys<CallOptions extends Record<string, any>>(
-  config?: CallOptions
-): RunnableConfig | undefined {
-  return config
-    ? {
-        configurable: config.configurable,
-        recursionLimit: config.recursionLimit,
-        callbacks: config.callbacks,
-        tags: config.tags,
-        metadata: config.metadata,
-        maxConcurrency: config.maxConcurrency,
-        timeout: config.timeout,
-        signal: config.signal,
-      }
-    : undefined;
-}
-
 export class AsyncGeneratorWithSetup<
   S = unknown,
   T = unknown,
@@ -234,7 +215,9 @@ export class AsyncGeneratorWithSetup<
     // to each generator is available.
     this.setup = new Promise((resolve, reject) => {
       void AsyncLocalStorageProviderSingleton.runWithConfig(
-        pickRunnableConfigKeys(params.config as RunnableConfig),
+        pickRunnableConfigKeys(
+          params.config as Record<string, unknown> | undefined
+        ),
         async () => {
           this.firstResult = params.generator.next();
           if (params.startSetup) {
@@ -257,7 +240,9 @@ export class AsyncGeneratorWithSetup<
     }
 
     return AsyncLocalStorageProviderSingleton.runWithConfig(
-      pickRunnableConfigKeys(this.config as RunnableConfig),
+      pickRunnableConfigKeys(
+        this.config as Record<string, unknown> | undefined
+      ),
       this.signal
         ? async () => {
             return raceWithSignal(this.generator.next(...args), this.signal);