Updated generation pages.
This commit is contained in:
@@ -78,11 +78,11 @@ def register_routes(app):
|
||||
if character:
|
||||
identity = character.data.get('identity', {})
|
||||
defaults = character.data.get('defaults', {})
|
||||
char_parts = [v for v in [identity.get('base_specs'), identity.get('hair'),
|
||||
identity.get('eyes'), defaults.get('expression')] if v]
|
||||
face_parts = [v for v in [identity.get('hair'), identity.get('eyes'),
|
||||
char_parts = [v for v in [identity.get('base'), identity.get('head'),
|
||||
defaults.get('expression')] if v]
|
||||
hand_parts = [v for v in [wardrobe.get('hands'), wardrobe.get('gloves')] if v]
|
||||
face_parts = [v for v in [identity.get('head'),
|
||||
defaults.get('expression')] if v]
|
||||
hand_parts = [v for v in [wardrobe.get('hands')] if v]
|
||||
main_parts = ([outfit_triggers] if outfit_triggers else []) + char_parts + wardrobe_parts + tags
|
||||
return {
|
||||
'main': _dedup_tags(', '.join(p for p in main_parts if p)),
|
||||
@@ -94,17 +94,16 @@ def register_routes(app):
|
||||
action_data = entity.data.get('action', {})
|
||||
action_triggers = entity.data.get('lora', {}).get('lora_triggers', '')
|
||||
tags = entity.data.get('tags', [])
|
||||
pose_fields = ['full_body', 'arms', 'hands', 'torso', 'pelvis', 'legs', 'feet', 'additional']
|
||||
pose_parts = [action_data.get(k, '') for k in pose_fields if action_data.get(k)]
|
||||
expr_parts = [action_data.get(k, '') for k in ['head', 'eyes'] if action_data.get(k)]
|
||||
from utils import _BODY_GROUP_KEYS
|
||||
pose_parts = [action_data.get(k, '') for k in _BODY_GROUP_KEYS if action_data.get(k)]
|
||||
expr_parts = [action_data.get('head', '')] if action_data.get('head') else []
|
||||
char_parts = []
|
||||
face_parts = list(expr_parts)
|
||||
hand_parts = [action_data.get('hands', '')] if action_data.get('hands') else []
|
||||
if character:
|
||||
identity = character.data.get('identity', {})
|
||||
char_parts = [v for v in [identity.get('base_specs'), identity.get('hair'),
|
||||
identity.get('eyes')] if v]
|
||||
face_parts = [v for v in [identity.get('hair'), identity.get('eyes')] + expr_parts if v]
|
||||
char_parts = [v for v in [identity.get('base'), identity.get('head')] if v]
|
||||
face_parts = [v for v in [identity.get('head')] + expr_parts if v]
|
||||
main_parts = ([action_triggers] if action_triggers else []) + char_parts + pose_parts + tags
|
||||
return {
|
||||
'main': _dedup_tags(', '.join(p for p in main_parts if p)),
|
||||
@@ -130,15 +129,15 @@ def register_routes(app):
|
||||
entity_parts = [p for p in [entity_triggers, det_prompt] + tags if p]
|
||||
|
||||
char_data_no_lora = _get_character_data_without_lora(character)
|
||||
base = build_prompt(char_data_no_lora, [], character.default_fields) if char_data_no_lora else {'main': '', 'face': '', 'hand': ''}
|
||||
base = build_prompt(char_data_no_lora, [], character.default_fields) if char_data_no_lora else {'main': '', 'face': '', 'hand': '', 'feet': ''}
|
||||
entity_str = ', '.join(entity_parts)
|
||||
if entity_str:
|
||||
base['main'] = f"{base['main']}, {entity_str}" if base['main'] else entity_str
|
||||
|
||||
if action is not None:
|
||||
action_data = action.data.get('action', {})
|
||||
action_parts = [action_data.get(k, '') for k in
|
||||
['full_body', 'arms', 'hands', 'torso', 'pelvis', 'legs', 'feet', 'additional', 'head', 'eyes']
|
||||
from utils import _BODY_GROUP_KEYS
|
||||
action_parts = [action_data.get(k, '') for k in _BODY_GROUP_KEYS
|
||||
if action_data.get(k)]
|
||||
action_str = ', '.join(action_parts)
|
||||
if action_str:
|
||||
|
||||
Reference in New Issue
Block a user