machineconfig 4.92__tar.gz → 4.93__tar.gz

{machineconfig-4.92/src/machineconfig.egg-info → machineconfig-4.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 4.92
+Version: 4.93
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-4.92 → machineconfig-4.93}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "4.92"
+version = "4.93"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-4.92 → machineconfig-4.93}/src/machineconfig/scripts/python/fire_jobs.py

@@ -45,11 +45,11 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
         ipy_profile = "default"
 
     if choice_file.suffix == ".py":
-        kwargs = extract_kwargs(args)  # This now returns empty dict, but kept for compatibility
+        kwargs_dict = extract_kwargs(args)  # This now returns empty dict, but kept for compatibility
         activate_ve_line = get_ve_activate_line(ve_root=args.ve or ve_root_from_file or "$HOME/code/machineconfig/.venv")
     else:
         activate_ve_line = ""
-        kwargs = {}
+        kwargs_dict = {}
 
     # =========================  choosing function to run
     choice_function: Optional[str] = None  # Initialize to avoid unbound variable
@@ -64,9 +64,9 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
 
             if choice_function == "RUN AS MAIN":
                 choice_function = None
-            if len(choice_function_args) > 0 and len(kwargs) == 0:
+            if len(choice_function_args) > 0 and len(kwargs_dict) == 0:
                 for item in choice_function_args:
-                    kwargs[item.name] = input(f"Please enter a value for argument `{item.name}` (type = {item.type}) (default = {item.default}) : ") or item.default
+                    kwargs_dict[item.name] = input(f"Please enter a value for argument `{item.name}` (type = {item.type}) (default = {item.default}) : ") or item.default
         elif choice_file.suffix == ".sh":  # in this case, we choos lines.
             options = []
             for line in choice_file.read_text(encoding="utf-8").splitlines():
@@ -88,6 +88,7 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
     if choice_file.suffix == ".py":
         if args.streamlit:
             import socket
+
             s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
             try:
                 s.connect(("8.8.8.8", 1))
@@ -153,9 +154,7 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
     else:
         raise NotImplementedError(f"File type {choice_file.suffix} not supported, in the sense that I don't know how to fire it.")
 
-    if (
-        args.module or (args.debug and args.choose_function)
-    ):  # because debugging tools do not support choosing functions and don't interplay with fire module. So the only way to have debugging and choose function options is to import the file as a module into a new script and run the function of interest there and debug the new script.
+    if args.module or (args.debug and args.choose_function):  # because debugging tools do not support choosing functions and don't interplay with fire module. So the only way to have debugging and choose function options is to import the file as a module into a new script and run the function of interest there and debug the new script.
         assert choice_file.suffix == ".py", f"File must be a python file to be imported as a module. Got {choice_file}"
         import_line = get_import_module_code(str(choice_file))
         if repo_root is not None:
@@ -178,7 +177,7 @@ except (ImportError, ModuleNotFoundError) as ex:
             txt = (
                 txt
                 + f"""
-res = {choice_function}({("**" + str(kwargs)) if kwargs else ""})
+res = {choice_function}({("**" + str(kwargs_dict)) if kwargs_dict else ""})
 """
             )
 
@@ -346,10 +345,10 @@ def main(
     watch: Annotated[bool, typer.Option("--watch", "-w", help="Watch the file for changes")] = False,
 ) -> None:
     """Main function to process fire jobs arguments."""
-    
+
     # Get Fire arguments from context
     fire_args = parse_fire_args_from_context(ctx)
