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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.4.15
+Version: 0.4.16
 Summary: NovelAI Python Binding With Pydantic
 Author-Email: sudoskys <coldlando@hotmail.com>
 License: Apache License 2.0

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

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

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

@@ -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)
@@ -336,12 +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 = ""
-        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])
-        )
+
+        # 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])
+            )
+
+        # Add quality prompt
         if self.parameters.qualityToggle:
             self.input += ", best quality, amazing quality, very aesthetic, absurdres"
 
@@ -414,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,