itd-sdk 2.8.0__tar.gz → 2.8.2__tar.gz

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itd-sdk
-Version: 2.8.0
+Version: 2.8.2
 Summary: ITD client for python
 Keywords: itd,itdsocial
 Author: fi-res
@@ -17,6 +17,7 @@ Requires-Dist: sseclient-py~=1.9.0
 Requires-Dist: telegramify-markdown>=0.5.4
 Requires-Dist: lxml>=6.1.1
 Requires-Dist: platformdirs>=4.10.0
+Requires-Dist: websockets>=16.1.1
 Requires-Dist: dateparser>=1.2.2 ; extra == 'date'
 Requires-Dist: filetype>=1.2.0 ; extra == 'filetype'
 Requires-Dist: rich>=15.0.0 ; extra == 'logs'

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/__init__.py

@@ -36,16 +36,18 @@ from time import sleep
 
 __version__ = version('itd-sdk')
 
+from itd.core.client import Client as ITDClient
+from itd.core.client import init_client
+from itd.core.config import Config as ITDConfig
 from itd.core.default import LimiterConfig, limiters
 from itd.core.default import set_config as set_limiter_config
 from itd.core.limiter import BurstRateLimiter, HalfRateLimiter, IPRateLimiter, RateLimiter
+from itd.models.announcement import Announcement, Announcements
 from itd.models.clan import Clan, TopClans
-from itd.core.client import Client as ITDClient
-from itd.core.config import Config as ITDConfig
-from itd.core.client import init_client
+from itd.models.comment import Comment
 from itd.models.file import File
 from itd.models.hashtag import Hashtag, Hashtags
-from itd.models.notification import Notifications
+from itd.models.notification import Notification, Notifications, Ntf, Ntfs
 from itd.models.poll import NewPoll
 from itd.models.portal import Portal
 from itd.models.post import HashtagPosts, LikedPosts, Post, Posts, UserPosts
@@ -69,12 +71,18 @@ __all__ = [
     'ITDClient',
     'ITDConfig',
     'init_client',
+    'Comment',
     'Clan',
     'TopClans',
     'File',
+    'Announcement',
+    'Announcements',
     'Hashtag',
     'Hashtags',
     'Notifications',
+    'Notification',
+    'Ntfs',
+    'Ntf',
     'Post',
     'Posts',
     'UserPosts',

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/api/hashtags.py

@@ -3,19 +3,14 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from uuid import UUID
 
+from itd.core.request import endpoint
 from itd.enums import AuthLevel
 from itd.exceptions import NotFoundError, TooLargeError, ValidationError
-from itd.core.request import endpoint
 
 if TYPE_CHECKING:
     from itd.core.client import Client
 
 
-@endpoint('get', 'hashtags', ValidationError(), level=AuthLevel.NO)
-def search_hashtags(client: Client, query: str, limit: int = 10):
-    return {'q': query, 'limit': limit}
-
-
 @endpoint('get', 'hashtags/trending', ValidationError(), level=AuthLevel.NO)
 def get_hashtags(client: Client, limit: int = 10):
     return {'limit': limit}
@@ -30,4 +25,7 @@ def get_hashtags(client: Client, limit: int = 10):
     level=AuthLevel.NO
 )
 def get_posts_by_hashtag(client: Client, hashtag: str, cursor: UUID | None = None, limit: int = 20):
-    return {'limit': limit, 'cursor': cursor}
+    query: dict = {'limit': limit}
+    if cursor:
+        query['cursor'] = cursor
+    return query

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/api/platform.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from itd.enums import AuthLevel
 from itd.core.request import endpoint
+from itd.enums import AuthLevel
 
 if TYPE_CHECKING:
     from itd.core.client import Client
@@ -15,3 +15,7 @@ def get_apps(client: Client): ...
 
 @endpoint('get', 'platform/changelog', level=AuthLevel.NO)
 def get_changelog(client: Client): ...
+
+
+@endpoint('get', 'platform/announcements', level=AuthLevel.NO)
+def get_announcements(client: Client): ...

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/api/users.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 from uuid import UUID
 
