novelai-python 0.4.8__tar.gz → 0.4.10__tar.gz

{novelai_python-0.4.8 → novelai_python-0.4.10}/PKG-INFO

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

{novelai_python-0.4.8 → novelai_python-0.4.10}/pyproject.toml

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

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/_response/ai/generate.py

@@ -20,4 +20,4 @@ class LLMResp(BaseModel):
 
     @staticmethod
     def decode_token(token_str, model: TextLLMModel) -> str:
-        return LLMTokenizer.decode(b64_to_tokens(token_str), tokenizer_name=TOKENIZER.get(model))
+        return LLMTokenizer().decode(b64_to_tokens(token_str), tokenizer_name=TOKENIZER.get(model))

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/_response/ai/generate_image.py

@@ -10,11 +10,12 @@ from pydantic import BaseModel
 from ..schema import RespBase
 
 
-class ImageGenerateResp(RespBase):
-    class RequestParams(BaseModel):
-        endpoint: str
-        raw_request: dict = None
+class RequestParams(BaseModel):
+    endpoint: str
+    raw_request: dict = None
+
 
+class ImageGenerateResp(RespBase):
     meta: RequestParams
     files: List[Tuple[str, bytes]] = None
 

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/_response/ai/generate_stream.py

@@ -20,4 +20,4 @@ class LLMStreamResp(BaseModel):
 
     @staticmethod
     def decode(token_str, model: TextLLMModel) -> str:
-        return LLMTokenizer.decode(b64_to_tokens(token_str), tokenizer_name=TOKENIZER.get(model))
+        return LLMTokenizer().decode(b64_to_tokens(token_str), tokenizer_name=TOKENIZER.get(model))

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/sdk/ai/generate/__init__.py

@@ -64,8 +64,9 @@ class LLM(ApiBaseModel):
 
     @model_validator(mode="after")
     def validate_model(self):
+        tokenizer = LLMTokenizer()
         if isinstance(self.input, str):
-            prompt = LLMTokenizer.encode(self.input, tokenizer_name=TOKENIZER.get(self.model))
+            prompt = tokenizer.encode(self.input, tokenizer_name=TOKENIZER.get(self.model))
             self.input = tokens_to_b64(prompt)
         if self.parameters.stop_sequences:
             if not isinstance(self.parameters.stop_sequences, list):
@@ -73,7 +74,7 @@ class LLM(ApiBaseModel):
             stop_sequences = []
             for i, obj in enumerate(self.parameters.stop_sequences):
                 if isinstance(obj, str):
-                    stop_sequences.append(LLMTokenizer.encode(obj, tokenizer_name=TOKENIZER.get(self.model)))
+                    stop_sequences.append(tokenizer.encode(obj, tokenizer_name=TOKENIZER.get(self.model)))
                 elif not isinstance(obj, list):
                     raise ValueError(
                         f"Expected type 'str' or 'list' for item #{i} of 'stop_sequences', " f"but got '{type(obj)}'"

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/sdk/ai/generate/_enum.py

@@ -1,6 +1,6 @@
 # Description: Enum class for TextLLMModel
 from enum import Enum
-from typing import List, Dict
+from typing import List
 
 
 class TextLLMModel(Enum):

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/sdk/ai/generate_image/__init__.py

@@ -28,7 +28,7 @@ from ._const import len_values, tempmin_value, sm_value, dyn_value, map_value
 from ._enum import Model, Sampler, NoiseSchedule, ControlNetModel, Action, UCPreset, INPAINTING_MODEL_LIST
 from ...schema import ApiBaseModel
 from ...._exceptions import APIError, AuthError, ConcurrentGenerationError, SessionHttpError
-from ...._response.ai.generate_image import ImageGenerateResp
+from ...._response.ai.generate_image import ImageGenerateResp, RequestParams
 from ....credential import CredentialBase
 from ....utils import try_jsonfy
 
@@ -453,7 +453,7 @@ class GenerateImageInfer(ApiBaseModel):
                 )
         per_sample = max(math.ceil(per_sample * strength), 2)
 
-        if uncond_scale != 1.0:
+        if int(uncond_scale) != 1:
             per_sample = math.ceil(per_sample * 1.3)
 
         return per_sample * n_samples
