Simplify parse_special_command logic to match mycli.

Author: amjith

litecli/packages/special/main.py

@@ -38,44 +38,28 @@ class CommandNotFound(Exception):
 
 
 class Verbosity(Enum):
-    """Mode for special command invocation: regular, verbose (+), or succinct (-)."""
+    """Invocation verbosity: succinct (-), normal, or verbose (+)."""
 
-    REGULAR = "regular"
-    VERBOSE = "verbose"
     SUCCINCT = "succinct"
+    NORMAL = "normal"
+    VERBOSE = "verbose"
 
 
 @export
 def parse_special_command(sql):
     """
-    Parse a special command prefix, extracting the base command name,
-    an invocation mode (regular, verbose, or succinct), and the argument.
+    Parse a special command, extracting the base command name, verbosity
+    (normal, verbose (+), or succinct (-)), and the remaining argument.
+    Mirrors mycli's behavior.
     """
-    raw, _, arg = sql.partition(" ")
-    raw = raw.strip()
-
-    suffix_count = 0
-    idx = len(raw) - 1
-    while idx >= 0 and raw[idx] in "+-":
-        suffix_count += 1
-        idx -= 1
-    if suffix_count > 1:
-        raise ValueError("Invalid special command: %s" % raw)
-
-    if suffix_count == 1:
-        suffix = raw[-1]
-        base_cmd = raw[:-1]
-        mode = Verbosity.VERBOSE if suffix == "+" else Verbosity.SUCCINCT
-    else:
-        suffix = None
-        base_cmd = raw
-        mode = Verbosity.REGULAR
-
-    last_char = base_cmd[-1] if base_cmd else None
-    if suffix is None and last_char and not (last_char.isalnum() or last_char in "?."):
-        raise ValueError("Invalid special command: %s" % raw)
-
-    return (base_cmd, mode, arg.strip())
+    command, _, arg = sql.partition(" ")
+    verbosity = Verbosity.NORMAL
+    if "+" in command:
+        verbosity = Verbosity.VERBOSE
+    elif "-" in command:
+        verbosity = Verbosity.SUCCINCT
+    command = command.strip().strip("+-")
+    return (command, verbosity, arg.strip())
 
 
 @export
@@ -135,7 +119,7 @@ def execute(cur, sql):
     """Execute a special command and return the results. If the special command
     is not supported a KeyError will be raised.
     """
-    command, mode, arg = parse_special_command(sql)
+    command, verbosity, arg = parse_special_command(sql)
 
     if (command not in COMMANDS) and (command.lower() not in COMMANDS):
         raise CommandNotFound
@@ -150,7 +134,7 @@ def execute(cur, sql):
     if special_cmd.arg_type == NO_QUERY:
         return special_cmd.handler()
     elif special_cmd.arg_type == PARSED_QUERY:
-        return special_cmd.handler(cur=cur, arg=arg, verbose=(mode is Verbosity.VERBOSE))
+        return special_cmd.handler(cur=cur, arg=arg, verbose=(verbosity == Verbosity.VERBOSE))
     elif special_cmd.arg_type == RAW_QUERY:
         return special_cmd.handler(cur=cur, query=sql)
 

tests/test_special_iocommands.py

@@ -63,10 +63,10 @@ def test_pipe_once_command():
 @pytest.mark.parametrize(
     "sql,expected",
     [
-        (r"\d table_name", ("\\d", Verbosity.REGULAR, "table_name")),
+        (r"\d table_name", ("\\d", Verbosity.NORMAL, "table_name")),
         (r"\d+ table_name", ("\\d", Verbosity.VERBOSE, "table_name")),
-        (r"\?", ("\\?", Verbosity.REGULAR, "")),
-        (r"\llm Question", ("\\llm", Verbosity.REGULAR, "Question")),
+        (r"\?", ("\\?", Verbosity.NORMAL, "")),
+        (r"\llm Question", ("\\llm", Verbosity.NORMAL, "Question")),
         (r"\llm-", ("\\llm", Verbosity.SUCCINCT, "")),
         (r"\llm+", ("\\llm", Verbosity.VERBOSE, "")),
     ],
@@ -79,11 +79,11 @@ def test_parse_special_command(sql, expected):
     assert result == expected
 
 
-def test_parse_special_command_error():
+def test_parse_special_command_edge_cases():
+    # mycli-compatible behavior: no ValueError on special characters; it parses leniently.
     sql = r"\llm* Question"
-    with pytest.raises(ValueError):
-        parse_special_command(sql)
+    assert parse_special_command(sql) == ("\\llm*", Verbosity.NORMAL, "Question")
 
     sql = r"\llm+- Question"
-    with pytest.raises(ValueError):
-        parse_special_command(sql)
+    # '+' in command sets verbosity; strip('+-') removes both suffixes
+    assert parse_special_command(sql) == ("\\llm", Verbosity.VERBOSE, "Question")