novelai-python 0.3.2__tar.gz → 0.3.3__tar.gz

{novelai_python-0.3.2 → novelai_python-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: novelai-python
-Version: 0.3.2
+Version: 0.3.3
 Summary: Novelai Python Binding With Pydantic
 Author-Email: sudoskys <coldlando@hotmail.com>
 License: Apache License 2.0
@@ -39,7 +39,7 @@ The goal of this repository is to use Pydantic to build legitimate requests to a
 - [x] /user/login
 - [x] /user/information
 - [x] /ai/upscale
-- [ ] /ai/generate-image/suggest-tags
+- [x] /ai/generate-image/suggest-tags
 - [ ] /ai/annotate-image
 - [ ] /ai/classify
 - [ ] /ai/generate-prompt

{novelai_python-0.3.2 → novelai_python-0.3.3}/README.md

@@ -12,7 +12,7 @@ The goal of this repository is to use Pydantic to build legitimate requests to a
 - [x] /user/login
 - [x] /user/information
 - [x] /ai/upscale
-- [ ] /ai/generate-image/suggest-tags
+- [x] /ai/generate-image/suggest-tags
 - [ ] /ai/annotate-image
 - [ ] /ai/classify
 - [ ] /ai/generate-prompt

{novelai_python-0.3.2 → novelai_python-0.3.3}/pyproject.toml

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

{novelai_python-0.3.2 → novelai_python-0.3.3}/src/novelai_python/sdk/ai/generate_image/__init__.py

@@ -236,7 +236,7 @@ class GenerateImageInfer(ApiBaseModel):
               seed: int = None,
               steps: int = 28,
               scale: float = 6.0,
-              cfg_rescale: int = 0,
+              cfg_rescale: float = 0,
               sampler: Union[Sampler, str] = Sampler.K_EULER,
               width: int = 832,
               height: int = 1216,

{novelai_python-0.3.2 → novelai_python-0.3.3}/src/novelai_python/utils/random_prompt/__init__.py

@@ -13,7 +13,6 @@ from .tag import (
     socks,
     action, expression, footwears, bottoms, color as colors
 )
-from .tag_artist import rankArtist
 from .tag_character import rankMoods, rankCharacter, rankIdentity
 from .tag_nsfw import nsfw
 
@@ -30,9 +29,11 @@ class RandomPromptGenerator(object):
         :param existing_tags:  a list of existing tags
         :return:  a tag
         """
-        valid_tags = [tag
-                      for tag in tags
-                      if len(tag) < 3 or not tag[2] or any(sub_tag in existing_tags for sub_tag in tag[2])]
+        valid_tags = [
+            tag
+            for tag in tags
+            if len(tag) < 3 or not tag[2] or any(sub_tag in existing_tags for sub_tag in tag[2])
+        ]
         total_weight = sum(tagr[1] for tagr in valid_tags if len(tagr) > 1)
         if total_weight == 0:
             if isinstance(tags, list):
@@ -70,7 +71,7 @@ class RandomPromptGenerator(object):
         has_unique_feature = any(feature in features for feature in unique_features)
         if random.random() < 0.1 and enable_skin_color:
             features.append(self.get_weighted_choice(sinkColor, features))
-        if random.random() < 0.8:
+        if random.random() < 0.7:
             features.append(self.get_weighted_choice(eyeColors, features))
         if random.random() < 0.1:
             features.append(self.get_weighted_choice(eyeCharacteristics, features))
@@ -230,12 +231,6 @@ class RandomPromptGenerator(object):
             return ', '.join(tags)
         if random.random() < 0.3:
             tags.append(self.get_weighted_choice(artStyle, tags))
-        if random.random() < 0.6:
-            tags.append("{" + self.get_weighted_choice(rankArtist, tags) + "}")
-            if random.random() < 0.5:
-                tags.append("[" + self.get_weighted_choice(rankArtist, tags) + "]")
-                if random.random() < 0.4:
-                    tags.append("{{" + self.get_weighted_choice(rankArtist, tags) + "}}")
         c_count = 0
         d_count = 0
         u_count = 0
@@ -286,23 +281,23 @@ class RandomPromptGenerator(object):
                 features = []
                 if random.random() < 0.2:
                     features = self.character_features(nsfw['fu'], None, True, irs)
-                if random.random() < 0.6:
+                if random.random() < 0.3:
                     tags.append(self.get_weighted_choice(nsfw["sex"], tags))
-                if random.random() < 0.6:
+                if random.random() < 0.5:
                     tags.append(self.get_weighted_choice(nsfw["pussy"], tags))
-                if random.random() < 0.6:
+                if random.random() < 0.3:
                     tags.append(self.get_weighted_choice(nsfw["sexMod"], tags))
-                if random.random() < 0.6:
+                if random.random() < 0.5:
                     tags.append(self.get_weighted_choice(nsfw["sexActionMode"], tags))
-                if random.random() < 0.2:
+                if random.random() < 0.1:
                     tags.append(self.get_weighted_choice(nsfw["bdsm"], tags))
-                if random.random() < 0.3:
+                if random.random() < 0.2:
                     tags.append(self.get_weighted_choice(nsfw["sexAccessories"], tags))
                 tags.extend(features)
-        if random.random() < 0.65 and enable_moods:
+        if random.random() < 0.4 and enable_moods:
             # 心情
             tags.append("[" + self.get_weighted_choice(rankMoods, tags) + "]")
-        if random.random() < 0.5 and enable_identity:
+        if random.random() < 0.4 and enable_identity:
             # 身份
             tags.append("[" + self.get_weighted_choice(rankIdentity, tags) + "]")
         if random.random() < 0.2 and enable_character:
@@ -315,9 +310,9 @@ class RandomPromptGenerator(object):
                 num_objects = random.randint(1, 3)
                 for _ in range(num_objects):
                     tags.append(self.get_weighted_choice(backgroundObjects, tags))
-        if random.random() < 0.3:
+        if random.random() < 0.1:
             tags.append(self.get_weighted_choice(cameraPerspective, tags))
-        if random.random() < 0.7:
+        if random.random() < 0.5:
             tags.append(self.get_weighted_choice(cameraAngle, tags))
         for _ in range(c_count):
             if random.random() < 0.2:

novelai_python-0.3.2/src/novelai_python/utils/random_prompt/tag_artist.py

@@ -1,398 +0,0 @@
-# -*- coding: utf-8 -*-
-# @Time    : 2024/1/26 下午5:08
-# @Author  : sudoskys
-# @File    : tag_artist.py
-# @Software: PyCharm
-
-rankArtist = [
-    [
-        "redi_(rasec_asdjh)",
-        50
-    ],
-    [
-        "suoiresnu",
-        41
-    ],
-    [
-        "kulo_jawa",
-        30
-    ],
-    [
-        "sakanaya_(sakanaya952)",
-        25
-    ],
-    [
-        "momisan",
-        20
-    ],
-    [
-        "tansuan_(ensj3875)",
-        19
-    ],
-    [
-        "hitmanatee",
-        18
-    ],
-    [
-        "yoru0409",
-        18
-    ],
-    [
-        "zovokia",
-        14
-    ],
-    [
-        "memeh",
-        13
-    ],
-    [
-        "honashi",
-        13
-    ],
-    [
-        "pinkmill",
-        13
-    ],
-    [
-        "kanjy00u",
-        12
-    ],
-    [
-        "eckert&eich",
-        12
-    ],
-    [
-        "ningen mame",
-        100
-    ],
-    [
-        "ciloranko",
-        100
-    ],
-    [
-        "sho (sho lwlw)",
-        80
-    ],
-    [
-        "tianliang duohe fangdongye",
-        100
-    ],
-    [
-        "alphonse (white datura)",
-        80
-    ],
-    [
-        "rei (sanbonzakura)",
-        100
-    ],
-    [
-        "mamyouda",
-        80
-    ],
-    [
-        "ogipote",
-        100
-    ],
-    [
-        "fuzichoco",
-        100
-    ],
-    [
-        "norza",
-        80
-    ],
-    [
-        "AkiZero1510",
-        100
-    ],
-    [
-        "ATDAN",
-        100
-    ],
-    [
-        "mignon",
-        80
-    ],
-    [
-        "shexyo",
-        100
-    ],
-    [
-        "musashi (dishwasher1910)",
-        100
-    ],
-    [
-        "modare",
-        80
-    ],
-    [
-        "asteroidill",
-        80
-    ],
-    [
-        "potg(piotegu)",
-        80
-    ],
-    [
-        "kedama milk",
-        100
-    ],
-    [
-        "jun (aousa0328)",
-        80
-    ],
-    [
-        "sky freedom",
-        80
-    ],
-    [
-        "ask (askzy)",
-        100
-    ],
-    [
-        "toridamono",
-        100
-    ],
-    [
-        "sencha (senchat)",
-        80
-    ],
-    [
-        "void_0",
-        80
-    ],
-    [
-        "mandrill",
-        100
-    ],
-    [
-        "tokkyu",
-        100
-    ],
-    [
-        "houkisei",
-        80
-    ],
-    [
-        "konya karasue",
-        100
-    ],
-    [
-        "akakura",
-        100
-    ],
-    [
-        "kawacy",
-        100
-    ],
-    [
-        "reoen",
-        100
-    ],
-    [
-        "nixeu",
-        100
-    ],
-    [
-        "cierra_(ra-bit)",
-        100
-    ],
-    [
-        "artistask_(askzy)",
-        100
-    ],
-    [
-        "gomzi",
-        100
-    ],
-    [
-        "you_shimizu",
-        100
-    ],
-    [
-        "demizu_posuka",
-        100
-    ],
-    [
-        "asakuraf",
-        100
-    ],
-    [
-        "ningen_mame",
-        100
-    ],
-    [
-        "sho_(sho_lwlw)",
-        100
-    ],
-    [
-        "alphonse_(white_datura)",
-        100
-    ],
-    [
-        "rei_(sanbonzakura)",
-        100
-    ],
-    [
-        "wlop",
-        100
-    ],
-    [
-        "as109",
-        100
-    ],
-    [
-        "Milkychu",
-        100
-    ],
-    [
-        "Cogecha",
-        100
-    ],
-    [
-        "liduke",
-        100
-    ],
-    [
-        "infukun",
-        100
-    ],
-    [
-        "amazuyu_tatsuki",
-        100
-    ],
-    [
-        "Happ\u014dbi Jin",
-        100
-    ],
-    [
-        "Rella",
-        100
-    ],
-    [
-        "omone hokoma agm",
-        100
-    ],
-    [
-        "toosaka asagi",
-        100
-    ],
-    [
-        "Mochizuki Kei",
-        100
-    ],
-    [
-        "Namie",
-        100
-    ],
-    [
-        "Hoji",
-        100
-    ],
-    [
-        "sy4",
-        100
-    ],
-    [
-        "mika_pikazo",
-        100
-    ],
-    [
-        "momoko(momopoco)",
-        100
-    ],
-    [
-        "rurudo",
-        100
-    ],
-    [
-        "missile228",
-        100
-    ],
-    [
-        "miyase_mahiro",
-        100
-    ],
-    [
-        "touzai(poppin phl95)",
-        100
-    ],
-    [
-        "kukka",
-        100
-    ],
-    [
-        "kantoku",
-        100
-    ],
-    [
-        "poco(asahi age)",
-        100
-    ],
-    [
-        "refeia",
-        100
-    ],
-    [
-        "ke-ta",
-        100
-    ],
-    [
-        "anmi",
-        100
-    ],
-    [
-        "tiv",
-        100
-    ],
-    [
-        "chen_bin",
-        100
-    ],
-    [
-        "lm7 (op-center)",
-        100
-    ],
-    [
-        "shion (mirudakemann)",
-        100
-    ],
-    [
-        "asteroid ill",
-        100
-    ],
-    [
-        "potg (piotegu)",
-        100
-    ],
-    [
-        "KinHasu",
-        100
-    ],
-    [
-        "ryou_(ryoutarou)",
-        100
-    ],
-    [
-        "mamimi_(mamamimi)",
-        100
-    ],
-]
-
-if __name__ == "__main__":
-    var = vars().copy()
-
-    # 获取tags列表
-    tags = []
-    for key, value in var.items():
-        if not key.startswith('_') and key != 'var':
-            tags.extend(value)
-    print(tags)
-
-    # 展开二级列表
-    tags = [tag[0] for tag in tags]
-    print(tags)
-    import json
-
-    with open('../../../../playground/cos/tag_artist.json', 'w') as f:
-        json.dump(tags, f)