Skip to content

Commit 541d8d3

Browse files
poadpoad
committed
Fix teremetry
1 parent 7ed502d commit 541d8d3

19 files changed

Lines changed: 1564 additions & 2903 deletions

File tree

‎agents/agent-langchain/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
"@arizeai/openinference-instrumentation-bedrock": "^0.4.8",
3838
"@arizeai/openinference-instrumentation-langchain": "^3.4.6",
3939
"@aws-lambda-powertools/logger": "^2.30.2",
40-
"@aws-sdk/credential-provider-node": "^3.967.0",
41-
"@langchain/aws": "^1.1.1",
42-
"@langchain/classic": "^1.0.8",
43-
"@langchain/core": "^1.1.12",
40+
"@aws-sdk/credential-provider-node": "^3.968.0",
41+
"@langchain/aws": "^1.2.0",
42+
"@langchain/classic": "^1.0.9",
43+
"@langchain/core": "^1.1.13",
4444
"@langchain/langgraph": "^1.0.15",
4545
"@langchain/mcp-adapters": "^1.1.1",
46-
"@langchain/openai": "^1.2.1",
46+
"@langchain/openai": "^1.2.2",
4747
"@opentelemetry/api": "^1.9.0",
4848
"@opentelemetry/exporter-trace-otlp-http": "^0.206.0",
4949
"@opentelemetry/exporter-trace-otlp-proto": "^0.206.0",
@@ -53,9 +53,9 @@
5353
"@opentelemetry/sdk-trace-base": "^2.3.0",
5454
"@opentelemetry/sdk-trace-node": "^2.3.0",
5555
"@opentelemetry/semantic-conventions": "^1.38.0",
56-
"@smithy/eventstream-codec": "^4.2.7",
56+
"@smithy/eventstream-codec": "^4.2.8",
5757
"constructs": "^10.4.4",
58-
"langchain": "^1.2.7",
58+
"langchain": "^1.2.8",
5959
"source-map-support": "^0.5.21",
6060
"uuid": "^13.0.0",
6161
"zod": "^4.3.5"

