From d788c841c64928ba6f3494bea97bf94416d37574 Mon Sep 17 00:00:00 2001 From: Alert Aigul Date: Fri, 13 Jun 2025 00:43:12 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20fixes(auth&uc):=20Uppercase=20us?= =?UTF-8?q?ernames=20and=20mutual=20exclusion=20fixes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 2 +- src/novelai_python/sdk/ai/generate_image/__init__.py | 4 ++-- src/novelai_python/utils/encode.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 06db6f6..b55848a 100755 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "novelai-python" -version = "0.7.11" +version = "0.7.12" description = "NovelAI Python Binding With Pydantic" authors = [ { name = "sudoskys", email = "coldlando@hotmail.com" }, diff --git a/src/novelai_python/sdk/ai/generate_image/__init__.py b/src/novelai_python/sdk/ai/generate_image/__init__.py index a39f3c5..51255e7 100755 --- a/src/novelai_python/sdk/ai/generate_image/__init__.py +++ b/src/novelai_python/sdk/ai/generate_image/__init__.py @@ -167,14 +167,14 @@ def enhance_message(_prompt): for key in input_prompt: if key in uc_prompt: uc_prompt.pop(key) - self.parameters.negative_prompt = ",".join(uc_prompt.values()) + self.parameters.negative_prompt = ",".join(uc_prompt.values()).strip() # Instantly remove nsfw if input contains it elif "nsfw" in self.input and "nsfw" in self.parameters.negative_prompt: uc_prompt = {x.strip(): x for x in self.parameters.negative_prompt.split(",")} uc_prompt.pop("nsfw", None) - self.parameters.negative_prompt = ",".join(uc_prompt.values()) + self.parameters.negative_prompt = ",".join(uc_prompt.values()).strip() @model_validator(mode="after") def _build_nai4_prompt(self): diff --git a/src/novelai_python/utils/encode.py b/src/novelai_python/utils/encode.py index 606e352..ed5e003 100755 --- a/src/novelai_python/utils/encode.py +++ b/src/novelai_python/utils/encode.py @@ -16,7 +16,7 @@ def encode_access_key(username: str, password: str) -> str: :param password: str (plaintext) :return: str """ - pre_salt = f"{password[:6]}{username}novelai_data_access_key" + pre_salt = f"{password[:6]}{username.lower()}novelai_data_access_key" blake = blake2b(digest_size=16) blake.update(pre_salt.encode())