Merge pull request #124 from LlmKira/dev

🔧 fixes(auth&uc): Uppercase usernames and mutual exclusion fixes.

Author: Alert-Aigul

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" },

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):

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())