novelai-python 0.8.0__tar.gz → 0.8.1__tar.gz

{novelai_python-0.8.0 → novelai_python-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.8.0
+Version: 0.8.1
 Summary: NovelAI Python Binding With Pydantic
 Author-Email: sudoskys <coldlando@hotmail.com>
 License: Apache License 2.0
@@ -101,7 +101,7 @@ Some changes do not raise an error, so check these when you upgrade:
 ### 📦 Usage
 
 ```shell
-pip -U install novelai-python
+pip install -U novelai-python
 ```
 
 All API users must adhere to the NovelAI Terms of Service: https://novelai.net/terms.

{novelai_python-0.8.0 → novelai_python-0.8.1}/README.md

@@ -71,7 +71,7 @@ Some changes do not raise an error, so check these when you upgrade:
 ### 📦 Usage
 
 ```shell
-pip -U install novelai-python
+pip install -U novelai-python
 ```
 
 All API users must adhere to the NovelAI Terms of Service: https://novelai.net/terms.

{novelai_python-0.8.0 → novelai_python-0.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "novelai-python"
-version = "0.8.0"
+version = "0.8.1"
 description = "NovelAI Python Binding With Pydantic"
 authors = [
     { name = "sudoskys", email = "coldlando@hotmail.com" },

{novelai_python-0.8.0 → novelai_python-0.8.1}/src/novelai_python/_response/user/subscription.py

@@ -63,7 +63,7 @@ class SubscriptionResp(RespBase):
     active: bool = Field(..., description="Subscription status")
     expiresAt: int = Field(..., description="Subscription expiration time")
     perks: Perks = Field(..., description="Subscription perks")
-    paymentProcessorData: dict[Any, Any] | None
+    paymentProcessorData: dict[Any, Any] | None = None  # absent or null on some accounts
     trainingStepsLeft: TrainingSteps = Field(..., description="Training steps left")
     accountType: int = Field(..., description="Account type")
     usage: SubscriptionUsage | None = Field(default=None, description="Opus V5 usage bar (absent on non-Opus)")

{novelai_python-0.8.0 → novelai_python-0.8.1}/src/novelai_python/credential/UserAuth.py

@@ -10,6 +10,20 @@ from pydantic import Field, PrivateAttr, SecretStr
 from ._base import CredentialBase, _correlation_id, _initiated_at, browser_headers
 
 
+class _LoginSession(AsyncSession):
+    """A session that drops the credential's cached token when NovelAI answers 401 to it."""
+
+    def __init__(self, credential: "LoginCredential", **kwargs) -> None:
+        super().__init__(**kwargs)
+        self._credential = credential
+
+    async def request(self, *args, **kwargs):  # pyright: ignore[reportIncompatibleMethodOverride]
+        response = await super().request(*args, **kwargs)
+        if response.status_code == 401:
+            self._credential.forget_token(self.headers.get("authorization"))
+        return response
+
+
 class LoginCredential(CredentialBase):
     """
     JwtCredential is the base class for all credential.
@@ -31,6 +45,13 @@ class LoginCredential(CredentialBase):
             not self.session_headers or self.update_at is None or int(time.time()) - self.update_at > 29 * 24 * 60 * 60
         )
 
+    def forget_token(self, authorization: str | None = None) -> None:
+        """Log in again on the next request. With ``authorization``, only if that is still the cached token
+        (a session made before a newer login must not drop the newer token)."""
+        if authorization is None or self.session_headers.get("authorization") == authorization:
+            self.session_headers = {}
+            self.update_at = None
+
     def _lock(self) -> asyncio.Lock:
         # an asyncio.Lock belongs to one event loop; a credential can outlive it (several asyncio.run)
         loop = asyncio.get_running_loop()
@@ -66,4 +87,4 @@ class LoginCredential(CredentialBase):
                 **(update_headers or {}),
             }
         )
-        return AsyncSession(**self.session_kwargs(timeout, headers))
+        return _LoginSession(self, **self.session_kwargs(timeout, headers))

{novelai_python-0.8.0 → novelai_python-0.8.1}/src/novelai_python/sdk/ai/_enum.py

@@ -263,6 +263,12 @@ PROMOTION = {
     "NovelAI Diffusion V4 7ABFFA2A": Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
     "NovelAI Diffusion V4 C1CCBA86": Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
     "NovelAI Diffusion V4 770A9E12": Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
+    # the web client's metadata import (rQ): the V5 Source names no variant, only the hash
+    "NovelAI Diffusion V5 657484A5": Model.NAI_DIFFUSION_5_FULL,
+    "NovelAI Diffusion V5 0ADF9AB7": Model.NAI_DIFFUSION_5_FULL,
+    "NovelAI Diffusion V5 93F4BD30": Model.NAI_DIFFUSION_5_FULL_MEDIUM,
+    "NovelAI Diffusion V5 70AB5786": Model.NAI_DIFFUSION_5_FULL_MEDIUM,
+    "NovelAI Diffusion V5 DB276663": Model.NAI_DIFFUSION_5_CURATED,
 }
 
 ModelTypeAlias = Model | str | None
@@ -604,9 +610,8 @@ def get_quality_suffix(model: ModelTypeAlias, preset_id: str | QualityPreset | N
 
 def find_model_by_hashcode(hashcode: str) -> ModelTypeAlias:
     if "NovelAI Diffusion V5" in hashcode:
-        if "Curated" in hashcode:
-            return PROMOTION.get(hashcode, Model.NAI_DIFFUSION_5_CURATED)
-        return PROMOTION.get(hashcode, Model.NAI_DIFFUSION_5_FULL)
+        # an unknown V5 hash is Curated, as in the web client
+        return PROMOTION.get(hashcode, Model.NAI_DIFFUSION_5_CURATED)
     if "NovelAI Diffusion V4.5" in hashcode:
         return PROMOTION.get(hashcode, Model.NAI_DIFFUSION_4_5_FULL)
     if "NovelAI Diffusion V4" in hashcode:

{novelai_python-0.8.0 → novelai_python-0.8.1}/src/novelai_python/sdk/ai/generate_voice/__init__.py

@@ -91,9 +91,10 @@ class VoiceGenerate(ApiBaseModel):
             # Request
             try:
                 response = await sess.post(url=self.base_url, json=request_data)
-                header_type = response.headers.get("Content-Type")
+                # opus=true answers WebM/Opus, maybe as 'audio/webm;codecs="opus"'
+                media_type = (response.headers.get("Content-Type") or "").split(";")[0].strip().lower()
                 if (
-                    header_type not in ["audio/mpeg", "audio/ogg", "audio/opus", "audio/wav", "audio/webm"]
+                    media_type not in ["audio/mpeg", "audio/ogg", "audio/opus", "audio/wav", "audio/webm"]
                     or response.status_code >= 400
                 ):
                     self._raise_for_status(

{novelai_python-0.8.0 → novelai_python-0.8.1}/src/novelai_python/server.py

@@ -299,10 +299,12 @@ async def generate_voice(
     """
     req = VoiceGenerate(text=text, voice=voice, seed=seed, opus=opus, version=version)
     result = await req.request(session=get_session(current_token))
+    # opus=true is WebM/Opus, as the web client plays it; otherwise MP3
+    media_type, filename = ("audio/webm", "audio.webm") if opus else ("audio/mpeg", "audio.mp3")
     return StreamingResponse(
         io.BytesIO(result.audio),
-        media_type="audio/mpeg",
-        headers={"Content-Disposition": "attachment;filename=audio.mp3"},
+        media_type=media_type,
+        headers={"Content-Disposition": f"attachment;filename={filename}"},
     )
 
 

{novelai_python-0.8.0 → novelai_python-0.8.1}/tests/test_from_metadata.py

@@ -94,6 +94,21 @@ def test_img2img_needs_the_source_image():
     assert (p.strength, p.noise, p.extra_noise_seed, p.color_correct) == (0.8, 0.1, 41, False)
 
 
+@pytest.mark.parametrize(
+    ("source", "model"),
+    [
+        ("NovelAI Diffusion V5 0ADF9AB7", Model.NAI_DIFFUSION_5_FULL),
+        ("NovelAI Diffusion V5 93F4BD30", Model.NAI_DIFFUSION_5_FULL_MEDIUM),
+        ("NovelAI Diffusion V5 DB276663", Model.NAI_DIFFUSION_5_CURATED),
+        ("NovelAI Diffusion V5 00000000", Model.NAI_DIFFUSION_5_CURATED),  # the web client's default
+    ],
+)
+def test_v5_model_from_source_hash(source, model):
+    from novelai_python.sdk.ai._enum import find_model_by_hashcode
+
+    assert find_model_by_hashcode(source) == model
+
+
 def test_unknown_model_and_missing_comment():
     with pytest.raises(ValueError):
         GenerateImageInfer.from_metadata(ImageMetadata(Comment=CommentModel(prompt="x"), Source="Stable Diffusion"))

{novelai_python-0.8.0 → novelai_python-0.8.1}/tests/test_login_proxy.py

@@ -97,3 +97,33 @@ def test_a_request_body_cannot_set_the_login_proxy():
     login = Login.model_validate({"key": "x", "proxy": "http://attacker:1"})
     assert login.session.proxies in (None, {})
     assert "proxy" not in login.model_dump()
+
+
+@pytest.mark.asyncio
+async def test_a_401_drops_the_cached_login_token():
+    import asyncio
+    import time
+
+    from novelai_python import LoginCredential
+
+    async def handle(reader, writer):
+        await reader.readuntil(b"\r\n\r\n")
+        writer.write(b"HTTP/1.1 401 Unauthorized\r\nContent-Length: 2\r\nConnection: close\r\n\r\n{}")
+        await writer.drain()
+        writer.close()
+
+    server = await asyncio.start_server(handle, "127.0.0.1", 0)
+    port = server.sockets[0].getsockname()[1]
+    credential = LoginCredential(
+        username="a@b.c", password="pw", session_headers={"authorization": "Bearer old"}, update_at=int(time.time())
+    )
+    stale = await credential.get_session()
+    credential.session_headers = {"authorization": "Bearer newer"}  # a newer login happened meanwhile
+    async with stale as sess:
+        await sess.get(f"http://127.0.0.1:{port}/")
+    assert credential.session_headers == {"authorization": "Bearer newer"}
+
+    async with await credential.get_session() as sess:
+        await sess.get(f"http://127.0.0.1:{port}/")
+    assert credential.session_headers == {} and credential.update_at is None
+    server.close()

{novelai_python-0.8.0 → novelai_python-0.8.1}/tests/test_presets_and_usage.py

@@ -33,8 +33,7 @@ def test_subscription_usage_is_optional_and_derived():
         "tier": 3,
         "active": True,
         "expiresAt": 1,
-        "paymentProcessorData": None,
-        "accountType": 0,
+        "accountType": 0,  # no paymentProcessorData: some accounts omit it
         "trainingStepsLeft": {"fixedTrainingStepsLeft": 10000, "purchasedTrainingSteps": 0},
         "perks": {
             "maxPriorityActions": 1,