novelai-python 0.7.6__tar.gz → 0.7.8__tar.gz

{novelai_python-0.7.6 → novelai_python-0.7.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.7.6
+Version: 0.7.8
 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.6.0
+Requires-Dist: curl-cffi>=0.9.0
 Requires-Dist: fastapi>=0.109.0
 Requires-Dist: uvicorn[standard]>=0.27.0.post1
 Requires-Dist: numpy>=1.24.4
@@ -52,6 +52,7 @@ the [NovelAI API service](https://api.novelai.net/docs).
 
 ### 📰 News
 
+- [NovelAI Diffusion V4.5 Curated is Here!](https://blog.novelai.net/novelai-diffusion-v4-5-curated-is-here-9e5ba1f628f3)
 - [Image Generation Model Release — NovelAI Anime Diffusion V4 Curated Preview (EN)](https://blog.novelai.net/release-novelai-anime-diffusion-v4-curated-preview-en-ca4b0b11e671)
 - [Tutorial: Creating Consistent Characters with NovelAI Diffusion Anime [Female]](https://blog.novelai.net/tutorial-en-creating-consistent-characters-with-novelai-diffusion-anime-female-538b4b678a4e)
 
@@ -87,7 +88,7 @@ prompt = "2girls, fisheye, closeup, from above"
 async def main():
     gen = GenerateImageInfer.build_generate(
         prompt=prompt,
-        model=Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
+        model=Model.NAI_DIFFUSION_4_5_CURATED,
         character_prompts=[
             Character(
                 prompt="1girl, head tilt, short hair, black hair, grey eyes, small breasts, looking at viewer",

{novelai_python-0.7.6 → novelai_python-0.7.8}/README.md

@@ -14,6 +14,7 @@ the [NovelAI API service](https://api.novelai.net/docs).
 
 ### 📰 News
 
+- [NovelAI Diffusion V4.5 Curated is Here!](https://blog.novelai.net/novelai-diffusion-v4-5-curated-is-here-9e5ba1f628f3)
 - [Image Generation Model Release — NovelAI Anime Diffusion V4 Curated Preview (EN)](https://blog.novelai.net/release-novelai-anime-diffusion-v4-curated-preview-en-ca4b0b11e671)
 - [Tutorial: Creating Consistent Characters with NovelAI Diffusion Anime [Female]](https://blog.novelai.net/tutorial-en-creating-consistent-characters-with-novelai-diffusion-anime-female-538b4b678a4e)
 
@@ -49,7 +50,7 @@ prompt = "2girls, fisheye, closeup, from above"
 async def main():
     gen = GenerateImageInfer.build_generate(
         prompt=prompt,
-        model=Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
+        model=Model.NAI_DIFFUSION_4_5_CURATED,
         character_prompts=[
             Character(
                 prompt="1girl, head tilt, short hair, black hair, grey eyes, small breasts, looking at viewer",

{novelai_python-0.7.6 → novelai_python-0.7.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "novelai-python"
-version = "0.7.6"
+version = "0.7.8"
 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.6.0",
+    "curl-cffi>=0.9.0",
     "fastapi>=0.109.0",
     "uvicorn[standard]>=0.27.0.post1",
     "numpy>=1.24.4",

{novelai_python-0.7.6 → novelai_python-0.7.8}/src/novelai_python/sdk/ai/_enum.py

@@ -91,6 +91,12 @@ class Resolution(Enum):
 
 
 class Model(Enum):
+    """
+    Nai Diffusion series
+    """
+    NAI_DIFFUSION_4_5_CURATED = 'nai-diffusion-4-5-curated'
+    NAI_DIFFUSION_4_5_CURATED_INPAINTING = 'nai-diffusion-4-5-curated-inpainting'
+
     NAI_DIFFUSION_4_CURATED_PREVIEW = "nai-diffusion-4-curated-preview"
     NAI_DIFFUSION_4_FULL = "nai-diffusion-4-full"
     NAI_DIFFUSION_4_FULL_INPAINTING = "nai-diffusion-4-full-inpainting"
@@ -132,7 +138,10 @@ INPAINTING_MODEL_LIST = [
     Model.NAI_DIFFUSION_INPAINTING,
     Model.SAFE_DIFFUSION_INPAINTING,
     Model.FURRY_DIFFUSION_INPAINTING,
-    Model.NAI_DIFFUSION_FURRY_3_INPAINTING
+    Model.NAI_DIFFUSION_FURRY_3_INPAINTING,
+    Model.NAI_DIFFUSION_4_CURATED_INPAINTING,
+    Model.NAI_DIFFUSION_4_FULL_INPAINTING,
+    Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING
 ]
 
 PROMOTION = {
@@ -156,6 +165,10 @@ PROMOTION = {
     "Stable Diffusion XL 9CC2F394": Model.NAI_DIFFUSION_FURRY_3,
     'NovelAI Diffusion V4 4F49EC75': Model.NAI_DIFFUSION_4_FULL,
     'NovelAI Diffusion V4 CA4B7203': Model.NAI_DIFFUSION_4_FULL,
+    'NovelAI Diffusion V4.5 5AB81C7C': Model.NAI_DIFFUSION_4_5_CURATED,
+    "NovelAI Diffusion V4.5 B5A2A797": Model.NAI_DIFFUSION_4_5_CURATED,
+    "NovelAI Diffusion V4 5AB81C7C": Model.NAI_DIFFUSION_4_5_CURATED,
+    "NovelAI Diffusion V4 B5A2A797": Model.NAI_DIFFUSION_4_5_CURATED,
 }
 
 ModelTypeAlias = Optional[Union[Model, str]]
@@ -175,8 +188,16 @@ class SupportCondition:
     characterPrompts: bool
     v4Prompts: bool
     smea: bool
+    smeaDyn: bool
     text: bool
     dynamicThresholding: bool
+    autoSmea: bool
+    v4_0legacyUC: bool
+    scaleRecommendedMin: int
+    scaleRecommendedMax: Optional[int]
+    numericEmphasis: bool
+    encodedVibes: bool
+    cfgDelaySigma: int
 
 
 def get_supported_params(model: Model):
@@ -207,8 +228,16 @@ def get_supported_params(model: Model):
             characterPrompts=False,
             v4Prompts=False,
             smea=True,
+            smeaDyn=False,
             text=False,
-            dynamicThresholding=True
+            dynamicThresholding=True,
+            autoSmea=True,
+            v4_0legacyUC=False,
+            scaleRecommendedMin=6,
+            scaleRecommendedMax=25,
+            numericEmphasis=False,
+            encodedVibes=False,
+            cfgDelaySigma=19
         )
     if model in [Model.NAI_DIFFUSION_2]:
         return SupportCondition(
@@ -222,8 +251,16 @@ def get_supported_params(model: Model):
             characterPrompts=False,
             v4Prompts=False,
             smea=True,
+            smeaDyn=False,
             text=False,
-            dynamicThresholding=True
+            dynamicThresholding=True,
+            autoSmea=True,
+            v4_0legacyUC=False,
+            scaleRecommendedMin=6,
+            scaleRecommendedMax=25,
+            numericEmphasis=False,
+            encodedVibes=False,
+            cfgDelaySigma=19
         )
     if model in [
         Model.NAI_DIFFUSION_XL,
@@ -243,13 +280,20 @@ def get_supported_params(model: Model):
             characterPrompts=False,
             v4Prompts=False,
             smea=True,
+            smeaDyn=True,
             text=False,
-            dynamicThresholding=True
+            dynamicThresholding=True,
+            autoSmea=True,
+            v4_0legacyUC=False,
+            scaleRecommendedMin=2,
+            scaleRecommendedMax=8,
+            numericEmphasis=False,
+            encodedVibes=False,
+            cfgDelaySigma=19
         )
     if model in [
         Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
         Model.NAI_DIFFUSION_4_CURATED_INPAINTING,
-        Model.CUSTOM,
         Model.NAI_DIFFUSION_4_FULL,
         Model.NAI_DIFFUSION_4_FULL_INPAINTING,
     ]:
@@ -264,8 +308,65 @@ def get_supported_params(model: Model):
             characterPrompts=True,
             v4Prompts=True,
             smea=False,
+            smeaDyn=False,
+            text=True,
+            dynamicThresholding=False,
+            autoSmea=False,
+            v4_0legacyUC=True,
+            scaleRecommendedMin=2,
+            scaleRecommendedMax=6,
+            numericEmphasis=True,
+            encodedVibes=True,
+            cfgDelaySigma=19
+        )
+    if model in [Model.CUSTOM]:
+        return SupportCondition(
+            controlnet=False,
+            vibetransfer=True,
+            scaleMax=10,
+            negativePromptGuidance=True,
+            noiseSchedule=True,
+            inpainting=True,
+            cfgDelay=True,
+            characterPrompts=True,
+            v4Prompts=True,
+            smea=False,
+            smeaDyn=False,
+            text=True,
+            dynamicThresholding=False,
+            autoSmea=False,
+            v4_0legacyUC=True,
+            scaleRecommendedMin=0,
+            scaleRecommendedMax=None,
+            numericEmphasis=True,
+            encodedVibes=True,
+            cfgDelaySigma=58
+        )
+    if model in [
+        Model.NAI_DIFFUSION_4_5_CURATED,
+        Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING,
+    ]:
+        return SupportCondition(
+            controlnet=False,
+            vibetransfer=False,
+            scaleMax=10,
+            negativePromptGuidance=True,
+            noiseSchedule=True,
+            inpainting=True,
+            cfgDelay=True,
+            characterPrompts=True,
+            v4Prompts=True,
+            smea=False,
+            smeaDyn=False,
             text=True,
-            dynamicThresholding=False
+            dynamicThresholding=False,
+            autoSmea=False,
+            v4_0legacyUC=False,
+            scaleRecommendedMin=0,
+            scaleRecommendedMax=None,
+            numericEmphasis=True,
+            encodedVibes=False,
+            cfgDelaySigma=58
         )
     return SupportCondition(
         controlnet=False,
@@ -278,8 +379,16 @@ def get_supported_params(model: Model):
         characterPrompts=False,
         v4Prompts=False,
         smea=False,
+        smeaDyn=False,
         text=False,
-        dynamicThresholding=False
+        dynamicThresholding=False,
+        autoSmea=False,
+        v4_0legacyUC=False,
+        scaleRecommendedMin=0,
+        scaleRecommendedMax=99,
+        numericEmphasis=False,
+        encodedVibes=False,
+        cfgDelaySigma=19
     )
 
 
@@ -290,6 +399,8 @@ class Modifier(object):
 
 
 def find_model_by_hashcode(hashcode: str) -> ModelTypeAlias:
+    if "NovelAI Diffusion V4.5" in hashcode:
+        return PROMOTION.get(hashcode, Model.NAI_DIFFUSION_4_5_CURATED)
     if "NovelAI Diffusion V4" in hashcode:
         return PROMOTION.get(hashcode, Model.NAI_DIFFUSION_4_CURATED_PREVIEW)
     return PROMOTION.get(hashcode, None)
@@ -303,6 +414,14 @@ def get_modifiers(model: Model) -> Modifier:
     """
     if model in [
         Model.CUSTOM,
+        Model.NAI_DIFFUSION_4_5_CURATED,
+        Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING
+    ]:
+        return Modifier(
+            qualityTags="",
+            suffix=", location, masterpiece, no text, -0.8::feet::, rating:general"
+        )
+    if model in [
         Model.NAI_DIFFUSION_4_FULL,
         Model.NAI_DIFFUSION_4_FULL_INPAINTING,
     ]:
@@ -364,8 +483,10 @@ def filter_by_model_noise_schedule(model: Model, noise_schedule: List[NoiseSched
     :param noise_schedule:
     :return:
     """
-    # 只有Novelai4系列不支持Native
+    # 只有 Novelai4 系列不支持Native
     if model in [
+        Model.NAI_DIFFUSION_4_5_CURATED,
+        Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING,
         Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
         Model.NAI_DIFFUSION_4_FULL,
         Model.NAI_DIFFUSION_4_FULL_INPAINTING,
@@ -451,7 +572,9 @@ def get_model_group(model: ModelTypeAlias) -> ModelGroups:
         "nai-diffusion-4-curated-preview": ModelGroups.V4,
         'nai-diffusion-4-full': ModelGroups.V4,
         'nai-diffusion-4-full-inpainting': ModelGroups.V4,
-        'nai-diffusion-4-curated-inpainting': ModelGroups.V4
+        'nai-diffusion-4-curated-inpainting': ModelGroups.V4,
+        'nai-diffusion-4-5-curated': ModelGroups.V4,
+        'nai-diffusion-4-5-curated-inpainting': ModelGroups.V4,
     }
     return mapping.get(model, ModelGroups.STABLE_DIFFUSION)
 
@@ -598,7 +721,6 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
             ),
         ]
     elif model in [
-        Model.CUSTOM,
         Model.NAI_DIFFUSION_4_FULL,
         Model.NAI_DIFFUSION_4_FULL_INPAINTING,
     ]:
@@ -619,6 +741,33 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
                 text=""
             ),
         ]
+    elif model in [
+        Model.CUSTOM,
+        Model.NAI_DIFFUSION_4_5_CURATED,
+        Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING,
+    ]:
+        prompts = [
+            UcPrompt(
+                category="heavy",
+                name="heavy",
+                text="blurry, lowres, upscaled, artistic error, film grain, scan artifacts, worst quality, bad quality, jpeg artifacts, very displeasing, chromatic aberration, halftone, multiple views, logo, too many watermarks, negative space, blank page"
+            ),
+            UcPrompt(
+                category="light",
+                name="light",
+                text="blurry, lowres, upscaled, artistic error, scan artifacts, jpeg artifacts, logo, too many watermarks, negative space, blank page"
+            ),
+            UcPrompt(
+                category="human",
+                name="humanFocus",
+                text="blurry, lowres, upscaled, artistic error, film grain, scan artifacts, bad anatomy, bad hands, worst quality, bad quality, jpeg artifacts, very displeasing, chromatic aberration, halftone, multiple views, logo, too many watermarks, @_@, mismatched pupils, glowing eyes, negative space, blank page"
+            ),
+            UcPrompt(
+                category="none",
+                name="none",
+                text=""
+            ),
+        ]
     return prompts
 
 

{novelai_python-0.7.6 → novelai_python-0.7.8}/src/novelai_python/sdk/ai/generate_image/__init__.py

@@ -32,9 +32,11 @@ from novelai_python.sdk.ai._enum import Model, Sampler, NoiseSchedule, ControlNe
     get_model_group, ModelGroups, get_supported_params, get_modifiers, ImageBytesTypeAlias
 from .schema import Character, V4Prompt, V4NegativePrompt, PositionMap
 from ...schema import ApiBaseModel
+from ...._enum import TextTokenizerGroup
 from ...._exceptions import APIError, AuthError, ConcurrentGenerationError, SessionHttpError, DataSerializationError
 from ...._response.ai.generate_image import ImageGenerateResp, RequestParams
 from ....credential import CredentialBase
+from ....tokenizer import NaiTokenizer
 from ....utils import try_jsonfy
 
 
@@ -779,7 +781,7 @@ class GenerateImageInfer(ApiBaseModel):
             noise: float = 0,
             seed: int = None,
             extra_noise_seed: int = None,
-            model: Union[Model, str] = Model.NAI_DIFFUSION_3,
+            model: Union[Model, str] = Model.NAI_DIFFUSION_4_5_CURATED,
             negative_prompt: str = "",
             ucPreset: UCPresetTypeAlias = UCPreset.TYPE0,
             steps: int = 23,
@@ -874,7 +876,7 @@ class GenerateImageInfer(ApiBaseModel):
             image: Union[bytes, str],
             mask: Union[bytes, str],
             strength: float = 0.7,
-            model: Union[Model, str] = Model.NAI_DIFFUSION_3,
+            model: Union[Model, str] = Model.NAI_DIFFUSION_4_5_CURATED,
             negative_prompt: str = "",
             ucPreset: UCPresetTypeAlias = UCPreset.TYPE0,
             steps: int = 23,

novelai_python-0.7.8/src/novelai_python/sdk/ai/generate_image/tokenizer.py

@@ -0,0 +1,22 @@
+from novelai_python._enum import TextTokenizerGroup
+from novelai_python.sdk.ai.generate_image import Model
+from novelai_python.tokenizer import NaiTokenizer
+
+
+def get_prompt_tokenizer(model: Model):
+    """
+    Only for IMAGE prompt length calculation
+    :param model:
+    :return:
+    """
+    if model in [
+        Model.CUSTOM,
+        Model.NAI_DIFFUSION_4_5_CURATED,
+        Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING,
+        Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
+        Model.NAI_DIFFUSION_4_CURATED_INPAINTING,
+        Model.NAI_DIFFUSION_4_FULL,
+        Model.NAI_DIFFUSION_4_FULL_INPAINTING,
+    ]:
+        return NaiTokenizer(TextTokenizerGroup.T5)
+    return NaiTokenizer(TextTokenizerGroup.CLIP)