-    
+
     args = FireJobArgs(
         path=path,
         function=function,
@@ -381,6 +380,7 @@ def main(
     except Exception as e:
         # For other exceptions, print clean error message and exit
         import sys
+
         print(f"❌ Error: {e}", file=sys.stderr)
         sys.exit(1)
 
@@ -389,6 +389,7 @@ def main_from_parser():
     # from trogon.typer import init_tui
     # from trogon.typer import init_tui
     from typer import Typer
+
     app = Typer(add_completion=False)
     app.command(context_settings={"allow_extra_args": True, "allow_interspersed_args": False})(main)
     # typer.run(main)

machineconfig-4.93/src/machineconfig/scripts/python/fire_jobs_args_helper.py

@@ -0,0 +1,132 @@
+from dataclasses import dataclass
+from typing import Optional, Any
+
+
+@dataclass
+class FireJobArgs:
+    """Type-safe dataclass for fire_jobs command line arguments."""
+
+    path: str = "."
+    function: Optional[str] = None
+    ve: str = ""
+    cmd: bool = False
+    interactive: bool = False
+    debug: bool = False
+    choose_function: bool = False
+    loop: bool = False
+    jupyter: bool = False
+    submit_to_cloud: bool = False
+    remote: bool = False
+    module: bool = False
+    streamlit: bool = False
+    environment: str = ""
+    holdDirectory: bool = False
+    PathExport: bool = False
+    git_pull: bool = False
+    optimized: bool = False
+    Nprocess: int = 1
+    zellij_tab: Optional[str] = None
+    watch: bool = False
+
+
+def extract_kwargs(args: FireJobArgs) -> dict[str, object]:
+    """Extract kwargs from command line arguments in Fire format.
+    
+    Parses Fire-like arguments (e.g., --a=2, --name=value) from sys.argv
+    and returns them as a dictionary.
+    
+    Returns:
+        Dictionary mapping argument names to their values
+    """
+    import sys
+    
+    kwargs: dict[str, object] = {}
+    
+    # Look for Fire-style arguments in sys.argv
+    for arg in sys.argv:
+        # Match patterns like --key=value or --key value (but we'll focus on --key=value)
+        if arg.startswith('--') and '=' in arg:
+            key, value = arg[2:].split('=', 1)  # Remove -- prefix and split on first =
+            
+            # Try to convert value to appropriate type
+            kwargs[key] = _convert_value_type(value)
+        elif arg.startswith('--') and '=' not in arg:
+            # Handle boolean flags like --debug
+            key = arg[2:]  # Remove -- prefix
+            # Check if next argument exists and doesn't start with --
+            arg_index = sys.argv.index(arg)
+            if arg_index + 1 < len(sys.argv) and not sys.argv[arg_index + 1].startswith('--'):
+                # Next argument is the value
+                value = sys.argv[arg_index + 1]
+                kwargs[key] = _convert_value_type(value)
+            else:
+                # It's a boolean flag
+                kwargs[key] = True
+                
+    return kwargs
+
+
+def _convert_value_type(value: str) -> object:
+    """Convert string value to appropriate Python type."""
+    # Try to convert to int
+    try:
+        if '.' not in value and 'e' not in value.lower():
+            return int(value)
+    except ValueError:
+        pass
+    
+    # Try to convert to float
+    try:
+        return float(value)
+    except ValueError:
+        pass
+    
+    # Try to convert boolean strings
+    if value.lower() in ('true', '1', 'yes', 'on'):
+        return True
+    elif value.lower() in ('false', '0', 'no', 'off'):
+        return False
+    
+    # Try to parse as list (comma-separated values)
+    if ',' in value:
+        items = [_convert_value_type(item.strip()) for item in value.split(',')]
+        return items
+    
+    # Return as string if no conversion possible
+    return value
+
+
+def parse_fire_args_from_argv() -> str:
+    """Parse arguments after -- separator for Fire compatibility.
+    
+    Returns:
+        String of Fire-compatible arguments to append to command
+    """
+    import sys
+    
+    if '--' in sys.argv:
+        separator_index = sys.argv.index('--')
+        fire_args = sys.argv[separator_index + 1:]
+        # Join all Fire arguments - they should already be in Fire format
+        return ' '.join(fire_args) if fire_args else ''
+    
+    return ''
+
+
+def parse_fire_args_from_context(ctx: Any) -> str:
+    """Parse Fire arguments from typer context.
+    
+    Args:
+        ctx: Typer context containing raw arguments
+        
+    Returns:
+        String of Fire-compatible arguments to append to command
+    """
+    # Get remaining args that weren't consumed by typer
+    if hasattr(ctx, 'args') and ctx.args:
+        args = ctx.args
+        # Filter out the -- separator if present
+        if args and args[0] == '--':
+            args = args[1:]
+        return ' '.join(args)
+    return ''

{machineconfig-4.92 → machineconfig-4.93}/src/machineconfig/settings/linters/.ruff.toml

@@ -30,7 +30,7 @@ exclude = [
 ]
 
 # Same as Black.
-line-length = 250
+line-length = 350
 indent-width = 4
 
 # Assume Python 3.13

{machineconfig-4.92 → machineconfig-4.93/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 4.92
+Version: 4.93
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

machineconfig-4.92/src/machineconfig/scripts/python/fire_jobs_args_helper.py

@@ -1,74 +0,0 @@
-from dataclasses import dataclass
-from typing import Optional, Any
-
-
-@dataclass
-class FireJobArgs:
-    """Type-safe dataclass for fire_jobs command line arguments."""
-
-    path: str = "."
-    function: Optional[str] = None
-    ve: str = ""
-    cmd: bool = False
-    interactive: bool = False
-    debug: bool = False
-    choose_function: bool = False
-    loop: bool = False
-    jupyter: bool = False
-    submit_to_cloud: bool = False
-    remote: bool = False
-    module: bool = False
-    streamlit: bool = False
-    environment: str = ""
-    holdDirectory: bool = False
-    PathExport: bool = False
-    git_pull: bool = False
-    optimized: bool = False
-    Nprocess: int = 1
-    zellij_tab: Optional[str] = None
-    watch: bool = False
-
-
-def extract_kwargs(args: FireJobArgs) -> dict[str, object]:
-    """Extract kwargs from command line using -- separator.
-    
-    Returns empty dict since kwargs are now parsed directly from sys.argv
-    using the -- separator pattern in the main function.
-    """
-    return {}
-
-
-def parse_fire_args_from_argv() -> str:
-    """Parse arguments after -- separator for Fire compatibility.
-    
-    Returns:
-        String of Fire-compatible arguments to append to command
-    """
-    import sys
-    
-    if '--' in sys.argv:
-        separator_index = sys.argv.index('--')
-        fire_args = sys.argv[separator_index + 1:]
-        # Join all Fire arguments - they should already be in Fire format
-        return ' '.join(fire_args) if fire_args else ''
-    
-    return ''
-
-
-def parse_fire_args_from_context(ctx: Any) -> str:
-    """Parse Fire arguments from typer context.
-    
-    Args:
-        ctx: Typer context containing raw arguments
-        
-    Returns:
-        String of Fire-compatible arguments to append to command
-    """
-    # Get remaining args that weren't consumed by typer
-    if hasattr(ctx, 'args') and ctx.args:
-        args = ctx.args
-        # Filter out the -- separator if present
-        if args and args[0] == '--':
-            args = args[1:]
-        return ' '.join(args)
-    return ''