From 6647c93a44da86b0d26dca52ac1b9c3e1f22d4fe Mon Sep 17 00:00:00 2001 From: pacnpal <183241239+pacnpal@users.noreply.github.com> Date: Sun, 17 Nov 2024 23:06:22 +0000 Subject: [PATCH] fix(processor): add fallback to absolute imports in reactions.py --- videoarchiver/__init__.py | 1 + videoarchiver/processor/__init__.py | 3 +++ videoarchiver/queue/__init__.py | 19 ++++++++++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/videoarchiver/__init__.py b/videoarchiver/__init__.py index 63312f3..f6fafba 100644 --- a/videoarchiver/__init__.py +++ b/videoarchiver/__init__.py @@ -15,6 +15,7 @@ modules_to_reload = [ ".processor.core", ".processor.queue_processor", ".queue", + ".queue.types", # Added types module ".queue.models", ".queue.manager", ".queue.cleaners", diff --git a/videoarchiver/processor/__init__.py b/videoarchiver/processor/__init__.py index cbc21d7..1b4f428 100644 --- a/videoarchiver/processor/__init__.py +++ b/videoarchiver/processor/__init__.py @@ -36,6 +36,7 @@ try: ) from .message_handler import MessageHandler from .queue_handler import QueueHandler + from .queue_processor import QueueProcessor # Added import from .reactions import ( handle_archived_reaction, update_queue_position_reaction, @@ -76,6 +77,7 @@ except ImportError: ) from videoarchiver.processor.message_handler import MessageHandler from videoarchiver.processor.queue_handler import QueueHandler + from videoarchiver.processor.queue_processor import QueueProcessor # Added import from videoarchiver.processor.reactions import ( handle_archived_reaction, update_queue_position_reaction, @@ -90,6 +92,7 @@ __all__ = [ "VideoProcessor", "MessageHandler", "QueueHandler", + "QueueProcessor", # Added export # URL Extraction "URLExtractor", "URLMetadata", diff --git a/videoarchiver/queue/__init__.py b/videoarchiver/queue/__init__.py index 8b124a2..05a5204 100644 --- a/videoarchiver/queue/__init__.py +++ b/videoarchiver/queue/__init__.py @@ -1,6 +1,7 @@ """Queue management package for video processing""" from .models import QueueItem, QueueMetrics +from .types import QueuePriority, ProcessingMetrics from .manager import EnhancedVideoQueueManager from .persistence import QueuePersistenceManager, QueueError from .monitoring import QueueMonitor, MonitoringError @@ -23,27 +24,35 @@ from ..utils.progress_tracker import ProgressTracker from ..utils.url_validator import UrlValidator __all__ = [ + # Queue models and types 'QueueItem', 'QueueMetrics', + 'QueuePriority', + 'ProcessingMetrics', + # Core components 'EnhancedVideoQueueManager', 'QueuePersistenceManager', 'QueueMonitor', 'QueueCleaner', - 'QueueError', - 'MonitoringError', - 'CleanupError', + 'QueueProcessor', + 'HealthChecker', + # Managers 'RecoveryManager', 'StateManager', 'MetricsManager', - 'QueueProcessor', - 'HealthChecker', + # Cleaners 'GuildCleaner', 'HistoryCleaner', 'TrackingCleaner', + # Utility handlers 'CompressionHandler', 'DirectoryManager', 'DownloadManager', 'FileOperations', 'ProgressTracker', 'UrlValidator', + # Errors + 'QueueError', + 'MonitoringError', + 'CleanupError', ]