@arbidocs/react 0.5.108 → 0.5.110

package/dist/index.cjs

@@ -3332,13 +3332,18 @@ function useUploadFiles() {
       }
       const total = input.files.reduce((sum, file) => sum + file.size, 0);
       const loadedByBatch = new Array(batches.length).fill(0);
+      const filesByBatch = new Array(batches.length).fill(0);
       let done = 0;
+      let highest = 0;
       const report = () => {
         const loaded = loadedByBatch.reduce((sum, bytes) => sum + bytes, 0);
+        const sent = filesByBatch.reduce((sum, files) => sum + files, 0);
+        const share = input.files.length > 0 ? sent / input.files.length : 0;
+        highest = Math.max(highest, Math.min(Math.round(share * 100), 100));
         onProgress?.({
           loaded,
           total,
-          percentage: total > 0 ? Math.min(Math.round(loaded / total * 100), 100) : 0,
+          percentage: highest,
           batches: batches.length > 1 ? { current: done, total: batches.length } : null
         });
       };
@@ -3352,11 +3357,14 @@ function useUploadFiles() {
             configExtId: input.configExtId ?? void 0,
             // Named even when it is the open one: batches sent after a switch stay in this workspace.
             workspaceExtId: workspaceId,
+            // One request for the batch: its files count by the share of its bytes sent.
             onProgress: (loaded) => {
               loadedByBatch[index] = Math.min(loaded, bytes);
+              filesByBatch[index] = bytes > 0 ? loadedByBatch[index] / bytes * files.length : 0;
               report();
             }
           });
