plugin-agent-orchestrator 1.0.13 → 1.0.14

package/dist/server/collections/skill-executions.js

@@ -0,0 +1,123 @@
+/**
+ * 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 skill_executions_exports = {};
+__export(skill_executions_exports, {
+  default: () => skill_executions_default
+});
+module.exports = __toCommonJS(skill_executions_exports);
+var skill_executions_default = {
+  name: "skillExecutions",
+  title: "Skill Executions",
+  fields: [
+    {
+      name: "id",
+      type: "bigInt",
+      autoIncrement: true,
+      primaryKey: true
+    },
+    {
+      name: "skill",
+      type: "belongsTo",
+      target: "skillDefinitions",
+      foreignKey: "skillId"
+    },
+    {
+      // 'pending' | 'running' | 'succeeded' | 'failed' | 'canceled' | 'timeout'
+      name: "status",
+      type: "string",
+      length: 20,
+      defaultValue: "pending"
+    },
+    {
+      name: "inputArgs",
+      type: "text"
+    },
+    {
+      // Final code after template rendering
+      name: "executedCode",
+      type: "text"
+    },
+    {
+      name: "stdout",
+      type: "text"
+    },
+    {
+      name: "stderr",
+      type: "text"
+    },
+    {
+      // [{ name, size, mimeType }]
+      name: "outputFiles",
+      type: "text",
+      defaultValue: null
+    },
+    {
+      name: "durationMs",
+      type: "integer"
+    },
+    {
+      name: "sessionId",
+      type: "string",
+      length: 100,
+      allowNull: true
+    },
+    {
+      name: "orchestratorRootRunId",
+      type: "string",
+      length: 100,
+      allowNull: true
+    },
+    {
+      name: "orchestratorSpanId",
+      type: "string",
+      length: 100,
+      allowNull: true
+    },
+    {
+      name: "orchestratorParentSpanId",
+      type: "string",
+      length: 100,
+      allowNull: true
+    },
+    {
+      name: "orchestratorToolCallId",
+      type: "string",
+      length: 100,
+      allowNull: true
+    },
+    {
+      name: "triggeredBy",
+      type: "belongsTo",
+      target: "users",
+      foreignKey: "triggeredById"
+    },
+    {
+      name: "createdAt",
+      type: "date"
+    }
+  ]
+};

package/dist/server/collections/skill-worker-configs.d.ts

@@ -0,0 +1,3 @@
+import { CollectionOptions } from '@nocobase/database';
+declare const _default: CollectionOptions;
+export default _default;

package/dist/server/collections/skill-worker-configs.js

@@ -0,0 +1,115 @@
+/**
+ * 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 skill_worker_configs_exports = {};
+__export(skill_worker_configs_exports, {
+  default: () => skill_worker_configs_default
+});
+module.exports = __toCommonJS(skill_worker_configs_exports);
+var skill_worker_configs_default = {
+  name: "skillWorkerConfigs",
+  title: "Skill Worker Configs",
+  fields: [
+    {
+      name: "id",
+      type: "bigInt",
+      autoIncrement: true,
+      primaryKey: true
+    },
+    {
+      name: "retentionHours",
+      type: "integer",
+      defaultValue: 24
+    },
+    {
+      name: "packageWhitelist",
+      type: "text",
+      defaultValue: null
+    },
+    {
+      name: "customPackages",
+      type: "text",
+      defaultValue: null
+    },
+    {
+      name: "npmRegistryUrl",
+      type: "string",
+      length: 500
+    },
+    {
+      name: "npmAuthToken",
+      type: "string",
+      length: 1e3
+    },
+    {
+      name: "pypiIndexUrl",
+      type: "string",
+      length: 500
+    },
+    {
+      name: "pypiTrustedHost",
+      type: "string",
+      length: 255
+    },
+    {
+      name: "aptMirrorUrl",
+      type: "string",
+      length: 500
+    },
+    {
+      name: "aptGpgKeyUrl",
+      type: "string",
+      length: 500
+    },
+    {
+      name: "initStatus",
+      type: "string",
+      length: 20,
+      defaultValue: "idle"
+    },
+    {
+      name: "lastInitLog",
+      type: "text"
+    },
+    {
+      name: "initProgressPercent",
+      type: "integer",
+      defaultValue: 0
+    },
+    {
+      name: "initProgressLog",
+      type: "text"
+    },
+    {
+      name: "createdAt",
+      type: "date"
+    },
+    {
+      name: "updatedAt",
+      type: "date"
+    }
+  ]
+};

package/dist/server/migrations/20260423000000-add-progress-fields.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class AddProgressFieldsMigration extends Migration {
+    up(): Promise<void>;
+}

package/dist/server/migrations/20260423000000-add-progress-fields.js

@@ -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.
+ */
+
+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 add_progress_fields_exports = {};
+__export(add_progress_fields_exports, {
+  default: () => AddProgressFieldsMigration
+});
+module.exports = __toCommonJS(add_progress_fields_exports);
+var import_server = require("@nocobase/server");
+class AddProgressFieldsMigration extends import_server.Migration {
+  async up() {
+    const queryInterface = this.db.sequelize.getQueryInterface();
+    const tablePrefix = this.db.options.tablePrefix || "";
+    const tableName = `${tablePrefix}skillWorkerConfigs`;
+    try {
+      const tableExists = await queryInterface.tableExists(tableName);
+      if (!tableExists) return;
+      const tableDesc = await queryInterface.describeTable(tableName);
+      const fieldRepo = this.db.getRepository("fields");
+      const collectionName = "skillWorkerConfigs";
+      const fieldsToSync = [
+        { name: "initProgressPercent", type: "integer", defaultValue: 0 },
+        { name: "initProgressLog", type: "text" }
+      ];
+      for (const f of fieldsToSync) {
+        const fieldMeta = await fieldRepo.findOne({
+          filter: { name: f.name, collectionName }
+        });
+        if (!fieldMeta && tableDesc[f.name]) {
+          await fieldRepo.create({
+            values: {
+              name: f.name,
+              type: f.type,
+              collectionName,
+              // Avoid trying to physically add it because it already exists
+              interface: f.type
+            }
+          });
+          this.app.logger.info(`[skill-hub] Restored NocoBase metadata for preexisting column ${f.name}`);
+        }
+      }
+    } catch (error) {
+      this.app.logger.error(`[skill-hub] Failed to check progress fields: ${error.message}`);
+    }
+  }
+}