+from itd.core.request import endpoint
 from itd.enums import UNSET, AccessType, AuthLevel, Unset
 from itd.exceptions import (
     AlreadyBlockedError,
@@ -20,7 +21,6 @@ from itd.exceptions import (
     UsernameTakenError,
     ValidationError
 )
-from itd.core.request import endpoint
 
 if TYPE_CHECKING:
     from itd.core.client import Client
@@ -133,6 +133,9 @@ def get_follow_status(client: Client, user_ids: list[UUID]):
     return {'userIds': list(map(str, user_ids))}
 
 
-@endpoint('get', 'users/search')
-def search_users(client: Client, query: str, limit: int = 10):
-    return {'q': query, 'limit': limit}
+@endpoint('get', 'users/stats/top-clans')
+def get_top_clans(client: Client): ...
+
+
+@endpoint('get', 'users/suggestions/who-to-follow')
+def get_who_to_follow(client: Client): ...

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/core/base.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from abc import abstractmethod
 from functools import cache
-from typing import TYPE_CHECKING, Any, Iterator, SupportsIndex, TypeVar, cast, overload
+from typing import TYPE_CHECKING, Any, Iterator, Literal, SupportsIndex, TypeVar, cast, overload
 from uuid import UUID
 
 from pydantic import BaseModel
@@ -21,7 +21,7 @@ l = get_logger('base')  # noqa: E741 # seriously, whats wrong that i am using "l
 
 
 @cache
-def validator_for(cls: type) -> type[BaseModel]:
+def get_pydantic_model(cls: type) -> type[BaseModel]:
     """Класс-валидатор модели: собирается один раз на модель при первой валидации"""
     # __module__ for correct forward refs in annotations
     return type(f'_{cls.__name__}Validate', (BaseModel, cls), {'__module__': cls.__module__})
@@ -96,12 +96,12 @@ class ITDBaseModel:
         return self
 
     def _fill_from_data(self, data: dict, *, context: dict | None = None):
-        assert self._validator, 'Unable to use fill_from_data without a validator'
-        context = dict(context or {})  # копия: дефолт {} общий на все вызовы, его нельзя мутировать
+        assert self._pydantic_model, 'Unable to use fill_from_data without a validator'
+        context = dict(context or {})
         context.update(self._extra_context)
-        validated = self._validator.model_validate(data, context=context)  # вложенные модели строятся с клиентом родителя
-        self._loaded_attrs = validated.model_fields_set  # значения автоматом добавляются через setattr # так значит это же тогда надо закоментить? # хз наверн
-        for name, value in validated.__dict__.items():
+        model = self._pydantic_model.model_validate(data, context=context)  # вложенные модели строятся с клиентом родителя
+        self._loaded_attrs = model.model_fields_set  # значения автоматом добавляются через setattr # так значит это же тогда надо закоментить? # хз наверн
+        for name, value in model.__dict__.items():
             object.__setattr__(self, name, value)
 
         self._post_refresh(context=context)
@@ -114,9 +114,18 @@ class ITDBaseModel:
 
         context.setdefault('client', instance.client)
         instance._fill_from_data(data, context=context)
-        instance.load_status = LoadStatus.PARTIALLY
+        if instance.load_status == LoadStatus.NO:
+            instance.load_status = LoadStatus.PARTIALLY
         return instance
 
+    def to_dict(self, *, mode: Literal['python', 'json'] = 'python', by_alias: bool = False):
+        model = self._pydantic_model.model_validate(self, from_attributes=True, by_alias=False, by_name=True)
+        # for name, value in model.__dict__.items():
+        #     object.__setattr__(model, name, value)
+        return {
+            k: v.to_dict() if isinstance(v, ITDBaseModel) else v for k, v in model.model_dump(exclude={'load_status'}, mode=mode, by_alias=by_alias).items()
+        }
+
     @classmethod
     def __get_pydantic_core_schema__(cls, source, handler):
         if issubclass(source, BaseModel):
@@ -126,9 +135,11 @@ class ITDBaseModel:
             lambda data, info: data if isinstance(data, source) else source.from_dict(data, context=dict(info.context or {}))
         )
 
+    # def __pydantic_serializer__
+
     @property
-    def _validator(self) -> type[BaseModel]:
-        return validator_for(type(self))  # один класс на модель, а не на объект
+    def _pydantic_model(self) -> type[BaseModel]:
+        return get_pydantic_model(type(self))  # один класс на модель, а не на объект
 
     if not TYPE_CHECKING:
 
@@ -194,6 +205,7 @@ class ITDList(ITDBaseModel, list[T]):
     has_more = True
     idx = 0
     _is_page_pagination: bool = False
+    cursor = None
 
     def _fetch(self, client: Client, limit: int) -> dict:
         return {}

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/core/client.py

@@ -14,12 +14,12 @@ from requests.adapters import HTTPAdapter
 
 from itd.api.auth import change_password, logout, refresh_token
 from itd.core.config import Config
-from itd.core.credfile import Credfile
 from itd.core.default import _default_client, set_default_client
 from itd.core.dwell import DwellTracker
 from itd.core.logger import get_logger
 from itd.core.request import decode_jwt_payload, fetch, fetch_stream
-from itd.core.utils import get_credfile, shorten_token
+from itd.core.session_file import SessionFile
+from itd.core.utils import get_session_file, shorten_token
 from itd.core.visibility import VisibilityTracker
 from itd.enums import AuthLevel, Role
 from itd.exceptions import InsufficientAuthLevelError, SessionExpiredError, SessionNotFoundError, SessionRevokedError
@@ -56,7 +56,7 @@ class Client:
         self.access_token: str | None = None
         self.access_token_data: AccessToken | None = None
         self.refresh_token: str | None = None
-        self._credfile: Credfile | None = None
+        self._session_file: SessionFile | None = None
         self._refresh_lock = RLock()  # so background timers and main thread dont refresh token simultaneously # еба он мой стиль коментов спиздил
 
         self.session = Session()
