itd-sdk 2.4.1__tar.gz → 2.4.3__tar.gz

{itd_sdk-2.4.1 → itd_sdk-2.4.3}/PKG-INFO

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

{itd_sdk-2.4.1 → itd_sdk-2.4.3}/itd/base.py

@@ -53,11 +53,12 @@ class ITDBaseModel:
 
     def __init__(self, client: Client | None = None) -> None:
         self._client = client or get_default_client()
-        self._fields_from_data: set[str] = set()
+        self._loaded_attrs: set[str] = set()
 
     def __setattr__(self, name: str, value: Any) -> None:
         if isinstance(value, ITDBaseModel) and (client := _getattr(self, '_client')): # ai
             value._client = client
+
         object.__setattr__(self, name, value)
 
     def _post_refresh(self): ...
@@ -66,9 +67,11 @@ class ITDBaseModel:
     def client(self) -> Client:
         return self._client
 
-    def _refresh(self, *, client: Client) -> dict: ...
+    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
@@ -78,7 +81,7 @@ class ITDBaseModel:
     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
+        # self._loaded_attrs = validated.model_fields_set # значения автоматически добавляются через __setattr__
         for name, value in validated.__dict__.items():
             setattr(self, name, value)
 
@@ -100,18 +103,20 @@ class ITDBaseModel:
             value = _getattr(self, name)
             if (
                 name.startswith('_') or # приватный аттрибут
-                name in ('client', 'model_fields_set', 'load_status') 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
+                self.load_status == LoadStatus.LOADING or # сейчас загружается (уже вроде как не надо, но пусть будет на всяк)
+                (not _getattr(self, 'client').config.load_comments_from_post and _is_comments_on_post(value, self)) or # коменты
+                name in self._loaded_attrs or name in self.__dict__ or # было загружено или добавлено через setattr
                 (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 (self.load_status != LoadStatus.FULL and name not in self._fields_from_data):
+            if isinstance(value, FieldInfo) or self.load_status != LoadStatus.FULL:
+                l.debug('attrs %s', list(self._loaded_attrs))
                 l.info('refresh %s field=%s load_status=%s', self.__class__.__name__, name, self.load_status.value)
                 self.refresh()
 
@@ -241,7 +246,6 @@ class ITDList[T](ITDBaseModel, list[T]):
     def __getitem__(self, index: slice) -> list[T]: ...
 
     def __getitem__(self, index: int | slice) -> T | list[T]:  # pyright: ignore[reportIncompatibleMethodOverride]
-
         if isinstance(index, slice):
             value: int | None = index.stop
         else:
@@ -402,7 +406,7 @@ def rate_limit(delay_min: float | None = None, delay_mid: float | None = None, d
                         l.error('too large rate limit')
                         raise
 
-                    retry_after = getattr(e, 'retry_after', client.config.retry_delay)
+                    retry_after = getattr(e, 'retry_after', client.config.retry_delay) or 10
                     l.warning('%s on %s: wait %ss', e.__class__.__name__, func.__name__, retry_after)
                     sleep(retry_after)
 

{itd_sdk-2.4.1 → itd_sdk-2.4.3}/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
@@ -64,7 +65,7 @@ class Config:
 
     retry_enabled: bool = True
     retry_delay: float = 10 # delay before next attempt (after rate limit error) if retry_after is not provided in request
-    retry_max_retries: int | None = None # none for no limit
+    retry_max_retries: int | None = 10 # none for no limit
     retry_exceptions: tuple[type[Exception]] | list[type[Exception]] | None = None
     retry_max_retry_after: int = 500
 
@@ -286,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, client=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.1 → itd_sdk-2.4.3}/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)
+            return User.from_dict(reply_to)
 
     @field_validator('author', mode='plain')
     @classmethod
     def validate_author(cls, author: dict):
-        return User._from_dict(author)
+        return User.from_dict(author)
 
 
 

{itd_sdk-2.4.1 → itd_sdk-2.4.3}/itd/file.py

@@ -30,7 +30,7 @@ class File(ITDBaseModel):
         super().__init__(client)
         self.filename = name
         self.data = data
-        self.refresh()
+        self._fill_from_data(upload_file(client or self.client, self.filename, self.data).json())
 
     @classmethod
     def from_path(cls, path: Path | str, *, client: Client | None = None):
@@ -51,15 +51,12 @@ class File(ITDBaseModel):
 
         return cls(name, data, client)
 
-    def _refresh(self, *, client: Client):
-        return upload_file(client, self.filename, self.data).json()
-
     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=self.client.config.timeout_file).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.1 → itd_sdk-2.4.3}/itd/notification.py

