From d84bf2e088b198b219ae0eacc7d024c57334fc2b Mon Sep 17 00:00:00 2001 From: isamu Date: Sun, 12 May 2024 07:13:20 +0900 Subject: [PATCH] format --- samples/sample_runner.ts | 8 +++----- .../llm_agents/groq_stream_agent.ts | 8 ++++---- .../llm_agents/slashgpt_agent.ts | 13 ++++++++----- src/node.ts | 10 +++++----- tests/agentFilters/test_filter_params.ts | 1 - 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/samples/sample_runner.ts b/samples/sample_runner.ts index b3215c6f7..95e3c2341 100644 --- a/samples/sample_runner.ts +++ b/samples/sample_runner.ts @@ -11,7 +11,7 @@ import { main as test_loop } from "./test/loop"; import { main as slashgpt } from "./llm/slashgpt"; import { main as groq } from "./llm/groq"; -import { main as net_paper_ai } from "./net/paper_ai" +import { main as net_paper_ai } from "./net/paper_ai"; import { main as net_rss } from "./net/rss"; import { main as interaction_text } from "./interaction/text"; @@ -20,7 +20,6 @@ import { main as interaction_select } from "./interaction/select"; import { main as sample_co2 } from "./tools/sample_co2"; import { main as tools_home } from "./tools/home"; - const main = async () => { // streaming await streaming_groq(); @@ -31,7 +30,7 @@ const main = async () => { // test await test_fibonacci(); await test_loop(); - + // llm await slashgpt(); await groq(); @@ -44,11 +43,10 @@ const main = async () => { // net await net_paper_ai(); await net_rss(); - + // tools await sample_co2(); await tools_home(); - }; main(); diff --git a/src/experimental_agents/llm_agents/groq_stream_agent.ts b/src/experimental_agents/llm_agents/groq_stream_agent.ts index 9eea02384..9e0c8c065 100644 --- a/src/experimental_agents/llm_agents/groq_stream_agent.ts +++ b/src/experimental_agents/llm_agents/groq_stream_agent.ts @@ -1,6 +1,6 @@ import { AgentFunction } from "@/graphai"; import { Groq } from "groq-sdk"; -import { ChatCompletionCreateParamsStreaming } from "groq-sdk/resources/chat/completions" +import { ChatCompletionCreateParamsStreaming } from "groq-sdk/resources/chat/completions"; import { assert } from "@/utils/utils"; const groq = process.env.GROQ_API_KEY ? new Groq({ apiKey: process.env.GROQ_API_KEY }) : undefined; @@ -67,7 +67,7 @@ export const groqStreamAgent: AgentFunction< } if (tools) { options.tools = tools; - options.tool_choice = tool_choice ?? "auto" as Groq.Chat.CompletionCreateParams.ToolChoice; + options.tool_choice = tool_choice ?? ("auto" as Groq.Chat.CompletionCreateParams.ToolChoice); } const stream = await groq.chat.completions.create(options); let lastMessage = null; @@ -81,9 +81,9 @@ export const groqStreamAgent: AgentFunction< contents.push(token); } lastMessage = message as any; - }; + } if (lastMessage) { - lastMessage.choices[0]["message"] = [{"role": "assistant", "content": contents.join("")}]; + lastMessage.choices[0]["message"] = [{ role: "assistant", content: contents.join("") }]; } return lastMessage; }; diff --git a/src/experimental_agents/llm_agents/slashgpt_agent.ts b/src/experimental_agents/llm_agents/slashgpt_agent.ts index a5ba0a8d6..0d78c5e62 100644 --- a/src/experimental_agents/llm_agents/slashgpt_agent.ts +++ b/src/experimental_agents/llm_agents/slashgpt_agent.ts @@ -22,11 +22,14 @@ export const slashGPTAgent: AgentFunction< const contents = query.concat(inputs); session.append_user_question(contents.join("\n")); - await session.call_loop(() => {}, (token: string) => { - if (filterParams && filterParams.streamTokenCallback && token) { - filterParams.streamTokenCallback(token); - } - }); + await session.call_loop( + () => {}, + (token: string) => { + if (filterParams && filterParams.streamTokenCallback && token) { + filterParams.streamTokenCallback(token); + } + }, + ); return session.history.messages(); }; diff --git a/src/node.ts b/src/node.ts index a6bc45bac..3c3110c32 100644 --- a/src/node.ts +++ b/src/node.ts @@ -220,18 +220,18 @@ export class ComputedNode extends Node { private agentFilterHandler(context: AgentFunctionContext, agent: AgentFunction): Promise { let index = 0; - const next = (context: AgentFunctionContext): Promise => { + const next = (innerContext: AgentFunctionContext): Promise => { const agentFilter = this.graph.agentFilters[index++]; if (agentFilter) { if (this.shouldApplyAgentFilter(agentFilter)) { if (agentFilter.filterParams) { - context.filterParams = { ...agentFilter.filterParams, ...context.filterParams }; + innerContext.filterParams = { ...agentFilter.filterParams, ...innerContext.filterParams }; } - return agentFilter.agent(context, next); + return agentFilter.agent(innerContext, next); } - return next(context); + return next(innerContext); } - return agent(context); + return agent(innerContext); }; return next(context); diff --git a/tests/agentFilters/test_filter_params.ts b/tests/agentFilters/test_filter_params.ts index de2e81d01..61e064f83 100644 --- a/tests/agentFilters/test_filter_params.ts +++ b/tests/agentFilters/test_filter_params.ts @@ -180,7 +180,6 @@ test("test filterParams on each agent", async () => { }); }); - test("test filterParams on agent filter", async () => { const graph_data = { version: 0.3,