novelai-python 0.4.7__tar.gz → 0.4.9__tar.gz

{novelai_python-0.4.7 → novelai_python-0.4.9}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.4.7
+Version: 0.4.9
 Summary: NovelAI Python Binding With Pydantic
 Author-Email: sudoskys <coldlando@hotmail.com>
 License: Apache License 2.0
 Project-URL: Repository, https://github.com/LlmKira/novelai-python/
 Project-URL: Issues, https://github.com/LlmKira/novelai-python/issues
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Requires-Dist: elara>=0.5.5
 Requires-Dist: loguru>=0.7.2
 Requires-Dist: pydantic-settings>=2.1.0
@@ -43,6 +43,8 @@ Description-Content-Type: text/markdown
 
 The goal of this repository is to use Pydantic to build legitimate requests to access the NovelAI API service.
 
+> Python >= 3.9 is required.
+
 ### Roadmap 🚧
 
 - [x] tool.random_prompt
@@ -113,17 +115,18 @@ import asyncio
 import os
 
 from dotenv import load_dotenv
+from pydantic import SecretStr
 
-from novelai_python import APIError, Login
+from novelai_python import APIError, LoginCredential
 from novelai_python.sdk.ai.generate import TextLLMModel, LLM
 
 load_dotenv()
 username = os.getenv("NOVELAI_USER", None)
 assert username is not None
 # credential = JwtCredential(jwt_token=SecretStr(jwt))
