itd-sdk 2.4.0__tar.gz → 2.4.2__tar.gz

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itd-sdk
-Version: 2.4.0
+Version: 2.4.2
 Summary: ITD client for python
 Keywords: itd,itdsocial
 Author: firedotguy

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/api/sessions.py

@@ -14,10 +14,10 @@ def get_sessions(client: Client):
 
 @catch_errors()
 @rate_limit()
-def delete_session(client: Client, id: UUID):
+def revoke(client: Client, id: UUID):
     return client.request('delete', f'v1/auth/sessions/{id}')
 
 @catch_errors()
 @rate_limit()
-def delete_all_sessions(client: Client):
+def revoke_all(client: Client):
     return client.request('delete', 'v1/auth/sessions')

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/base.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Any, Callable, TYPE_CHECKING, Iterator, TypeVar, overload
+from typing import Any, Callable, TYPE_CHECKING, Iterator, TypeVar, overload, Literal
 from functools import wraps
 from time import sleep
 from datetime import datetime, timedelta
@@ -16,7 +16,7 @@ from itd.exceptions import (
     ITDException, ValidationError, RateLimitError, UnauthorizedError, AccessTokenExpiredError,
     DEFAULT_ERRORS, AccountDeletedError
 )
-from itd.enums import All, ALL, DebugResponseMode, RateLimitMode, BATCH, Batch
+from itd.enums import All, ALL, DebugResponseMode, RateLimitMode, BATCH, Batch, LoadStatus
 if TYPE_CHECKING:
     from itd.client import Client
 
@@ -47,8 +47,7 @@ def _field_has_default(cls: type, name: str) -> bool:
 class ITDBaseModel:
     """Базовый класс модельки"""
     _refreshable: bool = True
-    _loaded: bool = False
-    _loading: bool = False
+    load_status: LoadStatus = LoadStatus.NO
     _load_with_parent: bool = True # load parent model if model called
     _validator: Callable[[Any], type[BaseModel]] | None = None # callable (pls use lambda), becuase we havent validator at that moment (it depends on this class)
 
@@ -61,16 +60,41 @@ class ITDBaseModel:
             value._client = client
         object.__setattr__(self, name, value)
 
-    def _post_refresh(self):
-        pass
+    def _post_refresh(self): ...
 
     @property
     def client(self) -> Client:
         return self._client
 
-    def refresh(self) -> Any:
-        l.warning('refresh is not implemented but have called')
-        self._loaded = True
+    def _refresh(self, *, client: Client) -> dict: raise NotImplementedError()
+
+    def refresh(self, *, client: Client | None = None) -> Any:
+        if not self._refreshable:
+            l.warning(f'{self.__class__.__name__} is not refreshable but refresh is called')
+        self.load_status = LoadStatus.LOADING
+        self._fill_from_data(self._refresh(client=client or self.client))
+        self.load_status = LoadStatus.FULL
+        return self
+
+
+    def _fill_from_data(self, data: dict):
+        assert self._validator, 'Unable to use fill_from_data without a validator'
+        validated = self._validator().model_validate(data) # pyright: ignore[reportCallIssue]
+        self._fields_from_data = validated.model_fields_set
+        for name, value in validated.__dict__.items():
+            setattr(self, name, value)
+
+        self._post_refresh()
+
+
+    @classmethod
+    def from_dict(cls, data: dict, *, client: Client | None = None):
+        instance = cls.__new__(cls)
+        ITDBaseModel.__init__(instance, client)
+
+        instance._fill_from_data(data)
+        instance.load_status = LoadStatus.PARTIALLY
+        return instance
 
 
     if not TYPE_CHECKING:
@@ -78,20 +102,20 @@ class ITDBaseModel:
             value = _getattr(self, name)
             if (
                 name.startswith('_') or # приватный аттрибут
-                name in ('client', 'model_fields_set') or
+                name in ('client', 'model_fields_set', 'load_status') or
                 not _getattr(self, '_refreshable') or # не рефрешабельная модель
                 not _getattr(self, 'client').config.auto_load or # отключено в конфиге
                 callable(value) or # функция
+                self.load_status == LoadStatus.LOADING or
                 (not _getattr(self, 'client').config.load_comments_from_post and _is_comments_on_post(value, self)) or
                 (isinstance(value, ITDBaseModel) and not value._load_with_parent)
             ):
                 # l.debug('return %s as is', name)
                 return object.__getattribute__(self, name)
 
