Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add pick method to base asynclocalstorage method #7326

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions langchain-core/src/runnables/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import {
getCallbackManagerForConfig,
mergeConfigs,
patchConfig,
pickRunnableConfigKeys,
} from "./config.js";
import { AsyncCaller } from "../utils/async_caller.js";
import { Run } from "../tracers/base.js";
Expand Down Expand Up @@ -2533,7 +2532,7 @@ export class RunnableLambda<
recursionLimit: (config?.recursionLimit ?? DEFAULT_RECURSION_LIMIT) - 1,
});
void AsyncLocalStorageProviderSingleton.runWithConfig(
pickRunnableConfigKeys(childConfig),
childConfig,
async () => {
try {
let output = await this.func(input, {
Expand Down Expand Up @@ -2631,7 +2630,7 @@ export class RunnableLambda<
const output = await new Promise<RunOutput | Runnable>(
(resolve, reject) => {
void AsyncLocalStorageProviderSingleton.runWithConfig(
pickRunnableConfigKeys(childConfig),
childConfig,
async () => {
try {
const res = await this.func(finalChunk as RunInput, {
Expand Down
5 changes: 2 additions & 3 deletions langchain-core/src/runnables/iter.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { RunnableConfig } from "../runnables/types.js";
import { AsyncLocalStorageProviderSingleton } from "../singletons/index.js";
import { pickRunnableConfigKeys } from "./config.js";

export function isIterableIterator(
thing: unknown
Expand Down Expand Up @@ -37,7 +36,7 @@ export function* consumeIteratorInContext<T>(
): IterableIterator<T> {
while (true) {
const { value, done } = AsyncLocalStorageProviderSingleton.runWithConfig(
pickRunnableConfigKeys(context),
context,
iter.next.bind(iter),
true
);
Expand All @@ -57,7 +56,7 @@ export async function* consumeAsyncIterableInContext<T>(
while (true) {
const { value, done } =
await AsyncLocalStorageProviderSingleton.runWithConfig(
pickRunnableConfigKeys(context),
context,
iterator.next.bind(iter),
true
);
Expand Down
10 changes: 6 additions & 4 deletions langchain-core/src/singletons/async_local_storage/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
} from "./globals.js";
import { CallbackManager } from "../../callbacks/manager.js";
import { LangChainTracer } from "../../tracers/tracer_langchain.js";
import { pickRunnableConfigKeys } from "../../runnables/config.js";

export class MockAsyncLocalStorage implements AsyncLocalStorageInterface {
getStore(): any {
Expand Down Expand Up @@ -46,12 +47,13 @@ class AsyncLocalStorageProvider {
callback: () => T,
avoidCreatingRootRunTree?: boolean
): T {
const cleanedConfig = pickRunnableConfigKeys(config);
const callbackManager = CallbackManager._configureSync(
config?.callbacks,
cleanedConfig?.callbacks,
undefined,
config?.tags,
cleanedConfig?.tags,
undefined,
config?.metadata
cleanedConfig?.metadata
);
const storage = this.getInstance();
const previousValue = storage.getStore();
Expand All @@ -72,7 +74,7 @@ class AsyncLocalStorageProvider {
}

if (runTree) {
runTree.extra = { ...runTree.extra, [LC_CHILD_KEY]: config };
runTree.extra = { ...runTree.extra, [LC_CHILD_KEY]: cleanedConfig };
}

if (
Expand Down
5 changes: 2 additions & 3 deletions langchain-core/src/tools/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import {
ensureConfig,
patchConfig,
pickRunnableConfigKeys,
type RunnableConfig,
} from "../runnables/config.js";
import type { RunnableFunc, RunnableInterface } from "../runnables/base.js";
Expand Down Expand Up @@ -595,7 +594,7 @@ export function tool<
callbacks: runManager?.getChild(),
});
void AsyncLocalStorageProviderSingleton.runWithConfig(
pickRunnableConfigKeys(childConfig),
childConfig,
async () => {
try {
// TS doesn't restrict the type here based on the guard above
Expand Down Expand Up @@ -626,7 +625,7 @@ export function tool<
callbacks: runManager?.getChild(),
});
void AsyncLocalStorageProviderSingleton.runWithConfig(
pickRunnableConfigKeys(childConfig),
childConfig,
async () => {
try {
// TS doesn't restrict the type here based on the guard above
Expand Down
9 changes: 2 additions & 7 deletions langchain-core/src/utils/stream.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { pickRunnableConfigKeys } from "../runnables/config.js";
import { AsyncLocalStorageProviderSingleton } from "../singletons/index.js";
import type { IterableReadableStreamInterface } from "../types/stream.js";
import { raceWithSignal } from "./signal.js";
Expand Down Expand Up @@ -215,9 +214,7 @@ export class AsyncGeneratorWithSetup<
// to each generator is available.
this.setup = new Promise((resolve, reject) => {
void AsyncLocalStorageProviderSingleton.runWithConfig(
pickRunnableConfigKeys(
params.config as Record<string, unknown> | undefined
),
params.config,
async () => {
this.firstResult = params.generator.next();
if (params.startSetup) {
Expand All @@ -240,9 +237,7 @@ export class AsyncGeneratorWithSetup<
}

return AsyncLocalStorageProviderSingleton.runWithConfig(
pickRunnableConfigKeys(
this.config as Record<string, unknown> | undefined
),
this.config,
this.signal
? async () => {
return raceWithSignal(this.generator.next(...args), this.signal);
Expand Down
Loading