@convex-dev/agent 0.2.2-alpha.1 → 0.2.2-alpha.3
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,5 +1,5 @@
|
|
|
1
1
|
import type { UIMessage as AIUIMessage, UIDataTypes, UITools } from "ai";
|
|
2
|
-
import type
|
|
2
|
+
import { type MessageDoc } from "../client/index.js";
|
|
3
3
|
import type { MessageStatus } from "../validators.js";
|
|
4
4
|
export type UIMessage<METADATA = unknown, DATA_PARTS extends UIDataTypes = UIDataTypes, TOOLS extends UITools = UITools> = AIUIMessage<METADATA, DATA_PARTS, TOOLS> & {
|
|
5
5
|
key: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toUIMessages.d.ts","sourceRoot":"","sources":["../../src/react/toUIMessages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,IAAI,WAAW,EAQxB,WAAW,EACX,OAAO,EACR,MAAM,IAAI,CAAC;AACZ,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"toUIMessages.d.ts","sourceRoot":"","sources":["../../src/react/toUIMessages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,IAAI,WAAW,EAQxB,WAAW,EACX,OAAO,EACR,MAAM,IAAI,CAAC;AACZ,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,MAAM,SAAS,CACnB,QAAQ,GAAG,OAAO,EAClB,UAAU,SAAS,WAAW,GAAG,WAAW,EAC5C,KAAK,SAAS,OAAO,GAAG,OAAO,IAC7B,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,GAAG,aAAa,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,YAAY,CAC1B,QAAQ,GAAG,OAAO,EAClB,UAAU,SAAS,WAAW,GAAG,WAAW,EAC5C,KAAK,SAAS,OAAO,GAAG,OAAO,EAE/B,QAAQ,EAAE,CAAC,UAAU,GAAG;IAAE,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,GACjD,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,CAqN1C"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { extractText } from "../client/index.js";
|
|
1
2
|
import { deserializeMessage, toUIFilePart } from "../mapping.js";
|
|
2
3
|
export function toUIMessages(messages) {
|
|
3
4
|
const uiMessages = [];
|
|
4
5
|
let assistantMessage;
|
|
5
6
|
for (const message of messages) {
|
|
6
7
|
const coreMessage = message.message && deserializeMessage(message.message);
|
|
7
|
-
const text = message.text ?? "";
|
|
8
|
+
const text = message.text || ((message.message && extractText(message.message)) ?? "");
|
|
8
9
|
const content = coreMessage?.content;
|
|
9
10
|
const nonStringContent = content && typeof content !== "string" ? content : [];
|
|
10
11
|
if (!coreMessage)
|
|
@@ -198,9 +199,7 @@ export function toUIMessages(messages) {
|
|
|
198
199
|
}
|
|
199
200
|
}
|
|
200
201
|
}
|
|
201
|
-
if (!message.tool &&
|
|
202
|
-
assistantMessage &&
|
|
203
|
-
assistantMessage.parts.length > 0) {
|
|
202
|
+
if (!message.tool && assistantMessage) {
|
|
204
203
|
// Reset it so the next set of tool calls will create a new assistant message
|
|
205
204
|
assistantMessage = undefined;
|
|
206
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toUIMessages.js","sourceRoot":"","sources":["../../src/react/toUIMessages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"toUIMessages.js","sourceRoot":"","sources":["../../src/react/toUIMessages.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -10,7 +10,7 @@ import type {
|
|
|
10
10
|
UIDataTypes,
|
|
11
11
|
UITools,
|
|
12
12
|
} from "ai";
|
|
13
|
-
import type
|
|
13
|
+
import { extractText, type MessageDoc } from "../client/index.js";
|
|
14
14
|
import { deserializeMessage, toUIFilePart } from "../mapping.js";
|
|
15
15
|
import type { MessageStatus } from "../validators.js";
|
|
16
16
|
|
|
@@ -39,7 +39,8 @@ export function toUIMessages<
|
|
|
39
39
|
let assistantMessage: UIMessage<METADATA, DATA_PARTS, TOOLS> | undefined;
|
|
40
40
|
for (const message of messages) {
|
|
41
41
|
const coreMessage = message.message && deserializeMessage(message.message);
|
|
42
|
-
const text =
|
|
42
|
+
const text =
|
|
43
|
+
message.text || ((message.message && extractText(message.message)) ?? "");
|
|
43
44
|
const content = coreMessage?.content;
|
|
44
45
|
const nonStringContent =
|
|
45
46
|
content && typeof content !== "string" ? content : [];
|
|
@@ -240,11 +241,7 @@ export function toUIMessages<
|
|
|
240
241
|
}
|
|
241
242
|
}
|
|
242
243
|
}
|
|
243
|
-
if (
|
|
244
|
-
!message.tool &&
|
|
245
|
-
assistantMessage &&
|
|
246
|
-
assistantMessage.parts.length > 0
|
|
247
|
-
) {
|
|
244
|
+
if (!message.tool && assistantMessage) {
|
|
248
245
|
// Reset it so the next set of tool calls will create a new assistant message
|
|
249
246
|
assistantMessage = undefined;
|
|
250
247
|
}
|