Skip to content
Draft
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
41 changes: 23 additions & 18 deletions financial-agent/agent/index_nevermined.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function createModelWithSessionId(
customProperties: Record<string, string> = {}
): ChatOpenAI {
return new ChatOpenAI(
payments.observability.withHeliconeLangchain(
payments.observability.withLangchain(
"gpt-4o-mini",
OPENAI_API_KEY,
agentRequest,
Expand All @@ -172,7 +172,7 @@ async function ensureAuthorized(
const authHeader = (req.headers["authorization"] || "") as string;
const requestedUrl = `${NVM_AGENT_HOST}${req.url}`;
const httpVerb = req.method;
const result = await payments.requests.startProcessingRequest(
const result = await payments.requests.startProcessingBatchRequest(
NVM_AGENT_ID,
authHeader,
requestedUrl,
Expand Down Expand Up @@ -201,8 +201,9 @@ app.post("/ask", async (req: Request, res: Response) => {
const { agentRequest, requestAccessToken } = await ensureAuthorized(req);
console.log("agentRequestId", agentRequest.agentRequestId);
console.log("requestAccessToken", requestAccessToken);
const input = String(req.body?.input_query ?? "").trim();
if (!input) return res.status(400).json({ error: "Missing input" });
const inputs = req.body?.input_query ?? [];
if (!inputs || !Array.isArray(inputs) || inputs.length === 0)
return res.status(400).json({ error: "Missing input" });

let { sessionId } = req.body as { sessionId?: string };
if (!sessionId) sessionId = crypto.randomUUID();
Expand All @@ -211,25 +212,29 @@ app.post("/ask", async (req: Request, res: Response) => {
const model = createModelWithSessionId(agentRequest);
const runnable = createRunnable(model);

const result = await runnable.invoke(
{ input },
{ configurable: { sessionId } }
);
const text =
result?.content ??
(Array.isArray(result)
? result.map((m: any) => m.content).join("\n")
: String(result));

let outputs = [];
for (const input of inputs) {
console.log("Sending question to the agent", input);
const result = await runnable.invoke(
{ input },
{ configurable: { sessionId } }
);
const text =
result?.content ??
(Array.isArray(result)
? result.map((m: any) => m.content).join("\n")
: String(result));
outputs.push(text);
}
// After successful processing, redeem 1 credit for this request
let redemptionResult: any;
try {
redemptionResult = await payments.requests.redeemCreditsFromRequest(
redemptionResult = await payments.requests.redeemCreditsFromBatchRequest(
agentRequest.agentRequestId,
requestAccessToken,
1n
BigInt(inputs.length)
);
redemptionResult.creditsRedeemed = 1;
redemptionResult.creditsRedeemed = inputs.length;
console.log("redemptionResult", redemptionResult);
} catch (redeemErr) {
// eslint-disable-next-line no-console
Expand All @@ -240,7 +245,7 @@ app.post("/ask", async (req: Request, res: Response) => {
};
}

res.json({ output: text, sessionId, redemptionResult });
res.json({ output: outputs, sessionId, redemptionResult });
} catch (error: any) {
// eslint-disable-next-line no-console
console.error("Error handling /ask", error);
Expand Down
22 changes: 9 additions & 13 deletions financial-agent/client/index_nevermined.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,11 @@ async function main(): Promise<void> {
nvmEnv,
});

for (let i = 0; i < questions.length; i += 1) {
const input = questions[i];
// eslint-disable-next-line no-console
console.log(`\n[CLIENT] Sending question ${i + 1}: ${input}`);
const response = await askAgent(baseUrl, input, sessionId, bearer);
sessionId = response.sessionId;
// eslint-disable-next-line no-console
console.log(`[AGENT] (sessionId=${sessionId})\n${response.output}`);
}
console.log("Sending batch of questions to the agent");
console.table(questions);
const responses = await askAgent(baseUrl, questions, sessionId, bearer);
console.log("Received responses from the agent");
console.log(responses.output);
}

/**
Expand All @@ -65,25 +61,25 @@ async function main(): Promise<void> {
*/
async function askAgent(
baseUrl: string,
input: string,
inputs: string[],
sessionId?: string,
bearer?: string
): Promise<{ output: string; sessionId: string }> {
): Promise<{ output: string[]; sessionId: string }> {
const res = await fetch(`${baseUrl}/ask`, {
method: "POST",
headers: {
"Content-Type": "application/json",
...(bearer ? { Authorization: `Bearer ${bearer}` } : {}),
},
body: JSON.stringify({ input_query: input, sessionId }),
body: JSON.stringify({ input_query: inputs, sessionId }),
});
if (!res.ok) {
const errorText = await res.text().catch(() => "");
throw new Error(
`Agent request failed: ${res.status} ${res.statusText} ${errorText}`
);
}
const data = (await res.json()) as { output: string; sessionId: string };
const data = (await res.json()) as { output: string[]; sessionId: string };
return data;
}

Expand Down
4 changes: 2 additions & 2 deletions financial-agent/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion financial-agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"dependencies": {
"@langchain/openai": "^0.3.10",
"@nevermined-io/payments": "^1.0.0-rc14",
"@nevermined-io/payments": "^1.0.0-rc19",
"dotenv": "^16.4.5",
"express": "^4.19.2",
"langchain": "^0.2.14"
Expand Down