insforge 1.2.10 → 1.4.8

package/backend/src/services/ai/ai-config.service.ts

@@ -32,7 +32,7 @@ export class AIConfigService {
   ): Promise<{ id: string }> {
     try {
       const result = await this.getPool().query(
-        `INSERT INTO _ai_configs (input_modality, output_modality, provider, model_id, system_prompt)
+        `INSERT INTO ai.configs (input_modality, output_modality, provider, model_id, system_prompt)
          VALUES ($1, $2, $3, $4, $5)
          RETURNING id`,
         [inputModality, outputModality, provider, modelId, systemPrompt || null]
@@ -62,8 +62,8 @@ export class AIConfigService {
           COALESCE(SUM(u.input_tokens + u.output_tokens), 0)::INTEGER as "totalTokens",
           COALESCE(SUM(u.image_count), 0)::INTEGER as "totalImageCount",
           COALESCE(COUNT(u.id), 0)::INTEGER as "totalRequests"
-         FROM _ai_configs c
-         LEFT JOIN _ai_usage u ON c.id = u.config_id
+         FROM ai.configs c
+         LEFT JOIN ai.usage u ON c.id = u.config_id
          GROUP BY c.id, c.input_modality, c.output_modality, c.provider, c.model_id, c.system_prompt, c.created_at
          ORDER BY c.created_at DESC`
       );
@@ -92,7 +92,7 @@ export class AIConfigService {
   async update(id: string, systemPrompt: string | null): Promise<boolean> {
     try {
       const result = await this.getPool().query(
-        `UPDATE _ai_configs
+        `UPDATE ai.configs
          SET system_prompt = $1, updated_at = NOW()
          WHERE id = $2`,
         [systemPrompt, id]
@@ -111,7 +111,7 @@ export class AIConfigService {
 
   async delete(id: string): Promise<boolean> {
     try {
-      const result = await this.getPool().query('DELETE FROM _ai_configs WHERE id = $1', [id]);
+      const result = await this.getPool().query('DELETE FROM ai.configs WHERE id = $1', [id]);
 
       const success = (result.rowCount ?? 0) > 0;
       if (success) {
@@ -128,7 +128,7 @@ export class AIConfigService {
     try {
       const result = await this.getPool().query(
         `SELECT id, input_modality as "inputModality", output_modality as "outputModality", provider, model_id as "modelId", system_prompt as "systemPrompt", created_at, updated_at
-         FROM _ai_configs
+         FROM ai.configs
          WHERE model_id = $1`,
         [modelId]
       );

package/backend/src/services/ai/ai-model.service.ts

@@ -1,60 +1,60 @@
-import { isCloudEnvironment } from '@/utils/environment.js';
-import { AIClientService } from '@/providers/ai/openrouter.provider.js';
-import type { RawOpenRouterModel } from '@/types/ai.js';
-import type { AIModelSchema } from '@insforge/shared-schemas';
-import { calculatePriceLevel, filterAndSortModalities, getProviderOrder } from './helpers.js';
-
-export class AIModelService {
-  /**
-   * Get all available AI models
-   * Fetches from cloud API if in cloud environment, otherwise from OpenRouter directly
-   */
-  static async getModels(): Promise<AIModelSchema[]> {
-    const credentialsService = AIClientService.getInstance();
-    const configured = credentialsService.isConfigured();
-
-    if (!configured) {
-      return [];
-    }
-
-    // Get API key from credentials service
-    const apiKey = await credentialsService.getApiKey();
-
-    // Determine the API endpoint based on environment
-    const apiUrl = isCloudEnvironment()
-      ? 'https://api.insforge.dev/ai/v1/models'
-      : 'https://openrouter.ai/api/v1/models/user';
-
-    // Fetch models from the appropriate endpoint
-    const response = await fetch(apiUrl, {
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-      },
-    });
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch models: ${response.statusText}`);
-    }
-
-    const data = (await response.json()) as { data: RawOpenRouterModel[] };
-    const rawModels = data.data || [];
-
-    const models: AIModelSchema[] = rawModels
-      .map((rawModel) => ({
-        id: rawModel.id, // OpenRouter provided model ID
-        modelId: rawModel.id,
-        provider: 'openrouter',
-        inputModality: filterAndSortModalities(rawModel.architecture?.input_modalities || []),
-        outputModality: filterAndSortModalities(rawModel.architecture?.output_modalities || []),
-        priceLevel: calculatePriceLevel(rawModel.pricing),
-      }))
-      .sort((a, b) => {
-        const [aCompany = '', bCompany = ''] = [a.id.split('/')[0], b.id.split('/')[0]];
-
-        const orderDiff = getProviderOrder(aCompany) - getProviderOrder(bCompany);
-        return orderDiff !== 0 ? orderDiff : a.id.localeCompare(b.id);
-      });
-
-    return models || [];
-  }
-}
+import { isCloudEnvironment } from '@/utils/environment.js';
+import { OpenRouterProvider } from '@/providers/ai/openrouter.provider.js';
+import type { RawOpenRouterModel } from '@/types/ai.js';
+import type { AIModelSchema } from '@insforge/shared-schemas';
+import { calculatePriceLevel, filterAndSortModalities, getProviderOrder } from './helpers.js';
+
+export class AIModelService {
+  /**
+   * Get all available AI models
+   * Fetches from cloud API if in cloud environment, otherwise from OpenRouter directly
+   */
+  static async getModels(): Promise<AIModelSchema[]> {
+    const openRouterProvider = OpenRouterProvider.getInstance();
+    const configured = openRouterProvider.isConfigured();
+
+    if (!configured) {
+      return [];
+    }
+
+    // Get API key from OpenRouter provider
+    const apiKey = await openRouterProvider.getApiKey();
+
+    // Determine the API endpoint based on environment
+    const apiUrl = isCloudEnvironment()
+      ? 'https://api.insforge.dev/ai/v1/models'
+      : 'https://openrouter.ai/api/v1/models/user';
+
+    // Fetch models from the appropriate endpoint
+    const response = await fetch(apiUrl, {
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch models: ${response.statusText}`);
+    }
+
+    const data = (await response.json()) as { data: RawOpenRouterModel[] };
+    const rawModels = data.data || [];
+
+    const models: AIModelSchema[] = rawModels
+      .map((rawModel) => ({
+        id: rawModel.id, // OpenRouter provided model ID
+        modelId: rawModel.id,
+        provider: 'openrouter',
+        inputModality: filterAndSortModalities(rawModel.architecture?.input_modalities || []),
+        outputModality: filterAndSortModalities(rawModel.architecture?.output_modalities || []),
+        priceLevel: calculatePriceLevel(rawModel.pricing),
+      }))
+      .sort((a, b) => {
+        const [aCompany = '', bCompany = ''] = [a.id.split('/')[0], b.id.split('/')[0]];
+
+        const orderDiff = getProviderOrder(aCompany) - getProviderOrder(bCompany);
+        return orderDiff !== 0 ? orderDiff : a.id.localeCompare(b.id);
+      });
+
+    return models || [];
+  }
+}

package/backend/src/services/ai/ai-usage.service.ts

@@ -31,7 +31,7 @@ export class AIUsageService {
   async trackUsage(data: AIUsageDataSchema): Promise<{ id: string }> {
     try {
       const result = await this.getPool().query(
-        `INSERT INTO _ai_usage (config_id, input_tokens, output_tokens, image_count, image_resolution)
+        `INSERT INTO ai.usage (config_id, input_tokens, output_tokens, image_count, image_resolution)
          VALUES ($1, $2, $3, $4, $5)
          RETURNING id`,
         [
@@ -68,7 +68,7 @@ export class AIUsageService {
 
     try {
       const usageResult = await this.getPool().query(
-        `INSERT INTO _ai_usage (config_id, input_tokens, output_tokens, model_id)
+        `INSERT INTO ai.usage (config_id, input_tokens, output_tokens, model_id)
          VALUES ($1, $2, $3, $4)
          RETURNING id`,
         [configId, inputTokens || null, outputTokens || null, modelId || null]
@@ -100,7 +100,7 @@ export class AIUsageService {
   ): Promise<{ id: string }> {
     try {
       const usageResult = await this.getPool().query(
-        `INSERT INTO _ai_usage (config_id, image_count, image_resolution, input_tokens, output_tokens, model_id)
+        `INSERT INTO ai.usage (config_id, image_count, image_resolution, input_tokens, output_tokens, model_id)
          VALUES ($1, $2, $3, $4, $5, $6)
          RETURNING id`,
         [
@@ -140,7 +140,7 @@ export class AIUsageService {
         SELECT id, config_id as "configId", input_tokens as "inputTokens",
                output_tokens as "outputTokens", image_count as "imageCount",
                image_resolution as "imageResolution", created_at as "createdAt"
-        FROM _ai_usage
+        FROM ai.usage
         WHERE config_id = $1
       `;
 
@@ -180,7 +180,7 @@ export class AIUsageService {
           COALESCE(SUM(COALESCE(input_tokens, 0) + COALESCE(output_tokens, 0)), 0) as "totalTokens",
           COALESCE(SUM(image_count), 0) as "totalImageCount",
           COUNT(*) as "totalRequests"
-        FROM _ai_usage
+        FROM ai.usage
         WHERE 1=1
       `;
 
@@ -237,8 +237,8 @@ export class AIUsageService {
           c.provider,
           c.input_modality as "inputModality",
           c.output_modality as "outputModality"
-        FROM _ai_usage u
-        LEFT JOIN _ai_configs c ON u.config_id = c.id
+        FROM ai.usage u
+        LEFT JOIN ai.configs c ON u.config_id = c.id
         WHERE 1=1
       `;