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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.7.8
+Version: 0.7.10
 Summary: NovelAI Python Binding With Pydantic
 Author-Email: sudoskys <coldlando@hotmail.com>
 License: Apache License 2.0
@@ -48,10 +48,11 @@ Description-Content-Type: text/markdown
 The goal of this repository is to use Pydantic to build legitimate requests to access
 the [NovelAI API service](https://api.novelai.net/docs).
 
-> Python >= 3.9 is required.
+> Python >= 3.9 <3.13 is required.
 
 ### 📰 News
 
+- [New Model. No Restrictions. V4.5 Full Is Here.](https://blog.novelai.net/novelai-diffusion-v4-5-full-release-678318c86205)
 - [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)
@@ -88,7 +89,7 @@ prompt = "2girls, fisheye, closeup, from above"
 async def main():
     gen = GenerateImageInfer.build_generate(
         prompt=prompt,
-        model=Model.NAI_DIFFUSION_4_5_CURATED,
+        model=Model.NAI_DIFFUSION_4_5_FULL,
         character_prompts=[
             Character(
                 prompt="1girl, head tilt, short hair, black hair, grey eyes, small breasts, looking at viewer",
@@ -107,6 +108,7 @@ async def main():
         qualityToggle=True,
         decrisp_mode=False,
         variety_boost=True,
+        furry_mode=False,
         # Checkbox in novelai.net
     )
     cost = gen.calculate_cost(is_opus=True)

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

@@ -10,10 +10,11 @@
 The goal of this repository is to use Pydantic to build legitimate requests to access
 the [NovelAI API service](https://api.novelai.net/docs).
 
-> Python >= 3.9 is required.
+> Python >= 3.9 <3.13 is required.
 
 ### 📰 News
 
+- [New Model. No Restrictions. V4.5 Full Is Here.](https://blog.novelai.net/novelai-diffusion-v4-5-full-release-678318c86205)
 - [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)
@@ -50,7 +51,7 @@ prompt = "2girls, fisheye, closeup, from above"
 async def main():
     gen = GenerateImageInfer.build_generate(
         prompt=prompt,
-        model=Model.NAI_DIFFUSION_4_5_CURATED,
+        model=Model.NAI_DIFFUSION_4_5_FULL,
         character_prompts=[
             Character(
                 prompt="1girl, head tilt, short hair, black hair, grey eyes, small breasts, looking at viewer",
@@ -69,6 +70,7 @@ async def main():
         qualityToggle=True,
         decrisp_mode=False,
         variety_boost=True,
+        furry_mode=False,
         # Checkbox in novelai.net
     )
     cost = gen.calculate_cost(is_opus=True)

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

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

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

@@ -94,6 +94,9 @@ class Model(Enum):
     """
     Nai Diffusion series
     """
+    NAI_DIFFUSION_4_5_FULL = "nai-diffusion-4-5-full"
+    NAI_DIFFUSION_4_5_FULL_INPAINTING = 'nai-diffusion-4-5-full-inpainting'
+
     NAI_DIFFUSION_4_5_CURATED = 'nai-diffusion-4-5-curated'
     NAI_DIFFUSION_4_5_CURATED_INPAINTING = 'nai-diffusion-4-5-curated-inpainting'
 
@@ -141,7 +144,8 @@ INPAINTING_MODEL_LIST = [
     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
+    Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING,
+    Model.NAI_DIFFUSION_4_5_FULL_INPAINTING,
 ]
 
 PROMOTION = {
@@ -158,17 +162,27 @@ PROMOTION = {
     "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 1120E6A9": 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 F306816B": Model.NAI_DIFFUSION_FURRY_3,
     "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 B9F340FD': Model.NAI_DIFFUSION_4_5_FULL,
+    'NovelAI Diffusion V4.5 F3D95188': Model.NAI_DIFFUSION_4_5_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,
+    "NovelAI Diffusion V4 37442FCA": Model.NAI_DIFFUSION_4_FULL,
+    "NovelAI Diffusion V4 4F49EC75": Model.NAI_DIFFUSION_4_FULL,
+    "NovelAI Diffusion V4 CA4B7203": Model.NAI_DIFFUSION_4_FULL,
+    "NovelAI Diffusion V4 79F47848": Model.NAI_DIFFUSION_4_FULL,
+    "NovelAI Diffusion V4 F6302A9D": Model.NAI_DIFFUSION_4_FULL,
+    "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,
 }
 
 ModelTypeAlias = Optional[Union[Model, str]]
@@ -198,6 +212,9 @@ class SupportCondition:
     numericEmphasis: bool
     encodedVibes: bool
     cfgDelaySigma: int
+    enhancePromptAdd: bool  # For enhance mode, see https://github.com/llmkira/novelai-python/blob/main/playground/enhance.py
+    hasFurryMode: bool
+    img2imgInpainting: bool
 
 
 def get_supported_params(model: Model):
@@ -237,7 +254,10 @@ def get_supported_params(model: Model):
             scaleRecommendedMax=25,
             numericEmphasis=False,
             encodedVibes=False,
-            cfgDelaySigma=19
+            cfgDelaySigma=19,
+            enhancePromptAdd=False,
+            hasFurryMode=False,
+            img2imgInpainting=False
         )
     if model in [Model.NAI_DIFFUSION_2]:
         return SupportCondition(
@@ -260,7 +280,10 @@ def get_supported_params(model: Model):
             scaleRecommendedMax=25,
             numericEmphasis=False,
             encodedVibes=False,
-            cfgDelaySigma=19
+            cfgDelaySigma=19,
+            enhancePromptAdd=False,
+            hasFurryMode=False,
+            img2imgInpainting=False
         )
     if model in [
         Model.NAI_DIFFUSION_XL,
@@ -289,7 +312,10 @@ def get_supported_params(model: Model):
             scaleRecommendedMax=8,
             numericEmphasis=False,
             encodedVibes=False,
-            cfgDelaySigma=19
+            cfgDelaySigma=19,
+            enhancePromptAdd=False,
+            hasFurryMode=False,
+            img2imgInpainting=False
         )
     if model in [
         Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
@@ -299,8 +325,8 @@ def get_supported_params(model: Model):
     ]:
         return SupportCondition(
             controlnet=False,
-            vibetransfer=False,
-            scaleMax=20,
+            vibetransfer=True,
+            scaleMax=10,
             negativePromptGuidance=True,
             noiseSchedule=True,
             inpainting=True,
@@ -317,7 +343,10 @@ def get_supported_params(model: Model):
             scaleRecommendedMax=6,
             numericEmphasis=True,
             encodedVibes=True,
-            cfgDelaySigma=19
+            cfgDelaySigma=19,
+            enhancePromptAdd=False,
+            hasFurryMode=True,
+            img2imgInpainting=False
         )
     if model in [Model.CUSTOM]:
         return SupportCondition(
@@ -340,11 +369,16 @@ def get_supported_params(model: Model):
             scaleRecommendedMax=None,
             numericEmphasis=True,
             encodedVibes=True,
-            cfgDelaySigma=58
+            cfgDelaySigma=58,
+            enhancePromptAdd=False,
+            hasFurryMode=True,
+            img2imgInpainting=False
         )
     if model in [
         Model.NAI_DIFFUSION_4_5_CURATED,
         Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING,
+        Model.NAI_DIFFUSION_4_5_FULL,
+        Model.NAI_DIFFUSION_4_5_FULL_INPAINTING,
     ]:
         return SupportCondition(
             controlnet=False,
@@ -366,7 +400,10 @@ def get_supported_params(model: Model):
             scaleRecommendedMax=None,
             numericEmphasis=True,
             encodedVibes=False,
-            cfgDelaySigma=58
+            cfgDelaySigma=58,
+            enhancePromptAdd=True,
+            hasFurryMode=True,
+            img2imgInpainting=False
         )
     return SupportCondition(
         controlnet=False,
@@ -388,7 +425,10 @@ def get_supported_params(model: Model):
         scaleRecommendedMax=99,
         numericEmphasis=False,
         encodedVibes=False,
-        cfgDelaySigma=19
+        cfgDelaySigma=19,
+        enhancePromptAdd=False,
+        hasFurryMode=False,
+        img2imgInpainting=False
     )
 
 
@@ -400,7 +440,7 @@ 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)
+        return PROMOTION.get(hashcode, Model.NAI_DIFFUSION_4_5_FULL)
     if "NovelAI Diffusion V4" in hashcode:
         return PROMOTION.get(hashcode, Model.NAI_DIFFUSION_4_CURATED_PREVIEW)
     return PROMOTION.get(hashcode, None)
@@ -414,12 +454,20 @@ def get_modifiers(model: Model) -> Modifier:
     """
     if model in [
         Model.CUSTOM,
+        Model.NAI_DIFFUSION_4_5_FULL,
+        Model.NAI_DIFFUSION_4_5_FULL_INPAINTING
+    ]:
+        return Modifier(
+            qualityTags="",
+            suffix=", location, very aesthetic, masterpiece, no text"
+        )
+    if model in [
         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"
+            suffix=", very aesthetic, location, masterpiece, no text, -0.8::feet::, rating:general"
         )
     if model in [
         Model.NAI_DIFFUSION_4_FULL,
@@ -487,6 +535,8 @@ def filter_by_model_noise_schedule(model: Model, noise_schedule: List[NoiseSched
     if model in [
         Model.NAI_DIFFUSION_4_5_CURATED,
         Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING,
+        Model.NAI_DIFFUSION_4_5_FULL,
+        Model.NAI_DIFFUSION_4_5_FULL_INPAINTING,
         Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
         Model.NAI_DIFFUSION_4_FULL,
         Model.NAI_DIFFUSION_4_FULL_INPAINTING,
@@ -547,34 +597,42 @@ def get_default_noise_schedule(sample_type: Sampler) -> NoiseSchedule:
 
 
 def get_model_group(model: ModelTypeAlias) -> ModelGroups:
-    # 一般情况禁止转换
-    if isinstance(model, Enum):
-        model = model.value
-    else:
-        model = str(model)
+    """
+    Get model group
+    If the model is not in the mapping, return STABLE_DIFFUSION
+    :param model: Model enum or model name string
+    :return: Model group
+    """
+    if isinstance(model, str):
+        try:
+            model = Model(model)
+        except ValueError:
+            return ModelGroups.STABLE_DIFFUSION
     mapping = {
-        "stable-diffusion": ModelGroups.STABLE_DIFFUSION,
-        "nai-diffusion": ModelGroups.STABLE_DIFFUSION,
-        "safe-diffusion": ModelGroups.STABLE_DIFFUSION,
-        "waifu-diffusion": ModelGroups.STABLE_DIFFUSION,
-        "nai-diffusion-furry": ModelGroups.STABLE_DIFFUSION,
-        "curated-diffusion-test": ModelGroups.STABLE_DIFFUSION,
-        "nai-diffusion-inpainting": ModelGroups.STABLE_DIFFUSION,
-        "safe-diffusion-inpainting": ModelGroups.STABLE_DIFFUSION,
-        "furry-diffusion-inpainting": ModelGroups.STABLE_DIFFUSION,
-        "nai-diffusion-2": ModelGroups.STABLE_DIFFUSION_GROUP_2,
-        "nai-diffusion-xl": ModelGroups.STABLE_DIFFUSION_XL,
-        "nai-diffusion-3": ModelGroups.STABLE_DIFFUSION_XL,
-        "nai-diffusion-3-inpainting": ModelGroups.STABLE_DIFFUSION_XL,
-        "custom": ModelGroups.V4,
-        "nai-diffusion-furry-3": ModelGroups.STABLE_DIFFUSION_XL_FURRY,
-        "nai-diffusion-furry-3-inpainting": ModelGroups.STABLE_DIFFUSION_XL_FURRY,
-        "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-5-curated': ModelGroups.V4,
-        'nai-diffusion-4-5-curated-inpainting': ModelGroups.V4,
+        Model.STABLE_DIFFUSION: ModelGroups.STABLE_DIFFUSION,
+        Model.NAI_DIFFUSION: ModelGroups.STABLE_DIFFUSION,
+        Model.SAFE_DIFFUSION: ModelGroups.STABLE_DIFFUSION,
+        Model.WAIFU_DIFFUSION: ModelGroups.STABLE_DIFFUSION,
+        Model.NAI_DIFFUSION_FURRY: ModelGroups.STABLE_DIFFUSION,
+        Model.CURATED_DIFFUSION_TEST: ModelGroups.STABLE_DIFFUSION,
+        Model.NAI_DIFFUSION_INPAINTING: ModelGroups.STABLE_DIFFUSION,
+        Model.SAFE_DIFFUSION_INPAINTING: ModelGroups.STABLE_DIFFUSION,
+        Model.FURRY_DIFFUSION_INPAINTING: ModelGroups.STABLE_DIFFUSION,
+        Model.NAI_DIFFUSION_2: ModelGroups.STABLE_DIFFUSION_GROUP_2,
+        Model.NAI_DIFFUSION_XL: ModelGroups.STABLE_DIFFUSION_XL,
+        Model.NAI_DIFFUSION_3: ModelGroups.STABLE_DIFFUSION_XL,
+        Model.NAI_DIFFUSION_3_INPAINTING: ModelGroups.STABLE_DIFFUSION_XL,
+        Model.CUSTOM: ModelGroups.V4,
+        Model.NAI_DIFFUSION_FURRY_3: ModelGroups.STABLE_DIFFUSION_XL_FURRY,
+        Model.NAI_DIFFUSION_FURRY_3_INPAINTING: ModelGroups.STABLE_DIFFUSION_XL_FURRY,
+        Model.NAI_DIFFUSION_4_CURATED_PREVIEW: ModelGroups.V4,
+        Model.NAI_DIFFUSION_4_FULL: ModelGroups.V4,
+        Model.NAI_DIFFUSION_4_FULL_INPAINTING: ModelGroups.V4,
+        Model.NAI_DIFFUSION_4_CURATED_INPAINTING: ModelGroups.V4,
+        Model.NAI_DIFFUSION_4_5_CURATED: ModelGroups.V4,
+        Model.NAI_DIFFUSION_4_5_CURATED_INPAINTING: ModelGroups.V4,
+        Model.NAI_DIFFUSION_4_5_FULL: ModelGroups.V4,
+        Model.NAI_DIFFUSION_4_5_FULL_INPAINTING: ModelGroups.V4,
     }
     return mapping.get(model, ModelGroups.STABLE_DIFFUSION)
 
@@ -768,6 +826,37 @@ def get_uc_preset(model: ModelTypeAlias) -> List[UcPrompt]:
                 text=""
             ),
         ]
+    elif model in [
+        Model.NAI_DIFFUSION_4_5_FULL,
+        Model.NAI_DIFFUSION_4_5_FULL_INPAINTING,
+    ]:
+        prompts = [
+            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"
+            ),
+            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"
+            ),
+            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"
+            ),
+            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"
+            ),
+            UcPrompt(
+                category="none",
+                name="none",
+                text=""
+            ),
+        ]
     return prompts
 
 

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

@@ -3,7 +3,7 @@ from enum import Enum
 
 class ReqType(Enum):
     """
-    typing.Literal["bg-removal", "colorize", "lineart", "sketch", "emotion", "declutter"]
+    typing.Literal["bg-removal", "colorize", "lineart", "sketch", "emotion", "declutter", "declutter-keep-bubbles"]
     """
     BG_REMOVAL = "bg-removal"
     COLORIZE = "colorize"
@@ -11,6 +11,7 @@ class ReqType(Enum):
     SKETCH = "sketch"
     EMOTION = "emotion"
     DECLUTTER = "declutter"
+    DECLUTTER_KEEP_BUBBLES = "declutter-keep-bubbles"
 
 
 class Moods(Enum):