plugin-ai-api 1.0.20 → 1.0.23

package/dist/server/utils/openai-format.js

@@ -43,7 +43,8 @@ __export(openai_format_exports, {
   toOpenAIEmbeddingsResponse: () => toOpenAIEmbeddingsResponse,
   toOpenAIError: () => toOpenAIError,
   toOpenAIResponse: () => toOpenAIResponse,
-  toOpenAIStreamChunk: () => toOpenAIStreamChunk
+  toOpenAIStreamChunk: () => toOpenAIStreamChunk,
+  toOpenAIUsageChunk: () => toOpenAIUsageChunk
 });
 module.exports = __toCommonJS(openai_format_exports);
 var import_crypto = __toESM(require("crypto"));
@@ -116,7 +117,19 @@ function toOpenAIStreamChunk(options) {
         logprobs: null,
         finish_reason: finishReason
       }
-    ]
+    ],
+    usage: null
+  };
+}
+function toOpenAIUsageChunk(options) {
+  const { id, model, usage, object = "chat.completion.chunk" } = options;
+  return {
+    id,
+    object,
+    created: Math.floor(Date.now() / 1e3),
+    model,
+    choices: [],
+    usage
   };
 }
 function toOpenAIEmbeddingsResponse(options) {
@@ -154,5 +167,6 @@ function formatSSEDone() {
   toOpenAIEmbeddingsResponse,
   toOpenAIError,
   toOpenAIResponse,
-  toOpenAIStreamChunk
+  toOpenAIStreamChunk,
+  toOpenAIUsageChunk
 });

package/dist/server/utils/streaming.js

@@ -26,18 +26,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var streaming_exports = {};
 __export(streaming_exports, {
+  AiApiClientDisconnectedError: () => AiApiClientDisconnectedError,
   createRequestAbortController: () => createRequestAbortController,
+  isClientDisconnected: () => isClientDisconnected,
   isStreamingRequested: () => isStreamingRequested,
   writeResponse: () => writeResponse
 });
 module.exports = __toCommonJS(streaming_exports);
+class AiApiClientDisconnectedError extends Error {
+  code = "client_disconnected";
+  constructor() {
+    super("Client disconnected");
+    this.name = "AiApiClientDisconnectedError";
+  }
+}
+function isClientDisconnected(ctx, error) {
+  return ctx.req.aborted === true || error instanceof AiApiClientDisconnectedError;
+}
 function isStreamingRequested(value) {
   return value !== false;
 }
 function createRequestAbortController(ctx) {
   const controller = new AbortController();
   const abort = () => {
-    if (!ctx.res.writableEnded) controller.abort(new Error("Client disconnected"));
+    if (!ctx.res.writableEnded) controller.abort(new AiApiClientDisconnectedError());
   };
   ctx.req.once("aborted", abort);
   ctx.res.once("close", abort);
@@ -74,7 +86,9 @@ function waitForDrain(ctx) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AiApiClientDisconnectedError,
   createRequestAbortController,
+  isClientDisconnected,
   isStreamingRequested,
   writeResponse
 });

package/dist/server/utils/user-permissions.js