@@ -83,31 +83,31 @@ class Client:
 
     @classmethod
     def from_file(cls, name: str, initial_refresh: str | None = None, verify_refresh: bool = False, config: Config = Config()):
-        credfile = get_credfile(name)
-        l.debug('get credentials file refresh=%s access=%s', shorten_token(credfile.refresh), shorten_token(credfile.access))
-        if not credfile.valid:
+        session_file = get_session_file(name)
+        l.debug('get session file refresh=%s access=%s', shorten_token(session_file.refresh), shorten_token(session_file.access))
+        if not session_file.valid:
             l.warning('last refresh token was expired or not found. Please enter a new one:')
             update = True
         else:
-            update = credfile.refresh is None
+            update = session_file.refresh is None
 
         if update:
             if initial_refresh is not None:
-                credfile.refresh = initial_refresh
+                session_file.refresh = initial_refresh
             elif getenv('ITD_REFRESH_TOKEN') is not None:
-                credfile.refresh = getenv('ITD_REFRESH_TOKEN')
+                session_file.refresh = getenv('ITD_REFRESH_TOKEN')
             else:
                 try:
                     from rich.prompt import Prompt
                 except ImportError:
-                    credfile.refresh = input('refresh token: ')
+                    session_file.refresh = input('refresh token: ')
                 else:
-                    credfile.refresh = Prompt.ask('[cyan]refresh token[/]')
+                    session_file.refresh = Prompt.ask('[cyan]refresh token[/]')
 
-        instance = cls(credfile.refresh, credfile.access, config=config)
+        instance = cls(session_file.refresh, session_file.access, config=config)
         if instance.access_token_data and instance.access_token_data.expired_at < datetime.now():
             instance.access_token = instance.access_token_data = None
-        instance._credfile = credfile
+        instance._session_file = session_file
         if verify_refresh and initial_refresh is not None:
             instance.refresh_auth(force=True)
         elif update:
@@ -115,17 +115,17 @@ class Client:
         return instance
 
     def _update_file(self, valid: bool = True):
-        if self._credfile is None:
+        if self._session_file is None:
             return
 
-        l.debug('update credentials file refresh=%s access=%s', shorten_token(self.refresh_token), shorten_token(self.access_token))
+        l.debug('update session file refresh=%s access=%s', shorten_token(self.refresh_token), shorten_token(self.access_token))
         if not valid:
             l.warning('mark %s as not valid', shorten_token(self.refresh_token))
 
-        self._credfile.access = self.access_token
-        self._credfile.refresh = self.refresh_token
-        self._credfile.valid = valid
-        self._credfile.flush()
+        self._session_file.access = self.access_token
+        self._session_file.refresh = self.refresh_token
+        self._session_file.valid = valid
+        self._session_file.flush()
 
     @property
     def is_token_expired(self) -> bool:
@@ -158,16 +158,16 @@ class Client:
                 return self.token
 
             l.debug('refresh access_token')
-            if not force and self._credfile and self._credfile.update():
-                self.token = self._credfile.access
-                self.refresh_token = self._credfile.refresh
+            if not force and self._session_file and self._session_file.update():
+                self.token = self._session_file.access
+                self.refresh_token = self._session_file.refresh
 
                 if self.access_token:
                     if not self.is_token_expired:
-                        l.debug('update access_token from credfile')
+                        l.debug('update access_token from session_file')
                         return self.access_token
                     else:
-                        l.info('credfile access_token expired')
+                        l.info('session_file access_token expired')
                 else:
                     l.info('crefile access_token is none')
 

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/core/config.py

@@ -4,9 +4,9 @@ from typing import Callable, Literal
 from requests.exceptions import RequestException
 from requests.utils import default_user_agent
 
+from itd.core.utils import get_sdk_user_agent
 from itd.enums import BATCH, All, Batch, DebugResponseMode, ParseMode, UserAgent
 from itd.exceptions import RateLimitError
-from itd.core.utils import get_sdk_user_agent
 
 
 @dataclass
@@ -55,8 +55,6 @@ class Config:
     # ^ это если что просто мысли, не обращайте внимания
     client_type: Literal['client', 'bot', 'onetime'] = 'onetime'
 
-    auto_acquire: bool | None = None
-
     # enable_logging: bool | None = None
     # logging_level = 'DEBUG'
 

itd_sdk-2.8.2/itd/core/session_file.py

@@ -0,0 +1,27 @@
+from datetime import datetime
+from json import dumps, loads
+from pathlib import Path
+
+from pydantic import BaseModel, Field
+
+
+class SessionFile(BaseModel):
+    access: str | None = None
+    refresh: str | None = None
+    valid: bool = True
+    updated_at: datetime = Field(default_factory=datetime.now)
+    seen_announcements: list[str] = []
+
+    _file: Path
+
+    def flush(self):
+        self.updated_at = datetime.now()
+        self._file.write_text(dumps(self.model_dump(mode='json')))
+
+    def update(self):
+        new = self.model_validate(loads(self._file.read_text()))
+        if self.updated_at <= new.updated_at:
+            for field in SessionFile.model_fields:
+                setattr(self, field, getattr(new, field))
+            return True
+        return False

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/core/utils.py

