ymdantic 0.2.1__tar.gz → 0.2.2__tar.gz

ymdantic-0.2.2/.github/workflows/tests.yml

@@ -0,0 +1,104 @@
+name: Testing YMdantic
+
+on:
+  push:
+  pull_request:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  lint:
+    if: github.event_name != 'pull_request_target'
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.12", "3.13", "3.14"]
+        check:
+          - name: Ruff format
+            cmd: ruff format --diff
+          - name: Ruff check
+            cmd: ruff check ymdantic tests
+          - name: Mypy
+            cmd: mypy ymdantic tests
+
+    name: "${{ matrix.check.name }} (py${{ matrix.python-version }})"
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.17"
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+
+      - name: Install deps
+        run: uv sync --locked --all-groups
+
+      - name: Run check
+        run: uv run ${{ matrix.check.cmd }}
+
+  test_push:
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.12", "3.13", "3.14"]
+
+    name: "Pytest push (py${{ matrix.python-version }})"
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.17"
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+
+      - name: Install deps
+        run: uv sync --locked --all-groups
+
+      - name: Run Pytest
+        env:
+          YM_TOKEN: ${{ secrets.YM_TOKEN }}
+        run: uv run pytest -vv tests
+
+  test_pr_approved:
+    if: github.event_name == 'pull_request_target'
+    runs-on: ubuntu-latest
+    environment: pull_requests
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.12", "3.13", "3.14"]
+
+    name: "Pytest PR approved (py${{ matrix.python-version }})"
+
+    permissions:
+      contents: read
+      pull-requests: read
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.17"
+          python-version: ${{ matrix.python-version }}
+          enable-cache: true
+
+      - name: Install deps
+        run: uv sync --locked --all-groups
+
+      - name: Run Pytest
+        env:
+          YM_TOKEN: ${{ secrets.YM_TOKEN }}
+        run: uv run pytest -vv tests

{ymdantic-0.2.1 → ymdantic-0.2.2}/.pre-commit-config.yaml

@@ -1,4 +1,9 @@
 repos:
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    rev: 0.9.7
+    hooks:
+      - id: uv-lock
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:

