hoomanjs 1.26.0 → 1.26.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { dirname, join } from "node:path";
|
|
2
|
+
import { fileURLToPath, pathToFileURL } from "node:url";
|
|
2
3
|
import { OpenAIModel } from "@strands-agents/sdk/models/openai";
|
|
3
4
|
import { splitUsageOntoEmptyChoicesChunk } from "../openai/openai-stream-shims.js";
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
"
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
"too many requests",
|
|
14
|
-
];
|
|
5
|
+
/** Strands 1.x moves chat helpers into `chat-adapter.js`, which is not a package export; load it next to the public `models/openai` entry. */
|
|
6
|
+
function openAiChatAdapterUrl() {
|
|
7
|
+
return pathToFileURL(join(dirname(fileURLToPath(import.meta.resolve("@strands-agents/sdk/models/openai"))), "chat-adapter.js")).href;
|
|
8
|
+
}
|
|
9
|
+
let chatAdapterPromise = null;
|
|
10
|
+
function loadOpenAiChatAdapter() {
|
|
11
|
+
chatAdapterPromise ??= import(openAiChatAdapterUrl());
|
|
12
|
+
return chatAdapterPromise;
|
|
13
|
+
}
|
|
15
14
|
function preludeEventsForTensorZeroDelta(delta, streamState) {
|
|
16
15
|
const out = [];
|
|
17
16
|
if (!delta) {
|
|
@@ -85,10 +84,12 @@ export class StrandsTensorZeroModel extends OpenAIModel {
|
|
|
85
84
|
if (!messages || messages.length === 0) {
|
|
86
85
|
throw new Error("At least one message is required");
|
|
87
86
|
}
|
|
88
|
-
const
|
|
87
|
+
const { formatChatRequest, mapChatChunkToEvents } = await loadOpenAiChatAdapter();
|
|
88
|
+
const client = this._client;
|
|
89
|
+
const rewrap = this._rewrapError;
|
|
89
90
|
try {
|
|
90
|
-
const request =
|
|
91
|
-
const raw = await
|
|
91
|
+
const request = formatChatRequest(this.getConfig(), messages, options);
|
|
92
|
+
const raw = await client.chat.completions.create(request);
|
|
92
93
|
const stream = splitUsageOntoEmptyChoicesChunk(raw);
|
|
93
94
|
const streamState = {
|
|
94
95
|
messageStarted: false,
|
|
@@ -113,7 +114,7 @@ export class StrandsTensorZeroModel extends OpenAIModel {
|
|
|
113
114
|
}
|
|
114
115
|
const delta = chunk.choices[0]?.delta;
|
|
115
116
|
const prelude = preludeEventsForTensorZeroDelta(delta, streamState);
|
|
116
|
-
const base =
|
|
117
|
+
const base = mapChatChunkToEvents(chunk, streamState, activeToolCalls);
|
|
117
118
|
const events = injectReasoningStopBeforeMessageStop([...prelude, ...base], streamState);
|
|
118
119
|
for (const event of events) {
|
|
119
120
|
if (event.type === "modelMessageStopEvent" && bufferedUsage) {
|
|
@@ -128,17 +129,7 @@ export class StrandsTensorZeroModel extends OpenAIModel {
|
|
|
128
129
|
}
|
|
129
130
|
}
|
|
130
131
|
catch (error) {
|
|
131
|
-
|
|
132
|
-
if (err.status === 429 ||
|
|
133
|
-
err.code === "rate_limit_exceeded" ||
|
|
134
|
-
RATE_LIMIT_PATTERNS.some((p) => err.message?.toLowerCase().includes(p))) {
|
|
135
|
-
const message = err.message ?? "Request was throttled by the model provider";
|
|
136
|
-
throw new ModelThrottledError(message, { cause: err });
|
|
137
|
-
}
|
|
138
|
-
if (CONTEXT_OVERFLOW_PATTERNS.some((p) => err.message?.toLowerCase().includes(p))) {
|
|
139
|
-
throw new ContextWindowOverflowError(err.message);
|
|
140
|
-
}
|
|
141
|
-
throw error;
|
|
132
|
+
throw rewrap.call(this, error);
|
|
142
133
|
}
|
|
143
134
|
}
|
|
144
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strands-tensorzero.js","sourceRoot":"","sources":["../../../../src/core/models/tensorzero/strands-tensorzero.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"strands-tensorzero.js","sourceRoot":"","sources":["../../../../src/core/models/tensorzero/strands-tensorzero.ts"],"names":[],"mappings":"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"}
|