@@ -5,7 +5,7 @@ from uuid import UUID
 
 from platformdirs import user_data_path
 
-from itd.core.credfile import Credfile
+from itd.core.session_file import SessionFile
 
 
 def get_sdk_user_agent():
@@ -14,13 +14,13 @@ def get_sdk_user_agent():
     return f'itd-sdk/{__version__} (Python/{version})'
 
 
-def get_credfile(name: str) -> Credfile:
+def get_session_file(name: str) -> SessionFile:
     file = user_data_path('itd_sdk', False, ensure_exists=True) / f'{name}.json'
     if not file.exists():
-        model = Credfile(_file=file)
+        model = SessionFile(_file=file)
         file.write_text(dumps(model.model_dump(mode='json')))
     else:
-        model = Credfile.model_validate(loads(file.read_text()))
+        model = SessionFile.model_validate(loads(file.read_text()))
     model._file = file
     return model
 
@@ -47,7 +47,9 @@ def to_nullable_uuid(value: str | UUID | None) -> UUID | None:
     return to_uuid(value)
 
 
-def parse_datetime(value: str) -> datetime:
+def parse_datetime(value: str | datetime) -> datetime:
+    if isinstance(value, datetime):
+        return value
     v = value.replace('Z', '+00:00')
     try:
         return datetime.strptime(v + '00', '%Y-%m-%d %H:%M:%S.%f%z')

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/enums.py

@@ -2,6 +2,16 @@ from enum import Enum
 from typing import Literal
 
 
+class AnnouncementButtonStyle(Enum):
+    PRIMARY = 'primary'
+    SECONDARY = 'secondary'
+
+
+class AnnouncementButtonType(Enum):
+    DISMISS = 'dismiss'
+    LINK = 'link'
+
+
 class InteractionType(Enum):
     PHOTO_OPEN = 1
     VIDEO_PROGRESS = 2
@@ -34,7 +44,7 @@ class ViewReason(Enum):
     HIDDEN = 2  # тоже страница скрыта (listener visibilitychange и доп.проверка что document.hidden)
     PAGE_HIDE = 3  # и это тоже страница скрыта (listener pagehiden)
     UNOBSERVE = 4  # что то заумное на фронтедерском, пост удалили из дома
-    THRESHOLD_MET = INACTIVE = 5  # юзер перестал активить
+    INACTIVE = 5  # юзер перестал активить
 
 
 class AuthLevel(Enum):
@@ -59,13 +69,6 @@ class AuthLevel(Enum):
 _AUTH_LEVEL_HIERARCHY = [AuthLevel.NO, AuthLevel.ACCESS, AuthLevel.REFRESH]
 
 
-class RateLimitMode(Enum):
-    NO = 'no'
-    MIN = 'min'  # for one-time actions (eg script just to like post)
-    MID = 'mid'  # for client apps / basic scripts
-    MAX = 'max'  # for advanced scripts / userbots
-
-
 class DebugResponseMode(Enum):
     NO = 'no'
     BEFORE = 'before'  # before error checks, raw

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/exceptions.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Callable
+from typing import Callable, cast
 
 from requests import Response
 