{ymdantic-0.2.1 → ymdantic-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ymdantic
-Version: 0.2.1
+Version: 0.2.2
 Summary: Фреймворк предоставляющий доступ к API Яндекс Музыки (с Pydantic валидацией)
 Author-email: KatantDev <vlad26@mail.ru>
 License-File: LICENSE

{ymdantic-0.2.1 → ymdantic-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ymdantic"
-version = "0.2.1"
+version = "0.2.2"
 description = "Фреймворк предоставляющий доступ к API Яндекс Музыки (с Pydantic валидацией)"
 authors = [{ name = "KatantDev", email = "vlad26@mail.ru" }]
 requires-python = ">=3.12,<3.15"

{ymdantic-0.2.1 → ymdantic-0.2.2}/uv.lock

@@ -1122,7 +1122,7 @@ wheels = [
 
 [[package]]
 name = "ymdantic"
-version = "0.2.1"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },

{ymdantic-0.2.1 → ymdantic-0.2.2}/ymdantic/client/session/aiohttp_client.py

@@ -3,7 +3,7 @@ import urllib.parse
 from types import TracebackType
 from typing import Any, Optional, Self
 
-from aiohttp import ClientError, ClientSession, ClientTimeout, FormData
+from aiohttp import ClientError, ClientSession, ClientTimeout, FormData, TCPConnector
 from dataclass_rest.base_client import BaseClient
 from dataclass_rest.exceptions import ClientLibraryError
 from dataclass_rest.http_request import HttpRequest
@@ -22,14 +22,73 @@ class AiohttpClient(BaseClient):
         session: Optional[ClientSession] = None,
         headers: Optional[dict[str, Any]] = None,
         timeout: Optional[ClientTimeout] = None,
+        proxy: Optional[str] = None,
     ) -> None:
         super().__init__()
         self.base_url = base_url
         self.headers = headers or {}
+        self.proxy = proxy
+        self.timeout = timeout
 
-        self._session = session or ClientSession(
+        self._session = session or self._create_session(headers=headers)
+
+    def _create_session(self, headers: dict[str, Any] | None) -> ClientSession:
+        """
+        Создает ClientSession с учетом прокси.
+
+        Поддерживает HTTP, HTTPS и SOCKS прокси (4, 4a, 5).
+
+        :param headers:
+        :return: aiohttp ClientSession.
+        """
+        if self.proxy is None:
+            return ClientSession(
+                headers=headers,
+                timeout=self.timeout or ClientTimeout(total=0),
+            )
+
+        try:
+            from aiohttp_socks import ProxyConnector  # noqa: PLC0415
+        except ImportError as e:
+            raise ImportError(
+                "Warning: aiohttp_socks not installed. "
+                "SOCKS proxies will not work. "
+                "Install with: pip install aiohttp_socks",
+            ) from e
+
+        # Определяем тип прокси по схеме
+        proxy_lower = self.proxy.lower()
+
+        # SOCKS прокси (поддерживаются socks4, socks4a, socks5, socks5h)
+        if any(
+            scheme in proxy_lower
+            for scheme in ["socks4", "socks5", "socks5h", "socks4a"]
+        ):
+            # Используем ProxyConnector для SOCKS
+            connector = ProxyConnector.from_url(self.proxy)
+            return ClientSession(
+                connector=connector,
+                headers=headers,
+                timeout=self.timeout or ClientTimeout(total=0),
+            )
+
+        # HTTP/HTTPS прокси
+        if proxy_lower.startswith(("http://", "https://")):
+            connector = TCPConnector()
+            return ClientSession(
+                connector=connector,
+                proxy=self.proxy,
+                headers=headers,
+                timeout=self.timeout or ClientTimeout(total=0),
+            )
+
+        # Если схема не распознана, предполагаем HTTP
+        connector = TCPConnector()
+        return ClientSession(
+            connector=connector,
+            proxy=f"http://{self.proxy}",
             headers=headers,
-            timeout=timeout or ClientTimeout(total=0),
+            timeout=self.timeout or ClientTimeout(total=0),
         )
 
     async def close(self) -> None:

{ymdantic-0.2.1 → ymdantic-0.2.2}/ymdantic/client/yandex_music.py

@@ -51,6 +51,7 @@ from ymdantic.models import (
 )
 from ymdantic.models.account import AccountSettings, SetAccountSettingsParams
 from ymdantic.models.landing.artist import LandingArtistItemData
+from ymdantic.models.search.base import SearchParamsDict
 
 
 class YMClient(AiohttpClient):
@@ -61,15 +62,20 @@ class YMClient(AiohttpClient):
         token: str,
         user_id: int | None = None,
         base_url: str = "https://api.music.yandex.net/",
+        proxy: str | None = None,  # Формат: scheme://login:password@ip:port
     ) -> None:
         self.user_id = user_id
+
+        headers = {
+            "Accept": "application/json",
+            "Authorization": f"OAuth {token}",
+            "X-Yandex-Music-Client": "YandexMusicAndroid/24023621",
+        }
+
         super().__init__(
             base_url=base_url,
-            headers={
-                "Accept": "application/json",
-                "Authorization": f"OAuth {token}",
-                "X-Yandex-Music-Client": "YandexMusicAndroid/24023621",
-            },
+            headers=headers,
+            proxy=proxy,
         )
 
     def _init_request_body_factory(self) -> FactoryProtocol:
@@ -441,7 +447,7 @@ class YMClient(AiohttpClient):
 
     async def search_instant_mixed(
         self,
-        **params: Unpack[SearchParams],  # type: ignore[misc]
+        **params: Unpack[SearchParamsDict],
     ) -> SearchInstantMixedResponse:
         response = await self.search_instant_mixed_request(
             params=SearchParams(**params),

{ymdantic-0.2.1 → ymdantic-0.2.2}/ymdantic/models/search/base.py

@@ -1,4 +1,4 @@
-from typing import Annotated, Literal
+from typing import Annotated, Literal, NotRequired, TypedDict
 
 from pydantic import Field
 
@@ -24,6 +24,21 @@ class SearchParams(YMPostBaseModel):
     nocorrect: bool = False
 
 
+class SearchParamsDict(TypedDict, total=False):
+    """Fields for search function."""
+
+    text: str
+    with_likes_count: NotRequired[bool]
+    page: NotRequired[int]
+    page_size: NotRequired[int]
+    with_best_results: NotRequired[bool]
+    type: NotRequired[Literal["all"]]
+    filter: NotRequired[
+        Literal["track", "artist", "album", "playlist", "podcast", "book", "clip"]
+    ]
+    nocorrect: NotRequired[bool]
+
+
 class SearchFilter(YMBaseModel):
     """Фильтры для поиска."""
 

ymdantic-0.2.1/.github/workflows/tests.yml

@@ -1,40 +0,0 @@
-name: Testing YMdantic
-
-on: push
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.12", "3.13", "3.14"]
-        check:
-          - name: Ruff format
-            cmd: ruff format --diff
-          - name: Ruff check
-            cmd: ruff check ymdantic tests
-          - name: Mypy
-            cmd: mypy ymdantic tests
-          - name: Pytest
-            cmd: pytest -vv tests
-
-    name: "${{ matrix.check.name }} (py${{ matrix.python-version }})"
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v7
-        with:
-          version: "0.9.17"
-          python-version: ${{ matrix.python-version }}
-          enable-cache: true
-
-      - name: Install deps
-        run: uv sync --locked --all-groups
-
-      - name: Run check
-        env:
-          YM_TOKEN: ${{ secrets.YM_TOKEN }}
-        run: uv run ${{ matrix.check.cmd }}