package/dist/server/migrations/20260425000000-add-interaction-schema.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class AddInteractionSchemaMigration extends Migration {
+    up(): Promise<void>;
+}

package/dist/server/migrations/20260425000000-add-interaction-schema.js

@@ -0,0 +1,61 @@
+/**
+ * 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 add_interaction_schema_exports = {};
+__export(add_interaction_schema_exports, {
+  default: () => AddInteractionSchemaMigration
+});
+module.exports = __toCommonJS(add_interaction_schema_exports);
+var import_server = require("@nocobase/server");
+class AddInteractionSchemaMigration extends import_server.Migration {
+  async up() {
+    const queryInterface = this.db.sequelize.getQueryInterface();
+    const tableName = `${this.db.options.tablePrefix || ""}skillDefinitions`;
+    try {
+      const tableExists = await queryInterface.tableExists(tableName);
+      if (!tableExists) return;
+      const tableDesc = await queryInterface.describeTable(tableName);
+      const fieldRepo = this.db.getRepository("fields");
+      const collectionName = "skillDefinitions";
+      const fieldMeta = await fieldRepo.findOne({
+        filter: { name: "interactionSchema", collectionName }
+      });
+      if (!fieldMeta && tableDesc.interactionSchema) {
+        await fieldRepo.create({
+          values: {
+            name: "interactionSchema",
+            type: "text",
+            collectionName,
+            interface: "textarea"
+          }
+        });
+        this.app.logger.info("[skill-hub] Restored NocoBase metadata for preexisting column interactionSchema");
+      }
+    } catch (error) {
+      this.app.logger.error(`[skill-hub] Failed to check interactionSchema field: ${error.message}`);
+    }
+  }
+}

package/dist/server/migrations/20260427000000-change-packages-to-text.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class ChangePackagesToTextMigration extends Migration {
+    up(): Promise<void>;
+}

package/dist/server/migrations/20260427000000-change-packages-to-text.js

@@ -0,0 +1,70 @@
+/**
+ * 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 change_packages_to_text_exports = {};
+__export(change_packages_to_text_exports, {
+  default: () => ChangePackagesToTextMigration
+});
+module.exports = __toCommonJS(change_packages_to_text_exports);
+var import_server = require("@nocobase/server");
+class ChangePackagesToTextMigration extends import_server.Migration {
+  async up() {
+    const queryInterface = this.db.sequelize.getQueryInterface();
+    const tableName = `${this.db.options.tablePrefix || ""}skillDefinitions`;
+    try {
+      const tableExists = await queryInterface.tableExists(tableName);
+      if (!tableExists) return;
+      const tableDesc = await queryInterface.describeTable(tableName);
+      const columnsToChange = ["packages", "inputSchema", "interactionSchema"];
+      const fieldRepo = this.db.getRepository("fields");
+      const collectionName = "skillDefinitions";
+      for (const col of columnsToChange) {
+        if (tableDesc[col]) {
+          const dialect = this.db.sequelize.getDialect();
+          if (dialect === "postgres") {
+            await this.db.sequelize.query(`ALTER TABLE "${tableName}" ALTER COLUMN "${col}" TYPE text USING "${col}"::text;`);
+          } else {
+            await queryInterface.changeColumn(tableName, col, {
+              type: "TEXT"
+            });
+          }
+          const fieldMeta = await fieldRepo.findOne({
+            filter: { name: col, collectionName }
+          });
+          if (fieldMeta) {
+            await fieldRepo.update({
+              filterByTk: fieldMeta.get("id"),
+              values: { type: "text" }
+            });
+          }
+          this.app.logger.info(`[skill-hub] Changed ${col} column type to text to support markdown`);
+        }
+      }
+    } catch (error) {
+      this.app.logger.error(`[skill-hub] Failed to change packages field type: ${error.message}`);
+    }
+  }
+}

package/dist/server/migrations/20260427000001-change-other-json-to-text.d.ts

@@ -0,0 +1,4 @@
+import { Migration } from '@nocobase/server';
+export default class ChangeOtherJsonToTextMigration extends Migration {
+    up(): Promise<void>;
+}

package/dist/server/migrations/20260427000001-change-other-json-to-text.js

@@ -0,0 +1,80 @@
+/**
+ * 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 change_other_json_to_text_exports = {};
+__export(change_other_json_to_text_exports, {
+  default: () => ChangeOtherJsonToTextMigration
+});
+module.exports = __toCommonJS(change_other_json_to_text_exports);
+var import_server = require("@nocobase/server");
+class ChangeOtherJsonToTextMigration extends import_server.Migration {
+  async up() {
+    const queryInterface = this.db.sequelize.getQueryInterface();
+    const dialect = this.db.sequelize.getDialect();
+    const fieldRepo = this.db.getRepository("fields");
+    const tablePrefix = this.db.options.tablePrefix || "";
+    const workerTableName = `${tablePrefix}skillWorkerConfigs`;
+    try {
+      if (await queryInterface.tableExists(workerTableName)) {
+        const tableDesc = await queryInterface.describeTable(workerTableName);
+        const columns = ["packageWhitelist", "customPackages"];
+        for (const col of columns) {
+          if (tableDesc[col]) {
+            if (dialect === "postgres") {
+              await this.db.sequelize.query(`ALTER TABLE "${workerTableName}" ALTER COLUMN "${col}" TYPE text USING "${col}"::text;`);
+            } else {
+              await queryInterface.changeColumn(workerTableName, col, { type: "TEXT" });
+            }
+            const fieldMeta = await fieldRepo.findOne({ filter: { name: col, collectionName: "skillWorkerConfigs" } });
+            if (fieldMeta) await fieldRepo.update({ filterByTk: fieldMeta.get("id"), values: { type: "text" } });
+            this.app.logger.info(`[skill-hub] Changed ${col} in skillWorkerConfigs to text`);
+          }
+        }
+      }
+    } catch (e) {
+      this.app.logger.warn(`[skill-hub] Failed to migrate skillWorkerConfigs: ${e.message}`);
+    }
+    const execTableName = `${tablePrefix}skillExecutions`;
+    try {
+      if (await queryInterface.tableExists(execTableName)) {
+        const tableDesc = await queryInterface.describeTable(execTableName);
+        const col = "outputFiles";
+        if (tableDesc[col]) {
+          if (dialect === "postgres") {
+            await this.db.sequelize.query(`ALTER TABLE "${execTableName}" ALTER COLUMN "${col}" TYPE text USING "${col}"::text;`);
+          } else {
+            await queryInterface.changeColumn(execTableName, col, { type: "TEXT" });
+          }
+          const fieldMeta = await fieldRepo.findOne({ filter: { name: col, collectionName: "skillExecutions" } });
+          if (fieldMeta) await fieldRepo.update({ filterByTk: fieldMeta.get("id"), values: { type: "text" } });
+          this.app.logger.info(`[skill-hub] Changed ${col} in skillExecutions to text`);
+        }
+      }
+    } catch (e) {
+      this.app.logger.warn(`[skill-hub] Failed to migrate skillExecutions: ${e.message}`);
+    }
+  }
+}

package/dist/server/migrations/20260429000000-add-llm-fields.js

@@ -54,6 +54,14 @@ class AddLlmFieldsToOrchestratorConfig extends import_server.Migration {
       });
       console.log(`[AgentOrchestrator] Added model column to ${tableName}`);
     }
+    if (!tableDesc["recursionLimit"]) {
+      await queryInterface.addColumn(tableName, "recursionLimit", {
+        type: "INTEGER",
+        allowNull: true,
+        defaultValue: 50
+      });
+      console.log(`[AgentOrchestrator] Added recursionLimit column to ${tableName}`);
+    }
   }
   async down() {
   }

package/dist/server/migrations/20260429000000-fix-inputargs-json-to-text.d.ts

@@ -0,0 +1,16 @@
+import { Migration } from '@nocobase/server';
+/**
+ * Fix: inputArgs column in skillExecutions was json type but should be text.
+ *
+ * Root cause: The column was created as `json` from an older schema version,
+ * but the collection defines it as `text`. The `stringifyJsonText()` utility
+ * wraps values in markdown code fences (```json\n...\n```) which PostgreSQL
+ * rejects as invalid JSON syntax, causing SequelizeDatabaseError on every
+ * skill execution attempt.
+ */
+export default class FixInputArgsJsonToText extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

