Skip to content

Add new taggers for BikiniPlusMetric (WIP) #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aria1th wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add new taggers for BikiniPlusMetric (WIP) #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion sdeval/controllability/bikini_plus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,11 @@ def _mldanbooru_tagging(image: Image.Image, use_real_name: bool = False, general
"wd14_convnextv2": "wd-v1-4-convnextv2-tagger-v2",
"wd14_vit": "wd-v1-4-vit-tagger-v2",
"wd14_moat": "wd-v1-4-moat-tagger-v2",
"wd14_swinv3": 'wd-v-1-4-swinv2-tagger-v3',
"wd14_convnextv3": 'wd-v-1-4-convnext-tagger-v3',
"wd14_vitv3": 'wd-v-1-4-vit-tagger-v3',
"wd14_eva02_large": 'wd-v-1-4-eva02-large-tagger-v1',
"wd14_vit_largev3": 'wd-v-1-4-vit-large-tagger-v1',
}
_TAGGING_METHODS = {
'deepdanbooru': _deepdanbooru_tagging,
Expand All @@ -263,11 +268,17 @@ def _mldanbooru_tagging(image: Image.Image, use_real_name: bool = False, general
'wd14_swinv2': partial(_wd14_tagging, model_name='SwinV2'),
'wd14_moat': partial(_wd14_tagging, model_name='MOAT'),
'mldanbooru': _mldanbooru_tagging,
'wd14_swinv3': partial(_wd14_tagging, model_name='SwinV2_v3'),
'wd14_convnextv3': partial(_wd14_tagging, model_name='ConvNext_v3'),
'wd14_vitv3': partial(_wd14_tagging, model_name='ViT_v3'),
'wd14_eva02_large': partial(_wd14_tagging, model_name='EVA02_Large'),
'wd14_vit_largev3': partial(_wd14_tagging, model_name='ViT_Large'),
}

TaggingMethodTyping = Literal[
'deepdanbooru', 'mldanbooru',
'wd14_vit', 'wd14_convnext', 'wd14_convnextv2', 'wd14_swinv2', 'wd14_moat',
'wd14_vitv3', 'wd14_convnextv3', 'wd14_swinv3', 'wd14_eva02_large', 'wd14_vit_largev3'
]

PromptedImageTyping = Union[
Expand Down Expand Up @@ -339,7 +350,7 @@ class BikiniPlusMetrics:
:type silent: bool
"""

def __init__(self, tagger: TaggingMethodTyping = 'wd14_convnextv2',
def __init__(self, tagger: TaggingMethodTyping = 'wd14_convnextv3',
tagger_cfgs: Optional[dict] = None, base_num: float = 1.5,
tag_blacklist: Optional[List[str]] = None, silent: bool = False):
self.tagger = tagger
Expand Down