novelai-python 0.4.14__tar.gz → 0.4.16__tar.gz

{novelai_python-0.4.14 → novelai_python-0.4.16}/NOTICE.MD

@@ -4,7 +4,7 @@
 
 The MIT license applies to the files in:
 
-    file: "src/novelai_python/sdk/ai/generate_image.py" from https://github.com/HanaokaYuzu/NovelAI-API
+    file: "src/novelai_python/sdk/ai/generate-image.py" from https://github.com/HanaokaYuzu/NovelAI-API
     file: "src/novelai_python/tokenizer/novelai.model" from https://github.com/NovelAI/novelai-tokenizer
     file: "src/novelai_python/tokenizer/novelai_v2.model from https://github.com/NovelAI/novelai-tokenizer
     file: "src/novelai_python/tool/image_metadata/lsb_injector.py" from https://github.com/NovelAI/novelai-image-metadata

{novelai_python-0.4.14 → novelai_python-0.4.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.4.14
+Version: 0.4.16
 Summary: NovelAI Python Binding With Pydantic
 Author-Email: sudoskys <coldlando@hotmail.com>
 License: Apache License 2.0
@@ -27,9 +27,9 @@ Requires-Dist: pynacl>=1.5.0
 Requires-Dist: ftfy>=6.2.0
 Requires-Dist: regex>=2023.12.25
 Requires-Dist: tokenizers>=0.15.2
+Provides-Extra: testing
 Requires-Dist: pytest>=7.4.4; extra == "testing"
 Requires-Dist: pytest-asyncio>=0.23.4; extra == "testing"
-Provides-Extra: testing
 Description-Content-Type: text/markdown
 
 ![banner](https://github.com/LlmKira/novelai-python/blob/dev/playground/banner-raw.png?raw=true)

{novelai_python-0.4.14 → novelai_python-0.4.16}/pyproject.toml

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

{novelai_python-0.4.14 → novelai_python-0.4.16}/src/novelai_python/sdk/ai/_enum.py

@@ -6,6 +6,8 @@
 from enum import Enum, IntEnum
 from typing import List
 
+from pydantic.dataclasses import dataclass
+
 
 class Sampler(Enum):
     PLMS = "plms"
@@ -170,6 +172,8 @@ class ModelGroups(Enum):
 
 
 def get_model_group(model: str) -> ModelGroups:
+    if isinstance(model, Enum):
+        model = model.value
     mapping = {
         "stable-diffusion": ModelGroups.STABLE_DIFFUSION,
         "nai-diffusion": ModelGroups.STABLE_DIFFUSION,
@@ -212,8 +216,59 @@ PROMOTION = {
     "Stable Diffusion F1022D28": Model.NAI_DIFFUSION_2,
     "Stable Diffusion XL B0BDF6C1": Model.NAI_DIFFUSION_3,
     "Stable Diffusion XL C1E1DE52": Model.NAI_DIFFUSION_3,
+    "Stable Diffusion XL 7BCCAA2C": Model.NAI_DIFFUSION_3,
     "Stable Diffusion XL 8BA2AF87": Model.NAI_DIFFUSION_3,
     "Stable Diffusion XL 4BE8C60C": Model.NAI_DIFFUSION_FURRY_3,
     "Stable Diffusion XL C8704949": Model.NAI_DIFFUSION_FURRY_3,
+    "Stable Diffusion XL 37C2B166": Model.NAI_DIFFUSION_FURRY_3,
     "Stable Diffusion XL 9CC2F394": Model.NAI_DIFFUSION_FURRY_3,
 }
+
+
+def get_default_uc_preset(model: str, uc_preset: int) -> str:
+    if isinstance(model, Enum):
+        model = model.value
+    if isinstance(uc_preset, Enum):
+        uc_preset = uc_preset.value
+
+    @dataclass
+    class UcPrompt:
+        label: str
+        text: str
+
+    mapper = {
+        ModelGroups.STABLE_DIFFUSION: [
+            UcPrompt("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"),
+            UcPrompt("lowQuality",
+                     text="lowres, text, cropped, worst quality, low quality, normal quality, jpeg artifacts, signature, watermark, username, blurry"),
+            UcPrompt("none", text="lowres")
+        ],
+        ModelGroups.STABLE_DIFFUSION_GROUP_2: [
+            UcPrompt("heavy",
+                     text="lowres, bad, text, error, missing, extra, fewer, cropped, jpeg artifacts, worst quality, bad quality, watermark, displeasing, unfinished, chromatic aberration, scan, scan artifacts"),
+            UcPrompt("light", text="lowres, jpeg artifacts, worst quality, watermark, blurry, very displeasing"),
+            UcPrompt("none", text="lowres")
+        ],
+        ModelGroups.STABLE_DIFFUSION_XL: [
+            UcPrompt("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]"),
+            UcPrompt("light", text="lowres, jpeg artifacts, worst quality, watermark, blurry, very displeasing"),
+            UcPrompt("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"),
+            UcPrompt("none", text="lowres")
+        ],
+        ModelGroups.STABLE_DIFFUSION_XL_FURRY: [
+            UcPrompt("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"),
+            UcPrompt("light",
+                     text="{worst quality}, guide lines, unfinished, bad, url, tall image, widescreen, compression artifacts, unknown text"),
+            UcPrompt("none", text="lowres")
+        ],
+    }
+    model_group = get_model_group(model)
+    prompts: List[UcPrompt] = mapper.get(model_group, [UcPrompt("none", "lowres")])
+    if 0 <= uc_preset < len(prompts):
+        return prompts[uc_preset].text
+    else:
+        return "lowres"

{novelai_python-0.4.14 → novelai_python-0.4.16}/src/novelai_python/sdk/ai/generate_image/__init__.py

@@ -25,7 +25,7 @@ from typing_extensions import override
 
 from novelai_python.sdk.ai._cost import CostCalculator
 from novelai_python.sdk.ai._enum import Model, Sampler, NoiseSchedule, ControlNetModel, Action, UCPreset, \
-    INPAINTING_MODEL_LIST, get_default_noise_schedule, get_supported_noise_schedule
+    INPAINTING_MODEL_LIST, get_default_noise_schedule, get_supported_noise_schedule, get_default_uc_preset
 from ...schema import ApiBaseModel
 from ...._exceptions import APIError, AuthError, ConcurrentGenerationError, SessionHttpError
 from ...._response.ai.generate_image import ImageGenerateResp, RequestParams
@@ -138,8 +138,8 @@ class Params(BaseModel):
     # TODO: find out the usage
     steps: Optional[int] = Field(23, ge=1, le=50)
     """Steps"""
-    ucPreset: Optional[UCPreset] = 0
-    """The Negative Prompt Preset"""
+    ucPreset: Optional[Union[UCPreset, int]] = Field(None, ge=0)
+    """The Negative Prompt Preset, Bigger or equal to 0"""
     uncond_scale: Optional[float] = Field(1.0, ge=0, le=1.5, multiple_of=0.05)
     """Undesired Content Strength"""
     width: Optional[int] = Field(832, ge=64, le=49152)
@@ -324,7 +324,7 @@ class GenerateImageInfer(ApiBaseModel):
 
     action: Union[str, Action] = Field(Action.GENERATE, description="Mode for img generate")
     input: str = "1girl, best quality, amazing quality, very aesthetic, absurdres"
-    model: Optional[Model] = "nai-diffusion-3"
+    model: Optional[Union[Model, str]] = "nai-diffusion-3"
     parameters: Params = Params()
     model_config = ConfigDict(extra="ignore")
 
@@ -336,32 +336,18 @@ class GenerateImageInfer(ApiBaseModel):
         :param args: Any
         :return: None
         """
+        # Must be a string
         if self.parameters.negative_prompt is None:
             self.parameters.negative_prompt = ""
-        if self.parameters.ucPreset == 0:
-            # 0: 重型
-            self.parameters.negative_prompt = (
-                "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, lowres, bad anatomy, bad hands, text, error, missing fingers, "
-                "extra digit, fewer digits, cropped, worst quality, low quality, normal quality, "
-                f"jpeg artifacts, signature, watermark, username, blurry "
-                f",{self.parameters.negative_prompt}"
+
+        # Add negative prompt based on ucPreset
+        if self.parameters.ucPreset is not None:
+            default_negative_prompt = get_default_uc_preset(self.model, self.parameters.ucPreset)
+            self.parameters.negative_prompt = ", ".join(
+                filter(None, [default_negative_prompt, self.parameters.negative_prompt])
             )
-        elif self.parameters.ucPreset == 1:
-            # 1: 轻型
-            self.parameters.negative_prompt = (f"lowres, jpeg artifacts, worst quality, watermark, blurry, "
-                                               f"very displeasing"
-                                               f",{self.parameters.negative_prompt}")
-        elif self.parameters.ucPreset == 2:
-            # 2: 人物
-            self.parameters.negative_prompt = ("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 "
-                                               f"pupils, heart-shaped pupils, glowing eyes "
-                                               f",{self.parameters.negative_prompt}")
+
+        # Add quality prompt
         if self.parameters.qualityToggle:
             self.input += ", best quality, amazing quality, very aesthetic, absurdres"
 
@@ -434,7 +420,7 @@ class GenerateImageInfer(ApiBaseModel):
               model: Union[Model, str] = "nai-diffusion-3",
               action: Union[Action, str] = 'generate',
               negative_prompt: str = "",
-              ucPreset: Union[UCPreset, int] = UCPreset.TYPE0,
+              ucPreset: Optional[Union[UCPreset, int]] = UCPreset.TYPE0,
               steps: int = 28,
               seed: int = None,
               scale: float = 5.0,
@@ -470,7 +456,8 @@ class GenerateImageInfer(ApiBaseModel):
         :param decrisp_mode: Reduce artifacts caused by high prompt guidance values.
                             减少由高提示引导值引起的伪影。
         :param variety_boost: A new feature to improve the diversity of samples.
-                            一项新功能，用于提高样本的多样性。
+                            Variety Boost means your negative prompt will only be used after the body shape has been decided.
+                            一项新功能，用于提高样本的多样性。但是，这意味着您的负面提示只会在身体形状确定后使用。
         :param reference_information_extracted_multiple:  The reference information extracted for Vibe mode.
                                                             Vibe模式的提取的参考信息。
         :param reference_image_multiple: The reference image for Vibe mode.

{novelai_python-0.4.14 → novelai_python-0.4.16}/tests/test_server_run.py

@@ -29,8 +29,8 @@ def test_subscription_without_api_key(mock_subscription):
 @patch('src.novelai_python.server.GenerateImageInfer')
 def test_generate_image_without_api_key(mock_generate_image):
     mock_generate_image.return_value.request.return_value = {"status": "image generated"}
-    response = client.post("/ai/generate_image")
-    assert response.status_code == 404
+    response = client.post("/ai/generate-image")
+    assert response.status_code == 403
 
 
 def test_get_session_new_token():