-            if isinstance(value, FieldInfo) or (isinstance(value, ITDBaseModel) and value._load_with_parent and not value._loaded) or (not _getattr(self, '_loaded') and value is None):
-                l.info('refresh %s (caused by %s)', self.__class__.__name__, name)
+            if isinstance(value, FieldInfo) or (self.load_status != LoadStatus.FULL and name not in self._fields_from_data):
+                l.info('refresh %s field=%s load_status=%s', self.__class__.__name__, name, self.load_status.value)
                 self.refresh()
-                return object.__getattribute__(self, name)
 
             return object.__getattribute__(self, name)
 
@@ -179,7 +203,7 @@ class ITDList[T](ITDBaseModel, list[T]):
     def _get_objects(data: dict) -> list[dict]:
         return []
 
-    def refresh(self, count: int | All | Batch | None = None, limit: int | Batch = BATCH, client: Client | None = None) -> list[T]:
+    def refresh(self, count: int | All | Batch | None = None, limit: int | Batch = BATCH, *, client: Client | None = None) -> list[T]:
         """Обновить список (удалить все элементы и загрузить заново)
 
         Args:
@@ -265,29 +289,6 @@ class ITDList[T](ITDBaseModel, list[T]):
         return self.load_all()
 
 
-def refresh_wrapper(func):
-    """Декоратор для self.refresh"""
-    @wraps(func)
-    def wrapper(self, client: Client | None = None):
-        # if self._loading:
-        #     return
-
-        # self._loading = True
-        data = func(self, client or self.client)
-        if self._validator:
-            validated = self._validator().model_validate(data)
-            self._fields_from_data = validated.model_fields_set
-            l.debug('fill %s', self.__class__.__name__)
-            for name, value in validated.__dict__.items():
-                setattr(self, name, value)
-
-        # self._loading = False
-        self._loaded = True
-        self._post_refresh()
-
-    return wrapper
-
-
 def _filter_bytes(args: tuple):
     filtered = []
     for arg in args:

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/clan.py

@@ -27,8 +27,8 @@ 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):
-        l.warning('TopClans.refresh is deprecated and will be removed in 2.6.0. Pleas use TopClans.load')
+    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

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/client.py

@@ -52,6 +52,7 @@ class Config:
 
     timeout: float = 30
     timeout_file: float = 120
+    timeout_file_download: float = 60
 
     url: str = 'xn--d1ah4a.com'
     url_api: str | None = None
@@ -75,6 +76,7 @@ class Config:
     dwell_send_interval: float = 2
     dwell_save_on_quit: bool = True
     dwell_wait_durations: bool = True
+    post_view_increment: bool = False
 
     post_update_stats: bool = False
     post_update_stats_interval: int = 3
@@ -285,7 +287,7 @@ class Client:
             tuple[list[User], list[Hashtag]]: Результат поиска
         """
         res = search(self, query, users_limit, hashtags_limit).json()['data']
