itd-sdk 2.1.0__tar.gz → 2.1.2__tar.gz

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/PKG-INFO

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

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/itd/api/comments.py

@@ -3,18 +3,18 @@ from uuid import UUID
 from typing import TYPE_CHECKING
 
 from itd.base import catch_errors, rate_limit
-from itd.exceptions import ValidationError, NotFoundError, AlreadyDeletedError, BannedWordError
+from itd.exceptions import ValidationError, NotFoundError, AlreadyDeletedError, BannedWordError, ForbiddenError, RequiresSubscriptionError
 
 if TYPE_CHECKING:
     from itd.client import Client
 
 @rate_limit(5, 20, 80)
-@catch_errors(ValidationError(), NotFoundError('Post'), BannedWordError('Comment'))
+@catch_errors(ValidationError(), NotFoundError('Post'), BannedWordError('Comment'), ForbiddenError('comment - some files not owned'), RequiresSubscriptionError('Video uploading'))
 def add_comment(client: Client, post_id: UUID, content: str | None = None, attachment_ids: list[UUID] = []):
     return client.request('post', f'posts/{post_id}/comments', {'content': content or '', "attachmentIds": list(map(str, attachment_ids))})
 
 @rate_limit(1, 10, 30)
-@catch_errors(ValidationError(), NotFoundError('Comment'), NotFoundError('User', res_check=lambda res: res.status_code == 500 and 'Failed query' in res.text), BannedWordError('Reply'))
+@catch_errors(ValidationError(), NotFoundError('Comment'), NotFoundError('User', res_check=lambda res: res.status_code == 500 and 'Failed query' in res.text), BannedWordError('Reply'), ForbiddenError('reply - some files not owned'), RequiresSubscriptionError('Video uploading'))
 def add_reply_comment(client: Client, comment_id: UUID, author_id: UUID, content: str | None = None, attachment_ids: list[UUID] = []):
     return client.request('post', f'comments/{comment_id}/replies', {'content': content or '', 'replyToUserId': str(author_id), "attachmentIds": list(map(str, attachment_ids))})
 

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/itd/api/posts.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 from itd.enums import PostsTab, UserPostSorting
 from itd.poll import NewPoll
 from itd.exceptions import (
-    NotFoundError, ForbiddenError, RequiresVerificationError, ValidationError, AlreadyRepostedError, CantRepostYourselfError,
+    NotFoundError, ForbiddenError, RequiresSubscriptionError, ValidationError, AlreadyRepostedError, CantRepostYourselfError,
     NotPinnedError, EditExpiredError, BannedWordError
 )
 from itd.base import rate_limit, catch_errors
@@ -14,7 +14,7 @@ if TYPE_CHECKING:
     from itd.client import Client
 
 @rate_limit(1, 10, 30)