@@ -0,0 +1,160 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var user_permissions_exports = {};
+__export(user_permissions_exports, {
+  buildAccessScope: () => buildAccessScope,
+  enforceModelAccess: () => enforceModelAccess,
+  invalidateUserPermissionCache: () => invalidateUserPermissionCache,
+  isModelAllowed: () => isModelAllowed,
+  isServiceAllowed: () => isServiceAllowed,
+  resolveUserAccessScope: () => resolveUserAccessScope
+});
+module.exports = __toCommonJS(user_permissions_exports);
+var import_openai_format = require("./openai-format");
+const SCOPE_TTL_MS = 15e3;
+const scopeCache = /* @__PURE__ */ new Map();
+const NO_RECORD_SCOPE = {
+  hasUserRecord: false,
+  denyAll: false,
+  allowedServices: null,
+  allowAllModels: true,
+  allowedModels: /* @__PURE__ */ new Set(),
+  lookupFailed: false
+};
+const LOOKUP_FAILED_SCOPE = { ...NO_RECORD_SCOPE, denyAll: true, lookupFailed: true };
+function invalidateUserPermissionCache(userId) {
+  if (userId === void 0 || userId === null) {
+    scopeCache.clear();
+    return;
+  }
+  const suffix = `:${userId}`;
+  for (const key of scopeCache.keys()) {
+    if (key.endsWith(suffix)) scopeCache.delete(key);
+  }
+}
+function valueOf(row, name) {
+  if (!row) return void 0;
+  const candidate = row;
+  if (typeof candidate.get === "function") return candidate.get(name);
+  return row[name];
+}
+function toStringArray(value) {
+  if (!Array.isArray(value)) return [];
+  return value.filter((item) => typeof item === "string" && item.length > 0);
+}
+function buildAccessScope(row) {
+  if (!row) return NO_RECORD_SCOPE;
+  if (valueOf(row, "enabled") === false) {
+    return { ...NO_RECORD_SCOPE, hasUserRecord: true, denyAll: true, allowedServices: [] };
+  }
+  return {
+    hasUserRecord: true,
+    denyAll: false,
+    allowedServices: toStringArray(valueOf(row, "allowedLlmServices")),
+    allowAllModels: valueOf(row, "allowAllModels") !== false,
+    allowedModels: new Set(toStringArray(valueOf(row, "allowedModels"))),
+    lookupFailed: false
+  };
+}
+async function resolveUserAccessScope(ctx) {
+  var _a, _b, _c, _d;
+  const userId = (_a = ctx.state.currentUser) == null ? void 0 : _a.id;
+  if (userId === void 0 || userId === null) return NO_RECORD_SCOPE;
+  const key = `${((_b = ctx.app) == null ? void 0 : _b.name) ?? "main"}:${userId}`;
+  const cached = scopeCache.get(key);
+  if (cached && cached.expiresAt > Date.now()) return cached.scope;
+  let scope;
+  try {
+    const row = await ctx.db.getRepository("aiApiUserPermissions").findOne({ filter: { userId } });
+    scope = buildAccessScope(row);
+  } catch (err) {
+    (_d = (_c = ctx.log) == null ? void 0 : _c.error) == null ? void 0 : _d.call(_c, "AI API user permissions lookup failed, denying access:", err);
+    return LOOKUP_FAILED_SCOPE;
+  }
+  scopeCache.set(key, { scope, expiresAt: Date.now() + SCOPE_TTL_MS });
+  return scope;
+}
+function matchesService(list, serviceName, serviceTitle) {
+  return list.some((entry) => entry === serviceName || entry === serviceTitle);
+}
+function isServiceAllowed(scope, globalEnabledServices, service) {
+  if (scope.denyAll) return false;
+  const globalList = toStringArray(globalEnabledServices);
+  if (globalList.length && !matchesService(globalList, service.name, service.title)) return false;
+  if (!scope.hasUserRecord) return true;
+  return matchesService(scope.allowedServices ?? [], service.name, service.title);
+}
+function isModelAllowed(scope, fullModelId) {
+  if (scope.denyAll) return false;
+  if (!scope.hasUserRecord) return true;
+  if (scope.allowAllModels) return true;
+  return scope.allowedModels.has(fullModelId);
+}
+async function enforceModelAccess(ctx, globalEnabledServices, service, modelId) {
+  const scope = await resolveUserAccessScope(ctx);
+  const serviceLabel = service.title || service.name;
+  if (scope.lookupFailed) {
+    ctx.status = 503;
+    ctx.body = (0, import_openai_format.toOpenAIError)(
+      503,
+      "Unable to verify LLM permissions for this user. Please retry shortly.",
+      "service_unavailable",
+      "permission_check_failed"
+    );
+    return false;
+  }
+  if (!isServiceAllowed(scope, globalEnabledServices, service)) {
+    ctx.status = 403;
+    ctx.body = (0, import_openai_format.toOpenAIError)(
+      403,
+      `LLM service '${serviceLabel}' is not enabled for API access`,
+      "permission_denied",
+      "model_not_available"
+    );
+    return false;
+  }
+  if (!isModelAllowed(scope, `${service.name}/${modelId}`)) {
+    ctx.status = 403;
+    ctx.body = (0, import_openai_format.toOpenAIError)(
+      403,
+      `Model '${service.name}/${modelId}' is not permitted for this user. Use GET /v1/models to see available models.`,
+      "permission_denied",
+      "model_not_available"
+    );
+    return false;
+  }
+  return true;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildAccessScope,
+  enforceModelAccess,
+  invalidateUserPermissionCache,
+  isModelAllowed,
+  isServiceAllowed,
+  resolveUserAccessScope
+});

package/dist/server/validation.js

@@ -36,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var validation_exports = {};
 __export(validation_exports, {
+  validateModelMetadata: () => validateModelMetadata,
   validateModelPrice: () => validateModelPrice,
   validateQuotaPolicy: () => validateQuotaPolicy
 });
