Skip to content

Commit 6dc63f6

Browse files
fix: address review comments for generation params
- Use MIN_STEPS/MAX_STEPS/MIN_GUIDANCE_SCALE/MAX_GUIDANCE_SCALE constants in @option decorators instead of hard-coded values - Update test comment to reference correct line numbers (438-456) - Remove unreachable fallback in model_config.get('true_cfg_scale', 4.0) since outer if guarantees key exists
1 parent 79b820b commit 6dc63f6

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/oneiro/bot.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -359,16 +359,16 @@ async def on_raw_reaction_add(payload: discord.RawReactionActionEvent):
359359
int,
360360
description="Number of inference steps (default: model-specific)",
361361
required=False,
362-
min_value=1,
363-
max_value=100,
362+
min_value=MIN_STEPS,
363+
max_value=MAX_STEPS,
364364
)
365365
@option(
366366
"guidance_scale",
367367
float,
368368
description="CFG scale - prompt adherence (default: model-specific)",
369369
required=False,
370-
min_value=0.0,
371-
max_value=15.0,
370+
min_value=MIN_GUIDANCE_SCALE,
371+
max_value=MAX_GUIDANCE_SCALE,
372372
)
373373
@option(
374374
"lora",
@@ -441,7 +441,7 @@ async def dream(
441441

442442
# Handle Qwen's true_cfg_scale
443443
if model_config.get("true_cfg_scale"):
444-
model_guidance = model_config.get("true_cfg_scale", 4.0)
444+
model_guidance = model_config["true_cfg_scale"]
445445

446446
# Check for model-specific overrides set via /model command
447447
model_overrides = config.get("model_overrides", current_model, default={}) if config else {}
@@ -714,16 +714,16 @@ async def queue_status(ctx: discord.ApplicationContext):
714714
int,
715715
description="Override default steps for this model",
716716
required=False,
717-
min_value=1,
718-
max_value=100,
717+
min_value=MIN_STEPS,
718+
max_value=MAX_STEPS,
719719
)
720720
@option(
721721
"guidance_scale",
722722
float,
723723
description="Override default CFG scale for this model",
724724
required=False,
725-
min_value=0.0,
726-
max_value=15.0,
725+
min_value=MIN_GUIDANCE_SCALE,
726+
max_value=MAX_GUIDANCE_SCALE,
727727
)
728728
async def model_command(
729729
ctx: discord.ApplicationContext,

tests/test_dream_params.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def test_qwen_true_cfg_scale_mapping(self):
172172
# Qwen should prefer true_cfg_scale
173173
guidance_scale = model_config.get("guidance_scale", 0.0)
174174
if model_config.get("true_cfg_scale"):
175-
guidance_scale = model_config.get("true_cfg_scale", 4.0)
175+
guidance_scale = model_config["true_cfg_scale"]
176176

177177
assert guidance_scale == 1.3
178178

@@ -185,12 +185,12 @@ def test_qwen_true_cfg_scale_with_model_override(self):
185185
}
186186
model_overrides = {"guidance_scale": 2.5} # User set via /model command
187187

188-
# Simulate the logic from bot.py (lines 430-448):
188+
# Simulate the logic from bot.py (lines 438-456):
189189
# 1. Start with model_config defaults
190190
model_guidance = model_config.get("guidance_scale", 0.0)
191191
# 2. Apply Qwen's true_cfg_scale if present
192192
if model_config.get("true_cfg_scale"):
193-
model_guidance = model_config.get("true_cfg_scale", 4.0)
193+
model_guidance = model_config["true_cfg_scale"]
194194
# 3. model_overrides takes priority if set
195195
if "guidance_scale" in model_overrides:
196196
model_guidance = model_overrides["guidance_scale"]
@@ -209,7 +209,7 @@ def test_qwen_true_cfg_scale_no_override(self):
209209

210210
model_guidance = model_config.get("guidance_scale", 0.0)
211211
if model_config.get("true_cfg_scale"):
212-
model_guidance = model_config.get("true_cfg_scale", 4.0)
212+
model_guidance = model_config["true_cfg_scale"]
213213
if "guidance_scale" in model_overrides:
214214
model_guidance = model_overrides["guidance_scale"]
215215

0 commit comments

Comments
 (0)