@glodon-aiot/agent-cli-ui 3.5.0-alpha.3 → 3.5.0-beta.1

package/dist/es/index.mjs

@@ -1,16 +1,16 @@
-var D = Object.defineProperty, j = Object.defineProperties;
+var P = Object.defineProperty, j = Object.defineProperties;
 var F = Object.getOwnPropertyDescriptors;
 var V = Object.getOwnPropertySymbols;
-var P = Object.prototype.hasOwnProperty, W = Object.prototype.propertyIsEnumerable;
-var L = (m, s, n) => s in m ? D(m, s, { enumerable: !0, configurable: !0, writable: !0, value: n }) : m[s] = n, a = (m, s) => {
+var W = Object.prototype.hasOwnProperty, O = Object.prototype.propertyIsEnumerable;
+var T = (m, s, n) => s in m ? P(m, s, { enumerable: !0, configurable: !0, writable: !0, value: n }) : m[s] = n, a = (m, s) => {
   for (var n in s || (s = {}))
-    P.call(s, n) && L(m, n, s[n]);
+    W.call(s, n) && T(m, n, s[n]);
   if (V)
     for (var n of V(s))
-      W.call(s, n) && L(m, n, s[n]);
+      O.call(s, n) && T(m, n, s[n]);
   return m;
 }, C = (m, s) => j(m, F(s));
-var c = (m, s, n) => (L(m, typeof s != "symbol" ? s + "" : s, n), n);
+var c = (m, s, n) => (T(m, typeof s != "symbol" ? s + "" : s, n), n);
 var B = (m, s, n) => new Promise((e, u) => {
   var l = (h) => {
     try {
@@ -27,23 +27,24 @@ var B = (m, s, n) => new Promise((e, u) => {
   }, d = (h) => h.done ? e(h.value) : Promise.resolve(h.value).then(l, g);
   d((n = n.apply(m, s)).next());
 });
-import { jsx as z } from "react/jsx-runtime";
-import O from "react";
+import { jsx as L } from "react/jsx-runtime";
+import $ from "react";
 import v from "lodash/merge";
-import H from "react-dom";
-import $ from "./AgentClientUI.mjs";
-import { notification as T } from "antd";
-import K from "axios";
-import { v4 as J } from "uuid";
-import Q from "./packages/agent-cli-ui/package.json.mjs";
-import { defaultUIConfig as A, defaultApiUrl as G, defaultDovViewerUrl as X } from "./constant.mjs";
-import { ApiUrl as Y } from "./types.mjs";
-/* empty css             */import { BotClientApi as Z, ApplicationTypes as N } from "@glodon-aiot/apis";
-import { JWT as q, isExpired as ee } from "./utils/index.mjs";
-import { configuration as ie, configure as R, BotClient as te } from "@glodon-aiot/bot-client-sdk";
-import se from "./ReactTextGenerationUI/index.mjs";
+import A from "react-dom";
+import K from "./AgentClientUI.mjs";
+import { notification as H } from "antd";
+import J from "axios";
+import { v4 as Q } from "uuid";
+import G from "./packages/agent-cli-ui/package.json.mjs";
+import { defaultUIConfig as z, defaultApiUrl as X, defaultDovViewerUrl as Y } from "./constant.mjs";
+import { ApiUrl as Z } from "./types.mjs";
+/* empty css             */import { BotClientApi as q, ApplicationTypes as N } from "@glodon-aiot/apis";
+import { JWT as ee, isExpired as ie } from "./utils/index.mjs";
+import { configuration as te, configure as R, BotClient as se } from "@glodon-aiot/bot-client-sdk";
+import oe from "./ReactTextGenerationUI/index.mjs";
+import { AntdConfigWrapper as D } from "./utils/antdConfig.mjs";
 const E = {};
-class we {
+class ye {
   constructor(s) {
     c(this, "_token");
     c(this, "_activeSession", null);
@@ -51,22 +52,22 @@ class we {
     c(this, "_defaultInputText", "");
     c(this, "_inputDisabled", !1);
     c(this, "_defatulSessionId", "");
-    c(this, "_agentClientRef", O.createRef());
+    c(this, "_agentClientRef", $.createRef());
     c(this, "_config");
     c(this, "_uuid", "");
     c(this, "apiUrl");
     c(this, "docViewerUrl");
     c(this, "env", "prod");
-    c(this, "stream", ie.stream);
+    c(this, "stream", te.stream);
     c(this, "service");
     c(this, "rId", 0);
     c(this, "_mode", "float");
-    c(this, "uiConfig", A);
+    c(this, "uiConfig", z);
     c(this, "errorHandlers", {});
     c(this, "wrapper", document.createElement("div"));
     c(this, "botClient", null);
     var _, w, I, y, S;
-    this._uuid = J();
+    this._uuid = Q();
     const {
       env: n,
       token: e,
@@ -96,7 +97,7 @@ class we {
     };
     this.updateUIConfig(k, b), this.env = n || "prod", this.stream = p, R({
       stream: this.stream
-    }), this._applicationId = q(e).rid, this.apiUrl = d || Y[this.env] || G, this.docViewerUrl = h || X, this.service = this.setService(), this._initWrapper(), this.createBotClientSDK().then(() => {
+    }), this._applicationId = ee(e).rid, this.apiUrl = d || Z[this.env] || X, this.docViewerUrl = h || Y, this.service = this.setService(), this._initWrapper(), this.createBotClientSDK().then(() => {
       this.mode = u;
     });
   }
@@ -174,7 +175,7 @@ class we {
       this.updateUIConfig(d, e);
     } else {
       const d = {
-        size: a(a(a({}, this.uiConfig.size), A.size), this._config.size),
+        size: a(a(a({}, this.uiConfig.size), z.size), this._config.size),
         theme: v(this.uiConfig.theme, E)
       };
       this.updateUIConfig(d, e);
@@ -193,7 +194,7 @@ class we {
       const f = this.token;
       if (!f)
         return h;
-      if (ee(f)) {
+      if (ie(f)) {
         const i = "token is timeout";
         this.errorHandlers.token ? typeof this.errorHandlers.token == "function" ? this.errorHandlers.token(
           // @ts-ignore
@@ -210,7 +211,7 @@ class we {
       }), h;
     };
     function e(h, f = !0) {
-      const t = `${s}${h}`, i = K.create({
+      const t = `${s}${h}`, i = J.create({
         baseURL: t
       });
       return f && i.interceptors.request.use(n), i;
@@ -229,15 +230,17 @@ class we {
         ) : console.error("errorHandlers.token is not a function") : console.error(t);
       }
     }, l = (h, f, t) => {
-      h !== 10001 && h !== 10215 && (t || (T.config({
-        getContainer: this.uiConfig.getContainer
-      }), T.error({
+      h !== 10001 && h !== 10215 && (t || (H.config({
+        getContainer: this.uiConfig.getContainer,
+        prefixCls: "gbot-notification"
+      }), H.error({
         message: f
-      }), T.config({
-        getContainer: void 0
+      }), H.config({
+        getContainer: void 0,
+        prefixCls: "gbot-notification"
       })));
     }, g = e("");
-    return new Z(g, () => this.token, {
+    return new q(g, () => this.token, {
       onHttpStatusError: u,
       onAppStatusError: l
     });
@@ -293,7 +296,7 @@ class we {
             debug: this.uiConfig.debug,
             env: this.uiConfig.env,
             apiRoot: this.apiUrl
-          }), this.botClient = new te(this.token, {
+          }), this.botClient = new se(this.token, {
             plugins: this.uiConfig.plugins,
             mcp: this.uiConfig.mcp,
             stream: this.uiConfig.stream
@@ -304,7 +307,7 @@ class we {
             // 这里记录应用的名称和版本，以便后期数据分析
             ui: {
               name: "bot-client-ui",
-              version: Q.version
+              version: G.version
             }
           }), this.botClient.ready ? s(this.botClient) : this.botClient.addEventListener("ready", () => B(this, null, function* () {
             var e;
@@ -320,206 +323,212 @@ class we {
       var s, n, e, u, l, g, d, h, f;
       if (this.wrapper.style.height = "100%", !((s = this.botClient) != null && s.application))
         throw Error("application is required");
-      this.botClient.application.type === N.Text ? H.render(/* @__PURE__ */ z(se, {
-        rId: this.rId,
-        application: this.botClient.application,
-        sessionId: this._defatulSessionId,
-        showHeader: this.uiConfig.showHeader,
-        apiUrl: this.apiUrl,
-        env: this.uiConfig.env,
-        debug: this.uiConfig.debug,
-        mode: this.mode,
-        token: this.token,
-        className: this.mode,
-        open: this.uiConfig.open,
-        logo: this.uiConfig.logo,
-        icon: this.uiConfig.icon,
-        theme: this.uiConfig.theme,
-        greeting: this.uiConfig.greeting,
-        size: this.uiConfig.size,
-        triggerButton: a({
-          visible: !0
-        }, this.uiConfig.triggerButton),
-        history: this.uiConfig.history,
-        service: this.service,
-        docViewerUrl: this.docViewerUrl,
-        plugins: this.uiConfig.plugins,
-        mcp: this.uiConfig.mcp,
-        transform: C(a({}, this.uiConfig.transform), {
-          knowledges: ((n = this.uiConfig.features) == null ? void 0 : n.knowledges) === !0 || typeof ((e = this.uiConfig.features) == null ? void 0 : e.knowledges) == "object" && ((l = (u = this.uiConfig.features) == null ? void 0 : u.knowledges) == null ? void 0 : l.visible) !== !1
-        }),
-        features: this.uiConfig.features,
-        disabled: this._inputDisabled,
-        sider: this.uiConfig.sider,
-        footer: this.uiConfig.footer,
-        onComment: (t) => {
-          var i, o;
-          try {
-            (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.comment) == null || o.call(i, t);
-          } catch (r) {
-            console.error(r);
-          }
-        },
-        agentClient: this.botClient,
-        onMessage: (t) => {
-          var i, o;
-          if (t.message.messageId)
+      this.botClient.application.type === N.Text ? A.render(/* @__PURE__ */ L(D, {
+        getPopupContainer: () => this.uiConfig.getContainer(),
+        children: /* @__PURE__ */ L(oe, {
+          rId: this.rId,
+          application: this.botClient.application,
+          sessionId: this._defatulSessionId,
+          showHeader: this.uiConfig.showHeader,
+          apiUrl: this.apiUrl,
+          env: this.uiConfig.env,
+          debug: this.uiConfig.debug,
+          mode: this.mode,
+          token: this.token,
+          className: this.mode,
+          open: this.uiConfig.open,
+          logo: this.uiConfig.logo,
+          icon: this.uiConfig.icon,
+          theme: this.uiConfig.theme,
+          greeting: this.uiConfig.greeting,
+          size: this.uiConfig.size,
+          triggerButton: a({
+            visible: !0
+          }, this.uiConfig.triggerButton),
+          history: this.uiConfig.history,
+          service: this.service,
+          docViewerUrl: this.docViewerUrl,
+          plugins: this.uiConfig.plugins,
+          mcp: this.uiConfig.mcp,
+          transform: C(a({}, this.uiConfig.transform), {
+            knowledges: ((n = this.uiConfig.features) == null ? void 0 : n.knowledges) === !0 || typeof ((e = this.uiConfig.features) == null ? void 0 : e.knowledges) == "object" && ((l = (u = this.uiConfig.features) == null ? void 0 : u.knowledges) == null ? void 0 : l.visible) !== !1
+          }),
+          features: this.uiConfig.features,
+          disabled: this._inputDisabled,
+          sider: this.uiConfig.sider,
+          footer: this.uiConfig.footer,
+          onComment: (t) => {
+            var i, o;
             try {
-              (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.message) == null || o.call(i, t);
+              (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.comment) == null || o.call(i, t);
             } catch (r) {
               console.error(r);
             }
-        },
-        beforeMessageSend: (t) => {
-          var i, o, r;
-          if (!((i = this.uiConfig.eventListeners) != null && i.beforemessagesend))
-            return !0;
-          try {
-            return ((r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.beforemessagesend) == null ? void 0 : r.call(o, t)) || !1;
-          } catch (p) {
-            return console.error(p), !1;
-          }
-        },
-        onSessionUnload: (t) => {
-          var i, o;
-          this._activeSession = null;
-          try {
-            (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.sessionunload) == null || o.call(i, t);
-          } catch (r) {
-            console.error(r);
-          }
-        },
-        onSessionLoad: (t) => {
-          var i, o, r;
-          if (((i = this._activeSession) == null ? void 0 : i.id) === t.sessionId)
-            this._activeSession = t.session;
-          else {
-            this._activeSession = t.session;
+          },
+          agentClient: this.botClient,
+          onMessage: (t) => {
+            var i, o;
+            if (t.message.messageId)
+              try {
+                (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.message) == null || o.call(i, t);
+              } catch (r) {
+                console.error(r);
+              }
+          },
+          beforeMessageSend: (t) => {
+            var i, o, r;
+            if (!((i = this.uiConfig.eventListeners) != null && i.beforemessagesend))
+              return !0;
             try {
-              (r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.sessionload) == null || r.call(o, t);
+              return ((r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.beforemessagesend) == null ? void 0 : r.call(o, t)) || !1;
             } catch (p) {
-              console.error(p);
+              return console.error(p), !1;
             }
-          }
-        },
-        onHistoryLoad: (t) => {
-          var i, o, r;
-          if (((i = this._activeSession) == null ? void 0 : i.id) === t.sessionId)
+          },
+          onSessionUnload: (t) => {
+            var i, o;
+            this._activeSession = null;
             try {
-              (r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.historyload) == null || r.call(o, t);
-            } catch (p) {
-              console.error(p);
+              (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.sessionunload) == null || o.call(i, t);
+            } catch (r) {
+              console.error(r);
             }
-        },
-        defaultInput: this._defaultInputText !== void 0 ? {
-          text: this._defaultInputText
-        } : void 0,
-        bodyStyle: this.uiConfig.bodyStyle,
-        stream: this.stream
-      }), this.wrapper) : H.render(/* @__PURE__ */ z($, {
-        ref: this._agentClientRef,
-        rId: this.rId,
-        application: this.botClient.application,
-        agentClient: this.botClient,
-        sessionId: this._defatulSessionId,
-        showHeader: this.uiConfig.showHeader,
-        apiUrl: this.apiUrl,
-        env: this.uiConfig.env,
-        debug: this.uiConfig.debug,
-        mode: this.mode,
-        token: this.token,
-        className: this.mode,
-        open: this.uiConfig.open,
-        logo: this.uiConfig.logo,
-        icon: this.uiConfig.icon,
-        theme: this.uiConfig.theme,
-        greeting: this.uiConfig.greeting,
-        size: this.uiConfig.size,
-        triggerButton: a({
-          visible: !0
-        }, this.uiConfig.triggerButton),
-        history: this.uiConfig.history,
-        service: this.service,
-        docViewerUrl: this.docViewerUrl,
-        plugins: this.uiConfig.plugins,
-        mcp: this.uiConfig.mcp,
-        transform: C(a({}, this.uiConfig.transform), {
-          knowledges: ((g = this.uiConfig.features) == null ? void 0 : g.knowledges) === !0 || typeof ((d = this.uiConfig.features) == null ? void 0 : d.knowledges) == "object" && ((f = (h = this.uiConfig.features) == null ? void 0 : h.knowledges) == null ? void 0 : f.visible) !== !1
-        }),
-        features: this.uiConfig.features,
-        disabled: this._inputDisabled,
-        sider: this.uiConfig.sider,
-        footer: this.uiConfig.footer,
-        onComment: (t) => {
-          var i, o;
-          try {
-            (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.comment) == null || o.call(i, t);
-          } catch (r) {
-            console.error(r);
-          }
-        },
-        onMessage: (t) => {
-          var i, o;
-          if (t.message.messageId)
+          },
+          onSessionLoad: (t) => {
+            var i, o, r;
+            if (((i = this._activeSession) == null ? void 0 : i.id) === t.sessionId)
+              this._activeSession = t.session;
+            else {
+              this._activeSession = t.session;
+              try {
+                (r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.sessionload) == null || r.call(o, t);
+              } catch (p) {
+                console.error(p);
+              }
+            }
+          },
+          onHistoryLoad: (t) => {
+            var i, o, r;
+            if (((i = this._activeSession) == null ? void 0 : i.id) === t.sessionId)
+              try {
+                (r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.historyload) == null || r.call(o, t);
+              } catch (p) {
+                console.error(p);
+              }
+          },
+          defaultInput: this._defaultInputText !== void 0 ? {
+            text: this._defaultInputText
+          } : void 0,
+          bodyStyle: this.uiConfig.bodyStyle,
+          stream: this.stream
+        })
+      }), this.wrapper) : A.render(/* @__PURE__ */ L(D, {
+        getPopupContainer: () => this.uiConfig.getContainer(),
+        children: /* @__PURE__ */ L(K, {
+          ref: this._agentClientRef,
+          rId: this.rId,
+          application: this.botClient.application,
+          agentClient: this.botClient,
+          sessionId: this._defatulSessionId,
+          showHeader: this.uiConfig.showHeader,
+          apiUrl: this.apiUrl,
+          env: this.uiConfig.env,
+          debug: this.uiConfig.debug,
+          mode: this.mode,
+          token: this.token,
+          className: this.mode,
+          open: this.uiConfig.open,
+          logo: this.uiConfig.logo,
+          icon: this.uiConfig.icon,
+          theme: this.uiConfig.theme,
+          greeting: this.uiConfig.greeting,
+          size: this.uiConfig.size,
+          triggerButton: a({
+            visible: !0
+          }, this.uiConfig.triggerButton),
+          history: this.uiConfig.history,
+          service: this.service,
+          docViewerUrl: this.docViewerUrl,
+          plugins: this.uiConfig.plugins,
+          mcp: this.uiConfig.mcp,
+          transform: C(a({}, this.uiConfig.transform), {
+            knowledges: ((g = this.uiConfig.features) == null ? void 0 : g.knowledges) === !0 || typeof ((d = this.uiConfig.features) == null ? void 0 : d.knowledges) == "object" && ((f = (h = this.uiConfig.features) == null ? void 0 : h.knowledges) == null ? void 0 : f.visible) !== !1
+          }),
+          features: this.uiConfig.features,
+          disabled: this._inputDisabled,
+          sider: this.uiConfig.sider,
+          footer: this.uiConfig.footer,
+          onComment: (t) => {
+            var i, o;
             try {
-              (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.message) == null || o.call(i, t);
+              (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.comment) == null || o.call(i, t);
             } catch (r) {
               console.error(r);
             }
-        },
-        beforeMessageSend: (t) => {
-          var i, o, r;
-          if (!((i = this.uiConfig.eventListeners) != null && i.beforemessagesend))
-            return !0;
-          try {
-            return ((r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.beforemessagesend) == null ? void 0 : r.call(o, t)) || !1;
-          } catch (p) {
-            return console.error(p), !1;
-          }
-        },
-        onSessionUnload: (t) => {
-          var i, o;
-          this._activeSession = null;
-          try {
-            (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.sessionunload) == null || o.call(i, t);
-          } catch (r) {
-            console.error(r);
-          }
-        },
-        onSessionLoad: (t) => {
-          var i, o, r;
-          if (((i = this._activeSession) == null ? void 0 : i.id) === t.sessionId)
-            this._activeSession = t.session;
-          else {
-            this._activeSession = t.session;
+          },
+          onMessage: (t) => {
+            var i, o;
+            if (t.message.messageId)
+              try {
+                (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.message) == null || o.call(i, t);
+              } catch (r) {
+                console.error(r);
+              }
+          },
+          beforeMessageSend: (t) => {
+            var i, o, r;
+            if (!((i = this.uiConfig.eventListeners) != null && i.beforemessagesend))
+              return !0;
             try {
-              (r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.sessionload) == null || r.call(o, t);
+              return ((r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.beforemessagesend) == null ? void 0 : r.call(o, t)) || !1;
             } catch (p) {
-              console.error(p);
+              return console.error(p), !1;
             }
-          }
-        },
-        onHistoryLoad: (t) => {
-          var i, o, r;
-          if (((i = this._activeSession) == null ? void 0 : i.id) === t.sessionId)
+          },
+          onSessionUnload: (t) => {
+            var i, o;
+            this._activeSession = null;
             try {
-              (r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.historyload) == null || r.call(o, t);
-            } catch (p) {
-              console.error(p);
+              (o = (i = this.uiConfig.eventListeners) == null ? void 0 : i.sessionunload) == null || o.call(i, t);
+            } catch (r) {
+              console.error(r);
+            }
+          },
+          onSessionLoad: (t) => {
+            var i, o, r;
+            if (((i = this._activeSession) == null ? void 0 : i.id) === t.sessionId)
+              this._activeSession = t.session;
+            else {
+              this._activeSession = t.session;
+              try {
+                (r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.sessionload) == null || r.call(o, t);
+              } catch (p) {
+                console.error(p);
+              }
             }
-        },
-        defaultInput: this._defaultInputText !== void 0 ? {
-          text: this._defaultInputText
-        } : void 0,
-        bodyStyle: this.uiConfig.bodyStyle,
-        stream: this.stream
+          },
+          onHistoryLoad: (t) => {
+            var i, o, r;
+            if (((i = this._activeSession) == null ? void 0 : i.id) === t.sessionId)
+              try {
+                (r = (o = this.uiConfig.eventListeners) == null ? void 0 : o.historyload) == null || r.call(o, t);
+              } catch (p) {
+                console.error(p);
+              }
+          },
+          defaultInput: this._defaultInputText !== void 0 ? {
+            text: this._defaultInputText
+          } : void 0,
+          bodyStyle: this.uiConfig.bodyStyle,
+          stream: this.stream
+        })
       }), this.wrapper), this._defaultInputText = "";
     });
   }
   destroy(s) {
-    H.unmountComponentAtNode(this.wrapper), this.wrapper && this.wrapper.remove(), s == null || s();
+    H.destroy(), A.unmountComponentAtNode(this.wrapper), this.wrapper && this.wrapper.remove(), s == null || s();
   }
 }
 export {
-  we as default
+  ye as default
 };

package/dist/es/packages/agent-cli-ui/package.json.mjs

@@ -1,4 +1,4 @@
-const e = "@glodon-aiot/agent-cli-ui", t = "3.5.0-alpha.3", s = "./dist/es/index.mjs", o = "./dist/lib/index.js", i = "./dist/src/index.d.ts", n = {
+const e = "@glodon-aiot/agent-cli-ui", t = "3.5.0-beta.1", s = "./dist/es/index.mjs", o = "./dist/lib/index.js", i = "./dist/src/index.d.ts", n = {
   import: "./dist/es/index.mjs",
   require: "./dist/lib/index.js",
   types: "./dist/src/index.d.ts"
@@ -25,8 +25,8 @@ const e = "@glodon-aiot/agent-cli-ui", t = "3.5.0-alpha.3", s = "./dist/es/index
   webpack: "*"
 }, p = {
   "@ant-design/icons": "^5.3.4",
-  "@glodon-aiot/apis": "^3.5.0-alpha.3",
-  "@glodon-aiot/bot-client-sdk": "^3.5.0-alpha.3",
+  "@glodon-aiot/apis": "^3.5.0-beta.1",
+  "@glodon-aiot/bot-client-sdk": "^3.5.0-beta.1",
   "@matejmazur/react-mathjax": "^0.1.10",
   "@react-pdf-viewer/core": "^3.12.0",
   "@react-pdf-viewer/default-layout": "^3.12.0",