@@ -30,7 +30,7 @@ class ITDException(Exception):
         Returns:
             bool: Совпадение
         """
-        error = json.get('error') if isinstance(json.get('error'), dict) else {}
+        error = cast(dict, json.get('error')) if isinstance(json.get('error'), dict) else {}
         return bool(
             (self.res_check and self.res_check(res))
             or (self.text_check and self.text_check(res.text))
@@ -41,16 +41,6 @@ class ITDException(Exception):
         )
 
     def prepare(self, json: dict) -> 'ITDException':
-        """Собрать ошибку для выброса - копию декларации, дополненную данными из ответа
-
-        Args:
-            json (dict): Тело ответа
-
-        Returns:
-            ITDException: Ошибка
-        """
-        # именно копию: декларации переиспользуются между запросами и потоками, мутировать их нельзя.
-        # __init__ не вызываем - у наследников он с разными аргументами (NotFoundError('Post') и тд)
         exception = self.__class__.__new__(self.__class__)
         BaseException.__init__(exception, *self.args)
         exception.__dict__.update(self.__dict__)
@@ -58,7 +48,7 @@ class ITDException(Exception):
         return exception
 
     def _fill(self, error: dict) -> None:
-        """Дополнить ошибку данными из ['error'] (пустой dict если там не объект)"""
+        pass
 
 
 class ValidateError(ITDException):
@@ -208,7 +198,7 @@ class InsufficientAuthLevelError(NoRightsError):
 
 
 class PinNotOwnedError(NoRightsError):
-    code = "PIN_NOT_OWNED"
+    code = 'PIN_NOT_OWNED'
     text = 'You do not own this pin'
 
 

itd_sdk-2.8.2/itd/models/announcement.py

@@ -0,0 +1,74 @@
+from pydantic import BaseModel
+
+from itd.api.platform import get_announcements
+from itd.core.base import ITDBaseModel
+from itd.core.client import Client
+from itd.enums import AnnouncementButtonStyle, AnnouncementButtonType
+
+
+class AnnouncementImage(BaseModel):
+    url: str
+    width: int | None = None
+    height: int | None = None
+
+    def __str__(self):
+        return self.url
+
+
+class AnnouncementButtonAction(BaseModel):
+    type: AnnouncementButtonType
+    url: str | None = None
+
+
+class AnnouncementButton(BaseModel):
+    title: str
+    style: AnnouncementButtonStyle = AnnouncementButtonStyle.PRIMARY
+    action: AnnouncementButtonAction
+
+    def __str__(self):
+        return self.title
+
+
+class Announcement(ITDBaseModel):
+    id: str
+    image: AnnouncementImage | None = None
+    title: str
+    description: str | None = None
+    additional_text: str | None = None
+
+    buttons: list[AnnouncementButton] = []
+
+    def __str__(self):
+        return self.title
+
+    def read(self):
+        assert self.client._session_file, 'No session file'
+        self.client._session_file.seen_announcements.append(self.id)
+        self.client._session_file.flush()
+
+
+class Announcements(ITDBaseModel, list[Announcement]):
+    def __init__(self, *, hide_seen: bool = True, client: Client | None = None):
+        super().__init__(client=client)
+        self.load(hide_seen=hide_seen)
+
+    def load(self, *, hide_seen: bool = True) -> 'Announcements':
+        self.clear()
+        self.extend([Announcement.from_dict(announcement, client=self.client) for announcement in get_announcements(self.client).json()['announcements']])
+
+        if hide_seen and self.client._session_file:
+            for announcement in self.copy():
+                if announcement.id in self.client._session_file.seen_announcements:
+                    self.remove(announcement)
+
+        return self
+
+    def get(self) -> Announcement | None:
+        if self:
+            return self[0]
+
+    @classmethod
+    def empty(cls):
+        instance = cls.__new__(cls)
+        super(Announcements, instance).__init__()
+        return instance

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/models/clan.py

@@ -1,10 +1,7 @@
 from pydantic import BaseModel, Field
 
-from itd.api.etc import get_top_clans
+from itd.api.users import get_top_clans
 from itd.core.base import ITDBaseModel
-from itd.core.logger import get_logger
-
-l = get_logger('clan')  # noqa: E741
 
 
 class Clan(BaseModel):
@@ -27,10 +24,6 @@ class TopClans(ITDBaseModel, list[Clan]):
         self.extend([Clan.model_validate(clan) for clan in get_top_clans(self.client).json()['clans']])
         return self
 
-    def refresh(self, *, client=None):
-        l.warning('TopClans.refresh is deprecated and will be removed in 2.6.0. Please use TopClans.load')
-        self.load()
-
     @classmethod
     def empty(cls):
         instance = cls.__new__(cls)

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/models/comment.py

@@ -9,11 +9,11 @@ from pydantic import BeforeValidator, Field
 
 from itd.api.comments import add_comment, add_reply_comment, delete_comment, edit_comment, get_comments, get_replies, like_comment, unlike_comment
 from itd.core.base import ITDBaseModel, ITDList
-from itd.enums import CommentSorting, ReportReason, ReportTargetType
+from itd.core.utils import parse_datetime, to_nullable_uuid, to_uuid
+from itd.enums import CommentSorting, LoadStatus, ReportReason, ReportTargetType
 from itd.models.file import CommentAttach
 from itd.models.report import Report
 from itd.models.user import User
-from itd.core.utils import parse_datetime, to_nullable_uuid
 from itd.models.utils import ATTACHMENTS, format_attachments
 
 if TYPE_CHECKING:
@@ -22,7 +22,7 @@ if TYPE_CHECKING:
 
 
 class Comment(ITDBaseModel):
-    _refreshable = False
+    _refreshable = True
 
     id: UUID
     content: str
@@ -40,18 +40,30 @@ class Comment(ITDBaseModel):
 
     _post: Post | None = None
     _base_comment: Comment | None = None
+    _init_from_id: bool = False
+
+    def __init__(self, id: UUID | str, *, client: Client | None = None) -> None:
+        super().__init__(client=client)
+        self.id = to_uuid(id)
+        self._init_from_id = True
 
     @classmethod
     def from_dict(
         cls, data: dict, post: Post | None = None, base_comment: Comment | None = None, *, context: dict | None = None, client: Client | None = None
     ) -> Comment:
-        context = dict(context or {})  # контекст родителя не выбрасываем, иначе комментарий потеряет его клиента
+        context = dict(context or {})
         if post is not None:
             context['post'] = post
         if base_comment is not None:
             context['base_comment'] = base_comment
         return super().from_dict(data, client=client, context=context)
 
+    def _refresh(self, *, client: Client):
+        if self._init_from_id:
+            raise RuntimeError('Unable to refresh comment that initialized by id. Please load comment from post')
+        else:
+            super()._refresh(client=client)
+
     @cached_property
     def replies(self) -> Replies:
         assert self._post is not None, 'post not set'
@@ -90,16 +102,17 @@ class Comment(ITDBaseModel):
                 format_attachments(attachments)
             ).json(),
             post=self._post,
-            base_comment=self,
+            base_comment=self._base_comment if self.is_reply else self,
             client=client or self.client
         )
+        comment.reply_to = User(user_id) if user_id else self.author  # manual patch stupid api
         if self.is_reply:
             assert self._base_comment is not None
-            self._base_comment.replies.insert(0, comment)
+            self._base_comment.replies.append(comment)
             self._base_comment.replies.total += 1
             self._base_comment.replies_count += 1
         else:
-            self.replies.insert(0, comment)
+            self.replies.append(comment)
             self.replies.total += 1
             self.replies_count += 1
 
@@ -197,6 +210,7 @@ class Comment(ITDBaseModel):
         return not self.is_owner
 
     def _post_refresh(self, context: dict = {}):
+        self.load_status = LoadStatus.FULL
         self._base_comment = context.get('base_comment')
         self._post = context.get('post')
         for reply in self.first_replies:
@@ -257,7 +271,7 @@ class Replies(ITDList[Comment]):
     _base_comment: 'Comment'
 
     _post: Post
-    total: int
+    total: int = 0
     cursor: int = 1
     _is_page_pagination = True
 

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/models/hashtag.py

@@ -6,7 +6,8 @@ from uuid import UUID
 
 from pydantic import Field
 
-from itd.api.hashtags import get_hashtags, get_posts_by_hashtag, search_hashtags
+from itd.api.hashtags import get_hashtags, get_posts_by_hashtag
+from itd.api.search import search
 from itd.core.base import ITDBaseModel
 from itd.exceptions import NotFoundError
 
@@ -62,7 +63,7 @@ class Hashtags(ITDBaseModel, list[Hashtag]):
     def load(self, limit: int = 10):
         self.clear()
         if self.query:
-            self.extend([Hashtag.from_dict(hashtag) for hashtag in search_hashtags(self.client, self.query, limit).json()['data']['hashtags']])
+            self.extend([Hashtag.from_dict(hashtag) for hashtag in search(self.client, self.query, 1, limit).json()['data']['hashtags']])
         else:
             self.extend([Hashtag.from_dict(hashtag) for hashtag in get_hashtags(self.client, limit).json()['data']['hashtags']])
         return self

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/models/notification.py

@@ -3,10 +3,10 @@ from __future__ import annotations
 from datetime import datetime
 from json import loads
 from threading import Thread
-from typing import TYPE_CHECKING, Any, Callable, Iterator, Literal, cast
+from typing import TYPE_CHECKING, Annotated, Any, Callable, Iterator, Literal, cast
 from uuid import UUID
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, BeforeValidator, Field
 from sseclient import SSEClient
 
 from itd.api.notifications import (
@@ -20,8 +20,9 @@ from itd.api.notifications import (
 )
 from itd.core.base import ITDBaseModel, ITDList
 from itd.core.client import Client
-from itd.enums import DebugResponseMode, LoadStatus, NotificationSubjectType, NotificationTargetType, NotificationType
 from itd.core.logger import get_logger
+from itd.core.utils import parse_datetime
+from itd.enums import DebugResponseMode, LoadStatus, NotificationSubjectType, NotificationTargetType, NotificationType
 from itd.models.user import User
 
 if TYPE_CHECKING:
@@ -150,8 +151,8 @@ class Notification(ITDBaseModel):
     )
 
     is_read: bool = Field(False, alias='read')
-    read_at: datetime | None = Field(None, alias='readAt')
-    created_at: datetime = Field(alias='createdAt')
+    read_at: Annotated[datetime, BeforeValidator(parse_datetime)] | None = Field(None, alias='readAt')
+    created_at: Annotated[datetime, BeforeValidator(parse_datetime)] = Field(alias='createdAt')
 
     actor: User
     sound: bool = False  # for notifications from stream

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/models/post.py

@@ -64,7 +64,7 @@ class Post(ITDBaseModel):
     reposts_count: int = Field(0, alias='repostsCount')
     views_count: int = Field(0, alias='viewsCount')
 
-    edited_at: datetime | None = Field(None, alias='editedAt')
+    edited_at: Annotated[datetime, BeforeValidator(parse_datetime)] | None = Field(None, alias='editedAt')
 
     is_liked: bool = Field(False, alias='isLiked')
     is_reposted: bool = Field(False, alias='isReposted')
@@ -147,7 +147,13 @@ class Post(ITDBaseModel):
 
     @classmethod
     def from_dict(
-        cls, data: dict, source: ViewSource = ViewSource.POST_PAGE, source_context: str | None = None, *, context: dict | None = None, client: Client | None = None
+        cls,
+        data: dict,
+        source: ViewSource = ViewSource.POST_PAGE,
+        source_context: str | None = None,
+        *,
+        context: dict | None = None,
+        client: Client | None = None
     ) -> 'Post':
         context = dict(context or {})
         context.update({'source': source, 'source_context': source_context})
@@ -399,7 +405,7 @@ class Post(ITDBaseModel):
         self._set_stats(stats[0])
 
     def _set_stats(self, stats: dict):
-        fields = {value.alias or name: name for name, value in self._validator.model_fields.items()}
+        fields = {value.alias or name: name for name, value in self._pydantic_model.model_fields.items()}
         for name, value in stats.items():
             if name in fields:
                 setattr(self, fields[name], value)

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/models/report.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated
 from uuid import UUID
 
-from pydantic import Field
+from pydantic import BeforeValidator, Field
 
 from itd.api.reports import report
 from itd.core.base import ITDBaseModel
+from itd.core.utils import parse_datetime
 from itd.enums import ReportReason, ReportTargetType
 
 if TYPE_CHECKING:
@@ -18,7 +19,7 @@ class Report(ITDBaseModel):
     _refreshable = False
 
     id: UUID
-    created_at: datetime = Field(alias='createdAt')
+    created_at: Annotated[datetime, BeforeValidator(parse_datetime)] = Field(alias='createdAt')
 
     def __init__(self, target_id: UUID, target_type: ReportTargetType, reason: ReportReason, description: str | None = None, client: Client | None = None):
         super().__init__(client)

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/models/session.py

@@ -1,12 +1,14 @@
 from datetime import datetime
 from ipaddress import IPv4Address
+from typing import Annotated
 from uuid import UUID
 
-from pydantic import Field
+from pydantic import BeforeValidator, Field
 
 from itd.api.sessions import get_sessions, revoke, revoke_all
 from itd.core.base import ITDBaseModel
 from itd.core.client import Client
+from itd.core.utils import parse_datetime
 from itd.enums import DeviceType
 
 
@@ -16,9 +18,9 @@ class Session(ITDBaseModel):
     id: UUID
     is_current: bool = Field(alias='isCurrent')
 
-    created_at: datetime = Field(alias='createdAt')
-    last_used_at: datetime = Field(alias='lastUsedAt')
-    expires_at: datetime = Field(alias='expiresAt')
+    created_at: Annotated[datetime, BeforeValidator(parse_datetime)] = Field(alias='createdAt')
+    last_used_at: Annotated[datetime, BeforeValidator(parse_datetime)] = Field(alias='lastUsedAt')
+    expires_at: Annotated[datetime, BeforeValidator(parse_datetime)] = Field(alias='expiresAt')
 
     ip: IPv4Address = Field(alias='ipAddress')
     country: str | None = Field(None, alias='ipCountry')  # country code

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/itd/models/user.py

@@ -2,14 +2,13 @@ from __future__ import annotations
 
 from datetime import datetime
 from functools import cached_property
-from typing import TYPE_CHECKING, overload
+from typing import TYPE_CHECKING, Annotated, overload
 from uuid import UUID
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, BeforeValidator, Field
 
-from itd.core.default import get_default_client
-from itd.api.etc import get_who_to_follow
 from itd.api.pins import get_pins, remove_pin
+from itd.api.search import search
 from itd.api.subscription import get_payment_methods, get_subscription, pay_subscription, toggle_subscription_auto_renewal
 from itd.api.users import (
     block,
@@ -21,8 +20,8 @@ from itd.api.users import (
     get_privacy,
     get_profile,
     get_user,
+    get_who_to_follow,
     restore_account,
-    search_users,
     unblock,
     unfollow,
     update_privacy,
@@ -30,13 +29,14 @@ from itd.api.users import (
 )
 from itd.api.users import get_follow_status as _get_follow_status
 from itd.core.base import ITDBaseModel, ITDList
+from itd.core.default import get_default_client
+from itd.core.utils import parse_datetime, to_uuid
 from itd.enums import AccessType, LastSeenUnit, LoadStatus, ReportReason, ReportTargetType, Role, Unset
 from itd.exceptions import AccountDeletedError, NotFoundError, PinNotOwnedError
 from itd.models.pin import Pin
 from itd.models.poll import NewPoll
 from itd.models.report import Report
 from itd.models.span import Span
-from itd.core.utils import parse_datetime, to_uuid
 from itd.models.utils import ATTACHMENTS
 
 if TYPE_CHECKING:
@@ -124,7 +124,7 @@ class Subscription(ITDBaseModel):
     _refreshable = False
 
     active: bool = Field(False, alias='isActive')
-    expires_at: datetime | None = Field(None, alias='expiresAt')
+    expires_at: Annotated[datetime, BeforeValidator(parse_datetime)] | None = Field(None, alias='expiresAt')
     auto_renewal: bool = Field(True, alias='autoRenewal')
 
     def _refresh(self, *, client: Client):  # refreshes only is_active
@@ -231,7 +231,7 @@ class User(_UserBase):
         False, alias='isBlockedByThem'
     )  # not 100% true, server returns value only if isBlockedByThem is True and isBlockedByMe is False
     is_blocking: bool = Field(False, alias='isBlockedByMe')
-    blocked_at: datetime | None = Field(None, alias='blockedAt')
+    blocked_at: Annotated[datetime, BeforeValidator(parse_datetime)] | None = Field(None, alias='blockedAt')
 
     followers_count: int | None = Field(None, alias='followersCount')
     following_count: int | None = Field(None, alias='followingCount')
@@ -240,14 +240,15 @@ class User(_UserBase):
     wall_access: AccessType | None = Field(None, alias='wallAccess')  # none if blocked
     likes_visibility: AccessType | None = Field(None, alias='likesVisibility')  # none if blocked
     is_private: bool | None = Field(None, alias='isPrivate')  # none if following or blocked
+    can_message: bool = Field(False, alias='canMessage')
 
     is_subscribed: bool = Field(False, alias='hasNuksta')
-    last_seen: datetime | LastSeen | None = Field(None, alias='lastSeen')  # none if hidden or blocked
+    last_seen: LastSeen | None = Field(None, alias='lastSeen')  # none if hidden or blocked
     online: bool = False
 
     pinned_post_id: UUID | None = Field(None, alias='pinnedPostId')  # none if no or blocked
 
-    created_at: datetime | None = Field(None, alias='createdAt')  # none if blocked
+    created_at: Annotated[datetime, BeforeValidator(parse_datetime)] | None = Field(None, alias='createdAt')  # none if blocked
 
     def _post_refresh(self, context: dict = {}):
         if 'id' in self.__dict__:
@@ -370,7 +371,7 @@ class User(_UserBase):
     def following(self) -> list[User]:
         return [User.from_dict(user, client=self.client) for user in get_following(self.client, self._identifier).json()['data']['users']]
 
-    @property
+    @cached_property
     def followers(self) -> list[User]:
         return [User.from_dict(user, client=self.client) for user in get_followers(self.client, self._identifier).json()['data']['users']]
 
@@ -396,7 +397,7 @@ class Me(_UserBase):
     following_count: int = Field(alias='followingCount')
     posts_count: int = Field(alias='postsCount')
 
-    created_at: datetime = Field(alias='createdAt')
+    created_at: Annotated[datetime, BeforeValidator(parse_datetime)] = Field(alias='createdAt')
 
     def __init__(self, client: Client | None = None) -> None:
         super().__init__('me', client)
@@ -573,7 +574,7 @@ class Users(ITDBaseModel, list[User]):
 
     def load(self, limit: int = 10):
         self.clear()
-        self.extend([User.from_dict(hashtag) for hashtag in search_users(self.client, self.query, limit).json()['data']['users']])
+        self.extend([User.from_dict(hashtag) for hashtag in search(self.client, self.query, limit, 1).json()['data']['users']])
         return self
 
     @classmethod

{itd_sdk-2.8.0 → itd_sdk-2.8.2}/pyproject.toml

@@ -14,7 +14,7 @@ version_provider = "uv"
 
 [project]
 name = "itd-sdk"
-version = "2.8.0"
+version = "2.8.2"
 description = "ITD client for python"
 readme = "README.md"
 authors = [
@@ -36,6 +36,7 @@ dependencies = [
   "telegramify-markdown>=0.5.4",
   "lxml>=6.1.1",
   "platformdirs>=4.10.0",
+  "websockets>=16.1.1",
 ]
 requires-python = ">=3.10"
 

itd_sdk-2.8.0/itd/api/etc.py

@@ -1,16 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from itd.core.request import endpoint
-
-if TYPE_CHECKING:
-    from itd.core.client import Client
-
-
-@endpoint('get', 'users/stats/top-clans')
-def get_top_clans(client: Client): ...
-
-
-@endpoint('get', 'users/suggestions/who-to-follow')
-def get_who_to_follow(client: Client): ...

itd_sdk-2.8.0/itd/core/credfile.py

@@ -1,43 +0,0 @@
-from datetime import datetime
-from json import dumps, loads
-from pathlib import Path
-
-from pydantic import BaseModel, Field
-
-# class CredfileSession(BaseModel):
-#     id: int
-#     last_active: datetime
-#     main: bool
-
-#     @classmethod
-#     def current(cls, main: bool = False):
-#         return cls(id=getpid(), last_active=datetime.now(), main=main)
-
-
-class Credfile(BaseModel):
-    access: str | None = None
-    refresh: str | None = None
-    valid: bool = True
-    updated_at: datetime = Field(default_factory=datetime.now)
-    # sessions: list[CredfileSession] = Field(default_factory=lambda: [])
-    _file: Path
-
-    def flush(self):
-        self.updated_at = datetime.now()
-        self._file.write_text(dumps(self.model_dump(mode='json')))
-
-    def update(self):
-        new = self.model_validate(loads(self._file.read_text()))
-        if self.updated_at <= new.updated_at:
-            for field in Credfile.model_fields:
-                setattr(self, field, getattr(new, field))
-            return True
-        return False
-
-    # @field_validator('sessions', mode='after')
-    # def validate_sessions(self, sessions: list[CredfileSession]):
-    #     for session in sessions.copy():
-    #         if session.last_active < datetime.now() - timedelta(minutes=30):
-    #             sessions.remove(session)
-
-    #     sessions.append(CredfileSession.current(main=not any(session.main for session in sessions)))