django admin Groups reorg, Frontend udpates for site settings, #Migration runs

backend/igny8_core/ai/tasks.py

@@ -181,42 +181,26 @@ def process_image_generation_queue(self, image_ids: list, account_id: int = None
     failed = 0
     results = []
     
-    # Get image generation settings
-    # Try account-specific override, otherwise use GlobalIntegrationSettings
+    # Get image generation settings from AISettings (with account overrides)
     logger.info("[process_image_generation_queue] Step 1: Loading image generation settings")
-    from igny8_core.modules.system.global_settings_models import GlobalIntegrationSettings
+    from igny8_core.modules.system.ai_settings import AISettings
+    from igny8_core.ai.model_registry import ModelRegistry
     
-    config = {}
-    try:
-        image_settings = IntegrationSettings.objects.get(
-            account=account,
-            integration_type='image_generation',
-            is_active=True
-        )
-        logger.info(f"[process_image_generation_queue] Using account {account.id} IntegrationSettings override")
-        config = image_settings.config or {}
-    except IntegrationSettings.DoesNotExist:
-        logger.info(f"[process_image_generation_queue] No IntegrationSettings override for account {account.id}, using GlobalIntegrationSettings")
-    except Exception as e:
-        logger.error(f"[process_image_generation_queue] ERROR loading image generation settings: {e}", exc_info=True)
-        return {'success': False, 'error': f'Error loading image generation settings: {str(e)}'}
+    # Get effective settings
+    image_type = AISettings.get_effective_image_style(account)
+    image_format = 'webp'  # Default format
     
-    # Use GlobalIntegrationSettings for missing values
-    global_settings = GlobalIntegrationSettings.get_instance()
-    
-    logger.info(f"[process_image_generation_queue] Image generation settings loaded. Config keys: {list(config.keys())}")
-    logger.info(f"[process_image_generation_queue] Full config: {config}")
-    
-    # Get provider and model from config with global fallbacks
-    provider = config.get('provider') or global_settings.default_image_service
-    if provider == 'runware':
-        model = config.get('model') or config.get('imageModel') or global_settings.runware_model
+    # Get default image model from database
+    default_model = ModelRegistry.get_default_model('image')
+    if default_model:
+        model_config = ModelRegistry.get_model(default_model)
+        provider = model_config.provider if model_config else 'openai'
+        model = default_model
     else:
-        model = config.get('model') or config.get('imageModel') or global_settings.dalle_model
+        provider = 'openai'
+        model = 'dall-e-3'
     
     logger.info(f"[process_image_generation_queue] Using PROVIDER: {provider}, MODEL: {model} from settings")
-    image_type = config.get('image_type') or global_settings.image_style
-    image_format = config.get('image_format', 'webp')
     
     # Style to prompt enhancement mapping
     # These style descriptors are added to the image prompt for better results
@@ -268,22 +252,15 @@ def process_image_generation_queue(self, image_ids: list, account_id: int = None
     logger.info(f"  - Featured image size: {featured_image_size}")
     logger.info(f"  - In-article square: {in_article_square_size}, landscape: {in_article_landscape_size}")
     
-    # Get provider API key
-    # API keys are ALWAYS from GlobalIntegrationSettings (accounts cannot override API keys)
-    # Account IntegrationSettings only store provider preference, NOT API keys
-    logger.info(f"[process_image_generation_queue] Step 2: Loading {provider.upper()} API key from GlobalIntegrationSettings")
+    # Get provider API key from IntegrationProvider (centralized)
+    logger.info(f"[process_image_generation_queue] Step 2: Loading {provider.upper()} API key from IntegrationProvider")
     
-    # Get API key from GlobalIntegrationSettings
-    if provider == 'runware':
-        api_key = global_settings.runware_api_key
-    elif provider == 'openai':
-        api_key = global_settings.dalle_api_key or global_settings.openai_api_key
-    else:
-        api_key = None
+    # Get API key from IntegrationProvider (centralized)
+    api_key = ModelRegistry.get_api_key(provider)
     
     if not api_key:
-        logger.error(f"[process_image_generation_queue] {provider.upper()} API key not configured in GlobalIntegrationSettings")
-        return {'success': False, 'error': f'{provider.upper()} API key not configured in GlobalIntegrationSettings'}
+        logger.error(f"[process_image_generation_queue] {provider.upper()} API key not configured in IntegrationProvider")
+        return {'success': False, 'error': f'{provider.upper()} API key not configured'}
     
     # Log API key presence (but not the actual key for security)
     api_key_preview = f"{api_key[:10]}...{api_key[-4:]}" if len(api_key) > 14 else "***"