+          const fileShares = new Array(files.length).fill(0);
           const directly = async (key, workspace) => arbi.documents.uploadDirect(
             workspace,
             key,
@@ -3371,9 +3379,15 @@ function useUploadFiles() {
               shared: input.shared,
               folder: folder ?? void 0,
               configExtId: input.configExtId ?? void 0,
-              // Ciphertext bytes, scaled back to the files' own so the total stays true.
-              onBytesProgress: ({ loaded, total: sent }) => {
-                loadedByBatch[index] = sent > 0 ? Math.round(loaded / sent * bytes) : 0;
+              // Per file, in ciphertext bytes: that file's share sent, scaled back to its own
+              // size so the byte total stays true.
+              onBytesProgress: ({ fileIndex, loaded, total: sent }) => {
+                const share = sent > 0 ? Math.min(loaded / sent, 1) : 0;
+                fileShares[fileIndex] = Math.max(fileShares[fileIndex] ?? 0, share);
+                loadedByBatch[index] = Math.round(
+                  files.reduce((sum, file, i) => sum + (fileShares[i] ?? 0) * file.size, 0)
+                );
+                filesByBatch[index] = fileShares.reduce((sum, part) => sum + part, 0);
                 report();
               }
             }
@@ -3390,6 +3404,7 @@ function useUploadFiles() {
             );
           }
           loadedByBatch[index] = bytes;
+          filesByBatch[index] = files.length;
           done += 1;
           report();
           return result;
@@ -10965,6 +10980,8 @@ var DEFAULT_USAGE_SOURCE_LABELS = {
   description: "AI usage of your projects by day and model: \xA3 (ex VAT), tokens and requests.",
   period: "Period",
   periods: { current: "This period", previous: "Last period" },
+  projectParam: "Project",
+  allProjects: "All your projects",
   day: "Day",
   project: "Project",
   model: "Model",
@@ -10972,9 +10989,32 @@ var DEFAULT_USAGE_SOURCE_LABELS = {
   tokens: "Tokens",
   requests: "Requests"
 };
+var DEFAULT_USAGE_BREAKDOWN_SOURCE_LABELS = {
+  ...DEFAULT_USAGE_SOURCE_LABELS,
+  source: "AI usage breakdown",
+  description: "AI usage of your projects this period, in total or by user, workspace, model or feature: \xA3 (ex VAT), tokens and requests.",
+  breakdown: "Breakdown",
+  by: { total: "Total", user: "User", workspace: "Workspace", model: "Model", feature: "Feature" }
+};
 var monthsBackOf = (params) => String(params.period ?? "0") === "1" ? 1 : 0;
-function usageRows(usage, project, modelLabel = (g) => MODEL_GROUP_LABELS[g] ?? g) {
-  return (usage.daily ?? []).flatMap(
+var projectOf = (params) => typeof params.project === "string" && params.project ? params.project : void 0;
+var BREAKDOWNS = ["total", "user", "workspace", "model", "feature"];
+var breakdownOf = (params) => BREAKDOWNS.find((b) => b === params.by) ?? "user";
+var ownedBy = (projects, me) => (projects ?? []).filter((p) => !!me && p.created_by === me);
+function periodDays(start) {
+  const end = /* @__PURE__ */ new Date(`${start}T00:00:00Z`);
+  end.setUTCMonth(end.getUTCMonth() + 1);
+  end.setUTCDate(end.getUTCDate() - 1);
+  const days = [];
+  for (const d = /* @__PURE__ */ new Date(`${start}T00:00:00Z`); d <= end; d.setUTCDate(d.getUTCDate() + 1)) {
+    days.push(d.toISOString().slice(0, 10));
+  }
+  return days;
+}
+var featureLabel = (key) => key.replace(/[_-]+/g, " ").replace(/^\w/, (c) => c.toUpperCase());
+var modelLabelOf = (group) => MODEL_GROUP_LABELS[group] ?? group;
+function usageRows(usage, project, modelLabel = modelLabelOf) {
+  const rows = (usage.daily ?? []).flatMap(
     (day2) => Object.entries(day2.model_groups ?? {}).map(([group, mg]) => ({
       day: day2.date,
       project,
@@ -10984,6 +11024,127 @@ function usageRows(usage, project, modelLabel = (g) => MODEL_GROUP_LABELS[g] ??
       requests: (mg.successful_requests ?? 0) + (mg.failed_requests ?? 0)
     }))
   );
+  const model = rows[0]?.model;
+  if (!usage.period_start || model === void 0) return rows;
+  const used = new Set(rows.map((r) => r.day));
+  const gaps = periodDays(usage.period_start).filter((day2) => !used.has(day2)).map((day2) => ({ day: day2, project, model, spend: 0, tokens: 0, requests: 0 }));
+  return [...rows, ...gaps];
+}
+function usageNamesOf(workspaces) {
+  const names = {};
+  for (const ws of workspaces) {
+    names[ws.external_id] = ws.name;
+    for (const wu of ws.users ?? []) {
+      const user = wu.user;
+      if (user?.external_id && !names[user.external_id]) {
+        names[user.external_id] = chunkEEIYXVM4_cjs.getUserDisplayName(user);
+      }
+    }
+  }
+  return names;
+}
+function usageBreakdownRows(usage, project, by, names = {}, totalLabel = "Total") {
+  if (by === "total") {
+    return [
+      {
+        project,
+        name: totalLabel,
+        spend: usage.total_spend ?? 0,
+        tokens: usage.total_tokens ?? 0,
+        requests: usage.total_requests ?? 0
+      }
+    ];
+  }
+  if (by === "model") {
+    return Object.entries(usage.model_groups ?? {}).map(([group, mg]) => ({
+      project,
+      name: names[group] ?? modelLabelOf(group),
+      spend: mg.spend ?? 0,
+      tokens: mg.total_tokens ?? 0,
+      requests: (mg.successful_requests ?? 0) + (mg.failed_requests ?? 0)
+    }));
+  }
+  const totals = by === "workspace" ? usage.by_workspace : by === "feature" ? usage.by_feature : usage.by_user;
+  return Object.entries(totals ?? {}).map(([key, t]) => ({
+    project,
+    name: by === "feature" ? featureLabel(key) : names[key] ?? key,
+    spend: t.spend ?? 0,
+    tokens: t.total_tokens ?? 0,
+    requests: t.requests ?? 0
+  }));
+}
+function useUsageResponses(params, enabled) {
+  const arbi = chunk7LIMHY56_cjs.useArbi();
+  const monthsBack = monthsBackOf(params);
+  const only = projectOf(params);
+  const projects = chunk5HDKL6XB_cjs.useProjects({ enabled });
+  const user = chunk5HDKL6XB_cjs.useCurrentUser({ enabled: enabled && arbi.isLoggedIn && !only });
+  const me = user.data?.external_id;
+  const list = React.useMemo(() => {
+    const all = projects.data ?? [];
+    if (only) return [all.find((p) => p.external_id === only) ?? { external_id: only, name: only }];
+    return ownedBy(all, me);
+  }, [projects.data, me, only]);
+  const results = reactQuery.useQueries({
+    queries: list.map((p) => ({
+      queryKey: chunk7LIMHY56_cjs.arbiQueryKeys.projectUsage(p.external_id, monthsBack),
+      queryFn: () => arbi.projects.usage(p.external_id, monthsBack),
+      enabled: enabled && arbi.isLoggedIn,
+      retry: false
+    }))
+  });
+  const signature = results.map((r) => `${r.status}:${r.dataUpdatedAt}`).join("|");
+  const usages = React.useMemo(() => {
+    if (results.some((r) => r.isLoading)) return void 0;
+    if (!only && (!projects.data || !me)) return void 0;
+    return results.map((r, i) => ({
+      project: list[i],
+      usage: r.data
+    }));
+  }, [projects.data, me, only, signature]);
+  const loading = results.some((r) => r.isLoading);
+  return only ? (
+    // One project: its usage is the point, so its error shows (the project's name can wait).
+    { usages, isLoading: loading, error: results[0]?.error ?? null }
+  ) : {
+    usages,
+    isLoading: projects.isLoading || user.isLoading || loading,
+    // One project's usage failing (not its owner after all, a hiccup) leaves it out.
+    error: projects.error ?? user.error ?? null
+  };
+}
+function usageParams(l) {
+  const periodOptions = {
+    options: [
+      { value: "0", label: l.periods.current },
+      { value: "1", label: l.periods.previous }
+    ],
+    isLoading: false
+  };
+  return [
+    {
+      id: "period",
+      label: l.period,
+      placeholder: l.periods.current,
+      useOptions: () => periodOptions
+    },
+    {
+      id: "project",
+      label: l.projectParam,
+      placeholder: l.allProjects,
+      useOptions() {
+        const arbi = chunk7LIMHY56_cjs.useArbi();
+        const projects = chunk5HDKL6XB_cjs.useProjects();
+        const user = chunk5HDKL6XB_cjs.useCurrentUser({ enabled: arbi.isLoggedIn });
+        const me = user.data?.external_id;
+        const options = React.useMemo(
+          () => ownedBy(projects.data, me).map((p) => ({ value: p.external_id, label: p.name })),
+          [projects.data, me]
+        );
+        return { options, isLoading: projects.isLoading || user.isLoading };
+      }
+    }
+  ];
 }
 function createUsageSource(labels) {
   const l = { ...DEFAULT_USAGE_SOURCE_LABELS, ...labels };
@@ -10995,59 +11156,70 @@ function createUsageSource(labels) {
     { id: "tokens", label: l.tokens, type: "number", unit: "tokens" },
     { id: "requests", label: l.requests, type: "number" }
   ];
-  const periodOptions = {
-    options: [
-      { value: "0", label: l.periods.current },
-      { value: "1", label: l.periods.previous }
-    ],
-    isLoading: false
-  };
   return defineRowsSource({
     id: "usage",
     label: l.source,
     description: l.description,
-    params: [
+    params: usageParams(l),
+    useFields: staticFields(fields),
+    useRows(params, enabled) {
+      const { usages, isLoading, error } = useUsageResponses(params, enabled);
+      const rows = React.useMemo(
+        () => usages?.flatMap((u) => u.usage ? usageRows(u.usage, u.project.name) : []),
+        [usages]
+      );
+      return { rows, isLoading, error };
+    }
+  });
+}
+function createUsageBreakdownSource(labels) {
+  const l = { ...DEFAULT_USAGE_BREAKDOWN_SOURCE_LABELS, ...labels };
+  const fieldsBy = Object.fromEntries(
+    BREAKDOWNS.map((by) => [
+      by,
       {
-        id: "period",
-        label: l.period,
-        placeholder: l.periods.current,
-        useOptions: () => periodOptions
+        fields: [
+          { id: "project", label: l.project, type: "string" },
+          { id: "name", label: l.by[by], type: "string" },
+          { id: "spend", label: l.spend, type: "number", unit: "gbp" },
+          { id: "tokens", label: l.tokens, type: "number", unit: "tokens" },
+          { id: "requests", label: l.requests, type: "number" }
+        ],
+        isLoading: false,
+        error: null
       }
+    ])
+  );
+  const byOptions = {
+    options: BREAKDOWNS.map((by) => ({ value: by, label: l.by[by] })),
+    isLoading: false
+  };
+  return defineRowsSource({
+    id: "usage-breakdown",
+    label: l.source,
+    description: l.description,
+    params: [
+      ...usageParams(l),
+      { id: "by", label: l.breakdown, placeholder: l.by.user, useOptions: () => byOptions }
     ],
-    useFields: staticFields(fields),
+    useFields: (params) => fieldsBy[breakdownOf(params)],
     useRows(params, enabled) {
-      const arbi = chunk7LIMHY56_cjs.useArbi();
-      const monthsBack = monthsBackOf(params);
-      const projects = chunk5HDKL6XB_cjs.useProjects({ enabled });
-      const user = chunk5HDKL6XB_cjs.useCurrentUser({ enabled: enabled && arbi.isLoggedIn });
-      const me = user.data?.external_id;
-      const list = React.useMemo(
-        () => (projects.data ?? []).filter(
-          (p) => !!me && p.created_by === me
+      const by = breakdownOf(params);
+      const { usages, isLoading, error } = useUsageResponses(params, enabled);
+      const workspaces = chunk5HDKL6XB_cjs.useWorkspaces({
+        enabled: enabled && (by === "user" || by === "workspace")
+      });
+      const names = React.useMemo(
+        () => usageNamesOf(workspaces.data ?? []),
+        [workspaces.data]
+      );
+      const rows = React.useMemo(
+        () => usages?.flatMap(
+          (u) => u.usage ? usageBreakdownRows(u.usage, u.project.name, by, names, l.by.total) : []
         ),
-        [projects.data, me]
+        [usages, by, names, l.by.total]
       );
-      const results = reactQuery.useQueries({
-        queries: list.map((p) => ({
-          queryKey: chunk7LIMHY56_cjs.arbiQueryKeys.projectUsage(p.external_id, monthsBack),
-          queryFn: () => arbi.projects.usage(p.external_id, monthsBack),
-          enabled: enabled && arbi.isLoggedIn,
-          retry: false
-        }))
-      });
-      const signature = results.map((r) => `${r.status}:${r.dataUpdatedAt}`).join("|");
-      const rows = React.useMemo(() => {
-        if (!projects.data || !me || results.some((r) => r.isLoading)) return void 0;
-        return results.flatMap(
-          (r, i) => r.data ? usageRows(r.data, list[i].name) : []
-        );
-      }, [projects.data, me, signature]);
-      return {
-        rows,
-        isLoading: projects.isLoading || user.isLoading || results.some((r) => r.isLoading),
-        // One project's usage failing (not its owner after all, a hiccup) leaves it out.
-        error: projects.error ?? user.error ?? null
-      };
+      return { rows, isLoading, error };
     }
   });
 }
@@ -11114,6 +11286,7 @@ function createWorkspacesSource(labels) {
 // src/datasets/registry.ts
 var BUILTIN_DATA_SOURCES = [
   createUsageSource(),
+  createUsageBreakdownSource(),
   createDocumentsSource(),
   createConversationsSource(),
   createProjectsSource(),
@@ -19459,6 +19632,7 @@ exports.DEFAULT_FACTS_SOURCE_LABELS = DEFAULT_FACTS_SOURCE_LABELS;
 exports.DEFAULT_PASSWORD_CHANGE_FORM_MESSAGES = DEFAULT_PASSWORD_CHANGE_FORM_MESSAGES;
 exports.DEFAULT_PROJECTS_SOURCE_LABELS = DEFAULT_PROJECTS_SOURCE_LABELS;
 exports.DEFAULT_TAGS_SOURCE_LABELS = DEFAULT_TAGS_SOURCE_LABELS;
+exports.DEFAULT_USAGE_BREAKDOWN_SOURCE_LABELS = DEFAULT_USAGE_BREAKDOWN_SOURCE_LABELS;
 exports.DEFAULT_USAGE_SOURCE_LABELS = DEFAULT_USAGE_SOURCE_LABELS;
 exports.DEFAULT_WORKFLOWS_SOURCE_LABELS = DEFAULT_WORKFLOWS_SOURCE_LABELS;
 exports.DEFAULT_WORKSPACES_SOURCE_LABELS = DEFAULT_WORKSPACES_SOURCE_LABELS;
@@ -19565,6 +19739,7 @@ exports.createProjectsSource = createProjectsSource;
 exports.createSkillPack = createSkillPack;
 exports.createStreamHandlers = createStreamHandlers;
 exports.createTagsSource = createTagsSource;
+exports.createUsageBreakdownSource = createUsageBreakdownSource;
 exports.createUsageSource = createUsageSource;
 exports.createWorkflowsSource = createWorkflowsSource;
 exports.createWorkspaceSwitch = createWorkspaceSwitch;