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

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

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

{itd_sdk-2.4.1 → 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
@@ -66,9 +66,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

{itd_sdk-2.4.1 → 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

{itd_sdk-2.4.1 → itd_sdk-2.4.2}/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.2}/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.2}/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')
@@ -536,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):

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

@@ -1,58 +1,58 @@
-[build-system]
-requires = ["uv_build~=0.11"]
-build-backend = "uv_build"
-
-[tool.uv.build-backend]
-module-name = 'itd'
-module-root = ''
-
-[tool.commitizen]
-name = "cz_conventional_commits"
-tag_format = "v$version"
-version_scheme = "semver2"
-version_provider = "uv"
-
-[project]
-name = "itd-sdk"
-version = "2.4.1"
-description = "ITD client for python"
-readme = "README.md"
-authors = [
-  { name = "firedotguy", email = "nta16022013@gmail.com" }
-]
-classifiers = [
-    'Development Status :: 5 - Production/Stable',
-    'Natural Language :: Russian',
-    'Programming Language :: Python',
-    'Programming Language :: Python :: 3',
-    'Framework :: Pydantic :: 2'
-]
-keywords = ['itd', 'itdsocial']
-license = "MIT"
-dependencies = [
-  "requests~=2.32.5",
-  "pydantic>=2.12.5,<2.14.0",
-  "sseclient-py~=1.9.0",
-]
-requires-python = ">=3.9"
-
-[project.urls]
-Homepage = 'https://itdsdk.qzz.io'
-Documentation = 'https://itdsdk.qzz.io/docs'
-
-[project.optional-dependencies]
-filetype = [
-    "filetype>=1.2.0",
-]
-logs = [
-    "rich>=15.0.0",
-]
-date = [
-    "dateparser>=1.2.2",
-]
-
-[dependency-groups]
-dev = [
-    "pytest>=8.4.2",
-    "python-dotenv>=1.2.1",
-]
+[build-system]
+requires = ["uv_build~=0.11"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-name = 'itd'
+module-root = ''
+
+[tool.commitizen]
+name = "cz_conventional_commits"
+tag_format = "v$version"
+version_scheme = "semver2"
+version_provider = "uv"
+
+[project]
+name = "itd-sdk"
+version = "2.4.2"
+description = "ITD client for python"
+readme = "README.md"
+authors = [
+  { name = "firedotguy", email = "nta16022013@gmail.com" }
+]
+classifiers = [
+    'Development Status :: 5 - Production/Stable',
+    'Natural Language :: Russian',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 3',
+    'Framework :: Pydantic :: 2'
+]
+keywords = ['itd', 'itdsocial']
+license = "MIT"
+dependencies = [
+  "requests~=2.32.5",
+  "pydantic>=2.12.5,<2.14.0",
+  "sseclient-py~=1.9.0",
+]
+requires-python = ">=3.9"
+
+[project.urls]
+Homepage = 'https://itdsdk.qzz.io'
+Documentation = 'https://itdsdk.qzz.io/docs'
+
+[project.optional-dependencies]
+filetype = [
+    "filetype>=1.2.0",
+]
+logs = [
+    "rich>=15.0.0",
+]
+date = [
+    "dateparser>=1.2.2",
+]
+
+[dependency-groups]
+dev = [
+    "pytest>=8.4.2",
+    "python-dotenv>=1.2.1",
+]