@convex-dev/agent 0.1.6 → 0.1.7-alpha.1

package/src/react/usePaginatedQuery.ts

@@ -67,7 +67,6 @@ type UsePaginatedQueryState = {
 const splitQuery =
   (key: QueryPageKey, splitCursor: string, continueCursor: string) =>
   (prevState: UsePaginatedQueryState) => {
-    console.log("splitQuery", key, splitCursor, continueCursor);
     const queries = { ...prevState.queries };
     const splitKey1 = prevState.nextPageKey;
     const splitKey2 = prevState.nextPageKey + 1;
@@ -105,7 +104,6 @@ const splitQuery =
 
 const completeSplitQuery =
   (key: QueryPageKey) => (prevState: UsePaginatedQueryState) => {
-    console.log("completeSplitQuery", key);
     const completedSplit = prevState.ongoingSplits[key];
     if (completedSplit === undefined) {
       return prevState;
@@ -143,7 +141,6 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
   args: PaginatedQueryArgs<Query> | "skip",
   options: { initialNumItems: number }
 ): UsePaginatedQueryReturnType<Query> {
-  console.log("usePaginatedQuery", query, args, options);
   if (
     typeof options?.initialNumItems !== "number" ||
     options.initialNumItems < 0
@@ -158,7 +155,6 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
   const createInitialState = useMemo(() => {
     return () => {
       const id = nextPaginationId();
-      console.log("createInitialState", id, queryName, argsObject);
       return {
         query,
         args: argsObject as Record<string, Value>,
@@ -208,7 +204,6 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
     skip !== state.skip
   ) {
     currState = createInitialState();
-    console.log("resetting state", currState);
     setState(currState);
   }
   const convexClient = useConvex();
@@ -225,14 +220,6 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
     const allItems = [];
     for (const pageKey of currState.pageKeys) {
       currResult = resultsObject[pageKey];
-      console.log({
-        pageKey,
-        continue: currResult?.continueCursor,
-        cursor: currState.queries[pageKey]?.args?.paginationOpts?.cursor,
-        split: currResult?.splitCursor,
-        status: currResult?.pageStatus,
-        length: currResult?.page?.length,
-      });
       if (currResult === undefined) {
         break;
       }
@@ -264,13 +251,11 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
       }
       const ongoingSplit = currState.ongoingSplits[pageKey];
       if (ongoingSplit !== undefined) {
-        console.log("ongoingSplit", pageKey, ongoingSplit);
         if (
           resultsObject[ongoingSplit[0]] !== undefined &&
           resultsObject[ongoingSplit[1]] !== undefined
         ) {
           // Both pages of the split have results now. Swap them in.
-          console.log("completeSplitQuery", pageKey);
           setState(completeSplitQuery(pageKey));
         }
       } else if (
@@ -279,12 +264,6 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
           currResult.pageStatus === "SplitRequired" ||
           currResult.page.length > options.initialNumItems * 2)
       ) {
-        console.log(
-          "splitQuery",
-          pageKey,
-          currResult.pageStatus,
-          currResult.page.length
-        );
         // If a single page has more than double the expected number of items,
         // or if the server requests a split, split the page into two.
         setState(
@@ -321,7 +300,6 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
           },
         } as const;
       } else {
-        console.log("LoadingMore", maybeLastResult);
         return {
           status: "LoadingMore",
           isLoading: true,
@@ -332,7 +310,6 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
       }
     }
     if (maybeLastResult.isDone) {
-      console.log("Exhausted", maybeLastResult);
       return {
         status: "Exhausted",
         isLoading: false,
@@ -356,14 +333,6 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
             const nextPageKey = prevState.nextPageKey + 2;
             const pageKeys = prevState.pageKeys; //[...prevState.pageKeys, prevState.nextPageKey];
             const queries = { ...prevState.queries };
-            console.log(
-              "loading more",
-              lastPageKey,
-              replaceKey,
-              newKey,
-              nextPageKey,
-              pageKeys
-            );
 
             queries[replaceKey] = {
               query: prevState.query,

package/src/validators.ts

@@ -4,6 +4,7 @@ import {
   type ObjectType,
   type Validator,
   type Value,
+  type VObject,
 } from "convex/values";
 import { vVectorDimension } from "./component/vector/tables.js";
 
@@ -59,18 +60,6 @@ export const vFilePart = v.object({
   providerOptions,
 });
 
-export const vFile = v.object({
-  data: v.optional(v.union(v.bytes(), v.string())),
-  url: v.optional(v.string()),
-  mimeType: v.string(),
-  fileId: v.optional(v.id("files")),
-});
-
-export const vFileWithStringId = v.object({
-  ...vFile.fields,
-  fileId: v.optional(v.string()),
-});
-
 export const vUserContent = v.union(
   v.string(),
   v.array(v.union(vTextPart, vImagePart, vFilePart))
@@ -260,11 +249,11 @@ export const vLanguageModelV1CallWarning = v.union(
   })
 );
 
-export const vMessageWithMetadata = v.object({
+export const vMessageWithMetadataInternal = v.object({
   id: v.optional(v.string()), // external id, e.g. from Vercel AI SDK
   message: vMessage,
   text: v.optional(v.string()),
-  files: v.optional(v.array(vFile)),
+  fileIds: v.optional(v.array(v.id("files"))),
   // metadata
   finishReason: v.optional(vFinishReason),
   model: v.optional(v.string()),
@@ -277,6 +266,10 @@ export const vMessageWithMetadata = v.object({
   warnings: v.optional(v.array(vLanguageModelV1CallWarning)),
   error: v.optional(v.string()),
 });
+export const vMessageWithMetadata = v.object({
+  ...vMessageWithMetadataInternal.fields,
+  fileIds: v.optional(v.array(v.string())),
+});
 export type MessageWithMetadata = Infer<typeof vMessageWithMetadata>;
 
 export const vMessageEmbeddings = v.object({
@@ -285,37 +278,6 @@ export const vMessageEmbeddings = v.object({
   vectors: v.array(v.union(v.array(v.number()), v.null())),
 });
 
-export const vStep = v.object({
-  files: v.optional(v.array(v.any())),
-  finishReason: vFinishReason,
-  isContinued: v.boolean(),
-  logprobs: v.optional(v.any()),
-  providerMetadata,
-  experimental_providerMetadata: providerMetadata,
-  reasoning: v.optional(v.string()),
-  reasoningDetails: v.optional(vReasoningDetails),
-  request: v.optional(vRequest),
-  response: v.optional(vResponse),
-  sources: v.optional(v.array(vSource)),
-  stepType: v.union(
-    v.literal("initial"),
-    v.literal("continue"),
-    v.literal("tool-result")
-  ),
-  text: v.string(),
-  toolCalls: v.array(vToolCallPart),
-  toolResults: v.array(vToolResultPart),
-  usage: v.optional(vUsage),
-  warnings: v.optional(v.array(vLanguageModelV1CallWarning)),
-});
-export type Step = Infer<typeof vStep>;
-
-export const vStepWithMessages = v.object({
-  step: vStep,
-  messages: v.array(vMessageWithMetadata),
-  embeddings: v.optional(vMessageEmbeddings),
-});
-export type StepWithMessagesWithMetadata = Infer<typeof vStepWithMessages>;
 
 export const vObjectResult = v.object({
   request: vRequest,
@@ -353,10 +315,34 @@ export const vContextOptions = v.object({
 });
 
 export const vStorageOptions = v.object({
+  saveMessages: v.optional(
+    v.union(v.literal("all"), v.literal("none"), v.literal("promptAndOutput"))
+  ),
+});
+
+const vStorageOptionsIncludingDeprecated = v.object({
+  ...vStorageOptions.fields,
   saveAllInputMessages: v.optional(v.boolean()),
   saveAnyInputMessages: v.optional(v.boolean()),
   saveOutputMessages: v.optional(v.boolean()),
-});
+}) as VObject<
+  {
+    saveMessages?: "all" | "none" | "promptAndOutput";
+    /**
+     * @deprecated Use saveMessages instead.
+     */
+    saveAllInputMessages?: boolean;
+    /**
+     * @deprecated Use saveMessages instead.
+     */
+    saveAnyInputMessages?: boolean;
+    /**
+     * @deprecated Use saveMessages instead.
+     */
+    saveOutputMessages?: boolean;
+  },
+  typeof vStorageOptions.fields
+>;
 
 const vPromptFields = {
   system: v.optional(v.string()),
@@ -382,7 +368,7 @@ const vCommonArgs = {
   userId: v.optional(v.string()),
   threadId: v.optional(v.string()),
   contextOptions: v.optional(vContextOptions),
-  storageOptions: v.optional(vStorageOptions),
+  storageOptions: v.optional(vStorageOptionsIncludingDeprecated),
   providerOptions,
   ...vCallSettingsFields,
   ...vPromptFields,