Check pydantic models with pytest

.gitignore

@@ -21,3 +21,6 @@ MANIFEST
 .pytest_cache/
 .mypy_cache/
 .ruff_cache/
+
+# users
+.env

README.md

@@ -12,6 +12,8 @@
 
 _Pixiv API for Python (with Auth supported)_
 
+- [2025/02/09] Add `pydantic` models for App-API (thanks
+  [@Danipulok](https://github.com/Danipulok))
 - [2024/03/03] _v3.7.5_ Fix `novel_text()` BUG, add `webview_novel()`, see
   [#337](https://github.com/upbit/pixivpy/issues/337) (thanks
   [@xiyihan](https://github.com/xiyihan0))

pixivpy3/aapi.py

@@ -45,11 +45,7 @@
     "",
 ]
 _SEARCH_TARGET: TypeAlias = Literal[
-    "partial_match_for_tags",
-    "exact_match_for_tags",
-    "title_and_caption",
-    "keyword",
-    "",
+    "partial_match_for_tags", "exact_match_for_tags", "title_and_caption", "keyword", ""
 ]
 _SORT: TypeAlias = Literal["date_desc", "date_asc", "popular_desc", ""]
 _DURATION: TypeAlias = Literal[

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pixivpy3"
-version = "3.12.3"
+version = "3.13.0"
 description = "Pixiv API for Python (with 6.x AppAPI supported)"
 authors = ["upbit <rmusique@gmail.com>"]
 license = "Unlicense"
@@ -25,7 +25,7 @@ requests = "^2.31.0"
 requests-toolbelt = "^1.0.0"
 urllib3 = "^2.0.7"
 typing-extensions = "^4.1.1"
-pydantic = "^1.9.0"
+pydantic = ">=1.9.0 <3.0.0"
 
 [tool.poetry.group.dev.dependencies]
 black = [

tests/check_pydantic2/README.md

@@ -0,0 +1,6 @@
+# Check pydantic 2.x compatibility
+
+```sh
+$ pip3 install -r requirements.txt
+$ python3 run check.py
+```

tests/check_pydantic2/check.py

@@ -0,0 +1,11 @@
+import pydantic
+from pixivpy3 import AppPixivAPI
+
+print(f"Current pydantic=={pydantic.__version__}")
+_PYDANTIC_MAJOR_VERSION = int(pydantic.__version__.split(".")[0])
+assert _PYDANTIC_MAJOR_VERSION >= 2
+
+api = AppPixivAPI()
+assert api is not None
+
+print("SUCCESS!")

tests/check_pydantic2/requirements.txt

@@ -0,0 +1 @@
+pydantic>=2.0

tests/conftest.py

@@ -6,19 +6,7 @@
 
 import pytest
 
-from tests.utils import load_data_from_file, load_json_from_file
-
-
-class ResponseFixture:
-    def __init__(
-        self,
-        status_code: int,
-        headers: dict[str, str] | None = None,
-        json_data: dict[str, Any] | None = None,
-    ) -> None:
-        self.status_code = status_code
-        self.headers = headers or {}
-        self.json = json_data or {}
+from tests.utils import ResponseFixture, load_data_from_file, load_json_from_file
 
 
 @pytest.fixture