@drax/ai-back 3.51.1 → 3.52.0

package/src/providers/ai/DeepSeekAiProvider.ts

@@ -1,6 +1,4 @@
 import OpenAI from "openai";
-import type {IAILogBase} from "@drax/ai-share";
-import type {IPromptParams} from "../../interfaces/IAIProvider.js";
 import type {AILogService} from "../../services/AILogService.js";
 import OpenAiProvider from "./OpenAiProvider.js";
 
@@ -15,7 +13,7 @@ class DeepSeekAiProvider extends OpenAiProvider{
             throw new Error("DeepSeek model required")
         }
 
-        super(apiKey, model, visionModel, aiLogService)
+        super(apiKey, model, visionModel, aiLogService, "deepseek")
 
         if (!baseUrl) {
             throw new Error("DeepSeek baseUrl required")
@@ -35,23 +33,6 @@ class DeepSeekAiProvider extends OpenAiProvider{
         return this._client
     }
 
-    protected buildLogPayload(input: IPromptParams, params: {
-        model: string,
-        systemPrompt: string,
-        startedAt: Date,
-        endedAt?: Date,
-        inputTokens?: number,
-        outputTokens?: number,
-        tokens?: number,
-        output?: unknown,
-        success: boolean,
-        errorMessage?: string,
-    }): IAILogBase {
-        return {
-            ...super.buildLogPayload(input, params),
-            provider: "deepseek",
-        }
-    }
 }
 
 export default DeepSeekAiProvider

package/src/providers/ai/GoogleAiProvider.ts