package/dist/server/migrations/20260429000000-fix-inputargs-json-to-text.js

@@ -0,0 +1,51 @@
+/**
+ * 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 fix_inputargs_json_to_text_exports = {};
+__export(fix_inputargs_json_to_text_exports, {
+  default: () => FixInputArgsJsonToText
+});
+module.exports = __toCommonJS(fix_inputargs_json_to_text_exports);
+var import_server = require("@nocobase/server");
+class FixInputArgsJsonToText extends import_server.Migration {
+  on = "afterLoad";
+  appVersion = ">=0.1.0";
+  async up() {
+    const queryInterface = this.db.sequelize.getQueryInterface();
+    const tableDesc = await queryInterface.describeTable("skillExecutions").catch(() => null);
+    if (!tableDesc) return;
+    const col = tableDesc["inputArgs"];
+    if (!col) return;
+    if (col.type && col.type.toLowerCase().includes("json")) {
+      await this.db.sequelize.query(
+        `ALTER TABLE "skillExecutions" ALTER COLUMN "inputArgs" TYPE text USING "inputArgs"::text`
+      );
+      console.log("[skill-hub] Migration: converted skillExecutions.inputArgs from json to text");
+    }
+  }
+  async down() {
+  }
+}

package/dist/server/migrations/20260503000000-add-orchestrator-trace-fields.d.ts

@@ -0,0 +1,7 @@
+import { Migration } from '@nocobase/server';
+export default class AddOrchestratorTraceFieldsToSkillExecutions extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+    down(): Promise<void>;
+}