@adminforth/agent 1.22.2 → 1.24.0

package/dist/apiBasedTools.js

@@ -17,6 +17,32 @@ import YAML from 'yaml';
 dayjs.extend(utc);
 dayjs.extend(timezone);
 const DEFAULT_USER_TIME_ZONE = 'UTC';
+function getInputString(inputs, key) {
+    const value = inputs === null || inputs === void 0 ? void 0 : inputs[key];
+    return typeof value === 'string' && value ? value : undefined;
+}
+function getInputArrayLength(inputs, key) {
+    const value = inputs === null || inputs === void 0 ? void 0 : inputs[key];
+    return Array.isArray(value) ? value.length : undefined;
+}
+function resourceLabel(adminforth, inputs) {
+    var _a, _b;
+    const resourceId = getInputString(inputs, 'resourceId');
+    const resource = adminforth.config.resources.find((res) => res.resourceId === resourceId);
+    return (_b = (_a = resource === null || resource === void 0 ? void 0 : resource.label) !== null && _a !== void 0 ? _a : resourceId) !== null && _b !== void 0 ? _b : 'resource';
+}
+function getDataPrefix(inputs) {
+    const offset = typeof (inputs === null || inputs === void 0 ? void 0 : inputs.offset) === 'number' ? inputs.offset : undefined;
+    const limit = typeof (inputs === null || inputs === void 0 ? void 0 : inputs.limit) === 'number' ? inputs.limit : undefined;
+    if (offset !== undefined && limit !== undefined) {
+        return `${offset}-${offset + limit} `;
+    }
+    return limit === undefined ? '' : `${limit} `;
+}
+function actionText(inputs) {
+    const actionId = getInputString(inputs, 'actionId');
+    return actionId ? ` action ${actionId}` : ' action';
+}
 const TOOL_OVERRIDES = {
     get_resource: {
         wipe_frontend_specific_data: [
@@ -25,11 +51,10 @@ const TOOL_OVERRIDES = {
             'resource.options.actions[].customComponent',
             'resource.options.pageInjections',
         ],
-        format_tool: (_a) => __awaiter(void 0, [_a], void 0, function* ({}) {
-            return "get resource Apartments";
-        })
+        format_tool: ({ resourceLabel }) => `Get ${resourceLabel} resource`,
     },
     get_resource_data: {
+        format_tool: ({ inputs, resourceLabel }) => (`Get ${getDataPrefix(inputs)}${resourceLabel}`),
         post_process_response: (_a) => __awaiter(void 0, [_a], void 0, function* ({ output, inputs, invokeTool, userTimeZone }) {
             if (hasToolError(output)) {
                 return output;
@@ -47,9 +72,35 @@ const TOOL_OVERRIDES = {
             formatDateTimeColumns(response.data, dateTimeColumnNames, localizedTimeZone);
             return response;
         }),
-        format_tool: (_a) => __awaiter(void 0, [_a], void 0, function* ({}) {
-            return "get 1-20 Apartment filtered listed=yes";
-        })
+    },
+    aggregate: {
+        format_tool: ({ resourceLabel }) => `Aggregate ${resourceLabel}`,
+    },
+    start_custom_action: {
+        format_tool: ({ inputs, resourceLabel }) => `Run ${resourceLabel}${actionText(inputs)}`,
+    },
+    start_custom_bulk_action: {
+        format_tool: ({ inputs, resourceLabel }) => {
+            const recordCount = getInputArrayLength(inputs, 'recordIds');
+            const recordsText = recordCount === undefined ? '' : ` for ${recordCount} records`;
+            return `Run ${resourceLabel}${actionText(inputs)}${recordsText}`;
+        },
+    },
+    start_bulk_action: {
+        format_tool: ({ inputs, resourceLabel }) => {
+            const recordCount = getInputArrayLength(inputs, 'recordIds');
+            const recordsText = recordCount === undefined ? '' : ` for ${recordCount} records`;
+            return `Run ${resourceLabel}${actionText(inputs)}${recordsText}`;
+        },
+    },
+    create_record: {
+        format_tool: ({ resourceLabel }) => `Create ${resourceLabel}`,
+    },
+    update_record: {
+        format_tool: ({ resourceLabel }) => `Update ${resourceLabel}`,
+    },
+    delete_record: {
+        format_tool: ({ resourceLabel }) => `Delete ${resourceLabel}`,
     },
 };
 function sanitizeForYaml(value) {
@@ -212,6 +263,7 @@ function applyToolOverride(params) {
                     adminUser,
                     inputs: nestedInputs,
                     httpExtra: nestedHttpExtra,
+                    userTimeZone: nestedUserTimeZone,
                 });
                 return applyToolOverride({
                     adminforth,
@@ -234,6 +286,22 @@ function endpointPathToToolName(path) {
         .replace(/[^a-zA-Z0-9_]+/g, '_')
         .replace(/^_+|_+$/g, '');
 }
+export function formatApiBasedToolCall(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const formatTool = (_a = TOOL_OVERRIDES[params.toolName]) === null || _a === void 0 ? void 0 : _a.format_tool;
+        return yield (formatTool === null || formatTool === void 0 ? void 0 : formatTool({
+            adminUser: params.adminUser,
+            httpExtra: params.httpExtra,
+            inputs: params.inputs,
+            resourceLabel: resourceLabel(params.adminforth, params.inputs),
+            userTimeZone: params.userTimeZone,
+            invokeTool: () => __awaiter(this, void 0, void 0, function* () {
+                throw new Error('Tool info formatting cannot invoke tools');
+            }),
+        }));
+    });
+}
 function normalizeCookies(cookies) {
     if (!cookies) {
         return [];
@@ -306,13 +374,61 @@ function createRawExpressResponse(response) {
     };
     return rawResponse;
 }
+function normalizeDateTimeInputsToUtc(body, adminforth, userTimeZone) {
+    if (!userTimeZone || typeof body.resourceId !== 'string') {
+        return body;
+    }
+    const resource = adminforth.config.resources.find((res) => res.resourceId === body.resourceId);
+    if (!resource) {
+        return body;
+    }
+    const columnsByName = new Map(resource.dataSourceColumns.map((column) => [column.name, column]));
+    const normalizeColumnValue = (value, columnType) => {
+        if (Array.isArray(value)) {
+            return value.map((item) => normalizeColumnValue(item, columnType));
+        }
+        if (typeof value !== 'string' || value === '') {
+            return value;
+        }
+        if (columnType === AdminForthDataTypes.DATETIME) {
+            return dayjs.tz(value, userTimeZone).utc().toISOString();
+        }
+        if (columnType === AdminForthDataTypes.TIME) {
+            const userDate = dayjs().tz(userTimeZone).format('YYYY-MM-DD');
+            return dayjs.tz(`${userDate}T${value}`, userTimeZone).utc().format('HH:mm:ss');
+        }
+    };
+    const normalizeValue = (value, key) => {
+        const column = key ? columnsByName.get(key) : undefined;
+        if ((column === null || column === void 0 ? void 0 : column.type) === AdminForthDataTypes.DATETIME || (column === null || column === void 0 ? void 0 : column.type) === AdminForthDataTypes.TIME) {
+            return normalizeColumnValue(value, column.type);
+        }
+        if (Array.isArray(value)) {
+            return value.map((item) => normalizeValue(item));
+        }
+        if (!value || typeof value !== 'object') {
+            return value;
+        }
+        const record = value;
+        const filterColumn = typeof record.field === 'string' ? columnsByName.get(record.field) : undefined;
+        if ('value' in record &&
+            ((filterColumn === null || filterColumn === void 0 ? void 0 : filterColumn.type) === AdminForthDataTypes.DATETIME || (filterColumn === null || filterColumn === void 0 ? void 0 : filterColumn.type) === AdminForthDataTypes.TIME)) {
+            return Object.assign(Object.assign({}, record), { value: normalizeColumnValue(record.value, filterColumn.type) });
+        }
+        return Object.fromEntries(Object.entries(record).map(([nestedKey, nestedValue]) => [
+            nestedKey,
+            normalizeValue(nestedValue, nestedKey),
+        ]));
+    };
+    return normalizeValue(body);
+}
 function callCapturedEndpoint(params) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const { adminforth, adminUser, endpoint, httpExtra, inputs } = params;
+        const { adminforth, adminUser, endpoint, httpExtra, inputs, userTimeZone } = params;
         const response = createToolResponse(httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.response);
-        const headers = Object.assign({ 'content-type': 'application/json' }, ((_a = httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.headers) !== null && _a !== void 0 ? _a : {}));
-        const body = ((_b = inputs !== null && inputs !== void 0 ? inputs : httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.body) !== null && _b !== void 0 ? _b : {});
+        const headers = Object.assign({ 'content-type': 'application/json', 'X-TimeZone': userTimeZone }, ((_a = httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.headers) !== null && _a !== void 0 ? _a : {}));
+        const body = normalizeDateTimeInputsToUtc(((_b = inputs !== null && inputs !== void 0 ? inputs : httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.body) !== null && _b !== void 0 ? _b : {}), adminforth, headers['X-TimeZone']);
         const query = (_c = httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.query) !== null && _c !== void 0 ? _c : {};
         const cookies = normalizeCookies(httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.cookies);
         const requestUrl = (_d = httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.requestUrl) !== null && _d !== void 0 ? _d : `${adminforth.config.baseUrl}/adminapi/v1${endpoint.path}`;
@@ -387,6 +503,7 @@ export function prepareApiBasedTools(adminforth) {
                     adminUser: adminUser !== null && adminUser !== void 0 ? adminUser : adminuser,
                     inputs,
                     httpExtra,
+                    userTimeZone,
                 });
                 const processedOutput = yield applyToolOverride({
                     adminforth,

package/dist/custom/package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
-  "author": "",
+  "author": "DevForth (https://devforth.io)",
   "license": "ISC",
   "packageManager": "pnpm@10.33.0",
   "dependencies": {

package/dist/custom/skills/mutate_data/SKILL.md

@@ -73,8 +73,7 @@ Are you sure?
 ## Updating
 
 You can use tool `update_record` tool it updates fields of record. To update `allowedActions.edit` should be set to true and 
-`updated` column `showIn.edit` should be true at the same time. If one of this condition is not met, explain to user that is 
-not allowed to edit
+`updated` column `showIn.edit` should be true at the same time. If one of this condition is not met, explain to user that is not allowed to edit
 
 In addition to instructions above show user the table of edits (old value/new value)
 
@@ -126,6 +125,10 @@ After creation of new record also show user a link to this record. If several re
 
 Omit any pictures or file paths, you are not capable of doing it. If they are not required all is good, if they are required, explain to user that you are not able to create record because of this reason.
 
+### Working with dates 
+
+When you create or update date or datetime fields, please use ISO format for this. For example, "2024-01-01" for date and "2024-01-01T12:00:00Z" for datetime. If user provides date in different format, try to parse it and convert to ISO format.
+
 ### Example
 
 

package/dist/index.js

@@ -18,7 +18,7 @@ import { AdminForthPlugin, logger, Filters, Sorts } from "adminforth";
 import { randomUUID } from 'crypto';
 import { HumanMessage, SystemMessage } from "langchain";
 import { MemorySaver } from "@langchain/langgraph";
-import { createAgentChatModel, callAgent } from "./agent/simpleAgent.js";
+import { createAgentChatModel, callAgent, } from "./agent/simpleAgent.js";
 import { AdminForthCheckpointSaver } from "./agent/checkpointer.js";
 import { createSequenceDebugCollector } from "./agent/middleware/sequenceDebug.js";
 import { prepareApiBasedTools as buildApiBasedTools, } from './apiBasedTools.js';
@@ -91,22 +91,34 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
         });
     }
     getModeModels(mode, maxTokens) {
-        const cachedModels = this.modelsByModeName.get(mode.name);
-        if (cachedModels) {
-            return cachedModels;
-        }
-        const models = {
-            model: createAgentChatModel({
-                adapter: mode.completionAdapter,
-                maxTokens,
-            }),
-            summaryModel: createAgentChatModel({
-                adapter: mode.completionAdapter,
-                maxTokens,
-            }),
-        };
-        this.modelsByModeName.set(mode.name, models);
-        return models;
+        return __awaiter(this, void 0, void 0, function* () {
+            const cachedModels = this.modelsByModeName.get(mode.name);
+            if (cachedModels) {
+                return yield cachedModels;
+            }
+            const modelsPromise = Promise.all([
+                createAgentChatModel({
+                    adapter: mode.completionAdapter,
+                    maxTokens,
+                }),
+                createAgentChatModel({
+                    adapter: mode.completionAdapter,
+                    maxTokens,
+                }),
+            ]).then(([primaryModel, summaryModel]) => ({
+                model: primaryModel.model,
+                summaryModel: summaryModel.model,
+                modelProvider: primaryModel.provider,
+            }));
+            this.modelsByModeName.set(mode.name, modelsPromise);
+            try {
+                return yield modelsPromise;
+            }
+            catch (error) {
+                this.modelsByModeName.delete(mode.name);
+                throw error;
+            }
+        });
     }
     getCheckpointer() {
         if (this.checkpointer) {
@@ -272,18 +284,20 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
                     });
                     const maxTokens = (_f = this.options.maxTokens) !== null && _f !== void 0 ? _f : 10000;
                     const selectedMode = (_g = this.options.modes.find((mode) => mode.name === body.mode)) !== null && _g !== void 0 ? _g : this.options.modes[0];
-                    const { model, summaryModel } = this.getModeModels(selectedMode, maxTokens);
+                    const { model, summaryModel, modelProvider } = yield this.getModeModels(selectedMode, maxTokens);
                     const systemPrompt = yield this.agentSystemPromptPromise;
                     const stream = yield callAgent({
                         name: `adminforth-agent-${this.pluginInstanceId}`,
                         model,
                         summaryModel,
+                        modelProvider,
                         checkpointer: this.getCheckpointer(),
                         messages: [
                             new SystemMessage(systemPrompt),
                             new HumanMessage(prompt),
                         ],
                         adminUser,
+                        adminforth: this.adminforth,
                         apiBasedTools: this.apiBasedTools,
                         customComponentsDir: this.adminforth.config.customization.customComponentsDir,
                         sessionId,

package/index.ts

@@ -10,7 +10,12 @@ import type { PluginOptions } from './types.js';
 import { randomUUID } from 'crypto';
 import { HumanMessage, SystemMessage } from "langchain";
 import { MemorySaver, type BaseCheckpointSaver } from "@langchain/langgraph";
-import { createAgentChatModel, callAgent } from "./agent/simpleAgent.js";
+import {
+  createAgentChatModel,
+  callAgent,
+  type AgentChatModel,
+  type AgentModelProvider,
+} from "./agent/simpleAgent.js";
 import { AdminForthCheckpointSaver } from "./agent/checkpointer.js";
 import { createSequenceDebugCollector } from "./agent/middleware/sequenceDebug.js";
 import {
@@ -24,7 +29,6 @@ import {
 } from "./agent/systemPrompt.js";
 import { ALWAYS_AVAILABLE_API_TOOL_NAMES } from "./agent/tools/index.js";
 import type { ToolCallEvent } from "./agent/toolCallEvents.js";
-import type { ChatOpenAI } from "@langchain/openai";
 
 function isAggregateErrorLike(
   error: unknown,
@@ -75,10 +79,11 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
   private checkpointer: BaseCheckpointSaver | null = null;
   private readonly modelsByModeName = new Map<
     string,
-    {
-      model: ChatOpenAI;
-      summaryModel: ChatOpenAI;
-    }
+    Promise<{
+      model: AgentChatModel;
+      summaryModel: AgentChatModel;
+      modelProvider: AgentModelProvider;
+    }>
   >();
 
   private async createNewTurn(sessionId: string, prompt: string, response?: string) {
@@ -118,29 +123,39 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
     }));
   }
 
-  private getModeModels(
+  private async getModeModels(
     mode: PluginOptions["modes"][number],
     maxTokens: number,
   ) {
     const cachedModels = this.modelsByModeName.get(mode.name);
 
     if (cachedModels) {
-      return cachedModels;
+      return await cachedModels;
     }
 
-    const models = {
-      model: createAgentChatModel({
+    const modelsPromise = Promise.all([
+      createAgentChatModel({
         adapter: mode.completionAdapter,
         maxTokens,
       }),
-      summaryModel: createAgentChatModel({
+      createAgentChatModel({
         adapter: mode.completionAdapter,
         maxTokens,
       }),
-    };
+    ]).then(([primaryModel, summaryModel]) => ({
+      model: primaryModel.model,
+      summaryModel: summaryModel.model,
+      modelProvider: primaryModel.provider,
+    }));
+
+    this.modelsByModeName.set(mode.name, modelsPromise);
 
-    this.modelsByModeName.set(mode.name, models);
-    return models;
+    try {
+      return await modelsPromise;
+    } catch (error) {
+      this.modelsByModeName.delete(mode.name);
+      throw error;
+    }
   }
 
   private getCheckpointer() {
@@ -326,18 +341,21 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
 
           const maxTokens = this.options.maxTokens ?? 10000;
           const selectedMode = this.options.modes.find((mode) => mode.name === body.mode) ?? this.options.modes[0];
-          const { model, summaryModel } = this.getModeModels(selectedMode, maxTokens);
+          const { model, summaryModel, modelProvider } =
+            await this.getModeModels(selectedMode, maxTokens);
           const systemPrompt = await this.agentSystemPromptPromise;
           const stream = await callAgent({
             name: `adminforth-agent-${this.pluginInstanceId}`,
             model,
             summaryModel,
+            modelProvider,
             checkpointer: this.getCheckpointer(),
             messages: [
               new SystemMessage(systemPrompt),
               new HumanMessage(prompt),
             ],
             adminUser,
+            adminforth: this.adminforth,
             apiBasedTools: this.apiBasedTools,
             customComponentsDir: this.adminforth.config.customization.customComponentsDir,
             sessionId,

package/package.json

@@ -1,19 +1,28 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.22.2",
+  "version": "1.24.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
+  "homepage": "https://adminforth.dev/docs/tutorial/Plugins/agent/",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "build": "tsc && rsync -av --exclude 'node_modules' custom dist/"
   },
-  "keywords": [],
-  "author": "",
+  "keywords": [
+    "adminforth",
+    "ai-agent",
+    "tool-calling",
+    "chat-ui",
+    "langgraph",
+    "llm",
+    "session-memory"
+  ],
+  "author": "DevForth (https://devforth.io)",
   "license": "ISC",
-  "description": "",
+  "description": "AI agent plugin for AdminForth with tool-based workflows and persistent chat sessions",
   "devDependencies": {
     "@types/node": "latest",
     "semantic-release": "^24.2.1",
@@ -21,11 +30,13 @@
     "typescript": "^5.7.3"
   },
   "dependencies": {
+    "@langchain/anthropic": "1.3.26",
     "@langchain/core": "^1.1.40",
+    "@langchain/google-genai": "2.1.27",
     "@langchain/langgraph": "^1.2.8",
     "@langchain/langgraph-checkpoint": "^1.0.1",
     "@langchain/openai": "^1.4.4",
-    "adminforth": "2.27.0-next.47",
+    "adminforth": "2.42.0",
     "dayjs": "^1.11.20",
     "langchain": "^1.3.3",
     "yaml": "^2.8.3",