@adminforth/agent 1.19.0 → 1.21.0

package/agent/simpleAgent.ts

@@ -165,7 +165,6 @@ function createAgentLlmMetricsLogger() {
 export function createAgentChatModel(params: {
   adapter: CompletionAdapter;
   maxTokens: number;
-  modelName?: string;
 }) {
   const adapter = params.adapter as OpenAIBackedCompletionAdapter;
   const options = adapter.options ?? {};
@@ -176,7 +175,7 @@ export function createAgentChatModel(params: {
     );
   }
 
-  const model = params.modelName ?? options.model ?? "gpt-5-nano";
+  const model = options.model ?? "gpt-5-nano";
   const baseURL = options.baseURL ?? options.baseUrl;
   const reasoning = options.extraRequestBodyParameters
     ?.reasoning as OpenAiReasoningConfig | undefined;
@@ -195,8 +194,8 @@ export function createAgentChatModel(params: {
     useResponsesApi: true,
     outputVersion: "v1",
     streaming: true,
-    promptCacheKey: `adminforth-agent:${model}:system-v1:tools-v1`,
 
+    promptCacheKey: `adminforth-agent:${model}:system-v1:tools-v1`,
     promptCacheRetention: "in_memory", 
 
     ...(reasoningConfig ? { reasoning: reasoningConfig } : {}),

package/apiBasedTools.ts

@@ -75,6 +75,7 @@ type ToolOverrideContext = {
 
 type ToolOverride = {
   wipe_frontend_specific_data?: readonly string[];
+  format_tool?: (params: ToolOverrideContext) => Promise<string> | string;
   post_process_response?: (params: ToolOverrideContext) => Promise<unknown> | unknown;
 };
 
@@ -103,6 +104,9 @@ const TOOL_OVERRIDES: Record<string, ToolOverride> = {
       'resource.options.actions[].customComponent',
       'resource.options.pageInjections',
     ],
+    format_tool: async ({ }) => {
+      return "get resource Apartments"
+    }
   },
   get_resource_data: {
     post_process_response: async ({ output, inputs, invokeTool, userTimeZone }) => {
@@ -126,6 +130,9 @@ const TOOL_OVERRIDES: Record<string, ToolOverride> = {
 
       return response;
     },
+    format_tool: async ({ }) => {
+      return "get 1-20 Apartment filtered listed=yes"
+    }
   },
 };
 

package/build.log

@@ -32,5 +32,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 188,483 bytes  received 451 bytes  377,868.00 bytes/sec
-total size is 186,631  speedup is 0.99
+sent 188,784 bytes  received 451 bytes  378,470.00 bytes/sec
+total size is 186,932  speedup is 0.99

package/custom/skills/data-analytics/SKILL.md

@@ -12,10 +12,10 @@ Use `get_resource_data` to fetch data for this skill. This is the main tool for
 
 When the user asks for analytics, reports, trends, comparisons, or distributions:
 
-- Fetch the underlying rows with `get_resource_data`.
-- Prefer narrow requests: request only the columns you need and use filters, sorting, pagination, and date ranges whenever possible.
+- Fetch the requested data using `aggregate` tool. This tool is capable of performing fast server-side aggregations on filtered data, groupings by date including grouping by day/week/month etc. 
+- if it is not possible to get the required aggregates using `aggregate`, fetch the underlying rows with `get_resource_data`. This is much heavier since returns original rows  with all fields, but allows you to perform complex calculations, comparisons, and custom groupings in-memory. Always prefer `aggregate` when possible.
+- Prefer narrow requests: use filters, sorting, pagination, and date ranges whenever possible.
 - If the request is ambiguous, clarify the resource, metric, grouping, or date range before fetching data.
-- Compute aggregates from the returned rows yourself: sums, counts, averages, min/max, grouped totals, ratios, and trend deltas.
 - Return a short written summary with the key finding and most important numbers.
 - If a chart would help, produce a Vega-Lite spec.
 

package/dist/agent/simpleAgent.js

@@ -102,15 +102,15 @@ function createAgentLlmMetricsLogger() {
     return new AgentLlmMetricsLogger();
 }
 export function createAgentChatModel(params) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const adapter = params.adapter;
     const options = (_a = adapter.options) !== null && _a !== void 0 ? _a : {};
     if (!options.openAiApiKey) {
         throw new Error("CompletionAdapter must expose options.openAiApiKey for ChatOpenAI");
     }
-    const model = (_c = (_b = params.modelName) !== null && _b !== void 0 ? _b : options.model) !== null && _c !== void 0 ? _c : "gpt-5-nano";
-    const baseURL = (_d = options.baseURL) !== null && _d !== void 0 ? _d : options.baseUrl;
-    const reasoning = (_e = options.extraRequestBodyParameters) === null || _e === void 0 ? void 0 : _e.reasoning;
+    const model = (_b = options.model) !== null && _b !== void 0 ? _b : "gpt-5-nano";
+    const baseURL = (_c = options.baseURL) !== null && _c !== void 0 ? _c : options.baseUrl;
+    const reasoning = (_d = options.extraRequestBodyParameters) === null || _d === void 0 ? void 0 : _d.reasoning;
     const reasoningConfig = reasoning
         ? Object.assign(Object.assign({}, reasoning), { summary: "auto" }) : undefined;
     // @ts-ignore

package/dist/apiBasedTools.js

@@ -25,6 +25,9 @@ const TOOL_OVERRIDES = {
             'resource.options.actions[].customComponent',
             'resource.options.pageInjections',
         ],
+        format_tool: (_a) => __awaiter(void 0, [_a], void 0, function* ({}) {
+            return "get resource Apartments";
+        })
     },
     get_resource_data: {
         post_process_response: (_a) => __awaiter(void 0, [_a], void 0, function* ({ output, inputs, invokeTool, userTimeZone }) {
@@ -44,6 +47,9 @@ 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";
+        })
     },
 };
 function sanitizeForYaml(value) {

package/dist/custom/skills/data-analytics/SKILL.md

@@ -12,10 +12,10 @@ Use `get_resource_data` to fetch data for this skill. This is the main tool for
 
 When the user asks for analytics, reports, trends, comparisons, or distributions:
 
-- Fetch the underlying rows with `get_resource_data`.
-- Prefer narrow requests: request only the columns you need and use filters, sorting, pagination, and date ranges whenever possible.
+- Fetch the requested data using `aggregate` tool. This tool is capable of performing fast server-side aggregations on filtered data, groupings by date including grouping by day/week/month etc. 
+- if it is not possible to get the required aggregates using `aggregate`, fetch the underlying rows with `get_resource_data`. This is much heavier since returns original rows  with all fields, but allows you to perform complex calculations, comparisons, and custom groupings in-memory. Always prefer `aggregate` when possible.
+- Prefer narrow requests: use filters, sorting, pagination, and date ranges whenever possible.
 - If the request is ambiguous, clarify the resource, metric, grouping, or date range before fetching data.
-- Compute aggregates from the returned rows yourself: sums, counts, averages, min/max, grouped totals, ratios, and trend deltas.
 - Return a short written summary with the key finding and most important numbers.
 - If a chart would help, produce a Vega-Lite spec.
 

package/dist/index.js

@@ -371,7 +371,8 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
             path: `/agent/get-sessions`,
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, adminUser }) {
                 const userId = adminUser.pk;
-                const sessions = yield this.adminforth.resource(this.pluginOptions.sessionResource.resourceId).list([Filters.EQ(this.pluginOptions.sessionResource.askerIdField, userId)], undefined, undefined, [Sorts.DESC(this.pluginOptions.sessionResource.createdAtField)]);
+                const limit = typeof body.limit === 'number' ? body.limit : 20;
+                const sessions = yield this.adminforth.resource(this.pluginOptions.sessionResource.resourceId).list([Filters.EQ(this.pluginOptions.sessionResource.askerIdField, userId)], limit, undefined, [Sorts.DESC(this.pluginOptions.sessionResource.createdAtField)]);
                 const sessionsToReturn = [];
                 for (const session of sessions) {
                     sessionsToReturn.push({

package/index.ts

@@ -422,8 +422,9 @@ export default class AdminForthAgentPlugin extends AdminForthPlugin {
       path: `/agent/get-sessions`,
       handler: async ({body, adminUser }) => {
         const userId = adminUser.pk;
+        const limit = typeof body.limit === 'number' ? body.limit : 20;
         const sessions = await this.adminforth.resource(this.pluginOptions.sessionResource.resourceId).list(
-          [Filters.EQ(this.pluginOptions.sessionResource.askerIdField, userId)], undefined, undefined, [Sorts.DESC(this.pluginOptions.sessionResource.createdAtField)]
+          [Filters.EQ(this.pluginOptions.sessionResource.askerIdField, userId)], limit, undefined, [Sorts.DESC(this.pluginOptions.sessionResource.createdAtField)]
         );
         const sessionsToReturn = [];
         for (const session of sessions) {

package/package.json

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