@adminforth/agent 1.22.2 → 1.23.0

package/apiBasedTools.ts

@@ -94,6 +94,8 @@ type GetResourceDataToolResponse = {
   options?: Record<string, unknown>;
 };
 
+type DateTimeColumnType = AdminForthDataTypes.DATETIME | AdminForthDataTypes.TIME;
+
 const DEFAULT_USER_TIME_ZONE = 'UTC';
 
 const TOOL_OVERRIDES: Record<string, ToolOverride> = {
@@ -373,6 +375,7 @@ async function applyToolOverride(params: {
         adminUser,
         inputs: nestedInputs,
         httpExtra: nestedHttpExtra,
+        userTimeZone: nestedUserTimeZone,
       });
 
       return applyToolOverride({
@@ -488,20 +491,104 @@ function createRawExpressResponse(response: ToolHttpResponse) {
   return rawResponse;
 }
 
+function normalizeDateTimeInputsToUtc(
+  body: Record<string, unknown>,
+  adminforth: IAdminForth,
+  userTimeZone?: string,
+): Record<string, unknown> {
+  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: unknown,
+    columnType: DateTimeColumnType,
+  ): unknown => {
+    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: unknown, key?: string): unknown => {
+    const column = key ? columnsByName.get(key) : undefined;
+
+    if (column?.type === AdminForthDataTypes.DATETIME || 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 as Record<string, unknown>;
+    const filterColumn = typeof record.field === 'string' ? columnsByName.get(record.field) : undefined;
+
+    if (
+      'value' in record &&
+      (filterColumn?.type === AdminForthDataTypes.DATETIME || filterColumn?.type === AdminForthDataTypes.TIME)
+    ) {
+      return {
+        ...record,
+        value: normalizeColumnValue(record.value, filterColumn.type),
+      };
+    }
+
+    return Object.fromEntries(
+      Object.entries(record).map(([nestedKey, nestedValue]) => [
+        nestedKey,
+        normalizeValue(nestedValue, nestedKey),
+      ]),
+    );
+  };
+
+  return normalizeValue(body) as Record<string, unknown>;
+}
+
 async function callCapturedEndpoint(params: {
   adminforth: IAdminForth;
   adminUser?: AdminUser;
   endpoint: CapturedEndpoint;
   httpExtra?: Partial<HttpExtra>;
   inputs?: Record<string, unknown>;
+  userTimeZone?: string;
 }) {
-  const { adminforth, adminUser, endpoint, httpExtra, inputs } = params;
+  const { adminforth, adminUser, endpoint, httpExtra, inputs, userTimeZone } = params;
   const response = createToolResponse(httpExtra?.response);
   const headers = {
     'content-type': 'application/json',
+    'X-TimeZone': userTimeZone,
     ...(httpExtra?.headers ?? {}),
   };
-  const body = (inputs ?? httpExtra?.body ?? {}) as Record<string, unknown>;
+  const body = normalizeDateTimeInputsToUtc(
+    (inputs ?? httpExtra?.body ?? {}) as Record<string, unknown>,
+    adminforth,
+    headers['X-TimeZone'],
+  );
   const query = httpExtra?.query ?? {};
   const cookies = normalizeCookies(httpExtra?.cookies);
   const requestUrl = httpExtra?.requestUrl ?? `${adminforth.config.baseUrl}/adminapi/v1${endpoint.path}`;
@@ -596,6 +683,7 @@ export function prepareApiBasedTools(adminforth: IAdminForth): Record<string, Ap
           adminUser: adminUser ?? adminuser,
           inputs,
           httpExtra,
+          userTimeZone,
         });
 
         const processedOutput = await applyToolOverride({
@@ -629,4 +717,4 @@ export function serializeApiBasedTool(tool: ApiBasedTool | undefined) {
     output_schema: tool.output_schema,
     call: '[Function]',
   };
-}
+}

package/build.log

@@ -38,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 199,703 bytes  received 562 bytes  400,530.00 bytes/sec
-total size is 197,399  speedup is 0.99
+sent 199,973 bytes  received 562 bytes  401,070.00 bytes/sec
+total size is 197,669  speedup is 0.99

package/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/apiBasedTools.js

@@ -212,6 +212,7 @@ function applyToolOverride(params) {
                     adminUser,
                     inputs: nestedInputs,
                     httpExtra: nestedHttpExtra,
+                    userTimeZone: nestedUserTimeZone,
                 });
                 return applyToolOverride({
                     adminforth,
@@ -306,13 +307,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 +436,7 @@ export function prepareApiBasedTools(adminforth) {
                     adminUser: adminUser !== null && adminUser !== void 0 ? adminUser : adminuser,
                     inputs,
                     httpExtra,
+                    userTimeZone,
                 });
                 const processedOutput = yield applyToolOverride({
                     adminforth,

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.22.2",
+  "version": "1.23.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",