‎agents/agent-strands/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
},
3535
"dependencies": {
3636
"@aws-lambda-powertools/logger": "^2.30.2",
37-
"@aws-sdk/credential-provider-node": "^3.967.0",
37+
"@aws-sdk/credential-provider-node": "^3.968.0",
3838
"@llm-ts-example/common-backend": "workspace:*",
39-
"@strands-agents/sdk": "^0.1.4",
39+
"@strands-agents/sdk": "^0.1.5",
4040
"aws-cdk-lib": "^2.234.1",
4141
"constructs": "^10.4.4",
4242
"uuid": "^13.0.0"

‎basic/cdk/lambda/app.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { ChatPromptTemplate } from '@langchain/core/prompts';
2+
import { StringOutputParser } from '@langchain/core/output_parsers';
3+
import { LanguageModelLike } from '@langchain/core/language_models/base';
4+
import { BaseChatModel } from '@langchain/core/language_models/chat_models';
5+
import { createAgent } from 'langchain';
6+
7+
export const createApp = ({ model, modelName }: { model: LanguageModelLike & BaseChatModel, modelName: string }) => {
8+
const qaPrpmpt = `Answer the user's question to the best of your ability.
9+
However, please keep your answers brief and in the same language as the question.
10+
11+
{question}`;
12+
13+
const agent = createAgent({
14+
model,
15+
tools: [],
16+
systemPrompt: `Answer the user's question to the best of your ability.
17+
However, please keep your answers brief and in the same language as the question.
18+
19+
{question}`,
20+
});
21+
22+
return agent;
23+
}

‎basic/cdk/lambda/handler.ts‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import './instrumentation';
2-
import { ChatPromptTemplate } from '@langchain/core/prompts';
3-
import { StringOutputParser } from '@langchain/core/output_parsers';
42
import { CallbackHandler } from 'langfuse-langchain';
53

64
import { selectLlm, logger } from '@llm-ts-example/common-backend';
5+
import { createApp } from './app.js';
76

87
interface HandleProps { question: string, model?: string }
98

@@ -20,16 +19,6 @@ export async function handle(
2019

2120
const { platform, model, modelName } = selectLlm(modelType);
2221

23-
const qaPrpmpt = `Answer the user's question to the best of your ability.
24-
However, please keep your answers brief and in the same language as the question.
25-
26-
{question}`;
27-
28-
const prompt = ChatPromptTemplate.fromMessages([
29-
['system', qaPrpmpt],
30-
['human', 'question'],
31-
]);
32-
3322
try {
3423
// Initialize Langfuse callback handler
3524
const langfuseHandler = langfuse.publicKey && langfuse.secretKey ? new CallbackHandler({
@@ -41,14 +30,10 @@ export async function handle(
4130

4231
logger.debug(`Langfuse: ${langfuseHandler ? 'enable' : 'disable'}`);
4332

44-
const chain = prompt.pipe(model).pipe(new StringOutputParser()).withConfig({
45-
tags: [modelName],
46-
});
33+
const chain = createApp({model, modelName});
4734

4835
const stream = await chain.streamEvents(
49-
{
50-
question,
51-
},
36+
{ messages: [{ role: 'user', content: question }] },
5237
{
5338
version: 'v2',
5439
configurable: {

‎basic/cdk/lambda/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export const handler = awslambda.streamifyResponse(
99
event: APIGatewayProxyEvent, responseStream: NodeJS.WritableStream,
1010
) => {
1111
logger.debug('event', {event});
12-
const { question, model, sessionId } = event.body ? JSON.parse(event.body) : { question: 'あなたは誰？', model: 'gpt', sessionId: uuidv7() };
12+
const { question, model, sessionId } = event.body ? JSON.parse(event.body) : { question: 'あなたは誰？', model: 'nova-micro', sessionId: uuidv7() };
1313
await handle(sessionId, { question, model }, responseStream);
1414
responseStream.end();
1515
});

‎basic/cdk/lambda/instrumentation.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@ import { resourceFromAttributes } from '@opentelemetry/resources';
1313

1414
if (process.env.ENABLED_OPENINFERENCE_TELEMETRY === 'true') {
1515
// For troubleshooting, set the log level to DiagLogLevel.DEBUG
16-
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
16+
diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
1717

1818
const provider = new NodeTracerProvider({
1919
spanProcessors: [new SimpleSpanProcessor(
2020
new OTLPTraceExporter({
21-
22-
url: process.env.COLLECTOR_ENDPOINT ?? 'http://localhost:6006/v1/traces',
21+
url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT ?? 'http://localhost:6006/v1/traces',
22+
headers: {
23+
'x-api-key': process.env.OTEL_EXPORTER_OTLP_API_KEY ?? '',
24+
'Langsmith-Project': 'default',
25+
},
2326
}),
2427
),
2528
],

‎basic/cdk/package.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,26 @@
3838
"@arizeai/openinference-instrumentation-bedrock": "^0.4.8",
3939
"@arizeai/openinference-instrumentation-langchain": "^3.4.6",
4040
"@aws-lambda-powertools/logger": "^2.30.2",
41-
"@aws-sdk/credential-provider-node": "^3.967.0",
42-
"@langchain/aws": "^1.1.1",
43-
"@langchain/classic": "^1.0.8",
44-
"@langchain/core": "^1.1.12",
41+
"@aws-sdk/credential-provider-node": "^3.968.0",
42+
"@langchain/aws": "^1.2.0",
43+
"@langchain/classic": "^1.0.9",
44+
"@langchain/core": "^1.1.13",
4545
"@langchain/langgraph": "^1.0.15",
46-
"@langchain/openai": "^1.2.1",
46+
"@langchain/openai": "^1.2.2",
4747
"@llm-ts-example/common-backend": "workspace:*",
4848
"@opentelemetry/api": "^1.9.0",
49-
"@opentelemetry/exporter-trace-otlp-http": "^0.206.0",
50-
"@opentelemetry/exporter-trace-otlp-proto": "^0.206.0",
51-
"@opentelemetry/instrumentation": "^0.206.0",
49+
"@opentelemetry/exporter-trace-otlp-http": "^0.209.0",
50+
"@opentelemetry/exporter-trace-otlp-proto": "^0.209.0",
51+
"@opentelemetry/instrumentation": "^0.209.0",
5252
"@opentelemetry/resources": "^2.3.0",
53-
"@opentelemetry/sdk-node": "^0.206.0",
53+
"@opentelemetry/sdk-node": "^0.209.0",
5454
"@opentelemetry/sdk-trace-base": "^2.3.0",
5555
"@opentelemetry/sdk-trace-node": "^2.3.0",
5656
"@opentelemetry/semantic-conventions": "^1.38.0",
57-
"@smithy/eventstream-codec": "^4.2.7",
57+
"@smithy/eventstream-codec": "^4.2.8",
5858
"aws-cdk-lib": "^2.234.1",
5959
"constructs": "^10.4.4",
60+
"langchain": "^1.2.8",
6061
"langfuse": "^3.38.6",
6162
"langfuse-langchain": "^3.38.6",
6263
"source-map-support": "^0.5.21",

‎chat-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"@ai-sdk/amazon-bedrock": "^3.0.73",
15-
"@ai-sdk/react": "^3.0.34",
15+
"@ai-sdk/react": "^3.0.35",
1616
"@radix-ui/react-collapsible": "^1.1.12",
1717
"@radix-ui/react-dialog": "^1.1.15",
1818
"@radix-ui/react-dropdown-menu": "^2.1.16",

‎common/backend/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
},
2626
"dependencies": {
2727
"@aws-lambda-powertools/logger": "^2.30.2",
28-
"@langchain/aws": "^1.1.1",
29-
"@langchain/core": "^1.1.12",
30-
"@langchain/openai": "^1.2.1",
28+
"@langchain/aws": "^1.2.0",
29+
"@langchain/core": "^1.1.13",
30+
"@langchain/openai": "^1.2.2",
3131
"@llm-ts-example/common-core": "workspace:*"
3232
},
3333
"devDependencies": {

‎mcp/clients/mcp-client-http/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"license": "ISC",
1919
"dependencies": {
2020
"@anthropic-ai/sdk": "^0.69.0",
21-
"@aws-sdk/client-bedrock-runtime": "^3.967.0",
21+
"@aws-sdk/client-bedrock-runtime": "^3.968.0",
2222
"@inquirer/prompts": "^8.2.0",
2323
"@modelcontextprotocol/sdk": "^1.25.2",
2424
"dotenv": "^17.2.3"

0 commit comments

Comments
 (0)