insforge 1.2.10 → 1.4.8

package/backend/src/services/ai/helpers.ts

@@ -1,64 +1,64 @@
-import type { RawOpenRouterModel } from '@/types/ai.js';
-import type { ModalitySchema } from '@insforge/shared-schemas';
-
-const MODALITY_ORDER = ['text', 'image', 'audio', 'video', 'file'];
-const PROVIDER_ORDER: Record<string, number> = {
-  openai: 1,
-  anthropic: 2,
-  google: 3,
-  amazon: 4,
-};
-
-/**
- * Sort modalities by predefined order
- */
-export function sortModalities(modalities: string[]): string[] {
-  return [...modalities].sort((a, b) => {
-    const aIndex = MODALITY_ORDER.indexOf(a);
-    const bIndex = MODALITY_ORDER.indexOf(b);
-    return aIndex - bIndex;
-  });
-}
-
-/**
- * Filter to only supported modalities and sort
- */
-export function filterAndSortModalities(modalities: string[]): ModalitySchema[] {
-  const supportedModalities: ModalitySchema[] = ['text', 'image'];
-  const filtered = modalities.filter((m): m is ModalitySchema =>
-    supportedModalities.includes(m as ModalitySchema)
-  );
-  return sortModalities(filtered) as ModalitySchema[];
-}
-
-/**
- * Calculate price level (0-3)
- */
-export function calculatePriceLevel(pricing: RawOpenRouterModel['pricing']): number {
-  if (!pricing) {
-    return 0;
-  }
-  if (pricing.prompt === '0' && pricing.completion === '0') {
-    return 0;
-  }
-
-  const promptCostPerToken = parseFloat(pricing.prompt) || 0;
-  const completionCostPerToken = parseFloat(pricing.completion) || 0;
-  const avgCostPer1M = ((promptCostPerToken + completionCostPerToken) / 2) * 1000000;
-
-  if (avgCostPer1M <= 3) {
-    return 1;
-  }
-  if (avgCostPer1M <= 15) {
-    return 2;
-  }
-  return 3;
-}
-
-/**
- * Get provider order for sorting
- */
-export function getProviderOrder(modelId: string): number {
-  const companyId = modelId.split('/')[0]?.toLowerCase() || '';
-  return PROVIDER_ORDER[companyId] || 999;
-}
+import type { RawOpenRouterModel } from '@/types/ai.js';
+import type { ModalitySchema } from '@insforge/shared-schemas';
+
+const MODALITY_ORDER = ['text', 'image', 'audio', 'video', 'file'];
+const PROVIDER_ORDER: Record<string, number> = {
+  openai: 1,
+  anthropic: 2,
+  google: 3,
+  amazon: 4,
+};
+
+/**
+ * Sort modalities by predefined order
+ */
+export function sortModalities(modalities: string[]): string[] {
+  return [...modalities].sort((a, b) => {
+    const aIndex = MODALITY_ORDER.indexOf(a);
+    const bIndex = MODALITY_ORDER.indexOf(b);
+    return aIndex - bIndex;
+  });
+}
+
+/**
+ * Filter to only supported modalities and sort
+ */
+export function filterAndSortModalities(modalities: string[]): ModalitySchema[] {
+  const supportedModalities: ModalitySchema[] = ['text', 'image', 'audio'];
+  const filtered = modalities.filter((m): m is ModalitySchema =>
+    supportedModalities.includes(m as ModalitySchema)
+  );
+  return sortModalities(filtered) as ModalitySchema[];
+}
+
+/**
+ * Calculate price level (0-3)
+ */
+export function calculatePriceLevel(pricing: RawOpenRouterModel['pricing']): number {
+  if (!pricing) {
+    return 0;
+  }
+  if (pricing.prompt === '0' && pricing.completion === '0') {
+    return 0;
+  }
+
+  const promptCostPerToken = parseFloat(pricing.prompt) || 0;
+  const completionCostPerToken = parseFloat(pricing.completion) || 0;
+  const avgCostPer1M = ((promptCostPerToken + completionCostPerToken) / 2) * 1000000;
+
+  if (avgCostPer1M <= 3) {
+    return 1;
+  }
+  if (avgCostPer1M <= 15) {
+    return 2;
+  }
+  return 3;
+}
+
+/**
+ * Get provider order for sorting
+ */
+export function getProviderOrder(modelId: string): number {
+  const companyId = modelId.split('/')[0]?.toLowerCase() || '';
+  return PROVIDER_ORDER[companyId] || 999;
+}

package/backend/src/services/ai/image-generation.service.ts

@@ -2,7 +2,7 @@ import OpenAI from 'openai';
 
 import { AIUsageService } from './ai-usage.service.js';
 import { AIConfigService } from './ai-config.service.js';
