This commit is contained in:
justumen
2025-03-19 17:36:25 +01:00
parent 44d69e8907
commit 39dfb0220a
76 changed files with 3207 additions and 955 deletions

View File

@@ -14,31 +14,28 @@ class LineSelector:
def INPUT_TYPES(s):
return {
"required": {
"text": ("STRING", {"multiline": True}), # Input for multiple lines
"line_number": ("INT", {"default": 0, "min": 0, "max": 99999}), # 0 for random, >0 for specific line
"RANDOM": ("BOOLEAN", {"default": False}), # Force random selection
"LOOP": ("BOOLEAN", {"default": False}), # Return all lines as list
"LOOP_SEQUENTIAL": ("BOOLEAN", {"default": False}), # Sequential looping
"jump": ("INT", {"default": 1, "min": 1, "max": 100, "step": 1}), # Jump size for sequential loop
"pick_random_variable": ("BOOLEAN", {"default": True}), # Enable random choice functionality
"text": ("STRING", {"multiline": True}),
"line_number": ("INT", {"default": 0, "min": 0, "max": 99999}),
"RANDOM": ("BOOLEAN", {"default": False}),
"LOOP": ("BOOLEAN", {"default": False}),
"LOOP_SEQUENTIAL": ("BOOLEAN", {"default": False}),
"jump": ("INT", {"default": 1, "min": 1, "max": 100, "step": 1}),
"pick_random_variable": ("BOOLEAN", {"default": True}),
},
"optional": {
"variables": ("STRING", {"multiline": True, "forceInput": True}),
"seed": ("INT", {
"default": -1,
"min": -1,
"max": 0x7FFFFFFFFFFFFFFF
}),
"seed": ("INT", {"default": -1, "min": -1, "max": 0x7FFFFFFFFFFFFFFF}),
},
}
RETURN_TYPES = ("STRING", "INT", "INT") # String output, remaining cycles, current line number
RETURN_TYPES = ("STRING", "INT", "INT")
RETURN_NAMES = ("text", "remaining_cycles", "current_line")
OUTPUT_IS_LIST = (True, False, False) # Only text output can be a list
OUTPUT_IS_LIST = (True, False, False)
FUNCTION = "select_line"
CATEGORY = "Bjornulf"
def find_variables(self, text):
"""Identify nested curly brace sections in the text."""
stack = []
variables = []
for i, char in enumerate(text):
@@ -55,6 +52,7 @@ class LineSelector:
return variables
def parse_option(self, part):
"""Parse options within curly braces, handling CSV and weighted choices."""
if part.startswith('%csv='):
try:
filename = part.split('=', 1)[1].strip()
@@ -67,61 +65,83 @@ class LineSelector:
return (option.strip(), float(weight.split('%)')[0]))
return part.strip()
def process_content(self, content, seed):
random.seed(seed)
parts = []
def process_content(self, content, base_seed, position):
"""Process content within curly braces, handling groups and random choices."""
# Use a unique seed for regular choices based on position
random.seed(base_seed + position)
parts = [p.strip() for p in content.split('|')]
options = []
weights = []
group_defined = False
group_name = None
static_group = None
cycling_group = None
for p in content.split('|'):
p = p.strip()
if p.startswith('group='):
group_name = p.split('=', 1)[1].strip()
group_defined = True
continue
parsed = self.parse_option(p)
if isinstance(parsed, list): # CSV data
parts.extend(parsed)
weights.extend([1]*len(parsed))
elif isinstance(parsed, tuple): # Weighted option
parts.append(parsed[0])
weights.append(parsed[1])
for p in parts:
if p.startswith('static_group='):
static_group = p.split('=', 1)[1].strip()
elif p.startswith('group='):
cycling_group = p.split('=', 1)[1].strip()
else:
parts.append(parsed)
weights.append(1)
if group_defined:
return {'type': 'group', 'name': group_name, 'options': parts}
if any(w != 1 for w in weights):
total = sum(weights)
if total == 0: weights = [1]*len(parts)
return random.choices(parts, weights=[w/total for w in weights])[0]
return random.choice(parts) if parts else ''
parsed = self.parse_option(p)
if isinstance(parsed, list): # CSV data
options.extend(parsed)
weights.extend([1] * len(parsed))
elif isinstance(parsed, tuple): # Weighted option
options.append(parsed[0])
weights.append(parsed[1])
else:
options.append(parsed)
weights.append(1)
if static_group and cycling_group:
raise ValueError("Cannot specify both static_group and group in the same section.")
if static_group:
return {'type': 'static_group', 'name': static_group, 'options': options, 'weights': weights}
elif cycling_group:
return {'type': 'cycling_group', 'name': cycling_group, 'options': options, 'weights': weights}
else:
if options:
if any(w != 1 for w in weights):
total = sum(weights)
if total == 0:
weights = [1] * len(options)
return random.choices(options, weights=[w / total for w in weights])[0]
else:
return random.choice(options)
return ''
def process_advanced_syntax(self, text, seed):
# Process nested variables
"""Process the entire text for advanced syntax, handling nested variables and groups."""
variables = self.find_variables(text)
static_groups = {}
cycling_groups = {}
substitutions = []
groups = {}
for var in variables:
start, end = var['start'], var['end']
content = text[start+1:end-1]
processed = self.process_content(content, seed)
content = text[start + 1:end - 1]
processed = self.process_content(content, seed, start)
if isinstance(processed, dict):
if processed['type'] == 'group':
group_name = processed['name']
if group_name not in groups:
groups[group_name] = []
groups[group_name].append({
if processed['type'] == 'static_group':
name = processed['name']
if name not in static_groups:
static_groups[name] = []
static_groups[name].append({
'start': start,
'end': end,
'options': processed['options']
'options': processed['options'],
'weights': processed['weights']
})
elif processed['type'] == 'cycling_group':
name = processed['name']
if name not in cycling_groups:
cycling_groups[name] = []
cycling_groups[name].append({
'start': start,
'end': end,
'options': processed['options'],
'weights': processed['weights']
})
else:
substitutions.append({
@@ -130,15 +150,35 @@ class LineSelector:
'sub': processed
})
# Handle groups
for group_name, matches in groups.items():
# Handle static groups: choose one value per group name
random.seed(seed) # Reset seed for consistent static group behavior
for name, matches in static_groups.items():
if not matches or not matches[0]['options']:
continue
options = matches[0]['options']
weights = matches[0]['weights']
if any(w != 1 for w in weights):
total = sum(weights)
if total == 0:
weights = [1] * len(options)
chosen = random.choices(options, weights=[w / total for w in weights])[0]
else:
chosen = random.choice(options) if options else ''
for m in matches:
substitutions.append({
'start': m['start'],
'end': m['end'],
'sub': chosen
})
# Handle cycling groups: cycle through shuffled options
random.seed(seed) # Reset seed for consistent cycling group behavior
for name, matches in cycling_groups.items():
if not matches or not matches[0]['options']:
continue
options = matches[0]['options']
permuted = random.sample(options, len(options))
perm_cycle = cycle(permuted)
for m in matches:
substitutions.append({
'start': m['start'],
@@ -146,7 +186,7 @@ class LineSelector:
'sub': next(perm_cycle)
})
# Apply regular substitutions
# Apply substitutions in reverse order
substitutions.sort(key=lambda x: -x['start'])
result_text = text
for sub in substitutions:
@@ -155,43 +195,31 @@ class LineSelector:
return result_text
def select_line(self, text, line_number, RANDOM, LOOP, LOOP_SEQUENTIAL, jump, pick_random_variable, variables="", seed=-1):
# Parse variables
"""Select lines from the text based on the specified mode after processing advanced syntax."""
var_dict = {}
for line in variables.split('\n'):
if '=' in line:
key, value = line.split('=', 1)
var_dict[key.strip()] = value.strip()
# Replace variables in the text
for key, value in var_dict.items():
text = text.replace(f"<{key}>", value)
# Split the input text into lines, remove empty lines and lines starting with #
if seed < 0:
seed = random.randint(0, 0x7FFFFFFFFFFFFFFF)
if pick_random_variable:
text = self.process_advanced_syntax(text, seed)
lines = [line.strip() for line in text.split('\n')
if line.strip() and not line.strip().startswith('#')]
if line.strip() and not line.strip().startswith('#')]
if not lines:
return (["No valid lines found."], 0, 0)
import random
import os
# Set seed if provided
if seed < 0:
seed = random.randint(0, 0x7FFFFFFFFFFFFFFF)
# Process WriteTextAdvanced syntax if enabled
if pick_random_variable:
processed_lines = []
for line in lines:
processed_lines.append(self.process_advanced_syntax(line, seed))
lines = processed_lines
# Handle sequential looping
if LOOP_SEQUENTIAL:
counter_file = os.path.join("Bjornulf", "line_selector_counter.txt")
os.makedirs(os.path.dirname(counter_file), exist_ok=True)
try:
with open(counter_file, 'r') as f:
current_index = int(f.read().strip())
@@ -199,11 +227,10 @@ class LineSelector:
current_index = -jump
next_index = current_index + jump
if next_index >= len(lines):
with open(counter_file, 'w') as f:
f.write(str(-jump))
raise ValueError(f"Counter has reached the last line (total lines: {len(lines)}). Counter has be reset.")
raise ValueError(f"Counter has reached the last line (total lines: {len(lines)}). Counter has been reset.")
with open(counter_file, 'w') as f:
f.write(str(next_index))
@@ -211,11 +238,9 @@ class LineSelector:
remaining_cycles = max(0, (len(lines) - next_index - 1) // jump + 1)
return ([lines[next_index]], remaining_cycles, next_index + 1)
# Handle normal LOOP mode
if LOOP:
return (lines, len(lines), 0)
# Handle RANDOM or line_number selection
if RANDOM or line_number == 0:
selected = random.choice(lines)
else: