fixed imports again

videoarchiver/database/__init__.py

@@ -1,21 +1,22 @@
 """Database management package for video archiving"""
 
-try:
-    # Try relative imports first
-    from .connection_manager import DatabaseConnectionManager
-    from .query_manager import DatabaseQueryManager
-    from .schema_manager import DatabaseSchemaManager
-    from .video_archive_db import VideoArchiveDB
-except ImportError:
-    # Fall back to absolute imports if relative imports fail
-    # from videoarchiver.database.connection_manager import DatabaseConnectionManager
-    # from videoarchiver.database.query_manager import DatabaseQueryManager
-    # from videoarchiver.database.schema_manager import DatabaseSchemaManager
-    # from videoarchiver.database.video_archive_db import VideoArchiveDB
+# try:
+# Try relative imports first
+from .connection_manager import DatabaseConnectionManager
+from .query_manager import DatabaseQueryManager
+from .schema_manager import DatabaseSchemaManager
+from .video_archive_db import VideoArchiveDB
+
+# except ImportError:
+# Fall back to absolute imports if relative imports fail
+# from videoarchiver.database.connection_manager import DatabaseConnectionManager
+# from videoarchiver.database.query_manager import DatabaseQueryManager
+# from videoarchiver.database.schema_manager import DatabaseSchemaManager
+# from videoarchiver.database.video_archive_db import VideoArchiveDB
 
 __all__ = [
-    'DatabaseConnectionManager',
-    'DatabaseQueryManager',
-    'DatabaseSchemaManager',
-    'VideoArchiveDB'
+    "DatabaseConnectionManager",
+    "DatabaseQueryManager",
+    "DatabaseSchemaManager",
+    "VideoArchiveDB",
 ]

videoarchiver/database/connection_manager.py

@@ -10,10 +10,10 @@ import threading
 from queue import Queue, Empty
 from datetime import datetime
 
-try:
+#try:
     # Try relative imports first
-    from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity
-except ImportError:
+from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity
+#except ImportError:
     # Fall back to absolute imports if relative imports fail
     # from videoarchiver.utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity
 

videoarchiver/database/schema_manager.py

@@ -7,10 +7,10 @@ from typing import List, Dict, Any, Optional, TypedDict, ClassVar, Union
 from enum import Enum, auto
 from datetime import datetime
 
-try:
+#try:
     # Try relative imports first
-    from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity
-except ImportError:
+from ..utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity
+#except ImportError:
     # Fall back to absolute imports if relative imports fail
     # from videoarchiver.utils.exceptions import DatabaseError, ErrorContext, ErrorSeverity
 

videoarchiver/database/video_archive_db.py

@@ -4,16 +4,17 @@ import logging
 from pathlib import Path
 from typing import Optional, Dict, Any, List
 
-try:
-    # Try relative imports first
-    from .schema_manager import DatabaseSchemaManager
-    from .query_manager import DatabaseQueryManager
-    from .connection_manager import DatabaseConnectionManager
-except ImportError:
-    # Fall back to absolute imports if relative imports fail
-    # from videoarchiver.database.schema_manager import DatabaseSchemaManager
-    # from videoarchiver.database.query_manager import DatabaseQueryManager
-    # from videoarchiver.database.connection_manager import DatabaseConnectionManager
+# try:
+# Try relative imports first
+from .schema_manager import DatabaseSchemaManager
+from .query_manager import DatabaseQueryManager
+from .connection_manager import DatabaseConnectionManager
+
+# except ImportError:
+# Fall back to absolute imports if relative imports fail
+# from videoarchiver.database.schema_manager import DatabaseSchemaManager
+# from videoarchiver.database.query_manager import DatabaseQueryManager
+# from videoarchiver.database.connection_manager import DatabaseConnectionManager
 
 logger = logging.getLogger("VideoArchiverDB")