novelai-python 0.7.3__tar.gz → 0.7.5__tar.gz

{novelai_python-0.7.3 → novelai_python-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.7.3
+Version: 0.7.5
 Summary: NovelAI Python Binding With Pydantic
 Author-Email: sudoskys <coldlando@hotmail.com>
 License: Apache License 2.0
@@ -81,7 +81,7 @@ load_dotenv()
 session = ApiCredential(api_token=SecretStr(os.getenv("NOVELAI_JWT")))  # pst-***
 # For security reasons, storing user credentials in plaintext is strongly discouraged.
 
-prompt = "1girl, year 2023,dynamic angle,  best quality, amazing quality, very aesthetic, absurdres"
+prompt = "2girls, fisheye, closeup, from above"
 
 
 async def main():
@@ -90,19 +90,19 @@ async def main():
         model=Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
         character_prompts=[
             Character(
-                prompt="1girl",
+                prompt="1girl, head tilt, short hair, black hair, grey eyes, small breasts, looking at viewer",
                 uc="red hair",
-                center=PositionMap.AUTO
+                center=PositionMap.B2
             ),
             Character(
-                prompt="1boy",
-                center=PositionMap.E5
+                prompt="1girl, fox ears, fox tail, white hair, white tail, white ears",
+                uc="black hair",
+                center=PositionMap.D2
             )
         ],
         sampler=Sampler.K_EULER_ANCESTRAL,
         ucPreset=UCPreset.TYPE0,
         # Recommended, using preset negative_prompt depends on selected model
-        qualitySuffix=True,
         qualityToggle=True,
         decrisp_mode=False,
         variety_boost=True,

{novelai_python-0.7.3 → novelai_python-0.7.5}/README.md

@@ -43,7 +43,7 @@ load_dotenv()
 session = ApiCredential(api_token=SecretStr(os.getenv("NOVELAI_JWT")))  # pst-***
 # For security reasons, storing user credentials in plaintext is strongly discouraged.
 
-prompt = "1girl, year 2023,dynamic angle,  best quality, amazing quality, very aesthetic, absurdres"
+prompt = "2girls, fisheye, closeup, from above"
 
 
 async def main():
@@ -52,19 +52,19 @@ async def main():
         model=Model.NAI_DIFFUSION_4_CURATED_PREVIEW,
         character_prompts=[
             Character(
-                prompt="1girl",
+                prompt="1girl, head tilt, short hair, black hair, grey eyes, small breasts, looking at viewer",
                 uc="red hair",
-                center=PositionMap.AUTO
+                center=PositionMap.B2
             ),
             Character(
-                prompt="1boy",
-                center=PositionMap.E5
+                prompt="1girl, fox ears, fox tail, white hair, white tail, white ears",
+                uc="black hair",
+                center=PositionMap.D2
             )
         ],
         sampler=Sampler.K_EULER_ANCESTRAL,
         ucPreset=UCPreset.TYPE0,
         # Recommended, using preset negative_prompt depends on selected model
-        qualitySuffix=True,
         qualityToggle=True,
         decrisp_mode=False,
         variety_boost=True,

{novelai_python-0.7.3 → novelai_python-0.7.5}/pyproject.toml

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

{novelai_python-0.7.3 → novelai_python-0.7.5}/src/novelai_python/credential/ApiToken.py

@@ -42,5 +42,5 @@ class ApiCredential(CredentialBase):
     @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-")
+            logger.warning("api token should start with `pst-`")
         return v

{novelai_python-0.7.3 → novelai_python-0.7.5}/src/novelai_python/sdk/ai/_enum.py

@@ -281,7 +281,7 @@ def get_modifiers(model: Model) -> Modifier:
     if model in [Model.CUSTOM, Model.NAI_DIFFUSION_4_CURATED_PREVIEW]:
         return Modifier(
             qualityTags="",
-            suffix=", rating:general, amazing quality, very aesthetic, absurdres"
+            suffix=", rating:general, best quality, very aesthetic, absurdres"
         )
     if model in [Model.NAI_DIFFUSION_2]:
         return Modifier(

{novelai_python-0.7.3 → novelai_python-0.7.5}/src/novelai_python/sdk/ai/generate_image/__init__.py

@@ -344,10 +344,18 @@ class Params(BaseModel):
 
 class GenerateImageInfer(ApiBaseModel):
     _endpoint: str = PrivateAttr("https://image.novelai.net")
+    """Endpoint"""
+
+    @property
+    def endpoint(self):
+        return self._endpoint
+
+    @endpoint.setter
+    def endpoint(self, value):
+        self._endpoint = value
+
     _mutual_exclusion: bool = PrivateAttr(False)
     """Positive words and negative words are mutually exclusive, and conflicting negative words are deleted first."""
-    _quality_modifier: bool = PrivateAttr(True)
-    """Add Quality Modifier To Input"""
 
     def set_mutual_exclusion(self, value: bool):
         """
@@ -361,27 +369,6 @@ class GenerateImageInfer(ApiBaseModel):
         self._mutual_exclusion = bool(value)
         return self
 
-    def set_quality_modifier(self, value: bool):
-        """
-        **Enable This will modify the input prompt.**
-        Default is True.
-
-        Add Quality Modifier To Input.
-        Whether to add the quality vocabulary used by the web application.
-        :param value:
-        :return:
-        """
-        self._quality_modifier = bool(value)
-        return self
-
-    @property
-    def endpoint(self):
-        return self._endpoint
-
-    @endpoint.setter
-    def endpoint(self, value):
-        self._endpoint = value
-
     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"
@@ -467,8 +454,8 @@ class GenerateImageInfer(ApiBaseModel):
                 )
                 return _prompt
 
-        if self._quality_modifier:
-            logger.trace("Enhancing input with quality modifier, will modify input prompt.")
+        if self.parameters.qualityToggle:
+            logger.trace("Enhancing input with qualityToggle, will modify input prompt.")
             self.input = enhance_message(self.input)
 
         if self._mutual_exclusion:

{novelai_python-0.7.3 → novelai_python-0.7.5}/src/novelai_python/sdk/ai/generate_voice/__init__.py

@@ -107,7 +107,7 @@ class VoiceGenerate(ApiBaseModel):
         return cls(
             text=text,
             seed=speaker.seed,
-            voice=speaker.voice,
+            voice=speaker.sid,
             opus=opus,
             version=speaker.version
         )

{novelai_python-0.7.3 → novelai_python-0.7.5}/src/novelai_python/sdk/ai/generate_voice/_enum.py

@@ -7,30 +7,30 @@ class Speaker(BaseModel):
     """
     Speaker for /ai/generated_voice
     """
-    voice: int = -1
+    sid: int = -1
     seed: str = "kurumuz12"
     name: str
     category: str
 
     @property
     def version(self):
-        return "v2" if self.voice == -1 else "v1"
+        return "v2" if self.sid == -1 else "v1"
 
 
 class VoiceSpeakerV1(Enum):
     """
     Speaker for /ai/generated_voice
     """
-    Cyllene = Speaker(voice=17, name="Cyllene", category="female")
-    Leucosia = Speaker(voice=95, name="Leucosia", category="female")
-    Crina = Speaker(voice=44, name="Crina", category="female")
-    Hespe = Speaker(voice=80, name="Hespe", category="female")
-    Ida = Speaker(voice=106, name="Ida", category="female")
-    Alseid = Speaker(voice=6, name="Alseid", category="male")
-    Daphnis = Speaker(voice=10, name="Daphnis", category="male")
-    Echo = Speaker(voice=16, name="Echo", category="male")
-    Thel = Speaker(voice=41, name="Thel", category="male")
-    Nomios = Speaker(voice=77, name="Nomios", category="male")
+    Cyllene = Speaker(sid=17, name="Cyllene", category="female")
+    Leucosia = Speaker(sid=95, name="Leucosia", category="female")
+    Crina = Speaker(sid=44, name="Crina", category="female")
+    Hespe = Speaker(sid=80, name="Hespe", category="female")
+    Ida = Speaker(sid=106, name="Ida", category="female")
+    Alseid = Speaker(sid=6, name="Alseid", category="male")
+    Daphnis = Speaker(sid=10, name="Daphnis", category="male")
+    Echo = Speaker(sid=16, name="Echo", category="male")
+    Thel = Speaker(sid=41, name="Thel", category="male")
+    Nomios = Speaker(sid=77, name="Nomios", category="male")
     # SeedInput = Speaker(sid=-1, name="Seed Input", category="custom")