-        return [User._from_dict(user, False, self) for user in res['users']], [Hashtag._from_dict(hashtag, self) for hashtag in res['hashtags']]
+        return [User._from_dict(user, client=self) for user in res['users']], [Hashtag._from_dict(hashtag, self) for hashtag in res['hashtags']]
 
     def search_users(self, query: str, limit: int = 20) -> list[User]:
         """Поиск пользователей

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/comment.py

@@ -152,12 +152,12 @@ class _CommentValidate(BaseModel, Comment):
     @classmethod
     def validate_reply_to(cls, reply_to: dict | None):
         if reply_to is not None:
-            return User._from_dict(reply_to, False)
+            return User._from_dict(reply_to)
 
     @field_validator('author', mode='plain')
     @classmethod
     def validate_author(cls, author: dict):
-        return User._from_dict(author, False)
+        return User._from_dict(author)
 
 
 

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/enums.py

@@ -147,7 +147,6 @@ class AccessType(Enum):
 
 _ACCESS_TYPE_HIERARCHY = [AccessType.EVERYONE, AccessType.FOLLOWERS, AccessType.MUTUAL, AccessType.EVERYONE] # 100% that hierarcy is spelled wrong
 
-
 class SpanType(Enum):
     MONOSPACE = 'monospace' # моноширный (код)
     STRIKE = 'strike' # зачеркнутый
@@ -160,11 +159,16 @@ class SpanType(Enum):
     QUOTE = 'quote' # цитата (не работает)
     MENTION = 'mention' # упоминание (появляется только при получении постов, при создании нету)
 
-
 class Role(Enum):
     USER = 'user'
     ADMIN = 'admin'
 
+class LoadStatus(Enum):
+    NO = 'no'
+    LOADING = 'loading'
+    PARTIALLY = 'partially'
+    FULL = 'full'
+
 
 class Unset: pass
 UNSET = Unset()

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/file.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from pydantic import BaseModel, Field
 from requests import get
 
-from itd.base import ITDBaseModel, refresh_wrapper
+from itd.base import ITDBaseModel
 from itd.enums import AttachType
 from itd.api.files import upload_file, delete_file
 if TYPE_CHECKING:
@@ -29,37 +29,34 @@ class File(ITDBaseModel):
     def __init__(self, name: str, data: bytes | BufferedReader, client: Client | None = None):
         super().__init__(client)
         self.filename = name
-        self._upload(data)
+        self.data = data
+        self._fill_from_data(upload_file(client or self.client, self.filename, self.data).json())
 
     @classmethod
-    def from_path(cls, path: Path | str):
+    def from_path(cls, path: Path | str, *, client: Client | None = None):
         if isinstance(path, str):
             path = Path(path)
-        return cls(path.name, path.read_bytes())
+        return cls(path.name, path.read_bytes(), client)
 
     @classmethod
-    def from_bytes(cls, data: bytes | BufferedReader):
-        try:
-            from filetype import guess
-        except ModuleNotFoundError:
-            raise ImportError('filetype is required for File.from_bytes. Install by running "uv add itd-sdk[filetype]" (or "pip install itd-sdk[filetype]" if you are using pip)')
+    def from_bytes(cls, data: bytes | BufferedReader, name: str | None = None, *, client: Client | None = None):
+        if not name:
+            try:
+                from filetype import guess
+            except ModuleNotFoundError:
+                raise ImportError('filetype is required for File.from_bytes. Install by running "uv add itd-sdk[filetype]" (or "pip install itd-sdk[filetype]" if you are using pip)')
 
-        kind = guess(data)
-        return cls(
-            f'file.{kind.extension}' if kind else 'file.0',
-            data
-        )
+            kind = guess(data)
+            name = f'file.{kind.extension}' if kind else 'file.0'
 
-    @refresh_wrapper
-    def _upload(self, data: bytes | BufferedReader):
-        return upload_file(self.client, self.filename, data).json()
+        return cls(name, data, client)
 
-    def delete(self) -> None:
-        delete_file(self.client, self.id)
+    def delete(self, *, client: Client | None = None) -> None:
+        delete_file(client or self.client, self.id)
 
     def download(self, name: str | None = None) -> None:
         with open(name or self.filename, 'wb') as fl:
-            fl.write(get(self.url, timeout=60).content)
+            fl.write(get(self.url, timeout=self.client.config.timeout_file_download).content)
 
     def __str__(self) -> str:
         return self.filename
@@ -73,6 +70,7 @@ class _FileValidate(BaseModel, File):
 class PostAttach(ITDBaseModel):
     _validator = lambda _: _PostAttachValidate
     _post: Post
+    _refreshable = False
 
     id: UUID
     type: AttachType = AttachType.IMAGE
@@ -94,7 +92,7 @@ class PostAttach(ITDBaseModel):
             name (str): Имя файла.
         """
         with open(name, 'wb') as fl:
-            fl.write(get(self.url, timeout=self.client.config.timeout_file).content)
+            fl.write(get(self.url, timeout=self.client.config.timeout_file_download).content)
 
     def record_open(self, client: Client | None = None):
         """Записать событие открытия фото
@@ -163,7 +161,7 @@ class CommentAttach(PostAttach):
             name (str | None, optional): Имя файла. None - имя, под которым был загружен этот файл. Defaults to None.
         """
         with open(name or self.filename, 'wb') as fl:
-            fl.write(get(self.url, timeout=self.client.config.timeout_file).content)
+            fl.write(get(self.url, timeout=self.client.config.timeout_file_download).content)
 
 
 class _CommentAttachValidate(BaseModel, CommentAttach):

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/hashtag.py

