aioe621 0.2.2__tar.gz → 0.3.0__tar.gz

{aioe621-0.2.2 → aioe621-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioe621
-Version: 0.2.2
+Version: 0.3.0
 Summary: A simple asynchronous httpx+pydantic wrapper over the E621's API
 Keywords: async,httpx,e621
 Author: penggrin12

{aioe621-0.2.2 → aioe621-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioe621"
-version = "0.2.2"
+version = "0.3.0"
 description = "A simple asynchronous httpx+pydantic wrapper over the E621's API"
 license = { file = "LICENSE" }
 readme = "README.md"

{aioe621-0.2.2 → aioe621-0.3.0}/src/aioe621/client.py

@@ -1,7 +1,8 @@
 import typing
+from typing import overload
 
 import httpx
-from pydantic import BaseModel
+from pydantic import BaseModel, TypeAdapter
 
 from aioe621 import endpoints
 from aioe621.exceptions import (
@@ -78,18 +79,31 @@ class Client:
         raise self._find_error(response)
 
     _MT = typing.TypeVar("_MT", bound="BaseModel")
+    _T = typing.TypeVar("_T")
+
+    @overload
+    async def _request_model(
+        self, model: TypeAdapter[_T], method: str, url: str, **kwargs
+    ) -> _T: ...
+
+    @overload
+    async def _request_model(
+        self, model: type[_MT], method: str, url: str, **kwargs
+    ) -> _MT: ...
 
     async def _request_model(
         self,
-        model: type[_MT],
+        model: type[_MT] | TypeAdapter[_T],
         method: str,
         url: str,
         **kwargs,
-    ) -> _MT:
-        return model.model_validate_json(
-            await self._request(
-                method=method,
-                url=url,
-                **kwargs,
-            )
+    ) -> _MT | _T:
+        json: str = await self._request(
+            method=method,
+            url=url,
+            **kwargs,
         )
+        if isinstance(model, TypeAdapter):
+            return model.validate_json(json, strict=True)
+        else:
+            return model.model_validate_json(json, strict=True)

{aioe621-0.2.2 → aioe621-0.3.0}/src/aioe621/endpoints/posts.py

@@ -1,7 +1,9 @@
 from typing import Iterable
 
+from pydantic import TypeAdapter
+
 from aioe621.endpoints.endpoint import Endpoint
-from aioe621.schemas import Post, _PostsListResponse, _PostsOnePostResponse
+from aioe621.schemas import Post
 
 
 class Posts(Endpoint):
@@ -14,16 +16,16 @@ class Posts(Endpoint):
         if not isinstance(tags, str):
             tags = " ".join(tags)
 
-        return (
-            await self._request_model(
-                _PostsListResponse,
-                "GET",
-                "/posts.json",
-                tags=tags,
-                limit=limit,
-                page=page,
-            )
-        ).posts
+        return await self._request_model(
+            TypeAdapter(tuple[Post, ...]),
+            "GET",
+            "/posts.json",
+            tags=tags,
+            limit=limit,
+            page=page,
+            v2=True,
+            mode="extended",
+        )
 
     search = list
 
@@ -37,21 +39,21 @@ class Posts(Endpoint):
         """
         if id <= 0:
             raise ValueError("The post ID must not be less than or equal to zero.")
-        return (
-            await self._request_model(
-                _PostsOnePostResponse,
-                "GET",
-                f"/posts/{id}.json",
-            )
-        ).post
+        return await self._request_model(
+            Post,
+            "GET",
+            f"/posts/{id}.json",
+            v2=True,
+            mode="extended",
+        )
 
     async def random(
         self,
     ) -> Post:
-        return (
-            await self._request_model(
-                _PostsOnePostResponse,
-                "GET",
-                "/posts/random.json",
-            )
-        ).post
+        return await self._request_model(
+            Post,
+            "GET",
+            "/posts/random.json",
+            v2=True,
+            mode="extended",
+        )

{aioe621-0.2.2 → aioe621-0.3.0}/src/aioe621/schemas.py

@@ -1,13 +1,18 @@
 from datetime import datetime
 from enum import Enum
 from functools import cached_property
-from typing import Literal, Mapping, NamedTuple
+from typing import Literal, NamedTuple
 
 from pydantic import BaseModel, ConfigDict, Field
 
 
 class APIModel(BaseModel):
-    model_config = ConfigDict(frozen=True, ignored_types=(cached_property,))
+    model_config = ConfigDict(
+        frozen=True,
+        ignored_types=(cached_property,),
+        strict=True,
+        extra="forbid",
+    )
 
 
 class Auth(NamedTuple):
@@ -15,41 +20,26 @@ class Auth(NamedTuple):
     api_key: str
 
 
-class BaseFile(APIModel):
+class FileDimensions(APIModel):
     width: int
     height: int
-    url: str | None = None  # Safest to make URL optional (deleted posts hide URLs)
 
 
-class File(BaseFile):
-    ext: str
-    size: int
-    md5: str
+class BaseFile(FileDimensions):
+    url: str | None
 
 
-class PreviewFile(BaseFile):
-    alt: str | None = None
+class PreviewFile(FileDimensions):
+    jpg: str | None
+    webp: str | None
 
 
-class VideoAlternate(APIModel):
-    fps: int
-    codec: str
+class FilesMeta(APIModel):
+    md5: str
+    ext: str
     size: int
-    width: int
-    height: int
-    url: str | None = None
-
-
-class Alternates(APIModel):
-    has: bool = False
-    original: VideoAlternate | None = None
-    variants: Mapping[str, VideoAlternate] = Field(default_factory=dict)
-    samples: Mapping[str, VideoAlternate] = Field(default_factory=dict)
-
-
-class SampleFile(PreviewFile):
-    has: bool
-    alternates: Alternates
+    duration: float | None
+    has_sample: bool
 
 
 class PostScore(APIModel):
@@ -93,58 +83,84 @@ class PostFlags(APIModel):
     deleted: bool
 
 
-class Rating(str, Enum):
+class PostRating(str, Enum):
     SAFE = "s"
     QUESTIONABLE = "q"
     EXPLICIT = "e"
 
 
-class Relationships(APIModel):
-    parent_id: int | None = None
-    has_children: bool
-    has_active_children: bool
-    children: tuple[int, ...]
+class VideoFile(BaseFile):
+    fps: float
+    codec: str  # TODO: "vp9" or "avc1.4D401E" or ...?
+    size: int
 
 
-class Post(APIModel):
-    id: int
-    created_at: datetime
-    updated_at: datetime
+class VideoVariants(APIModel):
+    mp4: VideoFile | None = None
+    # TODO: any more?
+
+
+class VideoSamples(APIModel):
+    p480: VideoFile | None = Field(alias="480p", default=None)
+    p720: VideoFile | None = Field(alias="720p", default=None)
+
+
+class Video(APIModel):
+    has: Literal[True]
+    original: VideoFile
+    variants: VideoVariants
+    samples: VideoSamples
 
-    file: File
+
+class PostFiles(APIModel):
+    meta: FilesMeta
+    original: BaseFile
     preview: PreviewFile
-    sample: SampleFile
+    sample: PreviewFile
+    video: Video | None = None
 
-    score: PostScore
-    tags: PostTags
-    locked_tags: tuple[str, ...]
-    change_seq: int
-    flags: PostFlags
-    rating: Rating
 
+class PostStats(APIModel):
+    score: PostScore
     fav_count: int
-    sources: tuple[str, ...]
-    pools: tuple[int, ...]
-    relationships: Relationships
-
-    approver_id: int | None = None
-    uploader_id: int
-    uploader_name: str
-    description: str
-    comment_count: int
     is_favorited: bool
-
     vote: int
-    has_notes: bool
-    duration: float | None = None
+    comment_count: int
+    hotness: float
 
 
-class _PostsListResponse(APIModel):
-    posts: tuple[Post, ...]
+class PostHas(APIModel):
+    parent: bool
+    children: bool
+    active_children: bool
+    notes: bool
+    sample: bool
+
+
+class PostRelationships(APIModel):
+    parent_id: int | None
+    children: tuple[int, ...]
 
 
-class _PostsOnePostResponse(APIModel):
-    post: Post
+class Post(APIModel):
+    id: int
+    created_at: datetime
+    updated_at: datetime
+    change_seq: int
+    files: PostFiles
+    uploader_id: int
+    uploader_name: str
+    approver_id: int | None
+    stats: PostStats
+    flags: PostFlags
+    has: PostHas
+    relationships: PostRelationships
+    pools: tuple[int, ...]
+    rating: PostRating
+    locked_tags: tuple[str, ...]
+    sources: tuple[str, ...]
+    description: str
+    tags: PostTags
 
 
 class _ErrorResponse(APIModel):