@@ -8,7 +8,6 @@ import type {
 } from "@google/genai";
 import {toJSONSchema} from "zod";
 import type {
-    IAIProvider,
     IPromptContentPart,
     IPromptMessage,
     IPromptParams,
@@ -16,15 +15,14 @@ import type {
     IPromptTool
 } from "../../interfaces/IAIProvider.js";
 import type {AILogService} from "../../services/AILogService.js";
-import type {IAILogBase} from "@drax/ai-share";
 import PromptAudioService from "../../services/PromptAudioService.js";
+import AbstractAiProvider from "./AbstractAiProvider.js";
 
-class GoogleAiProvider implements IAIProvider{
+class GoogleAiProvider extends AbstractAiProvider{
     protected _apiKey: string
     protected _model: any
     protected _visionModel?: string
     protected _client: GoogleGenAI | undefined
-    protected _aiLogService?: AILogService
 
     constructor(apiKey: string, model: string, visionModel?: string, aiLogService?: AILogService) {
 
@@ -35,10 +33,11 @@ class GoogleAiProvider implements IAIProvider{
             throw new Error("Google AI model required")
         }
 
+        super("googleai", aiLogService)
+
         this._apiKey = apiKey
         this._model = model
         this._visionModel = visionModel
-        this._aiLogService = aiLogService
     }
 
     get model(){
@@ -169,117 +168,6 @@ class GoogleAiProvider implements IAIProvider{
         })
     }
 
-    protected hasImageInput(input: IPromptParams){
-        if(input.userImages && input.userImages.length > 0){
-            return true
-        }
-
-        if(input.userContent?.some(part => part.type === 'image')){
-            return true
-        }
-
-        return input.history?.some(message =>
-            Array.isArray(message.content) && message.content.some(part => part.type === 'image')
-        ) ?? false
-    }
-
-    protected serializePromptInput(input: IPromptParams, systemPrompt: string){
-        return JSON.stringify({
-            systemPrompt,
-            history: input.history,
-            userInput: input.userInput,
-            userContent: input.userContent,
-            memory: input.memory,
-            knowledgeBase: input.knowledgeBase,
-            tools: input.tools?.map(tool => ({
-                name: tool.name,
-                description: tool.description,
-                parameters: tool.parameters,
-            })),
-        })
-    }
-
-    protected serializePromptOutput(output: unknown){
-        if (typeof output === "string") {
-            return output
-        }
-
-        if (output === null || output === undefined) {
-            return undefined
-        }
-
-        return JSON.stringify(output)
-    }
-
-    protected buildLogPayload(input: IPromptParams, params: {
-        model: string,
-        systemPrompt: string,
-        startedAt: Date,
-        endedAt?: Date,
-        inputTokens?: number,
-        outputTokens?: number,
-        tokens?: number,
-        output?: unknown,
-        success: boolean,
-        errorMessage?: string,
-    }): IAILogBase {
-        return {
-            provider: "googleai",
-            model: params.model,
-            operationTitle: input.operationTitle,
-            operationGroup: input.operationGroup,
-            ip: input.ip,
-            userAgent: input.userAgent,
-            input: this.serializePromptInput(input, params.systemPrompt),
-            inputImages: input.userImages?.map(image => ({
-                url: image.url,
-            })) ?? input.userContent
-                ?.filter(part => part.type === "image")
-                .map(part => ({
-                    url: part.imageUrl,
-                })),
-            inputFiles: input.inputFiles,
-            inputTokens: params.inputTokens,
-            outputTokens: params.outputTokens,
-            tokens: params.tokens,
-            startedAt: params.startedAt,
-            endedAt: params.endedAt,
-            responseTime: params.endedAt ? `${params.endedAt.getTime() - params.startedAt.getTime()}ms` : undefined,
-            output: this.serializePromptOutput(params.output),
-            success: params.success,
-            errorMessage: params.errorMessage,
-            tenant: input.tenant,
-            user: input.user,
-        }
-    }
-
-    protected async registerPromptLog(input: IPromptParams, params: {
-        model: string,
-        systemPrompt: string,
-        startedAt: Date,
-        endedAt?: Date,
-        inputTokens?: number,
-        outputTokens?: number,
-        tokens?: number,
-        output?: unknown,
-        success: boolean,
-        errorMessage?: string,
-    }){
-        if(!this._aiLogService){
-            return
-        }
-
-        try{
-            await this._aiLogService.create(this.buildLogPayload(input, params))
-        }catch(e: any){
-            console.error("Error registerPromptLog", {
-                name: e?.name,
-                message: e?.message,
-                stack: e?.stack,
-            })
-        }
-    }
-
     async generateEmbedding({text, model="text-embedding-004"}: {text:string,model?:string }): Promise<number[]> {
         const response = await this.client.models.embedContent({
             model,

package/src/providers/ai/OllamaAiProvider.ts

@@ -1,6 +1,5 @@
 import {toJSONSchema} from "zod";
 import type {
-    IAIProvider,
     IPromptContentPart,
     IPromptMessage,
     IPromptParams,
@@ -8,8 +7,8 @@ import type {
     IPromptTool
 } from "../../interfaces/IAIProvider.js";
 import type {AILogService} from "../../services/AILogService.js";
-import type {IAILogBase} from "@drax/ai-share";
 import PromptAudioService from "../../services/PromptAudioService.js";
+import AbstractAiProvider from "./AbstractAiProvider.js";
 
 type OllamaMessage = {
     role: "system" | "user" | "assistant" | "tool",
@@ -25,12 +24,11 @@ type OllamaToolCall = {
     }
 }
 
-class OllamaAiProvider implements IAIProvider{
+class OllamaAiProvider extends AbstractAiProvider{
     protected _baseUrl: string
     protected _model: string
     protected _visionModel?: string
     protected _embeddingModel?: string
-    protected _aiLogService?: AILogService
 
     constructor(baseUrl: string, model: string, visionModel?: string, embeddingModel?: string, aiLogService?: AILogService) {
 
@@ -41,11 +39,12 @@ class OllamaAiProvider implements IAIProvider{
             throw new Error("Ollama AI model required")
         }
 
+        super("ollamaai", aiLogService)
+
         this._baseUrl = baseUrl.replace(/\/+$/, "")
         this._model = model
         this._visionModel = visionModel
         this._embeddingModel = embeddingModel
-        this._aiLogService = aiLogService
     }
 
     get model(){
@@ -154,117 +153,6 @@ class OllamaAiProvider implements IAIProvider{
         return messages
     }
 
-    protected hasImageInput(input: IPromptParams){
-        if(input.userImages && input.userImages.length > 0){
-            return true
-        }
-
-        if(input.userContent?.some(part => part.type === 'image')){
-            return true
-        }
-
-        return input.history?.some(message =>
-            Array.isArray(message.content) && message.content.some(part => part.type === 'image')
-        ) ?? false
-    }
-
-    protected serializePromptInput(input: IPromptParams, systemPrompt: string){
-        return JSON.stringify({
-            systemPrompt,
-            history: input.history,
-            userInput: input.userInput,
-            userContent: input.userContent,
-            memory: input.memory,
-            knowledgeBase: input.knowledgeBase,
-            tools: input.tools?.map(tool => ({
-                name: tool.name,
-                description: tool.description,
-                parameters: tool.parameters,
-            })),
-        })
-    }
-
-    protected serializePromptOutput(output: unknown){
-        if (typeof output === "string") {
-            return output
-        }
-
-        if (output === null || output === undefined) {
-            return undefined
-        }
-
-        return JSON.stringify(output)
-    }
-
-    protected buildLogPayload(input: IPromptParams, params: {
-        model: string,
-        systemPrompt: string,
-        startedAt: Date,
-        endedAt?: Date,
-        inputTokens?: number,
-        outputTokens?: number,
-        tokens?: number,
-        output?: unknown,
-        success: boolean,
-        errorMessage?: string,
-    }): IAILogBase {
-        return {
-            provider: "ollamaai",
-            model: params.model,
-            operationTitle: input.operationTitle,
-            operationGroup: input.operationGroup,
-            ip: input.ip,
-            userAgent: input.userAgent,
-            input: this.serializePromptInput(input, params.systemPrompt),
-            inputImages: input.userImages?.map(image => ({
-                url: image.url,
-            })) ?? input.userContent
-                ?.filter(part => part.type === "image")
-                .map(part => ({
-                    url: part.imageUrl,
-                })),
-            inputFiles: input.inputFiles,
-            inputTokens: params.inputTokens,
-            outputTokens: params.outputTokens,
-            tokens: params.tokens,
-            startedAt: params.startedAt,
-            endedAt: params.endedAt,
-            responseTime: params.endedAt ? `${params.endedAt.getTime() - params.startedAt.getTime()}ms` : undefined,
-            output: this.serializePromptOutput(params.output),
-            success: params.success,
-            errorMessage: params.errorMessage,
-            tenant: input.tenant,
-            user: input.user,
-        }
-    }
-
-    protected async registerPromptLog(input: IPromptParams, params: {
-        model: string,
-        systemPrompt: string,
-        startedAt: Date,
-        endedAt?: Date,
-        inputTokens?: number,
-        outputTokens?: number,
-        tokens?: number,
-        output?: unknown,
-        success: boolean,
-        errorMessage?: string,
-    }){
-        if(!this._aiLogService){
-            return
-        }
-
-        try{
-            await this._aiLogService.create(this.buildLogPayload(input, params))
-        }catch(e: any){
-            console.error("Error registerPromptLog", {
-                name: e?.name,
-                message: e?.message,
-                stack: e?.stack,
-            })
-        }
-    }
-
     async generateEmbedding({text, model}: {text:string, model?:string }): Promise<number[]> {
         const response = await this.post<any>("/api/embed", {
             model: model ?? this.embeddingModel,

package/src/providers/ai/OpenAiProvider.ts

@@ -1,7 +1,6 @@
 import OpenAI from "openai";
 import { zodResponseFormat } from "openai/helpers/zod";
 import type {
-    IAIProvider,
     IPromptContentPart,
     IPromptMessage,
     IPromptParams,
@@ -9,17 +8,16 @@ import type {
     IPromptTool
 } from "../../interfaces/IAIProvider.js";
 import type {AILogService} from "../../services/AILogService.js";
-import type {IAILogBase} from "@drax/ai-share";
 import PromptAudioService from "../../services/PromptAudioService.js";
+import AbstractAiProvider from "./AbstractAiProvider.js";
 
-class OpenAiProvider implements IAIProvider{
+class OpenAiProvider extends AbstractAiProvider{
     protected _apiKey: string
     protected _model: any
     protected _visionModel?: string
     protected _client: any
-    protected _aiLogService?: AILogService
 
-    constructor(apiKey: string, model: string, visionModel?: string, aiLogService?: AILogService) {
+    constructor(apiKey: string, model: string, visionModel?: string, aiLogService?: AILogService, providerName: string = "openai") {
 
         if (!apiKey) {
             throw new Error("OpenAI apiKey required")
@@ -28,10 +26,11 @@ class OpenAiProvider implements IAIProvider{
             throw new Error("OpenAI model required")
         }
 
+        super(providerName, aiLogService)
+
         this._apiKey = apiKey
         this._model = model
         this._visionModel = visionModel
-        this._aiLogService = aiLogService
     }
 
     get model(){
@@ -109,117 +108,6 @@ class OpenAiProvider implements IAIProvider{
         }))
     }
 
-    protected hasImageInput(input: IPromptParams){
-        if(input.userImages && input.userImages.length > 0){
-            return true
-        }
-
-        if(input.userContent?.some(part => part.type === 'image')){
-            return true
-        }
-
-        return input.history?.some(message =>
-            Array.isArray(message.content) && message.content.some(part => part.type === 'image')
-        ) ?? false
-    }
-
-    protected serializePromptInput(input: IPromptParams, systemPrompt: string){
-        return JSON.stringify({
-            systemPrompt,
-            history: input.history,
-            userInput: input.userInput,
-            userContent: input.userContent,
-            memory: input.memory,
-            knowledgeBase: input.knowledgeBase,
-            tools: input.tools?.map(tool => ({
-                name: tool.name,
-                description: tool.description,
-                parameters: tool.parameters,
-            })),
-        })
-    }
-
-    protected serializePromptOutput(output: unknown){
-        if (typeof output === "string") {
-            return output
-        }
-
-        if (output === null || output === undefined) {
-            return undefined
-        }
-
-        return JSON.stringify(output)
-    }
-
-    protected buildLogPayload(input: IPromptParams, params: {
-        model: string,
-        systemPrompt: string,
-        startedAt: Date,
-        endedAt?: Date,
-        inputTokens?: number,
-        outputTokens?: number,
-        tokens?: number,
-        output?: unknown,
-        success: boolean,
-        errorMessage?: string,
-    }): IAILogBase {
-        return {
-            provider: "openai",
-            model: params.model,
-            operationTitle: input.operationTitle,
-            operationGroup: input.operationGroup,
-            ip: input.ip,
-            userAgent: input.userAgent,
-            input: this.serializePromptInput(input, params.systemPrompt),
-            inputImages: input.userImages?.map(image => ({
-                url: image.url,
-            })) ?? input.userContent
-                ?.filter(part => part.type === "image")
-                .map(part => ({
-                    url: part.imageUrl,
-                })),
-            inputFiles: input.inputFiles,
-            inputTokens: params.inputTokens,
-            outputTokens: params.outputTokens,
-            tokens: params.tokens,
-            startedAt: params.startedAt,
-            endedAt: params.endedAt,
-            responseTime: params.endedAt ? `${params.endedAt.getTime() - params.startedAt.getTime()}ms` : undefined,
-            output: this.serializePromptOutput(params.output),
-            success: params.success,
-            errorMessage: params.errorMessage,
-            tenant: input.tenant,
-            user: input.user,
-        }
-    }
-
-    protected async registerPromptLog(input: IPromptParams, params: {
-        model: string,
-        systemPrompt: string,
-        startedAt: Date,
-        endedAt?: Date,
-        inputTokens?: number,
-        outputTokens?: number,
-        tokens?: number,
-        output?: unknown,
-        success: boolean,
-        errorMessage?: string,
-    }){
-        if(!this._aiLogService){
-            return
-        }
-
-        try{
-            await this._aiLogService.create(this.buildLogPayload(input, params))
-        }catch(e: any){
-            console.error("Error registerPromptLog", {
-                name: e?.name,
-                message: e?.message,
-                stack: e?.stack,
-            })
-        }
-    }
-
     async generateEmbedding({text, model="text-embedding-ada-002"}: {text:string,model:string }): Promise<number[]> {
         const response = await this.client.embeddings.create({
             model: model,

package/src/repository/sqlite/AILogSqliteRepository.ts

@@ -37,6 +37,7 @@ class AILogSqliteRepository extends AbstractSqliteRepository<IAILog, IAILogBase,
 {name: "startedAt", type: "TEXT", unique: false, primary: false},
 {name: "endedAt", type: "TEXT", unique: false, primary: false},
 {name: "responseTime", type: "TEXT", unique: false, primary: false},
+{name: "responseTimeMS", type: "REAL", unique: false, primary: false},
 {name: "output", type: "TEXT", unique: false, primary: false},
 {name: "success", type: "TEXT", unique: false, primary: false},
 {name: "statusCode", type: "INTEGER", unique: false, primary: false},
@@ -50,4 +51,3 @@ class AILogSqliteRepository extends AbstractSqliteRepository<IAILog, IAILogBase,
 
 export default AILogSqliteRepository
 export {AILogSqliteRepository}
-

package/src/routes/AILogRoutes.ts

@@ -9,29 +9,29 @@ async function AILogFastifyRoutes(fastify, options) {
     const schemas = new CrudSchemaBuilder(AILogSchema, AILogBaseSchema,AILogBaseSchema, 'AILog', 'openapi-3.0', ['ai']);
 
     fastify.get('/api/ailog', {schema: schemas.paginateSchema}, (req,rep) => controller.paginate(req,rep))
-    
+
     fastify.get('/api/ailog/find', {schema: schemas.findSchema}, (req,rep) => controller.find(req,rep))
-    
+
     fastify.get('/api/ailog/search', {schema: schemas.searchSchema}, (req,rep) => controller.search(req,rep))
-    
+
     fastify.get('/api/ailog/:id', {schema: schemas.findByIdSchema}, (req,rep) => controller.findById(req,rep))
-    
+
     fastify.get('/api/ailog/find-one', {schema: schemas.findOneSchema}, (req,rep) => controller.findOne(req,rep))
-    
+
     fastify.get('/api/ailog/group-by', {schema: schemas.groupBySchema}, (req,rep) => controller.groupBy(req,rep))
 
-    fastify.post('/api/ailog', {schema: schemas.createSchema}, (req,rep) =>controller.create(req,rep))
+    // fastify.post('/api/ailog', {schema: schemas.createSchema}, (req,rep) =>controller.create(req,rep))
 
-    fastify.put('/api/ailog/:id', {schema: schemas.updateSchema}, (req,rep) =>controller.update(req,rep))
-    
-    fastify.patch('/api/ailog/:id', {schema: schemas.updateSchema}, (req,rep) =>controller.updatePartial(req,rep))
+    // fastify.put('/api/ailog/:id', {schema: schemas.updateSchema}, (req,rep) =>controller.update(req,rep))
+
+    // fastify.patch('/api/ailog/:id', {schema: schemas.updateSchema}, (req,rep) =>controller.updatePartial(req,rep))
+
+    // fastify.delete('/api/ailog/:id', {schema: schemas.deleteSchema}, (req,rep) =>controller.delete(req,rep))
 
-    fastify.delete('/api/ailog/:id', {schema: schemas.deleteSchema}, (req,rep) =>controller.delete(req,rep))
-    
     fastify.get('/api/ailog/export', (req,rep) =>controller.export(req,rep))
-    
-    fastify.post('/api/ailog/import', (req,rep) => controller.import(req,rep))
-    
+
+    // fastify.post('/api/ailog/import', (req,rep) => controller.import(req,rep))
+
 }
 
 export default AILogFastifyRoutes;

package/src/schemas/AILogSchema.ts

@@ -33,6 +33,7 @@ const AILogBaseSchema = z.object({
     startedAt: z.coerce.date().nullable().optional(),
     endedAt: z.coerce.date().nullable().optional(),
     responseTime: z.string().optional(),
+    responseTimeMS: z.number().nullable().optional(),
     output: z.string().optional(),
     success: z.boolean().optional(),
     statusCode: z.number().nullable().optional(),
@@ -45,7 +46,9 @@ const AILogSchema = AILogBaseSchema
     .extend({
         _id: z.coerce.string(),
         tenant: z.object({_id: z.coerce.string(), name: z.string()}).nullable().optional(),
-        user: z.object({_id: z.coerce.string(), username: z.string()}).nullable().optional()
+        user: z.object({_id: z.coerce.string(), username: z.string()}).nullable().optional(),
+        createdAt: z.coerce.date().nullable().optional(),
+        updatedAt: z.coerce.date().nullable().optional(),
     })
 
 export default AILogSchema;