-@catch_errors(NotFoundError('Wall recipient'), ForbiddenError('post - some files not owned'), RequiresVerificationError('Video uploading'), BannedWordError('Post'), ValidationError())
+@catch_errors(NotFoundError('Wall recipient'), ForbiddenError('post - some files not owned'), RequiresSubscriptionError('Video uploading'), BannedWordError('Post'), ValidationError())
 def create_post(
     client: Client,
     content: str | None = None,
@@ -49,7 +49,7 @@ def get_post(client: Client, id: UUID):
     return client.request('get', f'posts/{id}')
 
 @rate_limit(None, 1, 5)
-@catch_errors(NotFoundError('Post'), ForbiddenError('edit post'), EditExpiredError())
+@catch_errors(NotFoundError('Post'), ForbiddenError('edit post'), EditExpiredError(), BannedWordError('Post'))
 def edit_post(client: Client, id: UUID, content: str, spans: list[dict] = []):
     return client.request('put', f'posts/{id}', {'content': content, 'spans': spans})
 
@@ -74,7 +74,7 @@ def unpin_post(client: Client, id: UUID):
     return client.request('delete', f'posts/{id}/pin')
 
 @rate_limit(1, 10, 30)
-@catch_errors(NotFoundError('Post'), AlreadyRepostedError(), CantRepostYourselfError(), ValidationError())
+@catch_errors(NotFoundError('Post'), AlreadyRepostedError(), CantRepostYourselfError(), ValidationError(), BannedWordError('Post'))
 def repost(client: Client, id: UUID, content: str | None = None):
     data = {}
     if content:

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/itd/base.py

@@ -12,7 +12,7 @@ from pydantic_core import PydanticUndefinedType
 
 from itd._default import get_default_client
 from itd.logger import get_logger
-from itd.exceptions import ITDException, ValidationError, RateLimitError, UnauthorizedError, AccessTokenExpiredError, DEFAULT_ERRORS
+from itd.exceptions import ITDException, ValidationError, RateLimitError, UnauthorizedError, AccessTokenExpiredError, DEFAULT_ERRORS, InternalError
 from itd.enums import All, ALL, DebugResponseMode, RateLimitMode, BATCH, Batch
 if TYPE_CHECKING:
     from itd.client import Client
@@ -370,12 +370,16 @@ def rate_limit(delay_min: float | None = None, delay_mid: float | None = None, d
                 sleep(max(delay, 0))
             client.last_actions[func.__name__] = datetime.now()
 
+            if not client.config.retry_on_rate_limits:
+                return func(client, *args, **kwargs)
+
             while True:
                 try:
                     return func(client, *args, **kwargs)
-                except RateLimitError as e:
-                    l.info('rate limit on %s; wait %ss', func.__name__, e.retry_after or 10)
-                    sleep(e.retry_after or 10)
+                except (RateLimitError, InternalError) as e:
+                    retry_after = getattr(e, 'retry_after', client.config.rate_limit_wait) or client.config.rate_limit_wait
+                    l.info('rate limit on %s; wait %ss', func.__name__, retry_after)
+                    sleep(retry_after)
 
         return wrapper
     return decorator

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/itd/client.py

@@ -45,6 +45,8 @@ class Config:
     solve_challenge: bool = True
     load_comments_from_post: bool = False
     parse_mode: ParseMode = ParseMode.NO
+    rate_limit_wait: int = 10 # delay before next attempt (after rate limit error) if retry_after is not provided
+    retry_on_rate_limits: bool = True
 
     def __post_init__(self):
         if self.rate_limit_default:

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/itd/exceptions.py

@@ -129,6 +129,11 @@ class RequiresVerificationError(NoRightsError):
     def __init__(self, obj: str):
         self.text = f'{obj} allowed only for verificated users'
 
+class RequiresSubscriptionError(NoRightsError):
+    code = 'VIDEO_REQUIRES_NUKSTA'
+    def __init__(self, obj: str):
+        self.text = f'{obj} allowed only for users with НУКСТА subscription'
+
 
 class UsernameTakenError(ValidateError):
     code = 'USERNAME_TAKEN'
@@ -226,6 +231,7 @@ class NotPinnedError(ITDException):
     text = 'Post not found or is not pinned'
 
 class InternalError(ITDException):
+    status_code = 502
     code = 'INTERNAL_ERROR'
     text = 'Internal server error'
 

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/itd/post.py

@@ -1,10 +1,9 @@
 from uuid import UUID
 from datetime import datetime
-from typing import Literal, overload
+from typing import Literal, overload, TYPE_CHECKING
 from time import sleep
 
 from pydantic import Field, BaseModel, field_validator
-from pydantic.fields import FieldInfo
 
 from itd.base import ITDBaseModel, refresh_wrapper, ITDList
 from itd.client import Client
@@ -238,7 +237,7 @@ class Post(ITDBaseModel):
             client (Client | None, optional): Клиент. Defaults to None.
         """
         pin_post(client or self.client, self.id)
-        self.is_pinned_post = True
+        self.is_pinned = True
         (client or self.client).user.pinned_post_id = self.id
 
     def unpin(self, client: Client | None = None) -> None:
@@ -248,7 +247,7 @@ class Post(ITDBaseModel):
             client (Client | None, optional): Клиент. Defaults to None.
         """
         unpin_post(client or self.client, self.id)
-        self.is_pinned_post = False
+        self.is_pinned = False
         (client or self.client).user.pinned_post_id = None
 
     def delete(self, client: Client | None = None) -> None:
@@ -314,13 +313,13 @@ class Post(ITDBaseModel):
     def url(self) -> str:
         return f'https://xn--d1ah4a.com/@{self.author.username}/post/{self.id}'
 
-
-    def __getattribute__(self, name: str):
-        value = super().__getattribute__(name)
-        if name == 'comments' and getattr(value, '_post_id', None) is None:
-            value = Comments()
-            value._post_id = self.id
-        return value
+    if not TYPE_CHECKING:
+        def __getattribute__(self, name: str):
+            value = super().__getattribute__(name)
+            if name == 'comments' and getattr(value, '_post_id', None) is None:
+                value = Comments()
+                value._post_id = self.id
+            return value
 
 
 

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/itd/user.py

@@ -106,10 +106,11 @@ class Privacy(ITDBaseModel):
         instance._user = user
         return instance
 
-    def __getattribute__(self, name: str):
-        if name in ('is_private', 'wall_access', 'likes_visibility') and object.__getattribute__(self, '_user'):
-            setattr(self, name, getattr(object.__getattribute__(self, '_user'), name))
-        return super().__getattribute__(name)
+    if not TYPE_CHECKING:
+        def __getattribute__(self, name: str):
+            if name in ('is_private', 'wall_access', 'likes_visibility') and object.__getattribute__(self, '_user'):
+                setattr(self, name, getattr(object.__getattribute__(self, '_user'), name))
+            return super().__getattribute__(name)
 
 
 class _PrivacyValidate(BaseModel, Privacy):
@@ -204,7 +205,7 @@ class _UserBase(ITDBaseModel):
 
     @property
     def liked_posts(self) -> LikedPosts:
-        if not hasattr(self, '_posts'):
+        if not hasattr(self, '_liked_posts'):
             from itd.post import LikedPosts
             self._liked_posts = LikedPosts(self, client=self.client)
         return self._liked_posts
@@ -515,11 +516,12 @@ class Me(_UserBase):
             self._pins = [Pin(pin, self) for pin in get_pins(self.client).json()['data']['pins']]
         return self._pins
 
-    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
+    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
 
 
 

{itd_sdk-2.1.0 → itd_sdk-2.1.2}/pyproject.toml

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