@adminforth/agent 1.36.0 → 1.38.0

package/dist/apiBasedTools.js

@@ -11,11 +11,13 @@ import { AdminForthDataTypes, logger, } from 'adminforth';
 import dayjs from 'dayjs';
 import timezone from 'dayjs/plugin/timezone.js';
 import utc from 'dayjs/plugin/utc.js';
-import { inspect } from 'util';
 import YAML from 'yaml';
 dayjs.extend(utc);
 dayjs.extend(timezone);
 const DEFAULT_USER_TIME_ZONE = 'UTC';
+function hasRegisteredApiToolHandler(schema) {
+    return typeof schema.handler === 'function';
+}
 function getInputString(inputs, key) {
     const value = inputs === null || inputs === void 0 ? void 0 : inputs[key];
     return typeof value === 'string' && value ? value : undefined;
@@ -138,38 +140,6 @@ function sanitizeForYaml(value) {
     }
     return JSON.parse(serialized);
 }
-export function serializeUnknownError(error) {
-    var _a, _b;
-    if (error instanceof Error) {
-        const errorWithCause = error;
-        const errorRecord = error;
-        const serialized = {
-            name: error.name,
-            message: error.message,
-            stack: error.stack,
-        };
-        if (errorWithCause.cause !== undefined) {
-            serialized.cause = serializeUnknownError(errorWithCause.cause);
-        }
-        for (const key of Object.getOwnPropertyNames(error)) {
-            if (key in serialized) {
-                continue;
-            }
-            serialized[key] = errorRecord[key];
-        }
-        return serialized;
-    }
-    if (typeof error === 'object' && error !== null) {
-        return {
-            type: (_b = (_a = error.constructor) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : 'Object',
-            inspected: inspect(error, { depth: 6, breakLength: 120 }),
-        };
-    }
-    return {
-        type: typeof error,
-        value: error,
-    };
-}
 function wipePath(target, pathParts) {
     if (!target || typeof target !== 'object' || pathParts.length === 0) {
         return;
@@ -243,7 +213,7 @@ function formatDateTimeColumns(rows, dateTimeColumnNames, userTimeZone) {
 function applyToolOverride(params) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const { adminforth, adminUser, httpExtra, inputs, invokeTool, output, toolName, userTimeZone, } = params;
+        const { adminforth, adminUser, inputs, output, toolName, userTimeZone } = params;
         const sanitizedOutput = sanitizeForYaml(output);
         const override = TOOL_OVERRIDES[toolName];
         if (!override) {
@@ -252,39 +222,15 @@ function applyToolOverride(params) {
         for (const path of (_a = override.wipe_frontend_specific_data) !== null && _a !== void 0 ? _a : []) {
             wipePath(sanitizedOutput, path.split('.'));
         }
-        if (!override.post_process_response) {
-            return sanitizedOutput;
-        }
-        const postProcessedOutput = yield override.post_process_response({
-            adminforth,
-            output: sanitizedOutput,
-            adminUser,
-            httpExtra,
-            inputs,
-            userTimeZone,
-            invokeTool: (nestedToolName_1, ...args_1) => __awaiter(this, [nestedToolName_1, ...args_1], void 0, function* (nestedToolName, nestedParams = {}) {
-                var _a, _b, _c;
-                const nestedInputs = (_a = nestedParams.inputs) !== null && _a !== void 0 ? _a : inputs;
-                const nestedHttpExtra = (_b = nestedParams.httpExtra) !== null && _b !== void 0 ? _b : httpExtra;
-                const nestedUserTimeZone = (_c = nestedParams.userTimeZone) !== null && _c !== void 0 ? _c : userTimeZone;
-                const nestedOutput = yield invokeTool(nestedToolName, {
-                    inputs: nestedInputs,
-                    httpExtra: nestedHttpExtra,
-                    userTimeZone: nestedUserTimeZone,
-                });
-                return applyToolOverride({
-                    adminforth,
-                    adminUser,
-                    httpExtra: nestedHttpExtra,
-                    inputs: nestedInputs,
-                    invokeTool,
-                    output: nestedOutput,
-                    toolName: nestedToolName,
-                    userTimeZone: nestedUserTimeZone,
-                });
-            }),
-        });
-        return sanitizeForYaml(postProcessedOutput);
+        return override.post_process_response
+            ? sanitizeForYaml(yield override.post_process_response({
+                adminforth,
+                adminUser,
+                output: sanitizedOutput,
+                inputs,
+                userTimeZone,
+            }))
+            : sanitizedOutput;
     });
 }
 function endpointPathToToolName(path) {
@@ -313,30 +259,16 @@ function formatLogNameList(names) {
 }
 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({
+        var _a, _b;
+        return yield ((_b = (_a = TOOL_OVERRIDES[params.toolName]) === null || _a === void 0 ? void 0 : _a.format_tool) === null || _b === void 0 ? void 0 : _b.call(_a, {
             adminforth: params.adminforth,
             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 [];
-    }
-    if (Array.isArray(cookies)) {
-        return cookies;
-    }
-    return Object.entries(cookies).map(([key, value]) => ({ key, value }));
-}
 function normalizeDateTimeInputsToUtc(body, adminforth, userTimeZone) {
     if (!userTimeZone || typeof body.resourceId !== 'string') {
         return body;
@@ -356,10 +288,8 @@ function normalizeDateTimeInputsToUtc(body, adminforth, userTimeZone) {
         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 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;
@@ -386,124 +316,92 @@ function normalizeDateTimeInputsToUtc(body, adminforth, userTimeZone) {
     return normalizeValue(body);
 }
 const METHODS_WITHOUT_REQUEST_BODY = new Set(['GET', 'HEAD']);
-const HEADERS_NOT_FORWARDED_TO_API_TOOL = new Set([
-    'connection',
-    'content-length',
-    'host',
-    'keep-alive',
-    'proxy-authenticate',
-    'proxy-authorization',
-    'te',
-    'trailer',
-    'transfer-encoding',
-    'upgrade',
-]);
-function isAbsoluteHttpUrl(value) {
-    try {
-        const url = new URL(value);
-        return url.protocol === 'http:' || url.protocol === 'https:';
-    }
-    catch (_a) {
-        return false;
-    }
-}
-function resolveOpenApiRequestUrl(params) {
-    var _a, _b;
-    const internalApiOrigin = (_b = (_a = params.adminforth.express).getInternalApiOrigin) === null || _b === void 0 ? void 0 : _b.call(_a);
-    if (internalApiOrigin) {
-        const path = isAbsoluteHttpUrl(params.path)
-            ? `${new URL(params.path).pathname}${new URL(params.path).search}`
-            : params.path;
-        return new URL(path, internalApiOrigin).toString();
-    }
-    throw new Error(`Tool "${params.toolName}" cannot call OpenAPI path "${params.path}" because internal API origin is unavailable.`);
-}
-function createToolRequestHeaders(httpExtra, userTimeZone) {
-    var _a;
-    const headers = {};
-    for (const [name, value] of Object.entries((_a = httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.headers) !== null && _a !== void 0 ? _a : {})) {
-        const headerName = name.toLowerCase();
-        if (typeof value === 'string' && !HEADERS_NOT_FORWARDED_TO_API_TOOL.has(headerName)) {
-            headers[headerName] = value;
-        }
-    }
-    headers.accept = 'application/json';
-    headers['content-type'] = 'application/json';
-    if (userTimeZone) {
-        headers['x-timezone'] = userTimeZone;
-    }
-    const cookieHeader = normalizeCookies(httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.cookies)
-        .map(({ key, value }) => `${key}=${value}`)
-        .join('; ');
-    if (cookieHeader && !headers.cookie) {
-        headers.cookie = cookieHeader;
-    }
-    return headers;
-}
-function appendInputsToQueryString(url, inputs) {
-    const nextUrl = new URL(url);
-    for (const [key, value] of Object.entries(inputs)) {
-        if (value === undefined) {
-            continue;
-        }
-        if (Array.isArray(value)) {
-            for (const item of value) {
-                nextUrl.searchParams.append(key, typeof item === 'object' && item !== null ? JSON.stringify(item) : String(item));
-            }
-            continue;
-        }
-        nextUrl.searchParams.set(key, typeof value === 'object' && value !== null ? JSON.stringify(value) : String(value));
-    }
-    return nextUrl.toString();
+function createDirectToolResponse() {
+    const headers = [];
+    return {
+        headers,
+        status: 200,
+        setHeader(name, value) {
+            headers.push([name, value]);
+        },
+        setStatus(code, message) {
+            this.status = code;
+            this.message = message;
+        },
+        blobStream() {
+            throw new Error('blobStream is not available for API-based agent tools');
+        },
+    };
 }
-function parseOpenApiToolResponse(response) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const responseText = yield response.text();
-        const payload = responseText && ((_a = response.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.includes('application/json'))
-            ? JSON.parse(responseText)
-            : responseText;
-        if (response.ok) {
-            return responseText ? payload : { status: response.status };
-        }
-        return {
-            error: 'HTTP_ERROR',
-            status: response.status,
-            statusText: response.statusText,
-            response: payload,
-        };
-    });
+function validationErrorResponse(error, details) {
+    return {
+        error,
+        details,
+    };
 }
 function callOpenApiSchema(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const { adminforth, httpExtra, inputs, schema, toolName, userTimeZone } = params;
+        const { adminforth, adminUser, abortSignal, inputs, schema, toolName, userTimeZone } = params;
         const method = schema.method.toUpperCase();
-        const body = normalizeDateTimeInputsToUtc(((_a = inputs !== null && inputs !== void 0 ? inputs : httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.body) !== null && _a !== void 0 ? _a : {}), adminforth, userTimeZone);
-        const requestUrl = resolveOpenApiRequestUrl({
-            adminforth,
-            path: schema.path,
-            toolName,
-        });
+        const normalizedInputs = normalizeDateTimeInputsToUtc((inputs !== null && inputs !== void 0 ? inputs : {}), adminforth, userTimeZone);
         const hasRequestBody = !METHODS_WITHOUT_REQUEST_BODY.has(method);
-        logger.info(`Calling OpenAPI tool "${toolName}" with method ${method} at URL ${requestUrl}`);
-        const response = yield fetch(hasRequestBody ? requestUrl : appendInputsToQueryString(requestUrl, body), {
-            method,
-            headers: createToolRequestHeaders(httpExtra, userTimeZone),
-            body: hasRequestBody ? JSON.stringify(body) : undefined,
+        const body = hasRequestBody ? normalizedInputs : {};
+        const query = hasRequestBody ? {} : normalizedInputs;
+        const requestValidation = adminforth.openApi.validateRequestSchema(schema, body);
+        if (!requestValidation.valid) {
+            return validationErrorResponse('REQUEST_VALIDATION_FAILED', requestValidation.errors);
+        }
+        const response = createDirectToolResponse();
+        logger.info(`Calling OpenAPI tool "${toolName}" with direct handler`);
+        const tr = (msg, category, trParams, pluralizationNumber) => adminforth.tr(msg, category, undefined, trParams, pluralizationNumber);
+        const output = yield schema.handler({
+            body,
+            query,
+            headers: {},
+            cookies: [],
+            adminUser,
+            response,
+            requestUrl: schema.path,
+            abortSignal: abortSignal !== null && abortSignal !== void 0 ? abortSignal : new AbortController().signal,
+            _raw_express_req: undefined,
+            _raw_express_res: undefined,
+            tr,
         });
-        logger.info(`Received response with status ${response.status} from OpenAPI tool "${toolName}"`);
-        return parseOpenApiToolResponse(response);
+        if (response.message) {
+            return response.status >= 400
+                ? {
+                    error: 'HANDLER_ERROR',
+                    status: response.status,
+                    response: response.message,
+                }
+                : response.message;
+        }
+        if (output === null) {
+            return { status: response.status };
+        }
+        const responseValidation = adminforth.openApi.validateResponseSchema(schema, output);
+        if (!responseValidation.valid) {
+            return validationErrorResponse('RESPONSE_VALIDATION_FAILED', responseValidation.errors);
+        }
+        return response.status >= 400
+            ? {
+                error: 'HANDLER_ERROR',
+                status: response.status,
+                response: output,
+            }
+            : output;
     });
 }
 export function prepareApiBasedTools(adminforth, hiddenResourceIds = []) {
     const apiBasedTools = {};
-    const openApiSchemas = adminforth.openApi.registeredSchemas.filter((schema) => schema.request_schema || schema.response_schema);
+    const openApiSchemas = adminforth.openApi.registeredSchemas;
     const openApiSchemasByToolName = new Map();
     const hiddenResourceIdSet = new Set(hiddenResourceIds);
     for (const schema of openApiSchemas) {
         const toolName = openApiSchemaPathToToolName(schema.path, adminforth);
-        openApiSchemasByToolName.set(toolName, schema);
+        if (hasRegisteredApiToolHandler(schema)) {
+            openApiSchemasByToolName.set(toolName, schema);
+        }
     }
     logger.info(`AdminForth Agent OpenAPI APIs: ${formatLogNameList(adminforth.openApi.registeredSchemas.map((schema) => openApiSchemaPathToToolName(schema.path, adminforth)))}`);
     logger.info(`AdminForth Agent OpenAPI tools connected: ${formatLogNameList([...openApiSchemasByToolName.keys()])}`);
@@ -511,40 +409,27 @@ export function prepareApiBasedTools(adminforth, hiddenResourceIds = []) {
         apiBasedTools[toolName] = {
             description: schema.description,
             input_schema: schema.request_schema,
-            input_schma: schema.request_schema,
             output_schema: schema.response_schema,
-            call: (...args_1) => __awaiter(this, [...args_1], void 0, function* ({ adminUser, adminuser, inputs, httpExtra, userTimeZone } = {}) {
+            call: (...args_1) => __awaiter(this, [...args_1], void 0, function* ({ adminUser, adminuser, abortSignal, inputs, userTimeZone } = {}) {
                 if (isHiddenResourceCall(hiddenResourceIdSet, inputs)) {
                     return YAML.stringify({
                         error: 'RESOURCE_NOT_AVAILABLE',
                         message: 'This resource is not available to the agent.',
                     });
                 }
-                const invokeTool = (nextToolName_1, ...args_2) => __awaiter(this, [nextToolName_1, ...args_2], void 0, function* (nextToolName, nextParams = {}) {
-                    const nextSchema = openApiSchemasByToolName.get(nextToolName);
-                    if (!nextSchema) {
-                        throw new Error(`Tool ${nextToolName} is not registered in OpenAPI`);
-                    }
-                    return callOpenApiSchema({
-                        adminforth,
-                        schema: nextSchema,
-                        toolName: nextToolName,
-                        inputs: nextParams.inputs,
-                        httpExtra: nextParams.httpExtra,
-                        userTimeZone: nextParams.userTimeZone,
-                    });
-                });
-                const output = yield invokeTool(toolName, {
+                const output = yield callOpenApiSchema({
+                    adminforth,
+                    adminUser: adminUser !== null && adminUser !== void 0 ? adminUser : adminuser,
+                    abortSignal,
+                    schema,
+                    toolName,
                     inputs,
-                    httpExtra,
                     userTimeZone,
                 });
                 const processedOutput = yield applyToolOverride({
                     adminforth,
                     adminUser: adminUser !== null && adminUser !== void 0 ? adminUser : adminuser,
-                    httpExtra,
                     inputs,
-                    invokeTool,
                     output,
                     toolName,
                     userTimeZone,
@@ -562,7 +447,6 @@ export function serializeApiBasedTool(tool) {
     return {
         description: tool.description,
         input_schema: tool.input_schema,
-        input_schma: tool.input_schma,
         output_schema: tool.output_schema,
         call: '[Function]',
     };

package/dist/custom/ChatSurface.vue

@@ -118,8 +118,12 @@
               transition: `transform ${agentTransitions.TRANSITION_DURATION}ms ease-in-out`
             }"            
           >
-            <div class="w-full border rounded-lg pb-8 dark:bg-gray-700">
+            <div 
+              class="w-full border rounded-lg pb-8 dark:bg-gray-700"
+              :class="agentStore.isAudioChatMode ? 'border-none mt-8' : 'border'"  
+            >
               <textarea
+                v-if="!agentStore.isAudioChatMode"
                 v-model="agentStore.userMessageInput"
                 ref="textInput"
                 @input="autoResize"
@@ -169,26 +173,29 @@
                   </button>
                 </div>
               </div>
-              <Button 
-                v-if="!agentStore.isResponseInProgress"
-                class="absolute right-4 bottom-2 !p-0 h-9 w-9"                    
-                @click="sendMessage" 
-                :disabled="!agentStore.trimmedUserMessage || agentStore.isResponseInProgress"
-              >
-                <IconArrowUpOutline 
-                  class="w-8 h-8 p-1
-                    text-white" 
-                />
-              </Button>
-              <Button
-                v-else
-                class="absolute right-4 bottom-2 !p-0 h-9 w-9"    
-                @click="stopCurrentRequest"                
-              >
-                <div
-                  class="w-3 h-3 bg-white rounded-sm"
-                />
-              </Button>
+              <MicrophoneButton v-if="props.meta.hasAudioAdapter" />
+              <template v-if="!agentStore.isAudioChatMode">
+                <Button 
+                  v-if="!agentStore.isResponseInProgress"
+                  class="absolute right-4 bottom-2 !p-0 h-9 w-9 transition-opacity duration-200"                    
+                  @click="sendMessage" 
+                  :disabled="!agentStore.trimmedUserMessage || agentStore.isResponseInProgress"
+                >
+                  <IconArrowUpOutline 
+                    class="w-8 h-8 p-1
+                      text-white" 
+                  />
+                </Button>
+                <Button
+                  v-else
+                  class="absolute right-4 bottom-2 !p-0 h-9 w-9"    
+                  @click="stopCurrentRequest"                
+                >
+                  <div
+                    class="w-3 h-3 bg-white rounded-sm"
+                  />
+                </Button>
+              </template>
             </div>
           </div>
         </div>
@@ -209,6 +216,7 @@ import { useAgentTransitions } from './composables/useAgentTransitions';
 import { Button } from '@/afcl';
 import { useCoreStore } from '@/stores/core';
 import { remToPx } from './utils';
+import MicrophoneButton from './speech_recognition_frontend/MicrophoneButon.vue';
 
 const props = defineProps<{
   meta: {
@@ -218,6 +226,7 @@ const props = defineProps<{
     }>;
     defaultModeName: string | null;
     stickByDefault: boolean;
+    hasAudioAdapter: boolean;
   }
   adminUser: any
 }>();
@@ -321,6 +330,7 @@ function selectMode(modeName: string) {
 }
 
 async function sendMessage() {
+  if (agentStore.isAudioChatMode) return;
   isModeMenuOpen.value = false;
   await agentStore.sendMessage();
   autoResize();

package/dist/custom/composables/agentStore/constants.ts

@@ -9,4 +9,11 @@ export const MIN_WIDTH = 25;
 export const DEFAULT_TEXTAREA_PLACEHOLDER = 'Type a message...';
 export const PLACEHOLDER_TYPING_DELAY_MS = 60;
 export const PLACEHOLDER_DELETING_DELAY_MS = 35;
-export const PLACEHOLDER_HOLD_DELAY_MS = 3000;
+export const PLACEHOLDER_HOLD_DELAY_MS = 3000;
+export const PRE_SESSION_ID = 'pre-session';
+
+export enum RESERVED_SYSTEM_MESSAGE_CONTENT {
+  START_AUDIO_CHAT = 'START_AUDIO_CHAT',
+  END_AUDIO_CHAT = 'END_AUDIO_CHAT',
+  AGENT_RESPONSE_ABORTED = 'AGENT_RESPONSE_ABORTED'
+}