upd

app/core/background/convert_service.py

@@ -17,8 +17,8 @@ from sqlalchemy import select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core.config import get_settings
-from app.core.database import get_async_session
-from app.core.models.content import Content, FileUpload
+from app.core.database import db_manager
+from app.core.models.content_models import Content, FileUpload
 from app.core.storage import storage_manager
 
 logger = logging.getLogger(__name__)
@@ -130,7 +130,7 @@ class ConvertService:
     
     async def _process_pending_files(self) -> None:
         """Process pending file conversions."""
-        async with get_async_session() as session:
+        async with db_manager.get_session() as session:
             try:
                 # Get pending uploads
                 result = await session.execute(
@@ -512,7 +512,7 @@ class ConvertService:
     
     async def _retry_failed_conversions(self) -> None:
         """Retry failed conversions that haven't exceeded max retries."""
-        async with get_async_session() as session:
+        async with db_manager.get_session() as session:
             try:
                 # Get failed uploads that can be retried
                 result = await session.execute(
@@ -559,7 +559,7 @@ class ConvertService:
     async def get_processing_stats(self) -> Dict[str, Any]:
         """Get processing statistics."""
         try:
-            async with get_async_session() as session:
+            async with db_manager.get_session() as session:
                 # Get upload stats by status
                 status_result = await session.execute(
                     select(FileUpload.status, asyncio.func.count())

app/core/background/indexer_service.py

@@ -11,7 +11,7 @@ from sqlalchemy import select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core.config import get_settings
-from app.core.database import get_async_session
+from app.core.database import db_manager
 from app.core.models.blockchain import Transaction, Wallet, BlockchainNFT, BlockchainTokenBalance
 from app.core.background.ton_service import TONService
 
@@ -174,7 +174,7 @@ class IndexerService:
     
     async def _index_pending_transactions(self) -> None:
         """Index pending transactions from the database."""
-        async with get_async_session() as session:
+        async with db_manager.get_session() as session:
             try:
                 # Get pending transactions
                 result = await session.execute(
@@ -230,7 +230,7 @@ class IndexerService:
     
     async def _update_transaction_confirmations(self) -> None:
         """Update confirmation counts for recent transactions."""
-        async with get_async_session() as session:
+        async with db_manager.get_session() as session:
             try:
                 # Get recent confirmed transactions
                 cutoff_time = datetime.utcnow() - timedelta(hours=24)
@@ -267,7 +267,7 @@ class IndexerService:
     
     async def _update_wallet_balances(self) -> None:
         """Update wallet balances from the blockchain."""
-        async with get_async_session() as session:
+        async with db_manager.get_session() as session:
             try:
                 # Get active wallets
                 result = await session.execute(
@@ -301,7 +301,7 @@ class IndexerService:
     
     async def _index_nft_collections(self) -> None:
         """Index NFT collections and metadata."""
-        async with get_async_session() as session:
+        async with db_manager.get_session() as session:
             try:
                 # Get wallets to check for NFTs
                 result = await session.execute(
@@ -370,7 +370,7 @@ class IndexerService:
     
     async def _update_token_balances(self) -> None:
         """Update token balances for wallets."""
-        async with get_async_session() as session:
+        async with db_manager.get_session() as session:
             try:
                 # Get wallets with token balances to update
                 result = await session.execute(
@@ -459,7 +459,7 @@ class IndexerService:
     async def get_indexing_stats(self) -> Dict[str, Any]:
         """Get indexing statistics."""
         try:
-            async with get_async_session() as session:
+            async with db_manager.get_session() as session:
                 # Get transaction stats
                 tx_result = await session.execute(
                     select(Transaction.status, asyncio.func.count())

app/core/background/ton_service.py

@@ -14,7 +14,7 @@ import httpx
 from sqlalchemy import select, update, and_
 
 from app.core.config import get_settings
-from app.core.database import get_async_session, get_cache_manager
+from app.core.database import db_manager, get_cache_manager
 from app.core.logging import get_logger
 from app.core.security import decrypt_data, encrypt_data