-import { AIClientService } from '@/providers/ai/openrouter.provider.js';
+import { OpenRouterProvider } from '@/providers/ai/openrouter.provider.js';
 import type {
   AIConfigurationSchema,
   ImageGenerationRequest,
@@ -14,7 +14,7 @@ import { OpenRouterImageMessage } from '@/types/ai.js';
 export class ImageGenerationService {
   private static aiUsageService = AIUsageService.getInstance();
   private static aiConfigService = AIConfigService.getInstance();
-  private static aiClientService = AIClientService.getInstance();
+  private static openRouterProvider = OpenRouterProvider.getInstance();
 
   /**
    * Validate model and get config
@@ -75,7 +75,7 @@ export class ImageGenerationService {
       };
 
       // Send request with automatic renewal and retry logic
-      const response = (await this.aiClientService.sendRequest((client) =>
+      const response = (await this.openRouterProvider.sendRequest((client) =>
         client.chat.completions.create(
           request as OpenAI.Chat.ChatCompletionCreateParamsNonStreaming
         )

package/backend/src/services/ai/index.ts

@@ -1,13 +1,13 @@
-export { AIConfigService } from './ai-config.service.js';
-export { AIModelService } from './ai-model.service.js';
-export { AIUsageService } from './ai-usage.service.js';
-export { ChatCompletionService } from './chat-completion.service.js';
-export { ImageGenerationService } from './image-generation.service.js';
-
-// Helper functions
-export {
-  sortModalities,
-  filterAndSortModalities,
-  calculatePriceLevel,
-  getProviderOrder,
-} from './helpers.js';
+export { AIConfigService } from './ai-config.service.js';
+export { AIModelService } from './ai-model.service.js';
+export { AIUsageService } from './ai-usage.service.js';
+export { ChatCompletionService } from './chat-completion.service.js';
+export { ImageGenerationService } from './image-generation.service.js';
+
+// Helper functions
+export {
+  sortModalities,
+  filterAndSortModalities,
+  calculatePriceLevel,
+  getProviderOrder,
+} from './helpers.js';

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

@@ -43,7 +43,7 @@ export class AuthConfigService {
           require_special_char as "requireSpecialChar",
           verify_email_method as "verifyEmailMethod",
           reset_password_method as "resetPasswordMethod"
-         FROM _auth_configs
+         FROM auth.configs
          LIMIT 1`
       );
 
@@ -93,7 +93,7 @@ export class AuthConfigService {
           sign_in_redirect_to as "signInRedirectTo",
           created_at as "createdAt",
           updated_at as "updatedAt"
-         FROM _auth_configs
+         FROM auth.configs
          LIMIT 1`
       );
 
@@ -138,7 +138,7 @@ export class AuthConfigService {
       await client.query('BEGIN');
 
       // Ensure config exists and lock row to prevent concurrent modifications
-      const existingResult = await client.query('SELECT id FROM _auth_configs LIMIT 1 FOR UPDATE');
+      const existingResult = await client.query('SELECT id FROM auth.configs LIMIT 1 FOR UPDATE');
 
       if (!existingResult.rows.length) {
         // Config doesn't exist, rollback and throw error
@@ -211,7 +211,7 @@ export class AuthConfigService {
       updates.push('updated_at = NOW()');
 
       const result = await client.query(
-        `UPDATE _auth_configs
+        `UPDATE auth.configs
          SET ${updates.join(', ')}
          RETURNING
            id,

package/backend/src/services/auth/auth-otp.service.ts

@@ -126,7 +126,7 @@ export class AuthOTPService {
       // Upsert token record - insert or update if email+purpose combination already exists
       // This ensures only one active token per email/purpose (replaces any existing token)
       await this.getPool().query(
-        `INSERT INTO _email_otps (email, purpose, otp_hash, expires_at, consumed_at)
+        `INSERT INTO auth.email_otps (email, purpose, otp_hash, expires_at, consumed_at)
          VALUES ($1, $2, $3, $4, NULL)
          ON CONFLICT (email, purpose)
          DO UPDATE SET
@@ -184,7 +184,7 @@ export class AuthOTPService {
       // Lookup by email and lock the row
       const result = await client.query(
         `SELECT id, email, purpose, otp_hash, expires_at, consumed_at
-         FROM _email_otps
+         FROM auth.email_otps
          WHERE email = $1 AND purpose = $2
          FOR UPDATE`,
         [email, purpose]
@@ -211,7 +211,7 @@ export class AuthOTPService {
 
       // Mark OTP as consumed atomically
       const consume = await client.query(
-        `UPDATE _email_otps
+        `UPDATE auth.email_otps
          SET consumed_at = NOW(), updated_at = NOW()
          WHERE id = $1 AND consumed_at IS NULL`,
         [otpRecord.id]
@@ -279,7 +279,7 @@ export class AuthOTPService {
       // Direct lookup by hash - O(1) with index on otp_hash
       const result = await client.query(
         `SELECT id, email, purpose, otp_hash, expires_at, consumed_at
-         FROM _email_otps
+         FROM auth.email_otps
          WHERE purpose = $1
            AND otp_hash = $2
            AND expires_at > NOW()
@@ -297,7 +297,7 @@ export class AuthOTPService {
 
       // Mark OTP as consumed atomically
       const consume = await client.query(
-        `UPDATE _email_otps
+        `UPDATE auth.email_otps
          SET consumed_at = NOW(), updated_at = NOW()
          WHERE id = $1 AND consumed_at IS NULL`,
         [otpRecord.id]
@@ -385,7 +385,7 @@ export class AuthOTPService {
       // Step 3: Insert the new token (replaces the consumed numeric code)
       // Uses upsert to overwrite the consumed code record with the new token
       await client.query(
-        `INSERT INTO _email_otps (email, purpose, otp_hash, expires_at, consumed_at)
+        `INSERT INTO auth.email_otps (email, purpose, otp_hash, expires_at, consumed_at)
          VALUES ($1, $2, $3, $4, NULL)
          ON CONFLICT (email, purpose)
          DO UPDATE SET