@@ -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)
+        return User.from_dict(actor)
 
 
 

{itd_sdk-2.4.1 → itd_sdk-2.4.3}/itd/post.py

@@ -289,6 +289,7 @@ class Post(ITDBaseModel):
         Returns:
             Post: Пост
         """
+        # TODO rewrite with from_dict
         instance = cls.__new__(cls)
         super(Post, instance).__init__(client)
 
@@ -311,7 +312,7 @@ class Post(ITDBaseModel):
         ).json()
 
         validated = _PostValidate.model_validate(post)
-        instance._fields_from_data = validated.model_fields_set
+        instance._loaded_attrs = validated.model_fields_set
         for name, value in validated.__dict__.items():
             setattr(instance, name, value)
 
@@ -405,7 +406,7 @@ class Post(ITDBaseModel):
             Post: Пост
         """
         post = repost(client or self.client, self.id, content).json()
-        if 'reposts_count' in self._fields_from_data:
+        if 'reposts_count' in self._loaded_attrs:
             self.reposts_count += 1
         if (client or self.client) == self.client:
             self.is_reposted = True
@@ -429,7 +430,7 @@ class Post(ITDBaseModel):
             view_post(c, self.id)
         if c == self.client:
             self.is_viewed = True
-        if c.config.post_view_increment and 'views_count' in self._fields_from_data:
+        if c.config.post_view_increment and 'views_count' in self._loaded_attrs:
             self.views_count += 1
 
     def pin(self, client: Client | None = None) -> None:
@@ -505,7 +506,7 @@ class Post(ITDBaseModel):
             Comment: Комментарий
         """
         comment = self.comments.new(content, attachments, client or self.client)
-        if 'comments_count' in self._fields_from_data:
+        if 'comments_count' in self._loaded_attrs:
             self.comments_count += 1
         return comment
 
@@ -588,13 +589,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)
+        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)
+            return User.from_dict(wall_recipient)
 
 
 

{itd_sdk-2.4.1 → itd_sdk-2.4.3}/itd/report.py

@@ -26,10 +26,7 @@ class Report(ITDBaseModel):
         self.reason = reason
         self.description = description
 
-        self.refresh()
-
-    def _refresh(self, *, client: Client):
-        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.1 → itd_sdk-2.4.3}/itd/user.py

@@ -123,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')
@@ -249,17 +250,6 @@ class User(_UserBase):
 
     created_at: datetime | None = Field(None, alias='createdAt') # none if blocked
 
-    @classmethod
-    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.load_status = LoadStatus.PARTIALLY
-        return instance
-
     @classmethod
     def by_id(cls, id: UUID | str) -> 'User':
         return cls(to_uuid(id))
@@ -381,13 +371,13 @@ class User(_UserBase):
     @property
     def following(self) -> list[User]:
         if not self._following:
-            self._following = [User._from_dict(user, client=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, client=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
 
 
@@ -536,13 +526,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):
@@ -585,7 +571,7 @@ class Followers(ITDList[User]):
         return data['pagination']['page'] + 1
 
     def _extend(self, objects: list, client: Client):
-        self.extend([User._from_dict(user, client=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':

{itd_sdk-2.4.1 → itd_sdk-2.4.3}/pyproject.toml

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