Import cleanup

src/cpl-database/cpl/database/__init__.py

@@ -3,7 +3,9 @@ import os
 from cpl.application.abc import ApplicationABC as _ApplicationABC
 from . import mysql as _mysql
 from . import postgres as _postgres
+from .database_module import DatabaseModule
 from .table_manager import TableManager
+from .logger import DBLogger
 
 
 def _with_migrations(self: _ApplicationABC, *paths: str | list[str]) -> _ApplicationABC:

src/cpl-database/cpl/database/abc/__init__.py

@@ -1,4 +1,6 @@
 from .connection_abc import ConnectionABC
+from .data_access_object_abc import DataAccessObjectABC
+from .data_seeder_abc import DataSeederABC
 from .db_context_abc import DBContextABC
 from .db_join_model_abc import DbJoinModelABC
 from .db_model_abc import DbModelABC

src/cpl-database/cpl/database/abc/data_access_object_abc.py

@@ -14,7 +14,7 @@ from cpl.database.logger import DBLogger
 from cpl.database.model.server_type import ServerType, ServerTypes
 from cpl.database.postgres.sql_select_builder import SQLSelectBuilder
 from cpl.database.typing import T_DBM, Attribute, AttributeFilters, AttributeSorts
-from cpl.dependency import get_provider
+from cpl.dependency.context import get_provider
 
 
 class DataAccessObjectABC(ABC, Generic[T_DBM]):

src/cpl-database/cpl/database/abc/db_model_dao_abc.py

@@ -2,7 +2,7 @@ from abc import abstractmethod
 from datetime import datetime
 from typing import Type
 
-from cpl.database import TableManager
+from cpl.database.table_manager import TableManager
 from cpl.database.abc.data_access_object_abc import DataAccessObjectABC
 from cpl.database.abc.db_model_abc import DbModelABC
 

src/cpl-database/cpl/database/database_module.py

@@ -1,8 +1,5 @@
 from cpl.core.errors import module_dependency_error
 from cpl.database.model.server_type import ServerType
-from cpl.database.schema.executed_migration_dao import ExecutedMigrationDao
-from cpl.database.service.migration_service import MigrationService
-from cpl.database.service.seeder_service import SeederService
 from cpl.dependency.module import Module, TModule
 from cpl.dependency.service_collection import ServiceCollection
 
@@ -17,6 +14,10 @@ class DatabaseModule(Module):
 
     @staticmethod
     def register(collection: ServiceCollection):
+        from cpl.database.schema import ExecutedMigrationDao
+        from cpl.database.service.migration_service import MigrationService
+        from cpl.database.service.seeder_service import SeederService
+
         collection.add_singleton(ExecutedMigrationDao)
         collection.add_singleton(MigrationService)
         collection.add_singleton(SeederService)

src/cpl-database/cpl/database/mysql/__init__.py

@@ -0,0 +1,4 @@
+from .connection import DatabaseConnection
+from .db_context import DBContext
+from .mysql_module import MySQLModule
+from .mysql_pool import MySQLPool

src/cpl-database/cpl/database/mysql/mysql_module.py

@@ -1,7 +1,5 @@
 from cpl.core.configuration.configuration import Configuration
-from cpl.database.abc.db_context_abc import DBContextABC
 from cpl.database.model.server_type import ServerTypes, ServerType
-from cpl.database.mysql.db_context import DBContext
 from cpl.dependency.module import Module, TModule
 from cpl.dependency.service_collection import ServiceCollection
 
@@ -13,6 +11,9 @@ class MySQLModule(Module):
 
     @staticmethod
     def register(collection: ServiceCollection):
+        from cpl.database.abc.db_context_abc import DBContextABC
+        from cpl.database.mysql.db_context import DBContext
+
         ServerType.set_server_type(ServerTypes(ServerTypes.MYSQL.value))
         Configuration.set("DB_DEFAULT_PORT", 3306)
 

src/cpl-database/cpl/database/postgres/__init__.py

@@ -0,0 +1,4 @@
+from .db_context import DBContext
+from .postgres_module import PostgresModule
+from .postgres_pool import PostgresPool
+from .sql_select_builder import SQLSelectBuilder

src/cpl-database/cpl/database/postgres/postgres_module.py

@@ -1,8 +1,6 @@
 from cpl.core.configuration.configuration import Configuration
-from cpl.database.abc.db_context_abc import DBContextABC
 from cpl.database.database_module import DatabaseModule
 from cpl.database.model.server_type import ServerTypes, ServerType
-from cpl.database.postgres.db_context import DBContext
 from cpl.dependency.module import Module, TModule
 from cpl.dependency.service_collection import ServiceCollection
 
@@ -14,6 +12,9 @@ class PostgresModule(Module):
 
     @staticmethod
     def register(collection: ServiceCollection):
+        from cpl.database.abc.db_context_abc import DBContextABC
+        from cpl.database.postgres.db_context import DBContext
+
         ServerType.set_server_type(ServerTypes(ServerTypes.POSTGRES.value))
         Configuration.set("DB_DEFAULT_PORT", 5432)
 

src/cpl-database/cpl/database/schema/__init__.py

@@ -0,0 +1,2 @@
+from .executed_migration import ExecutedMigration
+from .executed_migration_dao import ExecutedMigrationDao

src/cpl-database/cpl/database/schema/executed_migration_dao.py

@@ -1,4 +1,4 @@
-from cpl.database import TableManager
+from cpl.database.table_manager import TableManager
 from cpl.database.abc.data_access_object_abc import DataAccessObjectABC
 from cpl.database.schema.executed_migration import ExecutedMigration
 

src/cpl-database/cpl/database/service/migration_service.py

@@ -1,9 +1,9 @@
 import glob
 import os
 
-from cpl.database.abc import DBContextABC
+from cpl.database.abc.db_context_abc import DBContextABC
 from cpl.database.logger import DBLogger
-from cpl.database.model import Migration
+from cpl.database.model.migration import Migration
 from cpl.database.model.server_type import ServerType, ServerTypes
 from cpl.database.schema.executed_migration import ExecutedMigration
 from cpl.database.schema.executed_migration_dao import ExecutedMigrationDao