@glodon-aiot/dataset-annotation 3.14.0-alpha.33 → 3.14.0-alpha.34

package/dist/src/components/VLMAnnotationDetail/MarkVLMBoxModal/QADetail/QAGenerationConfig.d.ts

@@ -3,6 +3,7 @@ interface QAGenerationConfigProps {
     visionId?: string;
     datasetId?: string;
     afterChangeTemplates?: () => void;
+    onActiveIndexChange?: (index: number) => void;
 }
 export interface QAGenerationConfigRef {
     hasUnsavedChanges: () => boolean;

package/dist/src/components/VLMAnnotationDetail/VLMDetail/index.d.ts

@@ -0,0 +1,21 @@
+import { default as React } from 'react';
+import { IPagination, ISample } from '@glodon-aiot/apis';
+export interface VLMDetailRef {
+    handleModalCancel: () => Promise<void>;
+}
+interface VLMDetailProps {
+    visible: boolean;
+    selectSampleId?: string;
+    datasetId?: string;
+    versionId?: string;
+    onClose: VoidFunction;
+    onSave: (record: ISample) => Promise<boolean>;
+    filterMode?: string;
+    onFilterModeChange?: (mode: string) => void;
+    externalSamples?: ISample[];
+    externalPagination?: IPagination;
+    externalCurrentIndex?: number;
+    externalFilterMode?: string;
+}
+declare const VLMDetail: React.ForwardRefExoticComponent<VLMDetailProps & React.RefAttributes<VLMDetailRef>>;
+export default VLMDetail;

package/dist/src/components/VLMAnnotationDetail/VlmModal/index.d.ts

@@ -1,9 +1,9 @@
 import { default as React, Dispatch, SetStateAction } from 'react';
-import { ISample } from '@glodon-aiot/apis';
+import { IPagination, ISample } from '@glodon-aiot/apis';
 interface ImageDetailModalProps {
     isVlmModalVisible: boolean;
     setIsVlmModalVisible: Dispatch<SetStateAction<boolean>>;
-    record: ISample;
+    record?: ISample;
     onNextClick: VoidFunction;
     onPrevClick: VoidFunction;
     listLoading?: boolean;
@@ -12,6 +12,15 @@ interface ImageDetailModalProps {
     ocrMarkTmpl?: string;
     handleMarkClick: (sampleId?: string) => void;
     updateSampleList: () => void;
+    filterMode?: string;
+    onFilterModeChange?: (mode: string) => void;
+    samples?: ISample[];
+    onSave?: (record: ISample) => Promise<boolean>;
+    initialMode?: 'preview' | 'annotation';
+    selectSampleId?: string;
+    onClose: VoidFunction;
+    pagination?: IPagination;
+    currentIndex?: number;
 }
 declare const VlmModal: React.FC<ImageDetailModalProps>;
 export default VlmModal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glodon-aiot/dataset-annotation",
-  "version": "3.14.0-alpha.33",
+  "version": "3.14.0-alpha.34",
   "module": "./dist/es/index.mjs",
   "main": "./dist/lib/index.js",
   "types": "./dist/src/index.d.ts",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.3.4",
     "@aws-crypto/sha256-js": "^3.0.0",
-    "@glodon-aiot/apis": "^3.14.0-alpha.33",
+    "@glodon-aiot/apis": "^3.14.0-alpha.34",
     "@glodon-aiot/minio": "^0.1.6",
     "@reduxjs/toolkit": "^1.9.5",
     "@types/fabric": "^5.3.2",

package/dist/es/components/VLMAnnotationDetail/MarkVLMBoxModal/index.mjs

@@ -1,455 +0,0 @@
-var Ge = Object.defineProperty, $e = Object.defineProperties;
-var Pe = Object.getOwnPropertyDescriptors;
-var Ie = Object.getOwnPropertySymbols;
-var je = Object.prototype.hasOwnProperty, Be = Object.prototype.propertyIsEnumerable;
-var be = (w, u, o) => u in w ? Ge(w, u, { enumerable: !0, configurable: !0, writable: !0, value: o }) : w[u] = o, U = (w, u) => {
-  for (var o in u || (u = {}))
-    je.call(u, o) && be(w, o, u[o]);
-  if (Ie)
-    for (var o of Ie(u))
-      Be.call(u, o) && be(w, o, u[o]);
-  return w;
-}, P = (w, u) => $e(w, Pe(u));
-var z = (w, u, o) => new Promise((x, g) => {
-  var J = (q) => {
-    try {
-      r(o.next(q));
-    } catch (E) {
-      g(E);
-    }
-  }, R = (q) => {
-    try {
-      r(o.throw(q));
-    } catch (E) {
-      g(E);
-    }
-  }, r = (q) => q.done ? x(q.value) : Promise.resolve(q.value).then(J, R);
-  r((o = o.apply(w, u)).next());
-});
-import { jsx as l, jsxs as B, Fragment as Ee } from "react/jsx-runtime";
-import { Modal as ke, Space as Ae, Button as te, message as N, Tabs as de, Spin as Fe } from "antd";
-import { useContext as Qe, useRef as j, useState as m, useEffect as W } from "react";
-import "./style.less.mjs";
-import Ke from "../../DataEmpty/index.mjs";
-import Oe from "../../../DatasetContext/index.mjs";
-import He from "./AttributeDetail/index.mjs";
-import We from "./QADetail/index.mjs";
-import Je from "../../VLMAnnotation/index.mjs";
-import Xe from "axios";
-const {
-  TabPane: K
-} = de, lt = (w) => {
-  const {
-    visible: u,
-    selectSampleId: o,
-    datasetId: x,
-    versionId: g,
-    // vmlMarkTmpl,
-    onClose: J,
-    onSave: R
-  } = w, {
-    services: {
-      cvforceDatahub: r
-    },
-    token: q,
-    apiUrl: E
-  } = Qe(Oe), F = j(null);
-  j(null), j({});
-  const [i, I] = m(), C = j(void 0), [Ye, fe] = m(0), [y, G] = m([]), [ne, M] = m(-1), [f, T] = m({
-    current: 1,
-    pageSize: 100
-    // 与主列表保持一致
-  }), [ue, ge] = m(0), [he, pe] = m(0), [b, ie] = m(() => o ? "" : "nocode"), [me, O] = m(), [oe, xe] = m([]), [h, X] = m("textAnnotation"), [Y, Q] = m(), [Z, L] = m(!1), _ = j(0), re = j(0), [se, De] = m(!1), [ye, ee] = m(!1), [ae, ce] = m(!1), [Se, Ce] = m(!1), $ = j(null), D = j(null), [Ve, Le] = m(() => Date.now()), [ze, Ne] = m(() => Date.now());
-  W(() => {
-    u && (!x || !g || r == null || r.getDatasetsIdVersionsVidConfigs(x, g).then((e) => {
-      xe(e || []), (e == null ? void 0 : e.length) > 0 ? X("textAnnotation") : X("attributeDefinition");
-    }));
-  }, [u]), W(() => {
-    const e = f.current || 1, t = f.pageSize || 100, n = f.type;
-    if (!x || !g)
-      return;
-    const a = ++_.current;
-    ce(!0);
-    const p = y || [], s = o || me;
-    r == null || r.getDatasetsIdVersionsVidSamples(x, g, {
-      labels: b ? [b] : void 0,
-      pageNo: e,
-      pageSize: t
-    }).then((k) => {
-      if (a !== _.current)
-        return;
-      const d = k.recordList || [], c = e === 1 && !n ? d : n === "prev" ? [...d, ...p] : n === "next" ? [...p, ...d] : d;
-      G(c), T(P(U({}, f), {
-        current: e,
-        pageSize: t,
-        total: k.totalResults,
-        type: void 0
-      }));
-      let v = 0, S = c[0];
-      if (n === "next" && d.length)
-        v = p.length, S = d[0];
-      else if (n === "prev" && d.length)
-        v = d.length - 1, S = d[d.length - 1];
-      else if (s) {
-        const A = c.findIndex((H) => H.id === s);
-        if (A !== -1)
-          v = A, S = c[A];
-        else {
-          r == null || r.getDatasetsIdVersionsVidSsamplesSid(x, g, s).then((H) => {
-            a === _.current && H && (G([H, ...c]), I(H), M(0), fe(c.length + 1), O(void 0));
-          });
-          return;
-        }
-      }
-      S && (I(S), M(v), fe(c.length), me && O(void 0));
-    }).finally(() => {
-      a === _.current && ce(!1);
-    }), V();
-  }, [f.current, b, x, g]);
-  const V = () => {
-    !x || !g || r == null || r.getDatasetsIdVersionsVidLabelcount(x, g).then((e) => {
-      const t = e.find((a) => a.id === "allcodeid"), n = e.find((a) => a.id === "nocodeid");
-      ge(t ? t.count : 0), pe(n ? n.count : 0);
-    });
-  }, le = () => {
-    y && G((e) => {
-      var k, d, c, v;
-      const t = C.current || i, n = [...e];
-      let a;
-      if (t) {
-        const S = n.findIndex((A) => A.id === t.id);
-        S > -1 && n.splice(S, 1, t);
-      }
-      const p = !t || (k = t.labels) != null && k.length && b === "hascode" || !((d = t.labels) != null && d.length) && b === "nocode" || b === "" ? ne + 1 : ne;
-      if (t && ((c = t.labels) != null && c.length && b === "nocode" || !((v = t.labels) != null && v.length) && b === "hascode")) {
-        const S = n.findIndex((A) => A.id === t.id);
-        S > -1 && (n.splice(S, 1), a = [...n], T((A) => P(U({}, A), {
-          total: A.total ? A.total - 1 : A.total
-        })));
-      }
-      const s = a || n;
-      if (p >= s.length) {
-        const S = (f.current - 1) * f.pageSize + p;
-        f.total && S >= f.total ? N.error("已经是最后一个了") : T({
-          current: f.current + 1,
-          pageSize: f.pageSize,
-          type: "next"
-        });
-      } else
-        setTimeout(() => {
-          M(p);
-          const S = s[p];
-          I(S);
-        }, 0);
-      return s;
-    });
-  }, ve = () => {
-    var s, k;
-    if (!y)
-      return;
-    const e = C.current || i, t = [...y];
-    let n;
-    if (e && y) {
-      const d = t.findIndex((c) => c.id === e.id);
-      if (d > -1 && t.splice(d, 1, e), (s = e.labels) != null && s.length && b === "nocode" || !((k = e.labels) != null && k.length) && b === "hascode") {
-        const c = t.findIndex((v) => v.id === e.id);
-        c > -1 && (t.splice(c, 1), n = [...t], T((v) => P(U({}, v), {
-          total: v.total ? v.total - 1 : v.total
-        })));
-      }
-    }
-    const a = n || t, p = ne - 1;
-    if (p < 0)
-      (f.current - 1) * f.pageSize + p < 0 ? N.error("已经是第一个了") : T({
-        current: f.current - 1,
-        pageSize: f.pageSize,
-        type: "prev"
-      });
-    else {
-      M(p);
-      const d = a[p];
-      I(d);
-    }
-    n && G(n);
-  };
-  W(() => {
-    if (!u || !x || !g || !i)
-      return;
-    const e = ++re.current;
-    Ce(!0), r == null || r.getDatasetsIdVersionsVidSsamplesSid(x, g, i.id).then((t) => {
-      e === re.current && I(t);
-    }).finally(() => {
-      e === re.current && Ce(!1);
-    });
-  }, [u, i == null ? void 0 : i.id]);
-  const Re = () => z(void 0, null, function* () {
-    h === "attributeDefinition" && $.current && !(yield $.current.checkDirtyAndConfirm()) || h === "qaGeneration" && D.current && !(yield D.current.checkDirtyAndConfirm()) || J();
-  });
-  W(() => {
-    F.current && (F.current.width = F.current.offsetWidth, F.current.height = F.current.offsetHeight);
-  }, [F.current]);
-  const qe = () => z(void 0, null, function* () {
-    if (Z)
-      return;
-    if (L(!0), h === "qaGeneration" && D.current && !(yield D.current.checkDirtyAndConfirm())) {
-      L(!1);
-      return;
-    }
-    const e = C.current || i;
-    if (!e) {
-      L(!1);
-      return;
-    }
-    console.log("onPrevClick sampleToUse", e), h === "textAnnotation" && Y ? (ee(!0), R(e).then((t) => {
-      t ? (Q(void 0), ve(), V()) : N.error("保存失败");
-    }).finally(() => {
-      ee(!1), L(!1);
-    })) : (ve(), L(!1));
-  }), Me = () => z(void 0, null, function* () {
-    if (Z)
-      return;
-    if (L(!0), h === "qaGeneration" && D.current && !(yield D.current.checkDirtyAndConfirm())) {
-      L(!1);
-      return;
-    }
-    const e = C.current || i;
-    if (!e) {
-      L(!1);
-      return;
-    }
-    console.log("onNextClick sampleToUse", e), h === "textAnnotation" && Y ? (ee(!0), R(e).then((t) => {
-      t ? (Q(void 0), le(), V()) : N.error("保存失败");
-    }).finally(() => {
-      ee(!1), L(!1);
-    })) : (le(), L(!1));
-  });
-  W(() => {
-    C.current = i;
-  }, [i]);
-  const Te = (e) => (console.log("ocrRecognize apiUrl", E), Xe.post(`${E}/aishop/v2/infer?serviceId=Actpkb4pi3vxg`, {
-    pages: [{
-      image: e,
-      no: 0
-    }]
-  }, {
-    headers: {
-      Authorization: `Bearer ${q}`
-    }
-  }).then((t) => (console.log("ocrRecognize res", t.data.data), t.data.data.pages[0].layout.filter((a) => a.content))).catch((t) => {
-    console.error("ocrRecognize error", t);
-  })), Ue = () => z(void 0, null, function* () {
-    const e = C.current || i;
-    !e || !x || !g || ke.confirm({
-      title: "确认要删除此数据吗？",
-      content: "删除后不可恢复，请慎重操作",
-      onOk: () => z(void 0, null, function* () {
-        console.log("handleDeleteClick currentSample", e);
-        try {
-          yield r == null ? void 0 : r.delDatasetsIdVersionsVidSamplesId(x, g, e.id), N.success("删除成功"), o ? J() : G((t) => {
-            var d;
-            const n = t.findIndex((c) => c.id === e.id);
-            if (n === -1)
-              return t;
-            const a = [...t.slice(0, n), ...t.slice(n + 1)], p = f.pageSize || 1, s = Math.max(((d = f.total) != null ? d : t.length) - 1, 0), k = a.length === 0 && s > f.current * p;
-            if (T((c) => U(P(U({}, c), {
-              total: s
-            }), k ? {
-              current: c.current + 1,
-              pageSize: p,
-              type: "next"
-            } : {
-              type: k ? "next" : void 0
-            })), a.length) {
-              const c = Math.min(n, a.length - 1);
-              M(c), I(a[c]);
-            } else
-              M(-1), I(void 0);
-            return a;
-          }), V();
-        } catch (t) {
-          N.error("删除失败");
-        }
-      })
-    });
-  }), we = () => z(void 0, null, function* () {
-    if (!x || !g || !(i != null && i.id))
-      return;
-    const e = yield r == null ? void 0 : r.getDatasetsIdVersionsVidSsamplesSid(x, g, i.id);
-    e && (I(e), C.current = e);
-  });
-  return /* @__PURE__ */ l(ke, {
-    title: "标注",
-    width: "100%",
-    wrapClassName: "vlm-modal-wrap",
-    className: "vlm-modal",
-    open: u,
-    destroyOnClose: !0,
-    onCancel: () => Re(),
-    maskClosable: !1,
-    keyboard: !1,
-    centered: !0,
-    footer: h !== "attributeDefinition" ? /* @__PURE__ */ B("div", {
-      style: {
-        display: "flex",
-        justifyContent: "space-between",
-        alignItems: "center"
-      },
-      children: [/* @__PURE__ */ l("div", {
-        style: {
-          flex: 1
-        }
-      }), /* @__PURE__ */ B(Ae, {
-        size: 24,
-        children: [!o && (y == null ? void 0 : y.length) > 0 && /* @__PURE__ */ l(te, {
-          type: "default",
-          disabled: Se || ae || ye || Z,
-          onClick: qe,
-          children: "上一张"
-        }, "prev"), !o && (y == null ? void 0 : y.length) > 0 && /* @__PURE__ */ l(te, {
-          type: "default",
-          disabled: Se || ae || ye || Z,
-          onClick: Me,
-          children: "下一张"
-        }, "next")]
-      }), /* @__PURE__ */ l("div", {
-        style: {
-          flex: 1,
-          display: "flex",
-          justifyContent: "flex-end"
-        },
-        children: /* @__PURE__ */ l(Ae, {
-          children: h === "textAnnotation" && (y == null ? void 0 : y.length) > 0 ? /* @__PURE__ */ B(Ee, {
-            children: [/* @__PURE__ */ l(te, {
-              disabled: !i,
-              type: "primary",
-              onClick: () => {
-                const e = C.current || i;
-                e && (console.log("save currentSample", e), R(e).then((t) => z(void 0, null, function* () {
-                  t ? (N.success("保存成功"), Q(void 0), o ? yield we() : le(), V()) : N.error("保存失败");
-                })));
-              },
-              children: "保存标注"
-            }, "save"), /* @__PURE__ */ l(te, {
-              type: "default",
-              onClick: Ue,
-              children: "删除数据"
-            })]
-          }) : null
-        })
-      })]
-    }) : null,
-    children: /* @__PURE__ */ B("div", {
-      className: "vlm-records-content",
-      children: [/* @__PURE__ */ l("div", {
-        className: "records-content-tabs-container",
-        children: !o && /* @__PURE__ */ B(de, {
-          className: "records-content-tabs",
-          activeKey: b,
-          onChange: (e) => z(void 0, null, function* () {
-            var n, a, p;
-            let t = !1;
-            if (!(h === "attributeDefinition" && $.current && (t = !!((a = (n = $.current).hasUnsavedChanges) != null && a.call(n)), !(yield $.current.checkDirtyAndConfirm()))) && !(h === "qaGeneration" && D.current && !(yield D.current.checkDirtyAndConfirm()))) {
-              if (h === "textAnnotation" && Y) {
-                const s = C.current || i;
-                if (s && R) {
-                  if (!(yield R(s))) {
-                    N.error("保存失败，已阻止切换筛选");
-                    return;
-                  }
-                  I(s), C.current = s, Q(void 0), V == null || V(), !o && b === "nocode" && ((p = s == null ? void 0 : s.labels) != null && p.length) && (G([]), I(s), M(-1), O(s.id), T(P(U({}, f), {
-                    current: 1,
-                    total: void 0,
-                    type: void 0
-                  })), ie("hascode"));
-                }
-              }
-              t && Le(Date.now()), Ne(Date.now()), h !== "attributeDefinition" && (ce(!0), G([]), I(void 0), M(-1), O(void 0)), T(P(U({}, f), {
-                current: 1,
-                total: void 0,
-                type: void 0
-              })), ie(e);
-            }
-          }),
-          children: [/* @__PURE__ */ l(K, {
-            tab: `全部（${ue}）`
-          }, ""), /* @__PURE__ */ l(K, {
-            tab: `未标注（${he}）`
-          }, "nocode"), /* @__PURE__ */ l(K, {
-            tab: `已标注（${ue - he}）`
-          }, "hascode")]
-        })
-      }), y != null && y.length ? /* @__PURE__ */ B("div", {
-        className: "sample-detail",
-        children: [/* @__PURE__ */ l("div", {
-          className: "content-mode-buttons",
-          children: /* @__PURE__ */ B(de, {
-            activeKey: h,
-            onChange: (e) => z(void 0, null, function* () {
-              var t;
-              if (!(h === "attributeDefinition" && $.current && !(yield $.current.checkDirtyAndConfirm())) && !(h === "qaGeneration" && D.current && !(yield D.current.checkDirtyAndConfirm()))) {
-                if (h === "textAnnotation" && R && Y && (C.current || i)) {
-                  const n = C.current || i;
-                  if (!(yield R(n))) {
-                    N.error("保存失败，已阻止切换页签");
-                    return;
-                  }
-                  I(n), C.current = n, Q(void 0), V == null || V(), !o && b === "nocode" && ((t = n == null ? void 0 : n.labels) != null && t.length) && (G([]), I(n), M(-1), O(n.id), T(P(U({}, f), {
-                    current: 1,
-                    total: void 0,
-                    type: void 0
-                  })), ie("hascode"));
-                }
-                e === "textAnnotation" && (i != null && i.id) && (yield we()), X(e);
-              }
-            }),
-            children: [/* @__PURE__ */ l(K, {
-              tab: "属性定义",
-              disabled: se
-            }, "attributeDefinition"), /* @__PURE__ */ l(K, {
-              tab: "文本标注",
-              disabled: se
-            }, "textAnnotation"), /* @__PURE__ */ l(K, {
-              tab: "QA生成",
-              disabled: se
-            }, "qaGeneration")]
-          })
-        }), h === "textAnnotation" && i && /* @__PURE__ */ l("div", {
-          className: "container",
-          children: /* @__PURE__ */ l(Je, {
-            sample: i,
-            labelDefinitions: oe,
-            onChange: (e) => {
-              console.log("VLMAnnotation onChange", e), C.current = e, Q(e);
-            },
-            ocrRecognize: Te
-          })
-        }), h === "attributeDefinition" && /* @__PURE__ */ l(He, {
-          ref: $,
-          datasetId: x,
-          versionId: g,
-          onAttributesChange: (e) => {
-            xe(e), e.length > 0 && oe.length === 0 && X("textAnnotation");
-          },
-          onLoadingChange: (e) => {
-            De(e);
-          }
-        }, `attribute-${Ve}`), h === "qaGeneration" && /* @__PURE__ */ l(We, {
-          ref: D,
-          sample: i,
-          labels: oe,
-          datasetId: x,
-          visionId: g
-        }, `qa-${ze}`)]
-      }) : ae ? /* @__PURE__ */ l("div", {
-        style: {
-          padding: "48px 0",
-          textAlign: "center"
-        },
-        children: /* @__PURE__ */ l(Fe, {})
-      }) : /* @__PURE__ */ l(Ke, {})]
-    })
-  });
-};
-export {
-  lt as default
-};