Address feedback

Signed-off-by: Samuel Monson <[email protected]>

Author: sjmonson

src/guidellm/__main__.py

@@ -386,7 +386,6 @@ def benchmark():
 )
 @click.option(
     "--over-saturation",
-    "--detect-saturation",  # alias
     "over_saturation",
     callback=cli_tools.parse_json,
     default=None,
@@ -398,9 +397,11 @@ def benchmark():
     ),
 )
 @click.option(
+    "--detect-saturation",
     "--default-over-saturation",
     "over_saturation",
-    flag_value={"enabled": True},
+    callback=cli_tools.parse_json,
+    flag_value='{"enabled": true}',
     help="Enable over-saturation detection with default settings.",
 )
 def run(**kwargs):  # noqa: C901

src/guidellm/scheduler/constraints/request.py

@@ -13,6 +13,11 @@
 
 from pydantic import Field, field_validator
 
+from guidellm.scheduler.constraints.constraint import (
+    Constraint,
+    PydanticConstraintInitializer,
+)
+from guidellm.scheduler.constraints.factory import ConstraintsInitializerFactory
 from guidellm.scheduler.schemas import (
     SchedulerProgress,
     SchedulerState,
@@ -21,9 +26,6 @@
 from guidellm.schemas import RequestInfo, StandardBaseModel
 from guidellm.utils import InfoMixin
 
-from .constraint import Constraint, PydanticConstraintInitializer
-from .factory import ConstraintsInitializerFactory
-
 __all__ = [
     "MaxDurationConstraint",
     "MaxNumberConstraint",

src/guidellm/utils/cli.py

@@ -77,35 +77,18 @@ def parse_list_floats(ctx, param, value):
         ) from err
 
 
-def parse_json(ctx, param, value):  # noqa: ARG001, C901, PLR0911, PLR0912
+def parse_json(ctx, param, value):  # noqa: ARG001, C901, PLR0911
+    if isinstance(value, dict):
+        return value
+
     if value is None or value == [None]:
         return None
-    if isinstance(value, dict | list):
-        # Already parsed (e.g., from flag_value), return as-is
-        return value
-    if isinstance(value, list | tuple):
-        return [parse_json(ctx, param, val) for val in value]
 
-    # Handle empty strings (can occur when multiple options map to same parameter)
     if isinstance(value, str) and not value.strip():
         return None
 
-    # Handle string representation of dict (can occur when flag_value dict is
-    # converted to string)
-    if isinstance(value, str) and value.startswith("{") and value.endswith("}"):
-        # Try to parse as JSON first
-        try:
-            return json.loads(value)
-        except json.JSONDecodeError:
-            # If JSON parsing fails, try ast.literal_eval for Python dict syntax
-            try:
-                import ast
-
-                parsed = ast.literal_eval(value)
-                if isinstance(parsed, dict):
-                    return parsed
-            except (ValueError, SyntaxError):
-                pass  # Fall through to normal processing
+    if isinstance(value, list | tuple):
+        return [parse_json(ctx, param, val) for val in value]
 
     if "{" not in value and "}" not in value and "=" in value:
         # Treat it as a key=value pair if it doesn't look like JSON.