Allow to pass None, fix default value, don't allow negative numbers

Author: leszekhanusz

gql/cli.py

@@ -46,6 +46,25 @@
 """
 
 
+def positive_int_or_none(value_str: str) -> Optional[int]:
+    """Convert a string argument value into either an int or None.
+
+    Raise a ValueError if the argument is negative or a string which is not "none"
+    """
+    try:
+        value_int = int(value_str)
+    except ValueError:
+        if value_str.lower() == "none":
+            return None
+        else:
+            raise
+
+    if value_int < 0:
+        raise ValueError
+
+    return value_int
+
+
 def get_parser(with_examples: bool = False) -> ArgumentParser:
     """Provides an ArgumentParser for the gql-cli script.
 
@@ -106,8 +125,8 @@ def get_parser(with_examples: bool = False) -> ArgumentParser:
     parser.add_argument(
         "--execute-timeout",
         help="set the execute_timeout argument of the Client (default: 10)",
-        type=int,
-        default=None,
+        type=positive_int_or_none,
+        default=10,
         dest="execute_timeout",
     )
     parser.add_argument(

tests/test_cli.py

@@ -78,6 +78,20 @@ def test_cli_parser(parser):
     args = parser.parse_args(["https://your_server.com", "--execute-timeout", "1"])
     assert args.execute_timeout == 1
 
+    # gql-cli https://your_server.com --execute-timeout=none
+    args = parser.parse_args(["https://your_server.com", "--execute-timeout", "none"])
+    assert args.execute_timeout is None
+
+    # gql-cli https://your_server.com --execute-timeout=-1
+    with pytest.raises(SystemExit):
+        args = parser.parse_args(["https://your_server.com", "--execute-timeout", "-1"])
+
+    # gql-cli https://your_server.com --execute-timeout=invalid
+    with pytest.raises(SystemExit):
+        args = parser.parse_args(
+            ["https://your_server.com", "--execute-timeout", "invalid"]
+        )
+
 
 def test_cli_parse_headers(parser):