feat: parser, refactoring
This commit is contained in:
Artem Tsyrulnikov
@@ -41,9 +41,7 @@ from .target_channel.disconnect_target_chan import disconnect_target_chan
|
||||
from .target_channel.disconnect_target_chan_by_tg_id import disconnect_target_chan_by_tg_id
|
||||
from .target_channel.get_user_target_chans import get_user_target_chans
|
||||
from .target_channel.update_target_chan_permissions import update_target_chan_permissions
|
||||
from .views.fetch_views_manually import fetch_views_manually
|
||||
from .views.get_views_history import get_views_history
|
||||
from .views.run_views_worker_cycle import run_views_worker_cycle
|
||||
from .views.update_views_manually import update_views_manually
|
||||
|
||||
|
||||
@@ -66,8 +64,6 @@ class Database(typing.Protocol):
|
||||
self, user_id: UUID, channel_id: UUID | None = None, telegram_id: int | None = None
|
||||
) -> domain.TargetChannel | None: ...
|
||||
|
||||
async def create_target_channel(self, channel: domain.TargetChannel) -> domain.TargetChannel: ...
|
||||
|
||||
async def upsert_target_channel(self, channel: domain.TargetChannel) -> domain.TargetChannel: ...
|
||||
|
||||
async def get_user_target_channels(self, user_id: UUID) -> list[domain.TargetChannel]: ...
|
||||
@@ -123,8 +119,6 @@ class Database(typing.Protocol):
|
||||
|
||||
async def delete_placement(self, placement_id: UUID) -> None: ...
|
||||
|
||||
async def check_creative_in_use(self, creative_id: UUID) -> bool: ...
|
||||
|
||||
async def get_placement_by_invite_link(self, invite_link: str) -> domain.Placement | None: ...
|
||||
|
||||
async def get_subscriber(self, telegram_id: int) -> domain.Subscriber | None: ...
|
||||
@@ -161,8 +155,6 @@ class Database(typing.Protocol):
|
||||
to_date: datetime.datetime | None = None,
|
||||
) -> list[domain.PlacementViewsHistory]: ...
|
||||
|
||||
async def get_active_placements_with_urls(self) -> list[domain.Placement]: ... # Для worker
|
||||
|
||||
async def get_telegram_state(self, telegram_id: int) -> domain.TelegramState | None: ...
|
||||
|
||||
async def set_telegram_state(
|
||||
@@ -171,6 +163,17 @@ class Database(typing.Protocol):
|
||||
|
||||
async def clear_telegram_state(self, telegram_id: int) -> None: ...
|
||||
|
||||
# NATS-related methods for placement tracking
|
||||
async def get_placement_by_id(self, placement_id: UUID) -> domain.Placement | None: ...
|
||||
|
||||
async def update_placement_from_post_found(
|
||||
self, placement_id: UUID, ad_post_url: str, message_id: int, views_count: int
|
||||
) -> domain.Placement: ...
|
||||
|
||||
async def update_placement_from_post_deleted(self, placement_id: UUID) -> domain.Placement: ...
|
||||
|
||||
async def update_placement_views(self, placement_id: UUID, views_count: int) -> domain.Placement: ...
|
||||
|
||||
|
||||
class TelegramBotWriter(typing.Protocol):
|
||||
async def send_message(self, text: str, chat_id: int) -> None: ...
|
||||
@@ -188,10 +191,6 @@ class TelegramBotWriter(typing.Protocol):
|
||||
async def create_chat_invite_link(self, chat_id: int, requires_approval: bool = False) -> str: ...
|
||||
|
||||
|
||||
class TelegramParser(typing.Protocol):
|
||||
async def get_post_views(self, post_url: str) -> int | None: ...
|
||||
|
||||
|
||||
class JWTEncoder(typing.Protocol):
|
||||
def encode_access_token(self, user_id: UUID, telegram_id: int, username: str | None = None) -> str: ...
|
||||
|
||||
@@ -200,7 +199,6 @@ class JWTEncoder(typing.Protocol):
|
||||
class Usecase:
|
||||
database: Database
|
||||
telegram_bot: TelegramBotWriter
|
||||
telegram_parser: TelegramParser
|
||||
jwt_encoder: JWTEncoder
|
||||
|
||||
validate_login_token = validate_login_token
|
||||
@@ -232,8 +230,6 @@ class Usecase:
|
||||
delete_placement = delete_placement
|
||||
handle_subscription = handle_subscription
|
||||
handle_unsubscription = handle_unsubscription
|
||||
fetch_views = fetch_views_manually
|
||||
run_views_worker_cycle = run_views_worker_cycle
|
||||
get_views_history = get_views_history
|
||||
update_views_manually = update_views_manually
|
||||
get_placements_analytics = get_placements_analytics
|
||||
|
||||
@@ -41,7 +41,7 @@ async def create_placement(self: 'Usecase', input: dto.CreatePlacementInput, use
|
||||
requires_approval=requires_approval,
|
||||
)
|
||||
|
||||
# Создаём закуп
|
||||
# Создаём закуп со статусом PENDING (ожидаем публикацию поста)
|
||||
placement = domain.Placement(
|
||||
target_channel_id=input.target_channel_id,
|
||||
external_channel_id=input.external_channel_id,
|
||||
@@ -50,10 +50,9 @@ async def create_placement(self: 'Usecase', input: dto.CreatePlacementInput, use
|
||||
placement_date=input.placement_date,
|
||||
cost=input.cost,
|
||||
comment=input.comment,
|
||||
ad_post_url=input.ad_post_url,
|
||||
invite_link_type=input.invite_link_type,
|
||||
invite_link=invite_link,
|
||||
status=domain.PlacementStatus.ACTIVE,
|
||||
status=domain.PlacementStatus.PENDING,
|
||||
)
|
||||
|
||||
created = await self.database.create_placement(placement)
|
||||
@@ -62,7 +61,6 @@ async def create_placement(self: 'Usecase', input: dto.CreatePlacementInput, use
|
||||
creative.placements_count += 1
|
||||
await self.database.update_creative(creative)
|
||||
|
||||
# Формируем ответ внутри транзакции, пока объекты в сессии
|
||||
return dto.PlacementOutput(
|
||||
id=created.id,
|
||||
target_channel_id=created.target_channel_id,
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
import datetime
|
||||
import logging
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from src import domain, dto
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from .. import Usecase
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def fetch_views_manually(self: 'Usecase', input: dto.FetchViewsInputManually) -> dto.FetchViewsManuallyOutput:
|
||||
async with self.database.transaction():
|
||||
placement = await self.database.get_placement(input.user_id, input.placement_id)
|
||||
if not placement:
|
||||
raise domain.PlacementNotFound(input.placement_id)
|
||||
|
||||
if not placement.ad_post_url:
|
||||
return dto.FetchViewsManuallyOutput(
|
||||
placement_id=placement.id,
|
||||
views_count=None,
|
||||
views_availability=domain.PostViewsAvailability.UNAVAILABLE,
|
||||
fetched_at=datetime.datetime.now(datetime.UTC),
|
||||
error_message='No ad_post_url specified',
|
||||
)
|
||||
|
||||
views_count = await self.telegram_parser.get_post_views(placement.ad_post_url)
|
||||
fetched_at = datetime.datetime.now(datetime.UTC)
|
||||
|
||||
if views_count:
|
||||
placement.views_count = views_count
|
||||
placement.views_availability = domain.PostViewsAvailability.AVAILABLE
|
||||
placement.last_views_fetch_at = fetched_at
|
||||
await self.database.update_placement(placement)
|
||||
|
||||
history = domain.PlacementViewsHistory(
|
||||
placement_id=placement.id,
|
||||
views_count=views_count,
|
||||
fetched_at=fetched_at,
|
||||
)
|
||||
await self.database.create_placement_views_history(history)
|
||||
|
||||
log.info('Views fetched for placement %s: %d', placement.id, views_count)
|
||||
|
||||
return dto.FetchViewsManuallyOutput(
|
||||
placement_id=placement.id,
|
||||
views_count=views_count,
|
||||
views_availability=domain.PostViewsAvailability.AVAILABLE,
|
||||
fetched_at=fetched_at,
|
||||
)
|
||||
|
||||
placement.views_availability = domain.PostViewsAvailability.UNAVAILABLE
|
||||
placement.last_views_fetch_at = fetched_at
|
||||
await self.database.update_placement(placement)
|
||||
|
||||
log.warning('Failed to fetch views for placement %s', placement.id)
|
||||
|
||||
return dto.FetchViewsManuallyOutput(
|
||||
placement_id=placement.id,
|
||||
views_count=None,
|
||||
views_availability=domain.PostViewsAvailability.UNAVAILABLE,
|
||||
fetched_at=fetched_at,
|
||||
error_message='Failed to fetch views from Telegram API',
|
||||
)
|
||||
@@ -1,66 +0,0 @@
|
||||
import asyncio
|
||||
import datetime
|
||||
import logging
|
||||
import uuid
|
||||
from typing import TYPE_CHECKING, cast
|
||||
|
||||
from aiolimiter import AsyncLimiter
|
||||
|
||||
from src import domain
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from .. import Usecase
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def _process_placement(self: 'Usecase', placement_id: uuid.UUID, user_id: uuid.UUID, ad_post_url: str) -> None:
|
||||
views_count = await self.telegram_parser.get_post_views(ad_post_url)
|
||||
fetched_at = datetime.datetime.now(datetime.UTC)
|
||||
|
||||
async with self.database.transaction():
|
||||
p = await self.database.get_placement(user_id=user_id, placement_id=placement_id)
|
||||
if not p:
|
||||
log.error('Placement %s not found', placement_id)
|
||||
return
|
||||
|
||||
p.last_views_fetch_at = fetched_at
|
||||
if not views_count:
|
||||
p.views_availability = domain.PostViewsAvailability.UNAVAILABLE
|
||||
await self.database.update_placement(p)
|
||||
log.warning('Failed to fetch views for %s', placement_id)
|
||||
return
|
||||
|
||||
p.views_count = views_count
|
||||
p.views_availability = domain.PostViewsAvailability.AVAILABLE
|
||||
await self.database.update_placement(p)
|
||||
|
||||
history = domain.PlacementViewsHistory(
|
||||
placement_id=placement_id,
|
||||
views_count=views_count,
|
||||
fetched_at=fetched_at,
|
||||
)
|
||||
await self.database.create_placement_views_history(history)
|
||||
|
||||
log.info('Updated placement %s: %d', placement_id, views_count)
|
||||
|
||||
|
||||
async def run_views_worker_cycle(self: 'Usecase', interval_seconds: int) -> None:
|
||||
async with self.database.transaction():
|
||||
placements = await self.database.get_active_placements_with_urls()
|
||||
|
||||
if not placements:
|
||||
log.debug('ViewsWorkerCycle: No placements to process')
|
||||
return
|
||||
|
||||
limiter = AsyncLimiter(max_rate=len(placements), time_period=interval_seconds)
|
||||
log.info('Processing %d placements for %d seconds', len(placements), interval_seconds)
|
||||
|
||||
async def process(p: domain.Placement) -> None:
|
||||
async with limiter:
|
||||
try:
|
||||
await _process_placement(self, p.id, p.user_id, cast(str, p.ad_post_url))
|
||||
except Exception:
|
||||
log.exception('Error updating views for %s', p.id)
|
||||
|
||||
await asyncio.gather(*(process(p) for p in placements))
|
||||
Reference in New Issue
Block a user