Merge branch 'main' of github.com:devforth/adminforth

Author: yaroslav8765

adminforth/spa/src/views/LoginView.vue

@@ -32,8 +32,10 @@
       class="af-login-modal overflow-y-auto flex flex-grow
       overflow-x-hidden z-50 min-w-[350px]  justify-center items-center md:inset-0 h-[calc(100%-1rem)] max-h-full">
         <div class="relative p-4 w-full max-h-full max-w-[400px]">
+            <!-- dropdowns of the injections (the language select) open past the card edge;
+                 the card has no footer whose corners the panel would have to clip -->
             <DialogPanel
-              class="af-login-popup af-login-modal-content max-w-none bg-lightLoginViewBackground dark:bg-darkLoginViewBackground"
+              class="af-login-popup af-login-modal-content max-w-none overflow-visible bg-lightLoginViewBackground dark:bg-darkLoginViewBackground"
               :error="error"
               :classes="{
                 header: 'af-login-modal-header',

live-demo/app/globalPlugins.ts

@@ -76,6 +76,7 @@ export const adminForthAgent = new AdminForthAgent({
     promptField: 'prompt',
     responseField: 'response',
     checkpointIdField: 'checkpoint_id',
+    attachmentsField: 'attachments',
   },
   checkpointResource: {
     resourceId: 'agent_checkpoints',

live-demo/app/migrations/20261102120000_add_turn_attachments/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "turns" ADD COLUMN "attachments" TEXT;

live-demo/app/package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "dev": "pnpm setup-live-demo && pnpm start",
     "setup-live-demo": "[ -f .env ] || (cp .env.example .env && echo 'Created .env from .env.example, put OPENAI_API_KEY into it and run again' && exit 1) && pnpm install && pnpm migrate",
-    "start": "tsx --env-file=.env --watch index.ts",
+    "start": "tsx watch --env-file=.env index.ts",
     "test": "echo \"Error: no test specified\" && exit 1",
     "bundleNow": "tsx bundleNow.ts",
     "build": "tsup index.ts --format esm --clean",
@@ -22,7 +22,7 @@
   "author": "",
   "description": "",
   "dependencies": {
-    "@adminforth/agent": "^3.2.0",
+    "@adminforth/agent": "^3.5.0",
     "@adminforth/audio-adapter-openai": "^1.3.5",
     "@adminforth/audit-log": "^2.0.2",
     "@adminforth/auto-remove": "^1.0.22",
@@ -43,11 +43,11 @@
     "@adminforth/login-captcha-adapter-cloudflare": "^1.1.7",
     "@adminforth/mcp": "^3.2.0",
     "@adminforth/rich-editor": "^3.0.4",
-    "@adminforth/storage-adapter-amazon-s3": "^1.2.2",
+    "@adminforth/storage-adapter-amazon-s3": "^1.3.0",
     "@adminforth/text-complete": "^3.0.2",
     "@adminforth/two-factors-auth": "^7.1.0",
-    "@adminforth/upload": "^3.0.4",
-    "adminforth": "^4.20.0",
+    "@adminforth/upload": "^3.0.10",
+    "adminforth": "^4.22.3",
     "cldr-core": "^48.2.0",
     "express": "^5.3.0"
   },

live-demo/app/pnpm-lock.yaml

@@ -1,6 +1,8 @@
 import { AdminForthDataTypes } from 'adminforth';
 import type { AdminForthResourceInput, AdminUser } from 'adminforth';
 import { randomUUID } from 'crypto';
+import UploadPlugin from '@adminforth/upload';
+import AdminForthAdapterS3Storage from '@adminforth/storage-adapter-amazon-s3';
 
 async function allowedForSuperAdmins({ adminUser }: { adminUser: AdminUser }): Promise<boolean> {
   return adminUser.dbUser.role === 'superadmin';
@@ -54,6 +56,37 @@ const turnsResource: AdminForthResourceInput = {
         filter: false,
       },
     },
+    {
+      name: 'attachments',
+      type: AdminForthDataTypes.JSON,
+      isArray: {
+        enabled: true,
+        itemType: AdminForthDataTypes.STRING,
+      },
+      showIn: {
+        list: false,
+        show: true,
+        edit: false,
+        create: false,
+        filter: false,
+      },
+    },
+  ],
+  plugins: [
+    // images users send to the agent; private, the agent and the chat read them with signed URLs
+    new UploadPlugin({
+      pathColumnName: 'attachments',
+      storageAdapter: new AdminForthAdapterS3Storage({
+        bucket: 'demo-static.adminforth.dev',
+        region: 'eu-north-1',
+        accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
+        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
+        strictContentType: true,
+      }),
+      allowedFileExtensions: ['png', 'jpg', 'jpeg', 'webp'],
+      maxFileSize: 1024 * 1024 * 5,
+      filePath: ({ originalExtension }) => `agent_attachments/${randomUUID()}.${originalExtension}`,
+    }),
   ],
   options: {
     allowedActions: {

live-demo/app/resources/agent_resources/turns.ts

@@ -72,6 +72,7 @@ model turns {
   prompt        String?
   response      String?
   checkpoint_id String?
+  attachments   String?
 }
 
 model mcp_auth_secrets {