@@ -755,7 +755,7 @@ class GenerateImageInfer(ApiBaseModel):
                     data = zip_file.read(filename)
                     unzip_content.append((filename, data))
             return ImageGenerateResp(
-                meta=ImageGenerateResp.RequestParams(
+                meta=RequestParams(
                     endpoint=self.base_url,
                     raw_request=request_data,
                 ),

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/sdk/ai/generate_image/_enum.py

@@ -93,6 +93,9 @@ class Model(Enum):
     NAI_DIFFUSION_3 = "nai-diffusion-3"
     NAI_DIFFUSION_3_INPAINTING = "nai-diffusion-3-inpainting"
 
+    NAI_DIFFUSION_FURRY_3 = "nai-diffusion-furry-3"
+    NAI_DIFFUSION_FURRY_3_INPAINTING = "nai-diffusion-furry-3-inpainting"
+
     NAI_DIFFUSION = "nai-diffusion"
     NAI_DIFFUSION_2 = "nai-diffusion-2"
     NAI_DIFFUSION_INPAINTING = "nai-diffusion-inpainting"
@@ -107,11 +110,13 @@ class Model(Enum):
     CUSTOM = "custom"
 
 
-INPAINTING_MODEL_LIST = [Model.NAI_DIFFUSION_3_INPAINTING,
-                         Model.NAI_DIFFUSION_INPAINTING,
-                         Model.SAFE_DIFFUSION_INPAINTING,
-                         Model.FURRY_DIFFUSION_INPAINTING
-                         ]
+INPAINTING_MODEL_LIST = [
+    Model.NAI_DIFFUSION_3_INPAINTING,
+    Model.NAI_DIFFUSION_INPAINTING,
+    Model.SAFE_DIFFUSION_INPAINTING,
+    Model.FURRY_DIFFUSION_INPAINTING,
+    Model.NAI_DIFFUSION_FURRY_3_INPAINTING
+]
 
 PROMOTION = {
     "Stable Diffusion 1D44365E": Model.SAFE_DIFFUSION,
@@ -127,4 +132,7 @@ PROMOTION = {
     "Stable Diffusion XL B0BDF6C1": Model.NAI_DIFFUSION_3,
     "Stable Diffusion XL C1E1DE52": 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 9CC2F394": Model.NAI_DIFFUSION_FURRY_3,
 }

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/server.py

@@ -226,7 +226,11 @@ async def generate_voice(
     """
     生成图片
     :param current_token: Authorization
-    :param req: GenerateImageInfer
+    :param text: str
+    :param voice: int
+    :param seed: Optional[str]
+    :param opus: bool
+    :param version: Union[Literal["v2", "v1"], str]
     :return:
     """
     try:

{novelai_python-0.4.8 → novelai_python-0.4.10}/src/novelai_python/tokenizer/__init__.py

@@ -117,68 +117,66 @@ class SentencePiece(sentencepiece.SentencePieceProcessor):
         return "".join((decoded_parts[0], *itertools.chain.from_iterable(zip(junctions, decoded_parts[1:]))))
 
 
+def singleton(cls):
+    instances = {}
+
+    def wrapper(*args, **kwargs):
+        if cls not in instances:
+            instances[cls] = cls(*args, **kwargs)
+        return instances[cls]
+
+    return wrapper
+
+
 # MIT: https://github.com/Aedial/novelai-api/blob/794c4f3d89cc86df3c7d2c401b320f1822822ac0/novelai_api/Tokenizer.py#L118
+@singleton
 class LLMTokenizer:
     """
     Abstraction of the tokenizer behind each Model
     """
 
-    _GPT2_PATH = tokenizers_path / "gpt2_tokenizer.json"
-    _GPT2_TOKENIZER = tokenizers.Tokenizer.from_file(str(_GPT2_PATH))
-
-    _GENJI_PATH = tokenizers_path / "gpt2-genji_tokenizer.json"
-    _GENJI_TOKENIZER = tokenizers.Tokenizer.from_file(str(_GENJI_PATH))
-
-    _PILE_PATH = tokenizers_path / "pile_tokenizer.json"
-    _PILE_TOKENIZER = tokenizers.Tokenizer.from_file(str(_PILE_PATH))
-
+    _GPT2_PATH = "gpt2_tokenizer.json"
+    _GENJI_PATH = "gpt2-genji_tokenizer.json"
+    _PILE_PATH = "pile_tokenizer.json"
     # ORIGIN TODO: check differences from NAI tokenizer (from my limited testing, there is None)
-    _CLIP_TOKENIZER = SimpleTokenizer()
-
-    _NERDSTASH_TOKENIZER_v1_PATH = str(tokenizers_path / "nerdstash_v1.model")
-    _NERDSTASH_TOKENIZER_v1 = SentencePiece(_NERDSTASH_TOKENIZER_v1_PATH)
-
-    _NERDSTASH_TOKENIZER_v2_PATH = str(tokenizers_path / "nerdstash_v2.model")
-    _NERDSTASH_TOKENIZER_v2 = SentencePiece(_NERDSTASH_TOKENIZER_v2_PATH)
-
-    _tokenizers = {
-        "gpt2": _GPT2_TOKENIZER,
-        "gpt2-genji": _GENJI_TOKENIZER,
-        "pile": _PILE_TOKENIZER,
-        "clip": _CLIP_TOKENIZER,
-        "nerdstash_v1": _NERDSTASH_TOKENIZER_v1,
-        "nerdstash_v2": _NERDSTASH_TOKENIZER_v2,
-    }
-
-    @classmethod
-    def decode(cls, o: List[int], tokenizer_name: str) -> str:
-        """
-        Decode the provided tokens using the chosen tokenizer
-        :param tokenizer_name: Name of the tokenizer to use
-        :param o: List of tokens to decode
+    _NERDSTASH_TOKENIZER_v1_PATH = "nerdstash_v1.model"
+    _NERDSTASH_TOKENIZER_v2_PATH = "nerdstash_v2.model"
+
+    def __init__(self, tokenizer_path=tokenizers_path):
+        self._GPT2_TOKENIZER = tokenizers.Tokenizer.from_file(str(tokenizer_path / self._GPT2_PATH))
+        self._GENJI_TOKENIZER = tokenizers.Tokenizer.from_file(str(tokenizer_path / self._GENJI_PATH))
+        self._PILE_TOKENIZER = tokenizers.Tokenizer.from_file(str(tokenizer_path / self._PILE_PATH))
+        self._CLIP_TOKENIZER = SimpleTokenizer()
+        try:
+            self._NERDSTASH_TOKENIZER_v1 = SentencePiece(str(tokenizer_path / self._NERDSTASH_TOKENIZER_v1_PATH))
+            self._NERDSTASH_TOKENIZER_v2 = SentencePiece(str(tokenizer_path / self._NERDSTASH_TOKENIZER_v2_PATH))
+        except FileNotFoundError as exc:
+            logger.warning(
+                "Nerdstash tokenizers not found, please check model path or "
+                "there cannot be special text such as foreign languages, spaces, etc. in your model path."
+            )
+            raise exc
+        self._tokenizers = {
+            "gpt2": self._GPT2_TOKENIZER,
+            "gpt2-genji": self._GENJI_TOKENIZER,
+            "pile": self._PILE_TOKENIZER,
+            "clip": self._CLIP_TOKENIZER,
+            "nerdstash_v1": self._NERDSTASH_TOKENIZER_v1,
+            "nerdstash_v2": self._NERDSTASH_TOKENIZER_v2,
+        }
 
-        :return: Text the provided tokens decode into
-        """
-        if tokenizer_name not in cls._tokenizers:
+    def decode(self, o: List[int], tokenizer_name: str) -> str:
+        if tokenizer_name not in self._tokenizers:
             raise NotImplementedError(f"Tokenizer {tokenizer_name} not recognized")
-        tokenizer = cls._tokenizers[tokenizer_name]
+        tokenizer = self._tokenizers[tokenizer_name]
 
         return tokenizer.decode(o)
 
-    @classmethod
-    def encode(cls, o: str, tokenizer_name: str) -> List[int]:
-        """
-        Encode the provided text using the chosen tokenizer
-
-        :param tokenizer_name: Name of the tokenizer to use
-        :param o: Text to encode
-
-        :return: List of tokens the provided text encodes into
-        """
-        if tokenizer_name not in cls._tokenizers:
+    def encode(self, o: str, tokenizer_name: str) -> List[int]:
+        if tokenizer_name not in self._tokenizers:
             raise NotImplementedError(f"Tokenizer {tokenizer_name} not recognized")
 
-        tokenizer = cls._tokenizers[tokenizer_name]
+        tokenizer = self._tokenizers[tokenizer_name]
         if isinstance(tokenizer, tokenizers.Tokenizer):
             return tokenizer.encode(o).ids
         if isinstance(tokenizer, (SimpleTokenizer, sentencepiece.SentencePieceProcessor)):