novelai-python 0.7.10__tar.gz → 0.7.12__tar.gz

{novelai_python-0.7.10 → novelai_python-0.7.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.7.10
+Version: 0.7.12
 Summary: NovelAI Python Binding With Pydantic
 Author-Email: sudoskys <coldlando@hotmail.com>
 License: Apache License 2.0
@@ -14,7 +14,7 @@ Requires-Dist: pydantic>=2.9.0
 Requires-Dist: httpx>=0.26.0
 Requires-Dist: shortuuid>=1.0.11
 Requires-Dist: Pillow>=10.2.0
-Requires-Dist: curl-cffi>=0.9.0
+Requires-Dist: curl-cffi>=0.11.3
 Requires-Dist: fastapi>=0.109.0
 Requires-Dist: uvicorn[standard]>=0.27.0.post1
 Requires-Dist: numpy>=1.24.4
@@ -43,6 +43,18 @@ Description-Content-Type: text/markdown
 [![PyPI version](https://badge.fury.io/py/novelai-python.svg)](https://badge.fury.io/py/novelai-python)
 [![Downloads](https://pepy.tech/badge/novelai_python)](https://pepy.tech/project/novelai_python)
 
+
+>**Declaration** (2025/06/04)
+>
+>**I have nothing to do with NovelAI.**
+>
+>Due to various considerations, such as NovelAI's confusing project architecture and "can't learn anything from it", this project will be in a *non-active* maintenance state. If you have any questions, please *raise an issue*.
+>
+>This project is designed to be a sample project for me to write Python SDK. It turns out that Pydantic is very powerful.
+>
+>*I will invest more time in open source projects that are more beneficial to society.*
+>
+
 ✨ NovelAI api python sdk with Pydantic, modern and user-friendly.
 
 The goal of this repository is to use Pydantic to build legitimate requests to access

{novelai_python-0.7.10 → novelai_python-0.7.12}/README.md

@@ -5,6 +5,18 @@
 [![PyPI version](https://badge.fury.io/py/novelai-python.svg)](https://badge.fury.io/py/novelai-python)
 [![Downloads](https://pepy.tech/badge/novelai_python)](https://pepy.tech/project/novelai_python)
 
+
+>**Declaration** (2025/06/04)
+>
+>**I have nothing to do with NovelAI.**
+>
+>Due to various considerations, such as NovelAI's confusing project architecture and "can't learn anything from it", this project will be in a *non-active* maintenance state. If you have any questions, please *raise an issue*.
+>
+>This project is designed to be a sample project for me to write Python SDK. It turns out that Pydantic is very powerful.
+>
+>*I will invest more time in open source projects that are more beneficial to society.*
+>
+
 ✨ NovelAI api python sdk with Pydantic, modern and user-friendly.
 
 The goal of this repository is to use Pydantic to build legitimate requests to access

{novelai_python-0.7.10 → novelai_python-0.7.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "novelai-python"
-version = "0.7.10"
+version = "0.7.12"
 description = "NovelAI Python Binding With Pydantic"
 authors = [
     { name = "sudoskys", email = "coldlando@hotmail.com" },
@@ -13,7 +13,7 @@ dependencies = [
     "httpx>=0.26.0",
     "shortuuid>=1.0.11",
     "Pillow>=10.2.0",
-    "curl-cffi>=0.9.0",
+    "curl-cffi>=0.11.3",
     "fastapi>=0.109.0",
     "uvicorn[standard]>=0.27.0.post1",
     "numpy>=1.24.4",

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/credential/ApiToken.py

@@ -10,7 +10,7 @@ from curl_cffi.requests import AsyncSession
 from loguru import logger
 from pydantic import SecretStr, Field, field_validator
 
-from ._base import CredentialBase, FAKE_UA
+from ._base import CredentialBase
 
 
 class ApiCredential(CredentialBase):
@@ -22,13 +22,8 @@ class ApiCredential(CredentialBase):
 
     async def get_session(self, timeout: int = 180, update_headers: dict = None):
         headers = {
-            "Accept": "*/*",
-            "Accept-Encoding": "gzip, deflate, br",
-            "User-Agent": FAKE_UA.edge,
             "Authorization": f"Bearer {self.api_token.get_secret_value()}",
             "Content-Type": "application/json",
-            "Origin": "https://novelai.net",
-            "Referer": "https://novelai.net/",
             "x-correlation-id": self.x_correlation_id,
             "x-initiated-at": f"{arrow.utcnow().isoformat()}Z",
         }
@@ -37,10 +32,10 @@ class ApiCredential(CredentialBase):
             assert isinstance(update_headers, dict), "update_headers must be a dict"
             headers.update(update_headers)
 
-        return AsyncSession(timeout=timeout, headers=headers, impersonate="edge101")
+        return AsyncSession(timeout=timeout, headers=headers, impersonate="chrome136")
 
     @field_validator('api_token')
     def check_api_token(cls, v: SecretStr):
         if not v.get_secret_value().startswith("pst"):
             logger.warning("api token should start with `pst-`")
-        return v
+        return v

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/credential/JwtToken.py

@@ -10,7 +10,7 @@ from curl_cffi.requests import AsyncSession
 from loguru import logger
 from pydantic import SecretStr, Field, field_validator
 
-from ._base import CredentialBase, FAKE_UA
+from ._base import CredentialBase
 
 
 class JwtCredential(CredentialBase):
@@ -22,13 +22,8 @@ class JwtCredential(CredentialBase):
 
     async def get_session(self, timeout: int = 180, update_headers: dict = None):
         headers = {
-            "Accept": "*/*",
-            "User-Agent": FAKE_UA.edge,
-            "Accept-Encoding": "gzip, deflate, br",
             "Authorization": f"Bearer {self.jwt_token.get_secret_value()}",
             "Content-Type": "application/json",
-            "Origin": "https://novelai.net",
-            "Referer": "https://novelai.net/",
             "x-correlation-id": self.x_correlation_id,
             "x-initiated-at": f"{arrow.utcnow().isoformat()}Z",
         }
@@ -37,10 +32,10 @@ class JwtCredential(CredentialBase):
             assert isinstance(update_headers, dict), "update_headers must be a dict"
             headers.update(update_headers)
 
-        return AsyncSession(timeout=timeout, headers=headers, impersonate="edge101")
+        return AsyncSession(timeout=timeout, headers=headers, impersonate="chrome136")
 
     @field_validator('jwt_token')
     def check_jwt_token(cls, v: SecretStr):
         if not v.get_secret_value().startswith("ey"):
             logger.warning("jwt_token should start with ey")
-        return v
+        return v

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/credential/UserAuth.py

@@ -10,7 +10,7 @@ import shortuuid
 from curl_cffi.requests import AsyncSession
 from pydantic import SecretStr, Field
 
-from ._base import CredentialBase, FAKE_UA
+from ._base import CredentialBase
 
 
 class LoginCredential(CredentialBase):
@@ -25,13 +25,8 @@ class LoginCredential(CredentialBase):
 
     async def get_session(self, timeout: int = 180, update_headers: dict = None):
         headers = {
-            "Accept": "*/*",
-            "User-Agent": FAKE_UA.edge,
-            "Accept-Encoding": "gzip, deflate, br",
             "Authorization": "Bearer ",
             "Content-Type": "application/json",
-            "Origin": "https://novelai.net",
-            "Referer": "https://novelai.net/",
             "x-correlation-id": self.x_correlation_id,
             "x-initiated-at": f"{arrow.utcnow().isoformat()}Z",
         }
@@ -49,4 +44,4 @@ class LoginCredential(CredentialBase):
         if update_headers:
             headers.update(update_headers)
 
-        return AsyncSession(timeout=timeout, headers=headers, impersonate="edge101")
+        return AsyncSession(timeout=timeout, headers=headers, impersonate="chrome136")

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/_enum.py

@@ -217,12 +217,17 @@ class SupportCondition:
     img2imgInpainting: bool
 
 
-def get_supported_params(model: Model):
+def get_supported_params(model: ModelTypeAlias):
     """
     Get supported parameters for a given model
     :param model: Model
     :return: SupportCondition
     """
+    if isinstance(model, str):
+        try:
+            model = Model(model)
+        except ValueError:
+            pass
     if model in [
         Model.STABLE_DIFFUSION,
         Model.NAI_DIFFUSION,
@@ -459,7 +464,7 @@ def get_modifiers(model: Model) -> Modifier:
     ]:
         return Modifier(
             qualityTags="",
-            suffix=", location, very aesthetic, masterpiece, no text"
+            suffix=", very aesthetic, masterpiece, no text"
         )
     if model in [
         Model.NAI_DIFFUSION_4_5_CURATED,
@@ -656,12 +661,12 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
             UcPrompt(
                 category="heavy",
                 name="lowQualityPlusBadAnatomy",
-                text="lowres, bad anatomy, bad hands, text, error, missing fingers, extra digit, fewer digits, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry"
+                text="nsfw, lowres, bad anatomy, bad hands, text, error, missing fingers, extra digit, fewer digits, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry"
             ),
             UcPrompt(
                 category="light",
                 name="lowQuality",
-                text="lowres, text, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry"
+                text="nsfw, lowres, text, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry"
             ),
             UcPrompt(
                 category="none",
@@ -677,12 +682,12 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
             UcPrompt(
                 category="light",
                 name="lowQuality",
-                text="worst quality, low quality, what has science done, what, nightmare fuel, eldritch horror, where is your god now, why"
+                text="nsfw, worst quality, low quality, what has science done, what, nightmare fuel, eldritch horror, where is your god now, why"
             ),
             UcPrompt(
                 category="heavy",
                 name="badAnatomy",
-                text="{worst quality}, low quality, distracting watermark, [nightmare fuel], {{unfinished}}, deformed, outline, pattern, simple background"
+                text="nsfw, {worst quality}, low quality, distracting watermark, [nightmare fuel], {{unfinished}}, deformed, outline, pattern, simple background"
             ),
             UcPrompt(
                 category="none",
@@ -697,12 +702,12 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
             UcPrompt(
                 category="heavy",
                 name="heavy",
-                text="lowres, bad, text, error, missing, extra, fewer, cropped, jpeg artifacts, worst quality, bad quality, watermark, displeasing, unfinished, chromatic aberration, scan, scan artifacts"
+                text="nsfw, lowres, bad, text, error, missing, extra, fewer, cropped, jpeg artifacts, worst quality, bad quality, watermark, displeasing, unfinished, chromatic aberration, scan, scan artifacts"
             ),
             UcPrompt(
                 category="light",
                 name="light",
-                text="lowres, jpeg artifacts, worst quality, watermark, blurry, very displeasing"
+                text="nsfw, lowres, jpeg artifacts, worst quality, watermark, blurry, very displeasing"
             ),
             UcPrompt(
                 category="none",
@@ -718,17 +723,17 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
             UcPrompt(
                 category="heavy",
                 name="heavy",
-                text="lowres, {bad}, error, fewer, extra, missing, worst quality, jpeg artifacts, bad quality, watermark, unfinished, displeasing, chromatic aberration, signature, extra digits, artistic error, username, scan, [abstract]"
+                text="nsfw, lowres, {bad}, error, fewer, extra, missing, worst quality, jpeg artifacts, bad quality, watermark, unfinished, displeasing, chromatic aberration, signature, extra digits, artistic error, username, scan, [abstract]"
             ),
             UcPrompt(
                 category="light",
                 name="light",
-                text="lowres, jpeg artifacts, worst quality, watermark, blurry, very displeasing"
+                text="nsfw, lowres, jpeg artifacts, worst quality, watermark, blurry, very displeasing"
             ),
             UcPrompt(
                 category="human",
                 name="humanFocus",
-                text="lowres, {bad}, error, fewer, extra, missing, worst quality, jpeg artifacts, bad quality, watermark, unfinished, displeasing, chromatic aberration, signature, extra digits, artistic error, username, scan, [abstract], bad anatomy, bad hands, @_@, mismatched pupils, heart-shaped pupils, glowing eyes"
+                text="nsfw, lowres, {bad}, error, fewer, extra, missing, worst quality, jpeg artifacts, bad quality, watermark, unfinished, displeasing, chromatic aberration, signature, extra digits, artistic error, username, scan, [abstract], bad anatomy, bad hands, @_@, mismatched pupils, heart-shaped pupils, glowing eyes"
             ),
             UcPrompt(
                 category="none",
@@ -744,12 +749,12 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
             UcPrompt(
                 category="heavy",
                 name="heavy",
-                text="{{worst quality}}, [displeasing], {unusual pupils}, guide lines, {{unfinished}}, {bad}, url, artist name, {{tall image}}, mosaic, {sketch page}, comic panel, impact (font), [dated], {logo}, ych, {what}, {where is your god now}, {distorted text}, repeated text, {floating head}, {1994}, {widescreen}, absolutely everyone, sequence, {compression artifacts}, hard translated, {cropped}, {commissioner name}, unknown text, high contrast"
+                text="nsfw, {{worst quality}}, [displeasing], {unusual pupils}, guide lines, {{unfinished}}, {bad}, url, artist name, {{tall image}}, mosaic, {sketch page}, comic panel, impact (font), [dated], {logo}, ych, {what}, {where is your god now}, {distorted text}, repeated text, {floating head}, {1994}, {widescreen}, absolutely everyone, sequence, {compression artifacts}, hard translated, {cropped}, {commissioner name}, unknown text, high contrast"
             ),
             UcPrompt(
                 category="light",
                 name="light",
-                text="{worst quality}, guide lines, unfinished, bad, url, tall image, widescreen, compression artifacts, unknown text"
+                text="nsfw, {worst quality}, guide lines, unfinished, bad, url, tall image, widescreen, compression artifacts, unknown text"
             ),
             UcPrompt(
                 category="none",
@@ -786,12 +791,12 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
             UcPrompt(
                 category="heavy",
                 name="heavy",
-                text="blurry, lowres, error, film grain, scan artifacts, worst quality, bad quality, jpeg artifacts, very displeasing, chromatic aberration, multiple views, logo, too many watermarks, white blank page, blank page"
+                text="nsfw, blurry, lowres, error, film grain, scan artifacts, worst quality, bad quality, jpeg artifacts, very displeasing, chromatic aberration, multiple views, logo, too many watermarks, white blank page, blank page"
             ),
             UcPrompt(
                 category="light",
                 name="light",
-                text="blurry, lowres, error, worst quality, bad quality, jpeg artifacts, very displeasing, white blank page, blank page"
+                text="nsfw, blurry, lowres, error, worst quality, bad quality, jpeg artifacts, very displeasing, white blank page, blank page"
             ),
             UcPrompt(
                 category="none",
@@ -834,22 +839,22 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
             UcPrompt(
                 category="heavy",
                 name="heavy",
-                text="lowres, artistic error, film grain, scan artifacts, worst quality, bad quality, jpeg artifacts, very displeasing, chromatic aberration, dithering, halftone, screentone, multiple views, logo, too many watermarks, negative space, blank page"
+                text="nsfw, lowres, artistic error, film grain, scan artifacts, worst quality, bad quality, jpeg artifacts, very displeasing, chromatic aberration, dithering, halftone, screentone, multiple views, logo, too many watermarks, negative space, blank page"
             ),
             UcPrompt(
                 category="light",
                 name="light",
-                text="lowres, artistic error, scan artifacts, worst quality, bad quality, jpeg artifacts, multiple views, very displeasing, too many watermarks, negative space, blank page"
+                text="nsfw, lowres, artistic error, scan artifacts, worst quality, bad quality, jpeg artifacts, multiple views, very displeasing, too many watermarks, negative space, blank page"
             ),
             UcPrompt(
                 category="furry",
                 name="furryFocus",
-                text="{worst quality}, distracting watermark, unfinished, bad quality, {widescreen}, upscale, {sequence}, {{grandfathered content}}, blurred foreground, chromatic aberration, sketch, everyone, [sketch background], simple, [flat colors], ych (character), outline, multiple scenes, [[horror (theme)]], comic"
+                text="nsfw, {worst quality}, distracting watermark, unfinished, bad quality, {widescreen}, upscale, {sequence}, {{grandfathered content}}, blurred foreground, chromatic aberration, sketch, everyone, [sketch background], simple, [flat colors], ych (character), outline, multiple scenes, [[horror (theme)]], comic"
             ),
             UcPrompt(
                 category="human",
                 name="humanFocus",
-                text="lowres, artistic error, film grain, scan artifacts, worst quality, bad quality, jpeg artifacts, very displeasing, chromatic aberration, dithering, halftone, screentone, multiple views, logo, too many watermarks, negative space, blank page, @_@, mismatched pupils, glowing eyes, bad anatomy"
+                text="nsfw, lowres, artistic error, film grain, scan artifacts, worst quality, bad quality, jpeg artifacts, very displeasing, chromatic aberration, dithering, halftone, screentone, multiple views, logo, too many watermarks, negative space, blank page, @_@, mismatched pupils, glowing eyes, bad anatomy"
             ),
             UcPrompt(
                 category="none",

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/augment_image/__init__.py

@@ -174,28 +174,6 @@ class AugmentImageInfer(ApiBaseModel):
             prompt=prompt,
         )
 
-    async def necessary_headers(self, request_data) -> dict:
-        """
-        :param request_data:
-        :return:
-        """
-        return {
-            "Host": urlparse(self.endpoint).netloc,
-            "Accept": "*/*",
-            "Accept-Encoding": "gzip, deflate, br",
-            "Referer": "https://novelai.net/",
-            "Content-Type": "application/json",
-            "Origin": "https://novelai.net",
-            "Content-Length": str(len(json.dumps(request_data).encode("utf-8"))),
-            "Connection": "keep-alive",
-            "Sec-Fetch-Dest": "empty",
-            "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-site",
-            "Pragma": "no-cache",
-            "Cache-Control": "no-cache",
-            'priority': "u=1, i"
-        }
-
     @retry(
         wait=wait_random(min=1, max=3),
         stop=stop_after_attempt(3),
@@ -216,7 +194,6 @@ class AugmentImageInfer(ApiBaseModel):
         # Prepare request data
         request_data = self.model_dump(mode="json", exclude_none=True)
         async with session if isinstance(session, AsyncSession) else await session.get_session() as sess:
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/generate/__init__.py

@@ -65,22 +65,6 @@ class LLM(ApiBaseModel):
     def base_url(self):
         return f"{self.endpoint.strip('/')}/ai/generate"
 
-    async def necessary_headers(self, request_data) -> dict:
-        """
-        :param request_data: dict
-        :return: dict
-        """
-        return {
-            "Host": urlparse(self.endpoint).netloc,
-            "accept": "*/*",
-            "accept-language": "zh-CN,zh;q=0.9",
-            "cache-control": "no-cache",
-            "content-type": "application/json",
-            "pragma": "no-cache",
-            "Referer": "https://novelai.net/",
-            "Referrer-Policy": "strict-origin-when-cross-origin"
-        }
-
     @model_validator(mode="after")
     def normalize_model(self):
         if self.model in [
@@ -361,7 +345,6 @@ class LLM(ApiBaseModel):
         }
         async with session if isinstance(session, AsyncSession) else await session.get_session() as sess:
             # Header
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/generate_image/__init__.py

@@ -9,7 +9,6 @@ from copy import deepcopy
 from enum import Enum
 from io import BytesIO
 from typing import Optional, Union, List
-from urllib.parse import urlparse
 from zipfile import ZipFile, BadZipFile
 
 import curl_cffi
@@ -61,9 +60,9 @@ class GenerateImageInfer(ApiBaseModel):
         self._mutual_exclusion = bool(value)
         return self
 
-    action: Union[str, Action] = Field(Action.GENERATE, description="Mode for img generate")
     input: str = "1girl, best quality, amazing quality, very aesthetic, absurdres"
     model: ModelTypeAlias = "nai-diffusion-3"
+    action: Union[str, Action] = Field(Action.GENERATE, description="Mode for img generate")
     parameters: Union[Params]
     model_config = ConfigDict(extra="ignore")
 
@@ -158,7 +157,14 @@ class GenerateImageInfer(ApiBaseModel):
             for key in input_prompt:
                 if key in uc_prompt:
                     uc_prompt.pop(key)
-            self.parameters.negative_prompt = ",".join(uc_prompt.values())
+            self.parameters.negative_prompt = ",".join(uc_prompt.values()).strip()
+            
+        # Instantly remove nsfw if input contains it
+        elif "nsfw" in self.input and "nsfw" in self.parameters.negative_prompt:
+            uc_prompt = {x.strip(): x for x in self.parameters.negative_prompt.split(",")}
+            uc_prompt.pop("nsfw", None)
+            
+            self.parameters.negative_prompt = ",".join(uc_prompt.values()).strip()
 
     @model_validator(mode="after")
     def _build_nai4_prompt(self):
@@ -188,9 +194,9 @@ class GenerateImageInfer(ApiBaseModel):
         if not get_supported_params(self.model).vibetransfer:
             if self.parameters.reference_image_multiple:
                 logger.warning("Vibe transfer is not supported for this model.")
-            self.parameters.reference_image_multiple = []
-            self.parameters.reference_information_extracted_multiple = []
-            self.parameters.reference_strength_multiple = []
+            self.parameters.reference_image_multiple = None # Auto exclude None values
+            self.parameters.reference_information_extracted_multiple = None # Auto exclude None values
+            self.parameters.reference_strength_multiple = None # Auto exclude None values
 
         if not get_supported_params(self.model).controlnet:
             if self.parameters.controlnet_condition is not None:
@@ -211,6 +217,9 @@ class GenerateImageInfer(ApiBaseModel):
         """
         if self.parameters.characterPrompts:
             self.parameters.use_coords = any([c.center != PositionMap.AUTO for c in self.parameters.characterPrompts])
+            
+            if get_supported_params(self.model).v4Prompts and self.parameters.v4_prompt is not None:
+                self.parameters.v4_prompt.use_coords = self.parameters.use_coords
         # Mix Prompt Warning
         if self.input.count('|') > 6:
             logger.warning("Maximum prompt mixes exceeded. Extra will be ignored.")
@@ -489,12 +498,12 @@ class GenerateImageInfer(ApiBaseModel):
     def build_img2img(
             prompt: str,
             *,
+            model: Union[Model, str] = Model.NAI_DIFFUSION_4_5_FULL,
             image: Union[bytes, str],
             strength: float = None,
             noise: float = None,
             seed: int = None,
             extra_noise_seed: int = None,
-            model: Union[Model, str] = Model.NAI_DIFFUSION_4_5_CURATED,
             negative_prompt: str = None,
             ucPreset: UCPresetTypeAlias = None,
             steps: int = None,
@@ -523,7 +532,7 @@ class GenerateImageInfer(ApiBaseModel):
         :param reference_strength_multiple:
         :param reference_image_multiple:
         :param prompt: Given prompt.
-        :param model: Model for generation.
+        :param model: Model for generation, which NOT end with 'inpainting'.
         :param negative_prompt: The things you don't want to see in the image.
         :param ucPreset: The negative prompt preset.
         :param steps: The steps for generation.
@@ -592,10 +601,10 @@ class GenerateImageInfer(ApiBaseModel):
     def build_infill(
             prompt: str,
             *,
+            model: Union[Model, str],
             image: Union[bytes, str],
             mask: Union[bytes, str],
             strength: float = None,
-            model: Union[Model, str] = Model.NAI_DIFFUSION_4_5_CURATED,
             negative_prompt: str = None,
             ucPreset: UCPresetTypeAlias = None,
             steps: int = None,
@@ -645,7 +654,7 @@ class GenerateImageInfer(ApiBaseModel):
 
         # Update only explicitly set parameters
         params.image = image  # image is required for infill
-        params.mask = mask   # mask is required for infill
+        params.mask = mask  # mask is required for infill
         if strength is not None:
             params.strength = strength
         if negative_prompt is not None:
@@ -686,28 +695,6 @@ class GenerateImageInfer(ApiBaseModel):
             parameters=params
         )
 
-    async def necessary_headers(self, request_data) -> dict:
-        """
-        :param request_data:
-        :return:
-        """
-        return {
-            "Host": urlparse(self.endpoint).netloc,
-            "Accept": "*/*",
-
-            "Accept-Encoding": "gzip, deflate, br",
-            "Referer": "https://novelai.net/",
-            "Content-Type": "application/json",
-            "Origin": "https://novelai.net",
-            "Content-Length": str(len(json.dumps(request_data).encode("utf-8"))),
-            "Connection": "keep-alive",
-            "Sec-Fetch-Dest": "empty",
-            "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-site",
-            "Pragma": "no-cache",
-            "Cache-Control": "no-cache",
-        }
-
     @retry(
         wait=wait_random(min=1, max=3),
         stop=stop_after_attempt(3),
@@ -738,7 +725,6 @@ class GenerateImageInfer(ApiBaseModel):
         # Prepare request data
         request_data = self.model_dump(mode="json", exclude_none=True)
         async with session if isinstance(session, AsyncSession) else await session.get_session() as sess:
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/generate_image/params.py

@@ -1,13 +1,14 @@
 import base64
 import random
 from io import BytesIO
-from typing import Optional, List, Union, Tuple
+from collections import OrderedDict
+from typing import Optional, List, Set, Union, Tuple
 
 import cv2
 import numpy as np
 from PIL import Image
 from loguru import logger
-from pydantic import BaseModel, Field, model_validator, field_validator
+from pydantic import BaseModel, Field, model_serializer, model_validator, field_validator
 
 from novelai_python.sdk.ai._enum import Sampler, UCPresetTypeAlias, NoiseSchedule, ImageBytesTypeAlias, ControlNetModel, \
     Model
@@ -20,6 +21,8 @@ def is_multiple_of_01(num, precision=1e-10):
 
 
 class Params(BaseModel):
+    params_version: int = 3
+    """Params Version For Request"""
     width: int = Field(832, ge=64, le=49152)
     """Width For Image"""
     height: int = Field(1216, ge=64, le=49152)
@@ -32,42 +35,68 @@ class Params(BaseModel):
     """Steps"""
     n_samples: int = Field(1, ge=1, le=8)
     """Number of samples"""
-    strength: Optional[float] = Field(0.7, ge=0.01, le=0.99, multiple_of=0.01)
-    """Strength for img2img"""
-    noise: Optional[float] = Field(0, ge=0, le=0.99, multiple_of=0.01)
-    """Noise for img2img"""
     ucPreset: UCPresetTypeAlias = Field(None, ge=0)
     """The Negative Prompt Preset, Bigger or equal to 0"""
     qualityToggle: bool = True
     """Whether to add the quality prompt"""
-    sm: Optional[bool] = False
-    # TODO: find out the usage
-    sm_dyn: Optional[bool] = False
-    # TODO: find out the usage
+    autoSmea: Optional[bool] = False
     dynamic_thresholding: bool = False
     """Decrisp:Reduce artifacts caused by high prompt guidance values"""
     controlnet_strength: float = Field(1.0, ge=0.1, le=2, multiple_of=0.1)
     """ControlNet Strength"""
     legacy: bool = False
     """Legacy Mode"""
+    add_original_image: Optional[bool] = Field(False, description="Overlay Original Image")
+    """
+    Overlay Original Image.Prevents the existing image from changing,
+    but can introduce seams along the edge of the mask.
+    """
     cfg_rescale: Optional[float] = Field(0, ge=0, le=1, multiple_of=0.02)
     """Prompt Guidance Rescale"""
     noise_schedule: Optional[NoiseSchedule] = None
     """Noise Schedule"""
     legacy_v3_extend: Optional[bool] = False
     """Legacy V3 Extend"""
-    mask: ImageBytesTypeAlias = None
-    """Mask for Inpainting"""
+    skip_cfg_above_sigma: Optional[int] = None
+    """Variety Boost, a new feature to improve the diversity of samples."""
+    use_coords: bool = Field(False, description="Use Coordinates")
+    """Use Coordinates"""
+    legacy_uc: bool = False
+    normalize_reference_strength_multiple: bool = True
+    inpaintImg2ImgStrength: Optional[float] = Field(None, ge=0, le=1, multiple_of=0.01)
+    """For SameFeel"""
     seed: int = Field(
         default_factory=lambda: random.randint(0, 4294967295 - 7),
         gt=0,
         le=4294967295 - 7,
     )
     """Seed"""
-    image: ImageBytesTypeAlias = None
-    """Image for img2img"""
+    characterPrompts: List[Character] = Field(default_factory=list)
+    """Character Prompts"""
+    v4_prompt: Optional[V4Prompt] = Field(None, description="V4 Prompt")
+    """V4 Prompt"""
+    v4_negative_prompt: Optional[V4NegativePrompt] = Field(None, description="V4 Negative Prompt")
+    """V4 Negative Prompt"""
     negative_prompt: Optional[str] = ''
     """Negative Prompt"""
+    deliberate_euler_ancestral_bug: Optional[bool] = Field(False, description="Deliberate Euler Ancestral Bug")
+    """Deliberate Euler Ancestral Bug"""
+    prefer_brownian: bool = Field(True, description="Prefer Brownian")
+    """Prefer Brownian"""
+
+    # Other fields
+    strength: Optional[float] = Field(0.7, ge=0.01, le=0.99, multiple_of=0.01)
+    """Strength for img2img"""
+    noise: Optional[float] = Field(0, ge=0, le=0.99, multiple_of=0.01)
+    """Noise for img2img"""
+    sm: Optional[bool] = False
+    # TODO: find out the usage
+    sm_dyn: Optional[bool] = False
+    # TODO: find out the usage
+    mask: ImageBytesTypeAlias = None
+    """Mask for Inpainting"""
+    image: ImageBytesTypeAlias = None
+    """Image for img2img"""
     reference_image_multiple: Optional[List[Union[str, bytes]]] = Field(default_factory=list)
     """Reference Image For Vibe Mode"""
     reference_information_extracted_multiple: Optional[List[float]] = Field(default_factory=list)
@@ -79,48 +108,44 @@ class Params(BaseModel):
     """Reference Strength For Vibe Mode"""
     extra_noise_seed: Optional[int] = Field(None, gt=0, le=4294967295 - 7)
     """Extra Noise Seed"""
-
-    # ====Version3 ====
-    params_version: int = 3
-    """Params Version For Request"""
-    add_original_image: Optional[bool] = Field(False, description="Overlay Original Image")
-    """
-    Overlay Original Image.Prevents the existing image from changing,
-    but can introduce seams along the edge of the mask.
-    """
-    use_coords: bool = Field(False, description="Use Coordinates")
-    """Use Coordinates"""
-    characterPrompts: List[Character] = Field(default_factory=list)
-    """Character Prompts"""
-
     color_correct: Optional[bool] = None
     """For Inpaint"""
-    inpaintImg2ImgStrength: Optional[float] = Field(None, ge=0, le=1, multiple_of=0.01)
-    """For SameFeel"""
-
-    v4_prompt: Optional[V4Prompt] = Field(None, description="V4 Prompt")
-    """V4 Prompt"""
-    v4_negative_prompt: Optional[V4NegativePrompt] = Field(None, description="V4 Negative Prompt")
-    """V4 Negative Prompt"""
-
-    deliberate_euler_ancestral_bug: Optional[bool] = Field(False, description="Deliberate Euler Ancestral Bug")
-    """Deliberate Euler Ancestral Bug"""
-    prefer_brownian: bool = Field(True, description="Prefer Brownian")
-    """Prefer Brownian"""
-
-    # ======== V1 ========
     controlnet_condition: Optional[str] = None
     """ControlNet Condition"""
     controlnet_model: Optional[ControlNetModel] = None
     """ControlNet Model"""
-    skip_cfg_above_sigma: Optional[int] = None
-    """Variety Boost, a new feature to improve the diversity of samples."""
     uncond_scale: Optional[float] = Field(None, ge=0, le=1.5, multiple_of=0.05)
     """Undesired Content Strength"""
 
-    autoSmea: Optional[bool] = False
-    normalize_reference_strength_multiple: bool = True
-    legacy_uc: bool = False
+    # region Custom serializer
+    __strong_values__: Set[str] = {
+        "skip_cfg_above_sigma", # See models before Anime V3
+    }
+    """Settings with none value to strongly include"""
+    
+    @model_serializer(mode="wrap")
+    def _serialize(self, handler):
+        """
+        Custom serializer to force include specific fields even when they are None
+        """
+        data = handler(self)
+        
+        # Force include strong fields and ensure proper ordering
+        # Create ordered dict following JavaScript field order
+        ordered_fields = list(self.__class__.model_fields.keys())
+        ordered_data = OrderedDict()
+        
+        for field_name in ordered_fields:
+            if field_name in data:
+                # Field exists in data, include it
+                ordered_data[field_name] = data[field_name]
+            elif field_name in self.__strong_values__:
+                # Since we iterate from `self.__class__.model_fields`,、
+                # the field is guaranteed to exist. The previous safety check was redundant.
+                ordered_data[field_name] = getattr(self, field_name, None)
+        
+        return ordered_data
+    # endregion
 
     @model_validator(mode="after")
     def v_character(self):

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/generate_image/schema.py

@@ -84,14 +84,14 @@ class Caption(BaseModel):
 
 class V4Prompt(BaseModel):
     caption: Caption = Field(default_factory=Caption, description="Caption")
-    use_coords: bool = Field(True, description="Use Coordinates")
+    use_coords: bool = Field(False, description="Use Coordinates")
     use_order: bool = Field(True, description="Use Order")
 
     @classmethod
     def build_from_character_prompts(cls,
                                      base_caption: str,
                                      character_prompts: List[Character],
-                                     use_coords: bool = True,
+                                     use_coords: bool = False,
                                      use_order: bool = True
                                      ) -> "V4Prompt":
         """

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/generate_image/suggest_tags.py

@@ -37,25 +37,6 @@ class SuggestTags(ApiBaseModel):
     def base_url(self):
         return f"{self.endpoint.strip('/')}/ai/generate-image/suggest-tags"
 
-    async def necessary_headers(self, request_data) -> dict:
-        return {
-            "Host": urlparse(self.endpoint).netloc,
-            "Accept": "*/*",
-
-            "Accept-Encoding": "gzip, deflate, br",
-            "Access-Control-Allow-Origin": "*",
-            "Referer": "https://novelai.net/",
-            "Content-Type": "application/json",
-            "Origin": "https://novelai.net",
-            "Connection": "keep-alive",
-            "Sec-Fetch-Dest": "empty",
-            "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-site",
-            "Pragma": "no-cache",
-            "Cache-Control": "no-cache",
-            "TE": "trailers",
-        }
-
     async def request(self,
                       session: Union[AsyncSession, CredentialBase],
                       *,
@@ -70,9 +51,9 @@ class SuggestTags(ApiBaseModel):
         # Data Build
         request_data = self.model_dump(mode="json", exclude_none=True)
         if isinstance(session, AsyncSession):
-            session.headers.update(await self.necessary_headers(request_data))
+            pass
         elif isinstance(session, CredentialBase):
-            session = await session.get_session(update_headers=await self.necessary_headers(request_data))
+            pass
         # Header
         if override_headers:
             session.headers.clear()

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/generate_stream.py

@@ -87,7 +87,6 @@ class LLMStream(LLM):
         }
         async with session if isinstance(session, AsyncSession) else await session.get_session() as sess:
             # Header
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/generate_voice/__init__.py

@@ -57,27 +57,6 @@ class VoiceGenerate(ApiBaseModel):
     def endpoint(self, value):
         self._endpoint = value
 
-    async def necessary_headers(self, request_data) -> dict:
-        """
-        :param request_data: dict
-        :return: dict
-        "Sec-Ch-Ua": '"Edge";v="123", "Not:A-Brand";v="8"',
-        "Sec-Ch-Ua-Mobile": "?0",
-        "Sec-Ch-Ua-Platform": '"Windows"',
-        "Sec-Fetch-Dest": "empty",
-        "Sec-Fetch-Mode": "cors",
-        "Sec-Fetch-Site": "same-site",
-        """
-        return {
-            "Host": urlparse(self.endpoint).netloc,
-            "Accept": "*/*",
-            "Accept-Language": "zh-CN,zh;q=0.9",
-            "Cache-Control": "no-cache",
-            "Origin": "https://novelai.net",
-            "Pragma": "no-cache",
-            "Referer": "https://novelai.net/",
-        }
-
     @classmethod
     def build(cls,
               text: str,
@@ -133,7 +112,6 @@ class VoiceGenerate(ApiBaseModel):
         request_data = self.model_dump(mode="json", exclude_none=True)
         async with session if isinstance(session, AsyncSession) else await session.get_session() as sess:
             # Header
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/ai/upscale.py

@@ -66,28 +66,6 @@ class Upscale(ApiBaseModel):
     def endpoint(self, value):
         self._endpoint = value
 
-    async def necessary_headers(self, request_data) -> dict:
-        """
-        :param request_data:
-        :return:
-        """
-        return {
-            "Host": urlparse(self.endpoint).netloc,
-            "Accept": "*/*",
-
-            "Accept-Encoding": "gzip, deflate, br",
-            "Referer": "https://novelai.net/",
-            "Content-Type": "application/json",
-            "Origin": "https://novelai.net",
-            "Content-Length": str(len(json.dumps(request_data).encode("utf-8"))),
-            "Connection": "keep-alive",
-            "Sec-Fetch-Dest": "empty",
-            "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-site",
-            "Pragma": "no-cache",
-            "Cache-Control": "no-cache",
-        }
-
     @retry(
         wait=wait_random(min=1, max=3),
         stop=stop_after_attempt(3),
@@ -108,7 +86,6 @@ class Upscale(ApiBaseModel):
         # Prepare request data
         request_data = self.model_dump(mode="json", exclude_none=True)
         async with session if isinstance(session, AsyncSession) else await session.get_session() as sess:
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/schema.py

@@ -31,10 +31,6 @@ class ApiBaseModel(BaseModel, ABC):
     def endpoint(self, value):
         self._endpoint = value
 
-    @abstractmethod
-    async def necessary_headers(self, request_data) -> dict:
-        raise NotImplementedError()
-
     @staticmethod
     def ensure_session_has_post_method(session):
         if not hasattr(session, "post"):

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/user/information.py

@@ -33,17 +33,6 @@ class Information(ApiBaseModel):
     def endpoint(self, value):
         self._endpoint = value
 
-    async def necessary_headers(self, request_data) -> dict:
-        return {
-            "Host": urlparse(self.endpoint).netloc,
-            "Accept": "*/*",
-
-            "Accept-Encoding": "gzip, deflate, br",
-            "Referer": "https://novelai.net/",
-            "Content-Type": "application/json",
-            "Origin": "https://novelai.net"
-        }
-
     async def request(self,
                       session: Union[AsyncSession, CredentialBase],
                       *,
@@ -58,7 +47,6 @@ class Information(ApiBaseModel):
         request_data = {}
         async with session if isinstance(session, AsyncSession) else await session.get_session() as sess:
             # Header
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/user/login.py

@@ -53,9 +53,6 @@ class Login(ApiBaseModel):
         """
         return cls(key=encode_access_key(user_name, password))
 
-    async def necessary_headers(self, request_data) -> dict:
-        return {}
-
     async def request(self,
                       session: Union[AsyncSession, CredentialBase] = None,
                       *,
@@ -70,7 +67,6 @@ class Login(ApiBaseModel):
 
         async with session if isinstance(session, AsyncSession) else self.session as sess:
             # Header
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/sdk/user/subscription.py

@@ -33,24 +33,6 @@ class Subscription(ApiBaseModel):
     def endpoint(self, value):
         self._endpoint = value
 
-    async def necessary_headers(self, request_data) -> dict:
-        return {
-            "Host": urlparse(self.endpoint).netloc,
-            "Accept": "*/*",
-
-            "Accept-Encoding": "gzip, deflate, br",
-            "Referer": "https://novelai.net/",
-            "Content-Type": "application/json",
-            "Origin": "https://novelai.net",
-            "Connection": "keep-alive",
-            "Sec-Fetch-Dest": "empty",
-            "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-site",
-            "Pragma": "no-cache",
-            "Cache-Control": "no-cache",
-            "TE": "trailers",
-        }
-
     async def request(self,
                       session: Union[AsyncSession, CredentialBase],
                       *,
@@ -66,7 +48,6 @@ class Subscription(ApiBaseModel):
         request_data = {}
         async with session if isinstance(session, AsyncSession) else await session.get_session() as sess:
             # Header
-            sess.headers.update(await self.necessary_headers(request_data))
             if override_headers:
                 sess.headers.clear()
                 sess.headers.update(override_headers)

{novelai_python-0.7.10 → novelai_python-0.7.12}/src/novelai_python/utils/encode.py

@@ -16,7 +16,7 @@ def encode_access_key(username: str, password: str) -> str:
     :param password: str (plaintext)
     :return: str
     """
-    pre_salt = f"{password[:6]}{username}novelai_data_access_key"
+    pre_salt = f"{password[:6]}{username.lower()}novelai_data_access_key"
 
     blake = blake2b(digest_size=16)
     blake.update(pre_salt.encode())