feat: add app-level proxy settings with UI integration and session management, fixes #382

py/lora_manager.py

@@ -409,9 +409,6 @@ class LoraManager:
                                 await cls._remove_folder_safely(folder_path)
                                 invalid_hash_folders_removed += 1
                                 continue
-                                
-                            logger.debug(f"Keeping valid example images folder: {folder_name}")
-                            
 
                         except Exception as e:
                             logger.error(f"Error processing example images folder {folder_name}: {e}")

py/routes/misc_routes.py

@@ -14,6 +14,7 @@ from ..utils.constants import SUPPORTED_MEDIA_EXTENSIONS, NODE_TYPES, DEFAULT_NO
 from ..services.service_registry import ServiceRegistry
 from ..services.metadata_service import get_metadata_archive_manager, update_metadata_providers
 from ..services.websocket_manager import ws_manager
+from ..services.downloader import get_downloader
 logger = logging.getLogger(__name__)
 
 standalone_mode = 'nodes' not in sys.modules
@@ -123,6 +124,8 @@ class MiscRoutes:
         """Update application settings"""
         try:
             data = await request.json()
+            proxy_keys = {'proxy_enabled', 'proxy_host', 'proxy_port', 'proxy_username', 'proxy_password', 'proxy_type'}
+            proxy_changed = False
             
             # Validate and update settings
             for key, value in data.items():
@@ -142,11 +145,22 @@ class MiscRoutes:
                     if old_path != value:
                         logger.info(f"Example images path changed to {value} - server restart required")
 
-                # Save to settings
-                settings.set(key, value)
+                # Handle deletion for proxy credentials
+                if value == '__DELETE__' and key in ('proxy_username', 'proxy_password'):
+                    settings.delete(key)
+                else:
+                    # Save to settings
+                    settings.set(key, value)
             
                 if key == 'enable_metadata_archive_db':
                     await update_metadata_providers()
+                
+                if key in proxy_keys:
+                    proxy_changed = True
+
+            if proxy_changed:
+                downloader = await get_downloader()
+                await downloader.refresh_session()
 
             return web.json_response({'success': True})
         except Exception as e:

py/services/downloader.py

@@ -45,6 +45,7 @@ class Downloader:
         # Session management
         self._session = None
         self._session_created_at = None
+        self._proxy_url = None  # Store proxy URL for current session
         
         # Configuration
         self.chunk_size = 4 * 1024 * 1024  # 4MB chunks for better throughput
@@ -64,6 +65,13 @@ class Downloader:
             await self._create_session()
         return self._session
     
+    @property
+    def proxy_url(self) -> Optional[str]:
+        """Get the current proxy URL (initialize if needed)"""
+        if not hasattr(self, '_proxy_url'):
+            self._proxy_url = None
+        return self._proxy_url
+    
     def _should_refresh_session(self) -> bool:
         """Check if session should be refreshed"""
         if self._session is None:
@@ -84,6 +92,26 @@ class Downloader:
         if self._session is not None:
             await self._session.close()
         