-login_credential = Login.build(
-    user_name=os.getenv("NOVELAI_USER"),
-    password=os.getenv("NOVELAI_PASS")
+login_credential = LoginCredential(
+    username=os.getenv("NOVELAI_USER"),
+    password=SecretStr(os.getenv("NOVELAI_PASS"))
 )
 
 

{novelai_python-0.4.7 → novelai_python-0.4.9}/README.md

@@ -9,6 +9,8 @@
 
 The goal of this repository is to use Pydantic to build legitimate requests to access the NovelAI API service.
 
+> Python >= 3.9 is required.
+
 ### Roadmap 🚧
 
 - [x] tool.random_prompt
@@ -79,17 +81,18 @@ import asyncio
 import os
 
 from dotenv import load_dotenv
+from pydantic import SecretStr
 
-from novelai_python import APIError, Login
+from novelai_python import APIError, LoginCredential
 from novelai_python.sdk.ai.generate import TextLLMModel, LLM
 
 load_dotenv()
 username = os.getenv("NOVELAI_USER", None)
 assert username is not None
 # credential = JwtCredential(jwt_token=SecretStr(jwt))
-login_credential = Login.build(
-    user_name=os.getenv("NOVELAI_USER"),
-    password=os.getenv("NOVELAI_PASS")
+login_credential = LoginCredential(
+    username=os.getenv("NOVELAI_USER"),
+    password=SecretStr(os.getenv("NOVELAI_PASS"))
 )
 
 

{novelai_python-0.4.7 → novelai_python-0.4.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "novelai-python"
-version = "0.4.7"
+version = "0.4.9"
 description = "NovelAI Python Binding With Pydantic"
 authors = [
     { name = "sudoskys", email = "coldlando@hotmail.com" },
@@ -27,7 +27,7 @@ dependencies = [
     "regex>=2023.12.25",
     "tokenizers>=0.15.2",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 readme = "README.md"
 
 [project.license]

{novelai_python-0.4.7 → novelai_python-0.4.9}/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.7 → novelai_python-0.4.9}/src/novelai_python/sdk/ai/generate/__init__.py

@@ -24,7 +24,7 @@ from ....utils.encode import tokens_to_b64
 
 class LLM(ApiBaseModel):
     """
-    LLM Stream for /ai/generate-stream
+    LLM for /ai/generate
     """
     _endpoint: str = PrivateAttr("https://api.novelai.net")
     input: str = Field(..., description="Base64 encoded token text")
@@ -184,28 +184,28 @@ class LLM(ApiBaseModel):
                 message = _msg.get("message", "Unknown error")
                 if status_code == 400:
                     raise APIError(
-                        "A validation error occured.",
+                        f"A validation error occured. {message}",
                         request=request_data, code=status_code, response=_msg
                     )
 
                 elif status_code == 401:
                     raise APIError(
-                        "Access Token is incorrect.",
+                        f"Access Token is incorrect. {message}",
                         request=request_data, code=status_code, response=_msg
                     )
                 elif status_code == 402:
                     raise APIError(
-                        "An active subscription is required to access this endpoint.",
+                        f"An active subscription is required to access this endpoint. {message}",
                         request=request_data, code=status_code, response=_msg
                     )
                 elif status_code == 409:
                     raise APIError(
-                        "A conflict error occured.",
+                        f"A conflict error occured. {message}",
                         request=request_data, code=status_code, response=_msg
                     )
                 else:
                     raise APIError(
-                        f"An unknown error occured.{response.status_code}",
+                        f"An unknown error occured. {response.status_code} {message}",
                         request=request_data, code=status_code, response=_msg
                     )
             else:

{novelai_python-0.4.7 → novelai_python-0.4.9}/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):
@@ -71,7 +71,7 @@ def generate_order(request_body: dict) -> List[int]:
     order_list = []
     for member in Order:
         key, order = member.value
-        if key in request_body and request_body[key]:
+        if key in request_body and request_body[key] is None:
             order_list.append(order)
     order_list.sort()  # ensures the order list is properly sorted according to the true order
     return order_list

{novelai_python-0.4.7 → novelai_python-0.4.9}/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.7 → novelai_python-0.4.9}/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.7 → novelai_python-0.4.9}/src/novelai_python/server.py

@@ -190,7 +190,6 @@ async def generate(
         generator = agent.request(session=session)
         async for data in generator:
             data: LLMStreamResp
-            print(data)  # 或者做其他需要的处理
             yield data.text  # Yield data for streaming response
 
     return StreamingResponse(generator())
@@ -227,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.7 → novelai_python-0.4.9}/src/novelai_python/tool/image_metadata/__init__.py

@@ -3,7 +3,7 @@ import base64
 import json
 from io import BytesIO
 from pathlib import Path
-from typing import Union
+from typing import Union, Optional, List
 
 import numpy as np
 from PIL import Image
@@ -36,8 +36,10 @@ class ImageMetadata(BaseModel):
         hide_debug_overlay: bool = None
         noise_schedule: str = None
         legacy_v3_extend: bool = None
-        reference_information_extracted: float = None
-        reference_strength: float = None
+        reference_information_extracted: Optional[float] = None
+        reference_strength: Optional[float] = None
+        reference_strength_multiple: Optional[List[float]] = None
+        reference_information_extracted_multiple: Optional[List[float]] = None
         sampler: str = None
         controlnet_strength: float = None
         controlnet_model: Union[None, str] = None
@@ -58,6 +60,29 @@ class ImageMetadata(BaseModel):
         def negative_prompt(self):
             return self.uc
 
+        @property
+        def vibe_transfer_strength(self) -> List[float]:
+            """
+            Get the vibe transfer strength totally
+            :return: List[float]
+            """
+            if self.reference_strength_multiple:
+                return self.reference_strength_multiple
+            reference_strength = [] if self.reference_strength is None else [self.reference_strength]
+            return reference_strength
+
+        @property
+        def vibe_transfer_information(self) -> List[float]:
+            """
+            Get the vibe transfer information totally
+            :return: List[float]
+            """
+            if self.reference_information_extracted_multiple:
+                return self.reference_information_extracted_multiple
+            reference_information = [] if self.reference_information_extracted is None else [
+                self.reference_information_extracted]
+            return reference_information
+
     Title: str = "AI generated image"
     Software: str = "NovelAI"
     Source: str = None

{novelai_python-0.4.7 → novelai_python-0.4.9}/src/novelai_python/tool/paint_mask/__init__.py

@@ -2,12 +2,13 @@ import cv2 as cv
 import numpy as np
 
 
-def create_mask_from_sketch(original_img_bytes: bytes,
-                            sketch_img_bytes: bytes,
-                            min_block_size: int = 15,
-                            jagged_edges: bool = True,
-                            output_format: str = '.png'
-                            ) -> bytes:
+def create_mask_from_sketch(
+        original_img_bytes: bytes,
+        sketch_img_bytes: bytes,
+        min_block_size: int = 15,
+        jagged_edges: bool = True,
+        output_format: str = '.png'
+) -> bytes:
     """
     Function to create a mask from original and sketch images input as bytes. Returns BytesIO object.