@@ -5,7 +5,7 @@ from uuid import UUID
 from pydantic import BaseModel, Field
 
 from itd.api.hashtags import get_hashtags, get_posts_by_hashtag
-from itd.base import ITDBaseModel, refresh_wrapper
+from itd.base import ITDBaseModel
 if TYPE_CHECKING:
     from itd.client import Client
     from itd.post import HashtagPosts
@@ -22,9 +22,8 @@ class Hashtag(ITDBaseModel):
         super().__init__(client)
         self.name = name.lstrip('#')
 
-    @refresh_wrapper
-    def refresh(self, client: Client | None = None):
-        return get_posts_by_hashtag(client or self.client, self.name, limit=1).json()['data']['hashtag']
+    def _refresh(self, *, client: Client):
+        return get_posts_by_hashtag(client, self.name, limit=1).json()['data']['hashtag']
 
     @classmethod
     def _from_dict(cls, data: dict, client: Client | None = None):

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/notification.py

@@ -10,7 +10,7 @@ from sseclient import SSEClient
 
 from itd.base import ITDBaseModel, ITDList
 from itd.client import Client
-from itd.enums import NotificationTargetType, NotificationType, All, ALL
+from itd.enums import NotificationTargetType, NotificationType
 from itd.user import User
 from itd.api.notifications import (
     mark_as_read, mark_all_as_read, get_notifications, get_unread_notifications_count,
@@ -109,7 +109,7 @@ class _NotificationValidate(BaseModel, Notification):
     @field_validator('actor', mode='plain')
     @classmethod
     def validate_actor(cls, actor: dict):
-        return User._from_dict(actor, False)
+        return User._from_dict(actor)
 
 
 

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/post.py

@@ -24,8 +24,8 @@ from itd.api.posts import (
 )
 from itd.api.hashtags import get_posts_by_hashtag
 from itd.api.dwell import send_views, send_interactions
-from itd.base import ITDBaseModel, refresh_wrapper, ITDList
-from itd.enums import PostsTab, UserPostSorting, ReportReason, ReportTargetType, ParseMode, ALL, ViewReason, ViewSource, InteractionType
+from itd.base import ITDBaseModel, ITDList
+from itd.enums import PostsTab, UserPostSorting, ReportReason, ReportTargetType, ParseMode, ALL, ViewReason, ViewSource, InteractionType, LoadStatus
 from itd.exceptions import NotFoundError
 from itd.logger import get_logger
 from itd.utils import to_uuid, parse_datetime, format_attachments, ATTACHMENTS, parse_html, parse_md, calc_view_duration
@@ -66,6 +66,8 @@ class ViewEvent(DwellEvent):
 
 
 class DwellTracker(ITDBaseModel):
+    _refreshable = False
+
     def __init__(self, client: Client | None = None) -> None:
         super().__init__(client)
         self.views: list[ViewEvent] = []
@@ -313,25 +315,16 @@ class Post(ITDBaseModel):
         for name, value in validated.__dict__.items():
             setattr(instance, name, value)
 
-        instance._loaded = False
+        instance.load_status = LoadStatus.PARTIALLY
         instance._post_refresh()
 
         return instance
 
     @classmethod
-    def _from_dict(cls, data: dict, source: ViewSource = ViewSource.POST_PAGE, source_context: str | None = None, set_loaded: bool = True, client: Client | None = None) -> 'Post':
-        instance = cls.__new__(cls)
-        super(Post, instance).__init__(client)
-
-        validated = _PostValidate.model_validate(data)
-        instance._fields_from_data = validated.model_fields_set
-        for name, value in validated.__dict__.items():
-            setattr(instance, name, value)
-
-        instance._loaded = set_loaded
+    def from_dict(cls, data: dict, source: ViewSource = ViewSource.POST_PAGE, source_context: str | None = None, *, client: Client | None = None) -> 'Post':
+        instance = super().from_dict(data)
         instance.source = source
         instance.source_context = source_context
-        instance._post_refresh()
         return instance
 
 
@@ -339,9 +332,8 @@ class Post(ITDBaseModel):
         assert self.poll, 'No poll'
         self.poll.vote(options, client or self.client)
 
-    @refresh_wrapper
-    def refresh(self, client: Client | None = None):
-        return get_post(client or self.client, self.id).json()['data']
+    def _refresh(self, *, client: Client):
+        return get_post(client, self.id).json()['data']
 
 
     def __str__(self) -> str:
@@ -413,11 +405,12 @@ class Post(ITDBaseModel):
             Post: Пост
         """
         post = repost(client or self.client, self.id, content).json()
-        self.reposts_count += 1
+        if 'reposts_count' in self._fields_from_data:
+            self.reposts_count += 1
         if (client or self.client) == self.client:
             self.is_reposted = True
 
-        return Post._from_dict(post, client=client)
+        return Post.from_dict(post, client=client)
 
     def view(self, client: Client | None = None, entered_at: datetime | None = None, duration: int | None = None, reason: ViewReason = ViewReason.NORMAL) -> None:
         """Просмотреть пост
@@ -427,9 +420,6 @@ class Post(ITDBaseModel):
         """
         c = client or self.client
         if c.dwell_tracker is not None:
-            if self.vs is None:
-                self.refresh(c)
-                assert self.vs
             if duration is None:
                 duration = calc_view_duration(c.config, self.content, self.attachments)
                 if c.config.dwell_wait_durations:
@@ -439,7 +429,8 @@ class Post(ITDBaseModel):
             view_post(c, self.id)
         if c == self.client:
             self.is_viewed = True
-        # post can be already viewed, so view will not add; thats why do not change views_count
+        if c.config.post_view_increment and 'views_count' in self._fields_from_data:
+            self.views_count += 1
 
     def pin(self, client: Client | None = None) -> None:
         """Закрепить пост
@@ -514,7 +505,8 @@ class Post(ITDBaseModel):
             Comment: Комментарий
         """
         comment = self.comments.new(content, attachments, client or self.client)
-        self.comments_count += 1
+        if 'comments_count' in self._fields_from_data:
+            self.comments_count += 1
         return comment
 
     def report(self, reason: ReportReason, description: str | None = None, client: Client | None = None) -> Report:
@@ -575,7 +567,7 @@ class _PostValidate(BaseModel, Post): # BaseModel MUST be first or you ll have s
     def validate_original_post(cls, post: dict | None = None):
         if post is None:
             return
-        return Post._from_dict(post, set_loaded=False)
+        return Post.from_dict(post)
 
     @field_validator('poll', mode='plain')
     @classmethod
@@ -596,13 +588,13 @@ class _PostValidate(BaseModel, Post): # BaseModel MUST be first or you ll have s
             return None
         if isinstance(author, _UserBase):
             return author
-        return User._from_dict(author, False)
+        return User._from_dict(author)
 
     @field_validator('wall_recipient', mode='plain')
     @classmethod
     def validate_wall_recipient(cls, wall_recipient: dict | None):
         if wall_recipient is not None:
-            return User._from_dict(wall_recipient, False)
+            return User._from_dict(wall_recipient)
 
 
 
@@ -624,7 +616,7 @@ class _BasePosts(ITDList[Post]):
         return data['posts']
 
     def _extend(self, objects: list, client: Client):
-        self.extend([Post._from_dict(post, self.source, self.source_context, client=client) for post in objects])
+        self.extend([Post.from_dict(post, self.source, self.source_context, client=client) for post in objects])
 
     def __setattr__(self, name: str, value) -> None:
         if name == '_client':
@@ -766,7 +758,7 @@ class HashtagPosts(_BasePosts):
         return get_posts_by_hashtag(client, self.hashtag.name, self.cursor, limit).json()['data']
 
     def _extend(self, objects: list, client: Client):
-        self.extend([Post._from_dict(post, self.source, self.source_context, set_loaded=False, client=client) for post in objects])
+        self.extend([Post.from_dict(post, self.source, self.source_context, client=client) for post in objects])
 
     def _get_total(self, data: dict):
         return data['hashtag']['postsCount']

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/report.py

@@ -5,7 +5,7 @@ from datetime import datetime
 
 from pydantic import BaseModel, Field
 
-from itd.base import ITDBaseModel, refresh_wrapper
+from itd.base import ITDBaseModel
 from itd.enums import ReportReason, ReportTargetType
 from itd.api.reports import report
 if TYPE_CHECKING:
@@ -26,12 +26,7 @@ class Report(ITDBaseModel):
         self.reason = reason
         self.description = description
 
-        self.refresh()
-
-
-    @refresh_wrapper
-    def refresh(self, client: Client | None = None):
-        return report(client or self.client, self.target_id, self.target_type, self.reason, self.description).json()['data']
+        self._fill_from_data(report(client or self.client, self.target_id, self.target_type, self.reason, self.description).json()['data'])
 
 
 

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/session.py

@@ -7,7 +7,7 @@ from pydantic import Field, BaseModel
 from itd.base import ITDBaseModel
 from itd.client import Client
 from itd.enums import DeviceType
-from itd.api.sessions import get_sessions, delete_session, delete_all_sessions
+from itd.api.sessions import get_sessions, revoke, revoke_all
 
 
 class Session(ITDBaseModel):
@@ -33,8 +33,12 @@ class Session(ITDBaseModel):
     client_name: str = Field(alias='clientName') # cant use "client"
     client_version: str = Field(alias='clientVersion')
 
+    def revoke(self):
+        revoke(self.client, self.id)
+        del self
+
     def delete(self):
-        delete_session(self.client, self.id)
+        self.revoke()
 
     def __init__(self, session: dict, client: Client | None = None) -> None:
         super().__init__(client)
@@ -72,6 +76,14 @@ class Sessions(ITDBaseModel, list[Session]):
         self.extend([Session(session) for session in get_sessions(self.client).json()['sessions']])
         return self
 
+    def revoke_all(self) -> int:
+        revoked = revoke_all(self.client).json()['revokedCount']
+        self.clear()
+        return revoked
+
+    def delete_all(self) -> int:
+        return self.revoke_all()
+
     @classmethod
     def empty(cls):
         instance = cls.__new__(cls)

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/itd/user.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, override
 from uuid import UUID
 from datetime import datetime
 
 from pydantic import Field, BaseModel, field_validator
 
-from itd.base import ITDBaseModel, refresh_wrapper, ITDList
-from itd.enums import AccessType, Unset, Role, ReportReason, ReportTargetType
+from itd.base import ITDBaseModel, ITDList
+from itd.enums import AccessType, Unset, Role, ReportReason, ReportTargetType, LoadStatus
 from itd.pin import Pin
 from itd.poll import NewPoll
 from itd.report import Report
@@ -53,9 +53,8 @@ class Profile(ITDBaseModel):
     user_id: UUID | None = Field(None, alias='userId')
     roles: list[Role] | None = None
 
-    @refresh_wrapper
-    def refresh(self, client: Client | None = None):
-        return get_profile(client or self.client).json()
+    def _refresh(self, *, client: Client):
+        return get_profile(client).json()
 
     def __str__(self) -> str:
         if self.user:
@@ -77,9 +76,8 @@ class Privacy(ITDBaseModel):
     likes_visibility: AccessType = Field(alias='likesVisibility')
     show_last_seen: bool = Field(alias='showLastSeen')
 
-    @refresh_wrapper
-    def refresh(self, client: Client | None = None):
-        return get_privacy(client or self.client).json()
+    def _refresh(self, *, client: Client):
+        return get_privacy(client).json()
 
     def update(self,
         is_private: bool | None = None,
@@ -125,6 +123,7 @@ class _PrivacyValidate(BaseModel, Privacy):
 class Subscription(ITDBaseModel):
     _validator = lambda _: _SubscriptionValidate
     _payment_methods: list
+    _refreshable = False
 
     active: bool = Field(False, alias='isActive')
     expires_at: datetime | None = Field(None, alias='expiresAt')
@@ -138,9 +137,8 @@ class Subscription(ITDBaseModel):
         for name, value in validated.__dict__.items():
             setattr(self, name, value)
 
-    @refresh_wrapper
-    def refresh(self, client: Client | None = None): # refreshes only is_active
-        return get_subscription(client or self.client).json()
+    def _refresh(self, *, client: Client): # refreshes only is_active
+        return get_subscription(client).json()
 
     def pay(self):
         return pay_subscription(self.client).json()['confirmationUrl']
@@ -195,9 +193,8 @@ class _UserBase(ITDBaseModel):
     def __str__(self) -> str:
         return self.display_name
 
-    @refresh_wrapper
-    def refresh(self, client: Client | None = None):
-        return get_user(client or self.client, self._identifier).json()
+    def _refresh(self, *, client: Client):
+        return get_user(client, self._identifier).json()
 
     @property
     def posts(self) -> UserPosts:
@@ -254,14 +251,14 @@ class User(_UserBase):
     created_at: datetime | None = Field(None, alias='createdAt') # none if blocked
 
     @classmethod
-    def _from_dict(cls, data: dict, set_loaded: bool = True, client: Client | None = None):
+    def _from_dict(cls, data: dict, client: Client | None = None):
         instance = cls(data['username'], client)
         validated = _UserValidate.model_validate(data)
         instance._fields_from_data = validated.model_fields_set
         for name, value in validated.__dict__.items():
             setattr(instance, name, value)
 
-        instance._loaded = set_loaded
+        instance.load_status = LoadStatus.PARTIALLY
         return instance
 
     @classmethod
@@ -385,13 +382,13 @@ class User(_UserBase):
     @property
     def following(self) -> list[User]:
         if not self._following:
-            self._following = [User._from_dict(user, False, self.client) for user in get_following(self.client, self._identifier).json()['data']['users']]
+            self._following = [User._from_dict(user, client=self.client) for user in get_following(self.client, self._identifier).json()['data']['users']]
         return self._following
 
     @property
     def followers(self) -> list[User]:
         if not self._followers:
-            self._followers = [User._from_dict(user, False, self.client) for user in get_followers(self.client, self._identifier).json()['data']['users']]
+            self._followers = [User._from_dict(user, client=self.client) for user in get_followers(self.client, self._identifier).json()['data']['users']]
         return self._followers
 
 
@@ -439,7 +436,7 @@ class Me(_UserBase):
             if hasattr(self, name):
                 setattr(instance, name, getattr(self, name))
         instance._identifier = self.id
-        instance._loaded = False
+        instance.load_status = LoadStatus.PARTIALLY
         return instance
 
     def delete(self) -> datetime: # should not use other client, because you can get Me only from current client
@@ -531,9 +528,8 @@ class Me(_UserBase):
             self._pins = [Pin(pin, self) for pin in get_pins(self.client).json()['data']['pins']]
         return self._pins
 
-    @refresh_wrapper
-    def refresh(self, client: Client | None = None):
-        user = get_user(client or self.client, self._identifier).json()
+    def _refresh(self, *, client: Client):
+        user = get_user(client, self._identifier).json()
         if user.get('isDeleted'):
             exc = AccountDeletedError()
             exc.can_restore = user.get('canRestore', True)
@@ -541,13 +537,9 @@ class Me(_UserBase):
             raise exc
         return user
 
-    if not TYPE_CHECKING:
-        def __getattribute__(self, name: str):
-            value = super().__getattribute__(name)
-            if name == 'pin' and value is not None and getattr(value, '_user', None) is None:
-                value._user = self
-            return value
-
+    def _post_refresh(self):
+        if self.pin:
+            self.pin._user = self
 
 
 class _MeValidate(BaseModel, Me):
@@ -590,7 +582,7 @@ class Followers(ITDList[User]):
         return data['pagination']['page'] + 1
 
     def _extend(self, objects: list, client: Client):
-        self.extend([User._from_dict(user, False, client) for user in objects])
+        self.extend([User._from_dict(user, client=client) for user in objects])
 
     def __setattr__(self, name: str, value) -> None:
         if name == '_client':
@@ -620,6 +612,6 @@ class WhoToFollow(ITDBaseModel, list[User]):
         super().__init__(client)
         self.refresh()
 
-    def refresh(self):
+    def refresh(self, *, client: Client | None = None):
         self.clear()
-        self.extend([User._from_dict(user, False, self.client) for user in get_who_to_follow(self.client).json()['users']])
+        self.extend([User.from_dict(user, client=client or self.client) for user in get_who_to_follow(self.client).json()['users']])

{itd_sdk-2.4.0 → itd_sdk-2.4.2}/pyproject.toml

@@ -14,7 +14,7 @@ version_provider = "uv"
 
 [project]
 name = "itd-sdk"
-version = "2.4.0"
+version = "2.4.2"
 description = "ITD client for python"
 readme = "README.md"
 authors = [