insightfactory-cli 1.0.0.dev1__py3-none-any.whl → 1.0.0.dev2__py3-none-any.whl

if_cli/cli.py

@@ -21,6 +21,102 @@ class _ArgumentParser(argparse.ArgumentParser):
         die(message)
 
 
+def _option_flag_label(name: str, spec: dict[str, Any]) -> str:
+    short = spec.get("short")
+    if short:
+        return f"--{name}/-{short}"
+    return f"--{name}"
+
+
+def _resolve_short_option(
+    arg: str,
+    *,
+    options: Options,
+    short_options: dict[str, str],
+) -> tuple[str, str | None] | None:
+    """Return (option_name, inline_value) for a short-option token, or None if not an option."""
+    option_name = short_options.get(arg)
+    if option_name is not None:
+        return option_name, None
+
+    for short_flag, name in short_options.items():
+        if not arg.startswith(short_flag) or len(arg) <= len(short_flag):
+            continue
+        if options[name]["type"] == "boolean":
+            die(f"Unknown option '{arg}'")
+        return name, arg[len(short_flag) :]
+
+    return None
+
+
+def _parse_args_with_positionals(argv: list[str], *, options: Options) -> tuple[dict[str, Any], list[str]]:
+    """Parse argv allowing options and positionals in any order (Node util.parseArgs parity)."""
+    values: dict[str, Any] = {}
+    for name, spec in options.items():
+        if spec["type"] == "boolean":
+            values[name] = spec.get("default", False)
+        else:
+            values[name] = spec.get("default")
+
+    long_options = {f"--{name}": name for name in options}
+    short_options = {f"-{spec['short']}": name for name, spec in options.items() if spec.get("short") is not None}
+
+    positionals: list[str] = []
+    index = 0
+    while index < len(argv):
+        arg = argv[index]
+        if arg == "--":
+            positionals.extend(argv[index + 1 :])
+            break
+
+        option_name: str | None = None
+        inline_value: str | None = None
+
+        if arg.startswith("--"):
+            if "=" in arg:
+                flag, inline_value = arg.split("=", 1)
+                option_name = long_options.get(flag)
+                if option_name is None:
+                    die(f"Unknown option '{flag}'")
+            else:
+                option_name = long_options.get(arg)
+                if option_name is None:
+                    die(f"Unknown option '{arg}'")
+        elif arg.startswith("-") and len(arg) > 1:
+            resolved = _resolve_short_option(arg, options=options, short_options=short_options)
+            if resolved is None:
+                die(f"Unknown option '{arg}'")
+            option_name, inline_value = resolved
+        else:
+            positionals.append(arg)
+            index += 1
+            continue
+
+        spec = options[option_name]
+        if spec["type"] == "boolean":
+            if inline_value is not None:
+                die(f"argument {_option_flag_label(option_name, spec)}: does not take an argument")
+            values[option_name] = True
+            index += 1
+            continue
+
+        value = inline_value
+        if value is None:
+            if index + 1 >= len(argv):
+                die(f"argument {_option_flag_label(option_name, spec)}: expected one argument")
+            next_arg = argv[index + 1]
+            if next_arg == "--" or next_arg.startswith("-"):
+                die(f"argument {_option_flag_label(option_name, spec)}: expected one argument")
+            value = next_arg
+            index += 2
+        else:
+            index += 1
+
+        values[option_name] = value
+
+    return values, positionals
+
+
 def parse_args(
     argv: list[str],
     *,
@@ -28,6 +124,9 @@ def parse_args(
     allow_positionals: bool = False,
 ) -> tuple[dict[str, Any], list[str]]:
     """Parse argv with argparse, using the same flags as the TypeScript parseArgs specs."""
+    if allow_positionals:
+        return _parse_args_with_positionals(argv, options=options)
+
     parser = _ArgumentParser(add_help=False, allow_abbrev=False)
     for name, spec in options.items():
         flags = [f"--{name}"]
@@ -39,13 +138,9 @@ def parse_args(
             parser.add_argument(*flags, dest=dest, action="store_true", default=spec.get("default", False))
         else:
             parser.add_argument(*flags, dest=dest, default=spec.get("default"))
-    if allow_positionals:
-        parser.add_argument("positionals", nargs="*")
     namespace = parser.parse_args(argv)
     raw = vars(namespace)
     values = {name: raw.get(name.replace("-", "_")) for name in options}
-    if allow_positionals:
-        return values, list(raw.get("positionals") or [])
     return values, []
 
 

{insightfactory_cli-1.0.0.dev1.dist-info → insightfactory_cli-1.0.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: insightfactory-cli
-Version: 1.0.0.dev1
+Version: 1.0.0.dev2
 Summary: Profile-based authentication CLI for the InsightFactory Interfaces API
 Project-URL: Homepage, https://github.com/insightfactory-ai/insightfactory-cli
 Project-URL: Repository, https://github.com/insightfactory-ai/insightfactory-cli

{insightfactory_cli-1.0.0.dev1.dist-info → insightfactory_cli-1.0.0.dev2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 if_cli/__init__.py,sha256=YYcz-hEiXXUjdBFGipOrVHynsyH4ZLqQOCDobvCAu8Y,26
 if_cli/__main__.py,sha256=2hLFIiT-gocMb0VJVzVYtGVIoHrxyMChucRgexbXLSQ,68
 if_cli/cache.py,sha256=UfvHs3GQIVg0sVfKYWw4UGlq8d-8BEXuZIDfC1hwwjA,6587
-if_cli/cli.py,sha256=kBblhYrKEHFcWhI14imvEykxFYvagRTVrnc_hHEHzLY,2573
+if_cli/cli.py,sha256=1pdYz3bhsNO120aWs9Fqjchj4UvNByn5Otk62IiBvzY,5832
 if_cli/colour.py,sha256=2hbaM4ubTHGja6YZRD886eqnB7T2IaZyW5rvfOjxe4M,682
 if_cli/config.py,sha256=IZhuo0cMsP-L9rLIKYVB87YRhCF-tcuyBTWp0-um4vM,6338
 if_cli/constants.py,sha256=7pY68ZXSspE3dDVFnSQ461CnKNSDu2ibMbPT3WfYWFA,209
@@ -17,7 +17,7 @@ if_cli/commands/logout.py,sha256=TW0P4_tXcTtiHHR73xVPHyhlbOWD1jBnkZsMImCiCBw,668
 if_cli/commands/profiles.py,sha256=JNBrYWdHQ9MHauwZxH33IAOYgRYRniX7bwd7KBT6Vyk,3869
 if_cli/commands/set_token.py,sha256=BVyv_QmByvllr04pE2sz8JFEscHbIgOC-7ZPg61PRoc,1886
 if_cli/commands/token.py,sha256=CyiXkyH7vxgH91-n-XJzeHnLI6mZJwO9Js5AHvfHaeM,1120
-insightfactory_cli-1.0.0.dev1.dist-info/METADATA,sha256=m4q9y44Zw6yLllpCVHnK4z5RYQcv9TR3uY24W17c2H8,10880
-insightfactory_cli-1.0.0.dev1.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-insightfactory_cli-1.0.0.dev1.dist-info/entry_points.txt,sha256=UlX854D7f-7dBj5F0wGdakVy6vopvP9hA1BN-gv739w,44
-insightfactory_cli-1.0.0.dev1.dist-info/RECORD,,
+insightfactory_cli-1.0.0.dev2.dist-info/METADATA,sha256=xeezJWtMgGE5eV6nU0YF2fkSGl1du6cwrHd2rRBktPk,10880
+insightfactory_cli-1.0.0.dev2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+insightfactory_cli-1.0.0.dev2.dist-info/entry_points.txt,sha256=UlX854D7f-7dBj5F0wGdakVy6vopvP9hA1BN-gv739w,44
+insightfactory_cli-1.0.0.dev2.dist-info/RECORD,,