@@ -77,6 +78,22 @@ async function validateModelPrice(db, model) {
   });
   if (overlap) throw new Error("An enabled price already overlaps this effective period.");
 }
+function requirePositiveIntegerOrNull(value, field) {
+  if (value === null || value === void 0 || value === "") return;
+  const parsed = Number(value);
+  if (!Number.isSafeInteger(parsed) || parsed <= 0) throw new Error(`${field} must be a positive integer.`);
+}
+function validateModelMetadata(model) {
+  if (!String(model.get("llmService") ?? "").trim()) throw new Error("llmService is required.");
+  if (!String(model.get("model") ?? "").trim()) throw new Error("model is required.");
+  requirePositiveIntegerOrNull(model.get("contextWindow"), "contextWindow");
+  requirePositiveIntegerOrNull(model.get("maxCompletionTokens"), "maxCompletionTokens");
+  const contextWindow = model.get("contextWindow");
+  const maxCompletionTokens = model.get("maxCompletionTokens");
+  if (contextWindow !== null && contextWindow !== void 0 && contextWindow !== "" && maxCompletionTokens !== null && maxCompletionTokens !== void 0 && maxCompletionTokens !== "" && Number(maxCompletionTokens) > Number(contextWindow)) {
+    throw new Error("maxCompletionTokens cannot exceed contextWindow.");
+  }
+}
 function validateQuotaPolicy(model) {
   if (!["daily", "monthly"].includes(String(model.get("periodType")))) {
     throw new Error("periodType must be daily or monthly.");
@@ -97,6 +114,7 @@ function validateQuotaPolicy(model) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  validateModelMetadata,
   validateModelPrice,
   validateQuotaPolicy
 });

package/dist/swagger.js

