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

Nc/fix tracer chat output #1253

Merged
merged 4 commits into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions langchain/src/callbacks/handlers/tracer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {
RunInputs,
RunOutputs,
} from "../../schema/index.js";
import { mapChatMessagesToStoredMessages } from "../../stores/message/utils.js";
import { BaseCallbackHandler } from "../base.js";

export type RunType = "llm" | "chain" | "tool";
Expand Down Expand Up @@ -132,17 +131,14 @@ export abstract class BaseTracer extends BaseCallbackHandler {
parentRunId?: string
): Promise<void> {
const execution_order = this._getExecutionOrder(parentRunId);
const convertedMessages = messages.map((batch) =>
mapChatMessagesToStoredMessages(batch)
);
const run: Run = {
id: runId,
name: llm.name,
parent_run_id: parentRunId,
start_time: Date.now(),
end_time: 0,
serialized: llm,
inputs: { messages: convertedMessages },
inputs: { messages },
execution_order,
child_runs: [],
child_execution_order: execution_order,
Expand Down
6 changes: 2 additions & 4 deletions langchain/src/client/langchainplus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ import {
LLMResult,
RunInputs,
RunOutputs,
StoredMessage,
} from "../schema/index.js";
import { BaseLanguageModel } from "../base_language/index.js";
import { BaseChain } from "../chains/base.js";
import { BaseLLM } from "../llms/base.js";
import { BaseChatModel } from "../chat_models/base.js";
import {
StoredMessage,
mapStoredMessagesToChatMessages,
} from "../stores/message/utils.js";
import { mapStoredMessagesToChatMessages } from "../stores/message/utils.js";

export interface RunResult extends BaseRun {
name: string;
Expand Down
23 changes: 23 additions & 0 deletions langchain/src/schema/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ export type LLMResult = {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[RUN_KEY]?: Record<string, any>;
};

export interface StoredMessageData {
content: string;
role: string | undefined;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
additional_kwargs?: Record<string, any>;
}

export interface StoredMessage {
type: string;
data: StoredMessageData;
}

export type MessageType = "human" | "ai" | "generic" | "system";

export abstract class BaseChatMessage {
Expand All @@ -62,6 +75,16 @@ export abstract class BaseChatMessage {
constructor(text: string) {
this.text = text;
}

toJSON(): StoredMessage {
return {
type: this._getType(),
data: {
content: this.text,
role: "role" in this ? (this.role as string) : undefined,
},
};
}
}

export class HumanChatMessage extends BaseChatMessage {
Expand Down
2 changes: 1 addition & 1 deletion langchain/src/stores/message/dynamodb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import {
} from "@aws-sdk/client-dynamodb";

import {
StoredMessage,
BaseChatMessage,
BaseListChatMessageHistory,
} from "../../schema/index.js";
import {
StoredMessage,
mapChatMessagesToStoredMessages,
mapStoredMessagesToChatMessages,
} from "./utils.js";
Expand Down
2 changes: 1 addition & 1 deletion langchain/src/stores/message/redis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import {
RedisScripts,
} from "redis";
import {
StoredMessage,
BaseChatMessage,
BaseListChatMessageHistory,
} from "../../schema/index.js";
import {
StoredMessage,
mapChatMessagesToStoredMessages,
mapStoredMessagesToChatMessages,
} from "./utils.js";
Expand Down
22 changes: 2 additions & 20 deletions langchain/src/stores/message/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,10 @@ import {
BaseChatMessage,
ChatMessage,
HumanChatMessage,
StoredMessage,
SystemChatMessage,
} from "../../schema/index.js";

// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type AdditionalKwargs = Record<string, any>;
export interface StoredMessageData {
content: string;
role: string | undefined;
additional_kwargs?: AdditionalKwargs;
}

export interface StoredMessage {
type: string;
data: StoredMessageData;
}

interface StoredMessageV1 {
type: string;
role: string | undefined;
Expand Down Expand Up @@ -72,11 +60,5 @@ export function mapStoredMessagesToChatMessages(
export function mapChatMessagesToStoredMessages(
messages: BaseChatMessage[]
): StoredMessage[] {
return messages.map((message) => ({
type: message._getType(),
data: {
content: message.text,
role: "role" in message ? (message.role as string) : undefined,
},
}));
return messages.map((message) => message.toJSON());
}