@drax/ai-back 3.35.1 → 3.37.0

package/src/agents/DraxAgent.ts

@@ -19,22 +19,15 @@ import AgentSessionServiceFactory from "../factory/services/AgentSessionServiceF
 import type {AgentSessionService} from "../services/AgentSessionService.js";
 
 class DraxAgent {
-    private static singleton?: DraxAgent;
-
     protected sessions: Map<string, DraxAgentSession> = new Map();
     protected config: DraxAgentConfig = {
         systemPrompt: "Sos un asistente del sistema. Responde de forma clara, breve y util.",
     };
 
-    private constructor() {
-    }
-
-    static instance(): DraxAgent {
-        if (!DraxAgent.singleton) {
-            DraxAgent.singleton = new DraxAgent();
-        }
-
-        return DraxAgent.singleton;
+    constructor(
+        public readonly identifier: string = "default",
+        public readonly description: string = "",
+    ) {
     }
 
     configure(config: DraxAgentConfig): this {
@@ -132,6 +125,7 @@ class DraxAgent {
         });
 
         return {
+            agentIdentifier: this.identifier,
             sessionId: session.id,
             message: assistantMessage,
             navigationPath: navigationState.path,

package/src/controllers/DraxAgentController.ts

@@ -1,7 +1,9 @@
 import {z} from "zod";
 import {CommonController} from "@drax/common-back";
 import {DraxAgent} from "../agents/DraxAgent.js";
+import DraxAgentFactory from "../factory/DraxAgentFactory.js";
 import {AgentPermissions} from "../permissions/AgentPermissions.js";
+import type {DraxAgentControllerOptions} from "../interfaces/IDraxAgentController.js";
 
 const PromptImageSchema = z.object({
     url: z.string().min(1),
@@ -34,6 +36,7 @@ const PromptInputFileSchema = z.object({
 });
 
 const AgentSessionRequestSchema = z.object({
+    identifier: z.string().min(1).optional(),
     sessionId: z.string().optional(),
     userId: z.string().optional().nullable(),
     tenantId: z.string().optional().nullable(),
@@ -55,13 +58,31 @@ const AgentMessageRequestSchema = AgentSessionRequestSchema.extend({
 });
 
 class DraxAgentController extends CommonController {
-    protected agent: DraxAgent;
     protected permission: string | false;
+    protected defaultAgentIdentifier: string;
+    protected defaultAgentDescription: string;
 
-    constructor() {
+    constructor(options: DraxAgentControllerOptions = {}) {
         super();
-        this.permission = AgentPermissions.Session;
-        this.agent = DraxAgent.instance();
+        this.permission = options.permission ?? AgentPermissions.Session;
+        this.defaultAgentIdentifier = options.agentIdentifier ?? "default";
+        this.defaultAgentDescription = options.agentDescription ?? "";
+        DraxAgentFactory.instance(this.defaultAgentIdentifier, this.defaultAgentDescription);
+    }
+
+    async agents(request, reply) {
+        try {
+            this.assertAccess(request);
+
+            return reply.send({
+                agents: DraxAgentFactory.agents().map(agent => ({
+                    identifier: agent.identifier,
+                    description: agent.description,
+                })),
+            });
+        } catch (e: any) {
+            this.handleControllerError(e, reply);
+        }
     }
 
     async startSession(request, reply) {
@@ -69,13 +90,15 @@ class DraxAgentController extends CommonController {
             this.assertAccess(request);
 
             const input = AgentSessionRequestSchema.parse(request.body ?? {});
-            const session = await this.agent.startSession({
+            const agent = this.resolveAgent(input.identifier);
+            const session = await agent.startSession({
                 sessionId: input.sessionId,
                 userId: this.resolveUserId(request, input.userId),
                 tenantId: this.resolveTenantId(request, input.tenantId),
             });
 
             return reply.send({
+                agentIdentifier: agent.identifier,
                 sessionId: session.id,
                 createdAt: session.createdAt,
                 updatedAt: session.updatedAt,
@@ -90,7 +113,8 @@ class DraxAgentController extends CommonController {
             this.assertAccess(request);
 
             const input = AgentMessageRequestSchema.parse(request.body ?? {});
-            const response = await this.agent.sendMessage({
+            const agent = this.resolveAgent(input.identifier);
+            const response = await agent.sendMessage({
                 ...input,
                 userId: this.resolveUserId(request, input.userId),
                 tenantId: this.resolveTenantId(request, input.tenantId),
@@ -104,6 +128,10 @@ class DraxAgentController extends CommonController {
         }
     }
 
+    protected resolveAgent(identifier?: string): DraxAgent {
+        return DraxAgentFactory.instance(identifier ?? this.defaultAgentIdentifier);
+    }
+
     protected assertAccess(request: any) {
         if (this.permission === false) {
             return;

package/src/factory/DraxAgentFactory.ts

@@ -0,0 +1,22 @@
+import DraxAgent from "../agents/DraxAgent.js";
+
+class DraxAgentFactory {
+    private static singletons: Record<string, DraxAgent> = {};
+
+    public static instance(identifier: string = "default", description: string = ""): DraxAgent {
+        if (!DraxAgentFactory.singletons[identifier]) {
+            DraxAgentFactory.singletons[identifier] = new DraxAgent(identifier, description);
+        }
+
+        return DraxAgentFactory.singletons[identifier];
+    }
+
+    public static agents(): DraxAgent[] {
+        return Object.values(DraxAgentFactory.singletons);
+    }
+}
+
+export default DraxAgentFactory;
+export {
+    DraxAgentFactory,
+};

package/src/index.ts

@@ -9,6 +9,7 @@ import {OpenAiProviderFactory} from "./factory/OpenAiProviderFactory.js";
 import {GoogleAiProviderFactory} from "./factory/GoogleAiProviderFactory.js";
 import {OllamaAiProviderFactory} from "./factory/OllamaAiProviderFactory.js";
 import {AiProviderFactory} from "./factory/AiProviderFactory.js";
+import {DraxAgentFactory} from "./factory/DraxAgentFactory.js";
 import AILogServiceFactory from "./factory/services/AILogServiceFactory.js";
 import {OpenAiProvider} from "./providers/OpenAiProvider.js";
 import {GoogleAiProvider} from "./providers/GoogleAiProvider.js";
@@ -112,6 +113,7 @@ export {
     GoogleAiProviderFactory,
     OllamaAiProviderFactory,
     AiProviderFactory,
+    DraxAgentFactory,
     AILogServiceFactory,
     OpenAiProvider,
     GoogleAiProvider,

package/src/interfaces/IDraxAgent.ts

@@ -40,6 +40,7 @@ interface DraxAgentConfig {
 }
 
 interface DraxAgentSessionInput {
+    identifier?: string;
     sessionId?: string;
     userId?: string | null;
     tenantId?: string | null;
@@ -69,6 +70,7 @@ interface DraxAgentMessageInput extends DraxAgentSessionInput {
 }
 
 interface DraxAgentMessageOutput {
+    agentIdentifier: string;
     sessionId: string;
     message: string;
     navigationPath?: string | null;

package/src/interfaces/IDraxAgentController.ts

@@ -1,5 +1,7 @@
 interface DraxAgentControllerOptions {
     permission?: string | false;
+    agentIdentifier?: string;
+    agentDescription?: string;
 }
 
 export type {DraxAgentControllerOptions};

package/src/routes/DraxAgentRoutes.ts

@@ -1,9 +1,10 @@
 import DraxAgentController from "../controllers/DraxAgentController.js";
 
 async function DraxAgentRoutes(fastify, options:any) {
-    const controller = new DraxAgentController();
+    const controller = new DraxAgentController(options);
     const prefix = "/api/ai/agent";
 
+    fastify.get(`${prefix}`, (req, rep) => controller.agents(req, rep));
     fastify.post(`${prefix}/session`, (req, rep) => controller.startSession(req, rep));
     fastify.post(`${prefix}/message`, (req, rep) => controller.message(req, rep));
 }

package/test/DraxAgent.test.ts

@@ -1,5 +1,6 @@
 import {describe, expect, test} from "vitest";
 import {DraxAgent} from "../src/agents/DraxAgent.js";
+import {DraxAgentFactory} from "../src/factory/DraxAgentFactory.js";
 import type {IAIProvider, IPromptParams, IPromptResponse, IPromptTool} from "../src/interfaces/IAIProvider.js";
 
 class MockProvider implements IAIProvider {
@@ -23,9 +24,29 @@ class MockProvider implements IAIProvider {
 }
 
 describe("DraxAgent", () => {
+    test("factory returns one agent instance per identifier", () => {
+        expect(DraxAgentFactory.instance()).toBe(DraxAgentFactory.instance("default"));
+        expect(DraxAgentFactory.instance("taskSpecialist")).toBe(DraxAgentFactory.instance("taskSpecialist"));
+        expect(DraxAgentFactory.instance("taskSpecialist")).not.toBe(DraxAgentFactory.instance("default"));
+        expect(DraxAgentFactory.agents()).toContain(DraxAgentFactory.instance("taskSpecialist"));
+        expect(new DraxAgent()).not.toBe(new DraxAgent());
+    });
+
+    test("stores agent identifier and description", () => {
+        const defaultAgent = new DraxAgent();
+        const specialist = DraxAgentFactory.instance("taskSpecialistWithDescription", "Resuelve tareas especificas");
+
+        expect(defaultAgent.identifier).toBe("default");
+        expect(defaultAgent.description).toBe("");
+        expect(specialist.identifier).toBe("taskSpecialistWithDescription");
+        expect(specialist.description).toBe("Resuelve tareas especificas");
+        expect(DraxAgentFactory.instance("taskSpecialistWithDescription", "Otra descripcion")).toBe(specialist);
+        expect(DraxAgentFactory.instance("taskSpecialistWithDescription").description).toBe("Resuelve tareas especificas");
+    });
+
     test("creates a session and sends messages through the injected provider", async () => {
         const provider = new MockProvider();
-        const agent = DraxAgent.instance().clearSessions().configure({
+        const agent = new DraxAgent().configure({
             provider,
             systemPrompt: "Sos un asistente.",
             sessionService: false,
@@ -74,7 +95,7 @@ describe("DraxAgent", () => {
             },
         };
 
-        const agent = DraxAgent.instance().clearSessions().configure({
+        const agent = new DraxAgent().configure({
             provider,
             systemPrompt: "Prompt base.",
             sessionService: false,
@@ -99,7 +120,7 @@ describe("DraxAgent", () => {
 
     test("uses previous session messages as history", async () => {
         const provider = new MockProvider();
-        const agent = DraxAgent.instance().clearSessions().configure({
+        const agent = new DraxAgent().configure({
             provider,
             systemPrompt: "Sos un asistente.",
             sessionService: false,
@@ -125,7 +146,7 @@ describe("DraxAgent", () => {
 
     test("returns a navigation path from tool execution metadata", async () => {
         const provider = new MockProvider();
-        const agent = DraxAgent.instance().clearSessions().configure({
+        const agent = new DraxAgent().configure({
             provider,
             systemPrompt: "Sos un asistente.",
             sessionService: false,
@@ -178,7 +199,7 @@ describe("DraxAgent", () => {
             }),
         } as any;
 
-        const agent = DraxAgent.instance().clearSessions().configure({
+        const agent = new DraxAgent().configure({
             provider,
             systemPrompt: "Sos un asistente.",
             sessionService,