@@ -78,7 +78,7 @@ var swagger_default = {
       get: {
         tags: ["ai-llm"],
         summary: "List available models",
-        description: "Returns all LLM models available across registered services. Model IDs are formatted as `serviceName/modelId`.",
+        description: "Returns the LLM models available to the authenticated caller across registered services. Model IDs are formatted as `serviceName/modelId`.\n\nThe catalog is user-scoped: it starts from `enabledLlmServices` in the AI API configuration, then narrows to the caller's `aiApiUserPermissions` record when one exists. A user grant can only narrow the global whitelist, never widen it, so two users may receive different lists from the same request.",
         security: [{ BearerAuth: [] }],
         responses: {
           200: {
@@ -105,6 +105,7 @@ var swagger_default = {
       get: {
         tags: ["ai-llm"],
         summary: "Get model details",
+        description: "User-scoped in the same way as `GET /v1/models`: a model the caller is not granted is reported as not found rather than disclosed.",
         security: [{ BearerAuth: [] }],
         parameters: [
           {
@@ -124,7 +125,7 @@ var swagger_default = {
               }
             }
           },
-          404: { description: "Model not found" }
+          404: { description: "Model not found, or not available to this user" }
         }
       }
     },
@@ -272,11 +273,18 @@ var swagger_default = {
           enabledLlmServices: {
             type: "array",
             items: { type: "string" },
-            description: "List of enabled LLM service names"
+            description: "List of enabled LLM service names. This is the outer bound for every caller; per-user `aiApiUserPermissions` records can only narrow it further."
           },
           rateLimitPerMinute: {
             type: "integer",
             description: "Max requests per minute per user (0 = unlimited)"
+          },
+          maxRequestBodyMb: {
+            type: "integer",
+            minimum: 1,
+            maximum: 100,
+            default: 10,
+            description: "Max request body size in megabytes. Requests above this return 413. The gateway buffers each body in memory, so values above 100 are rejected."
           }
         }
       },
@@ -289,11 +297,35 @@ var swagger_default = {
           owned_by: { type: "string" }
         }
       },
+      ContentBlock: {
+        type: "object",
+        description: "A multimodal content block. Only text and image_url blocks are forwarded to the provider; any other type is rejected with 400 unsupported_content_block.",
+        properties: {
+          type: { type: "string", enum: ["text", "image_url"] },
+          text: { type: "string" },
+          image_url: {
+            type: "object",
+            properties: {
+              url: {
+                type: "string",
+                description: "An https URL or a base64 data URL, e.g. data:image/png;base64,iVBORw0KGgo...",
+                example: "data:image/png;base64,iVBORw0KGgo..."
+              },
+              detail: { type: "string", enum: ["auto", "low", "high"] }
+            },
+            required: ["url"]
+          }
+        },
+        required: ["type"]
+      },
       ChatMessage: {
         type: "object",
         properties: {
           role: { type: "string", enum: ["system", "user", "assistant", "tool"] },
-          content: { type: "string" },
+          content: {
+            description: 'Plain text, or an array of content blocks for multimodal requests. Inline base64 images inflate the payload by about 33%; see "Max request body size" in the gateway settings.',
+            oneOf: [{ type: "string" }, { type: "array", items: { $ref: "#/components/schemas/ContentBlock" } }]
+          },
           name: { type: "string" },
           tool_call_id: { type: "string" },
           tool_calls: { type: "array", items: { $ref: "#/components/schemas/ToolCall" } }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plugin-ai-api",
-  "version": "1.0.20",
+  "version": "1.0.23",
   "main": "dist/server/index.js",
   "dependencies": {},
   "peerDependencies": {
@@ -30,4 +30,4 @@
     "server.d.ts"
   ],
   "license": "Apache-2.0"
-}
+}

package/src/client/__tests__/settings-registration.test.tsx

@@ -0,0 +1,69 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { Application } from '@nocobase/client';
+import { describe, expect, it } from 'vitest';
+import { AI_API_ACL_SNIPPET, AI_API_USER_PERMISSIONS_SNIPPET } from '../../constants';
+import { PluginAiApiClient } from '../plugin';
+
+describe('AI API v1 settings registration', () => {
+  async function loadPlugin() {
+    const app = new Application({});
+    await new PluginAiApiClient({}, app).load();
+    return app;
+  }
+
+  it('registers the same ordered settings tabs and ACL boundaries as v2', async () => {
+    const app = await loadPlugin();
+    app.pluginSettingsManager.setAclSnippets([]);
+
+    const menu = app.pluginSettingsManager.get('ai-api');
+
+    expect(menu?.children?.map((item) => item.name)).toEqual([
+      'ai-api.config',
+      'ai-api.model-pricing',
+      'ai-api.model-metadata',
+      'ai-api.user-permissions',
+      'ai-api.user-quotas',
+      'ai-api.usage',
+    ]);
+    expect(app.pluginSettingsManager.getAclSnippet('ai-api.user-permissions')).toBe(AI_API_USER_PERMISSIONS_SNIPPET);
+    expect(app.pluginSettingsManager.getRoutePath('ai-api.user-permissions')).toBe(
+      '/admin/settings/ai-api/user-permissions',
+    );
+    expect(app.pluginSettingsManager.getList().map((item) => item.name)).not.toContain('ai-api-user-permissions');
+  });
+
+  it('requires access to the legacy parent before exposing the user permissions tab', async () => {
+    const app = await loadPlugin();
+    app.pluginSettingsManager.setAclSnippets([`!${AI_API_ACL_SNIPPET}`]);
+
+    expect(app.pluginSettingsManager.getList()).toEqual([]);
+  });
+
+  it('hides only the user permissions tab when its own snippet is denied', async () => {
+    const app = await loadPlugin();
+    app.pluginSettingsManager.setAclSnippets([`!${AI_API_USER_PERMISSIONS_SNIPPET}`]);
+
+    expect(app.pluginSettingsManager.get('ai-api')?.children?.map((item) => item.name)).toEqual([
+      'ai-api.config',
+      'ai-api.model-pricing',
+      'ai-api.model-metadata',
+      'ai-api.user-quotas',
+      'ai-api.usage',
+    ]);
+  });
+
+  it('hides both settings surfaces when both snippets are denied', async () => {
+    const app = await loadPlugin();
+    app.pluginSettingsManager.setAclSnippets([`!${AI_API_ACL_SNIPPET}`, `!${AI_API_USER_PERMISSIONS_SNIPPET}`]);
+
+    expect(app.pluginSettingsManager.getList()).toEqual([]);
+  });
+});

package/src/client/components/AiApiRolePermissions.tsx

@@ -1,169 +1,11 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-import React, { useEffect, useState } from 'react';
-import { useApp } from '@nocobase/client-v2';
-import { Card, Switch, Select, Space, Typography, Spin, Divider } from 'antd';
-
-const { Text } = Typography;
-
-interface AiEmployee {
-  username: string;
-  nickname: string;
-}
-
-interface RolePermRecord {
-  id?: number;
-  roleName: string;
-  enabled: boolean;
-  allowAllEmployees: boolean;
-  allowedEmployees: string[];
-}
-
-/**
- * Permission tab shown in Settings → Users & Permissions → [Role] → "AI API" tab.
- * Lets admins control whether a role can use the AI API and which AI Employees it may access.
- */
-export function AiApiRolePermissions({ role }: { role: any }) {
-  const api = useApp().apiClient;
-  const [loading, setLoading] = useState(true);
-  const [saving, setSaving] = useState(false);
-  const [employees, setEmployees] = useState<AiEmployee[]>([]);
-  const [record, setRecord] = useState<RolePermRecord | null>(null);
-
-  const roleName = role?.name;
-
-  useEffect(() => {
-    if (!roleName) return;
-    loadData();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [roleName]);
-
-  const loadData = async () => {
-    setLoading(true);
-    try {
-      const [permRes, empRes] = await Promise.all([
-        api.request({
-          url: 'aiApiRolePermissions',
-          params: { filter: { roleName }, paginate: false },
-        }),
-        api.request({ url: 'aiEmployees:list', params: { paginate: false } }),
-      ]);
-
-      const existing = permRes?.data?.data?.[0];
-      setRecord(
-        existing
-          ? {
-              id: existing.id,
-              roleName: existing.roleName,
-              enabled: !!existing.enabled,
-              allowAllEmployees: existing.allowAllEmployees !== false,
-              allowedEmployees: existing.allowedEmployees || [],
-            }
-          : {
-              roleName,
-              enabled: false,
-              allowAllEmployees: true,
-              allowedEmployees: [],
-            },
-      );
-
-      setEmployees(
-        (empRes?.data?.data || []).map((e: any) => ({
-          username: e.username,
-          nickname: e.nickname || e.username,
-        })),
-      );
-    } catch (err) {
-      console.error('Failed to load AI API role permissions:', err);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const save = async (patch: Partial<RolePermRecord>) => {
-    if (!record) return;
-    const next = { ...record, ...patch };
-    setRecord(next);
-    setSaving(true);
-    try {
-      if (next.id) {
-        await api.request({
-          url: `aiApiRolePermissions/${next.id}`,
-          method: 'PUT',
-          data: next,
-        });
-      } else {
-        const res = await api.request({
-          url: 'aiApiRolePermissions',
-          method: 'POST',
-          data: next,
-        });
-        const created = res?.data?.data;
-        if (created?.id) {
-          setRecord({ ...next, id: created.id });
-        }
-      }
-    } catch (err) {
-      console.error('Failed to save AI API role permissions:', err);
-      // Revert on error
-      setRecord(record);
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  if (loading) return <Spin />;
-
-  return (
-    <Card bordered={false}>
-      <Space direction="vertical" style={{ width: '100%' }} size="middle">
-        <Space>
-          <Switch checked={!!record?.enabled} loading={saving} onChange={(checked) => save({ enabled: checked })} />
-          <Text strong>Allow this role to use the AI API</Text>
-        </Space>
-
-        {record?.enabled && (
-          <>
-            <Divider style={{ margin: '8px 0' }} />
-            <Space>
-              <Switch
-                checked={!!record?.allowAllEmployees}
-                loading={saving}
-                onChange={(checked) => save({ allowAllEmployees: checked })}
-              />
-              <Text>Allow all AI Employees</Text>
-            </Space>
-
-            {!record?.allowAllEmployees && (
-              <div>
-                <Text type="secondary" style={{ display: 'block', marginBottom: 8 }}>
-                  Select which AI Employees this role may use:
-                </Text>
-                <Select
-                  mode="multiple"
-                  allowClear
-                  style={{ width: '100%', maxWidth: 480 }}
-                  placeholder="Select allowed AI Employees"
-                  value={record?.allowedEmployees || []}
-                  options={employees.map((e) => ({
-                    label: `${e.nickname} (${e.username})`,
-                    value: e.username,
-                  }))}
-                  onChange={(vals) => save({ allowedEmployees: vals })}
-                  disabled={saving}
-                />
-              </div>
-            )}
-          </>
-        )}
-      </Space>
-    </Card>
-  );
-}
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// Implementation lives in client-v2; imports may only flow v1 -> v2, never back.
+export { AiApiRolePermissions } from '../../client-v2/components/AiApiRolePermissions';

package/src/client/locale.ts

@@ -1,21 +1,11 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-
-import { tExpr as _tExpr, useFlowEngine } from '@nocobase/flow-engine';
-// @ts-ignore
-import pkg from './../../package.json';
-
-export function useT() {
-  const engine = useFlowEngine();
-  return (str: string) => engine.context.t(str, { ns: [pkg.name, 'client'] });
-}
-
-export function tExpr(key: string) {
-  return _tExpr(key, { ns: [pkg.name, 'client'] });
-}
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+// Implementation lives in client-v2; imports may only flow v1 -> v2, never back.
+export { tExpr, useT } from '../client-v2/locale';