+        # Check for app-level proxy settings
+        proxy_url = None
+        if settings.get('proxy_enabled', False):
+            proxy_host = settings.get('proxy_host', '').strip()
+            proxy_port = settings.get('proxy_port', '').strip()
+            proxy_type = settings.get('proxy_type', 'http').lower()
+            proxy_username = settings.get('proxy_username', '').strip()
+            proxy_password = settings.get('proxy_password', '').strip()
+            
+            if proxy_host and proxy_port:
+                # Build proxy URL
+                if proxy_username and proxy_password:
+                    proxy_url = f"{proxy_type}://{proxy_username}:{proxy_password}@{proxy_host}:{proxy_port}"
+                else:
+                    proxy_url = f"{proxy_type}://{proxy_host}:{proxy_port}"
+                
+                logger.info(f"Using app-level proxy: {proxy_type}://{proxy_host}:{proxy_port}")
+                logger.debug("Proxy mode: app-level proxy is active.")
+        else:
+            logger.debug("Proxy mode: system-level proxy (trust_env) will be used if configured in environment.")
         # Optimize TCP connection parameters
         connector = aiohttp.TCPConnector(
             ssl=True,
@@ -102,12 +130,15 @@ class Downloader:
         
         self._session = aiohttp.ClientSession(
             connector=connector,
-            trust_env=True,  # Use system proxy settings
+            trust_env=proxy_url is None,  # Only use system proxy if no app-level proxy is set
             timeout=timeout
         )
+        
+        # Store proxy URL for use in requests
+        self._proxy_url = proxy_url
         self._session_created_at = datetime.now()
         
-        logger.debug("Created new HTTP session")
+        logger.debug("Created new HTTP session with proxy settings. App-level proxy: %s, System-level proxy (trust_env): %s", bool(proxy_url), proxy_url is None)
     
     def _get_auth_headers(self, use_auth: bool = False) -> Dict[str, str]:
         """Get headers with optional authentication"""
@@ -164,6 +195,11 @@ class Downloader:
         while retry_count <= self.max_retries:
             try:
                 session = await self.session
+                # Debug log for proxy mode at request time
+                if self.proxy_url:
+                    logger.debug(f"[download_file] Using app-level proxy: {self.proxy_url}")
+                else:
+                    logger.debug("[download_file] Using system-level proxy (trust_env) if configured.")
                 
                 # Add Range header for resume if we have partial data
                 request_headers = headers.copy()
@@ -177,7 +213,7 @@ class Downloader:
                 if resume_offset > 0:
                     logger.debug(f"Requesting range from byte {resume_offset}")
                 
-                async with session.get(url, headers=request_headers, allow_redirects=True) as response:
+                async with session.get(url, headers=request_headers, allow_redirects=True, proxy=self.proxy_url) as response:
                     # Handle different response codes
                     if response.status == 200:
                         # Full content response
@@ -202,7 +238,7 @@ class Downloader:
                             part_size = os.path.getsize(part_path)
                             logger.warning(f"Range not satisfiable. Part file size: {part_size}")
                             # Try to get actual file size
-                            head_response = await session.head(url, headers=headers)
+                            head_response = await session.head(url, headers=headers, proxy=self.proxy_url)
                             if head_response.status == 200:
                                 actual_size = int(head_response.headers.get('content-length', 0))
                                 if part_size == actual_size:
@@ -345,13 +381,18 @@ class Downloader:
         """
         try:
             session = await self.session
+            # Debug log for proxy mode at request time
+            if self.proxy_url:
+                logger.debug(f"[download_to_memory] Using app-level proxy: {self.proxy_url}")
+            else:
+                logger.debug("[download_to_memory] Using system-level proxy (trust_env) if configured.")
             
             # Prepare headers
             headers = self._get_auth_headers(use_auth)
             if custom_headers:
                 headers.update(custom_headers)
             
-            async with session.get(url, headers=headers) as response:
+            async with session.get(url, headers=headers, proxy=self.proxy_url) as response:
                 if response.status == 200:
                     content = await response.read()
                     return True, content
@@ -387,13 +428,18 @@ class Downloader:
         """
         try:
             session = await self.session
+            # Debug log for proxy mode at request time
+            if self.proxy_url:
+                logger.debug(f"[get_response_headers] Using app-level proxy: {self.proxy_url}")
+            else:
+                logger.debug("[get_response_headers] Using system-level proxy (trust_env) if configured.")
             
             # Prepare headers
             headers = self._get_auth_headers(use_auth)
             if custom_headers:
                 headers.update(custom_headers)
             
-            async with session.head(url, headers=headers) as response:
+            async with session.head(url, headers=headers, proxy=self.proxy_url) as response:
                 if response.status == 200:
                     return True, dict(response.headers)
                 else:
@@ -426,12 +472,21 @@ class Downloader:
         """
         try:
             session = await self.session
+            # Debug log for proxy mode at request time
+            if self.proxy_url:
+                logger.debug(f"[make_request] Using app-level proxy: {self.proxy_url}")
+            else:
+                logger.debug("[make_request] Using system-level proxy (trust_env) if configured.")
             
             # Prepare headers
             headers = self._get_auth_headers(use_auth)
             if custom_headers:
                 headers.update(custom_headers)
             
+            # Add proxy to kwargs if not already present
+            if 'proxy' not in kwargs:
+                kwargs['proxy'] = self.proxy_url
+            
             async with session.request(method, url, headers=headers, **kwargs) as response:
                 if response.status == 200:
                     # Try to parse as JSON, fall back to text
@@ -460,7 +515,13 @@ class Downloader:
             await self._session.close()
             self._session = None
             self._session_created_at = None
+            self._proxy_url = None
             logger.debug("Closed HTTP session")
+    
+    async def refresh_session(self):
+        """Force refresh the HTTP session (useful when proxy settings change)"""
+        await self._create_session()
+        logger.info("HTTP session refreshed due to settings change")
 
 
 # Global instance accessor

py/services/settings_manager.py

@@ -82,7 +82,13 @@ class SettingsManager:
             "civitai_api_key": "",
             "show_only_sfw": False,
             "language": "en",
-            "enable_metadata_archive_db": False  # Enable metadata archive database
+            "enable_metadata_archive_db": False,  # Enable metadata archive database
+            "proxy_enabled": False,  # Enable app-level proxy
+            "proxy_host": "",  # Proxy host
+            "proxy_port": "",  # Proxy port  
+            "proxy_username": "",  # Proxy username (optional)
+            "proxy_password": "",  # Proxy password (optional)
+            "proxy_type": "http"  # Proxy type: http, https, socks4, socks5
         }
 
     def get(self, key: str, default: Any = None) -> Any:
@@ -94,6 +100,13 @@ class SettingsManager:
         self.settings[key] = value
         self._save_settings()
 
+    def delete(self, key: str) -> None:
+        """Delete setting key and save"""
+        if key in self.settings:
+            del self.settings[key]
+            self._save_settings()
+            logger.info(f"Deleted setting: {key}")
+
     def _save_settings(self) -> None:
         """Save settings to file"""
         try: