machineconfig 7.49__py3-none-any.whl → 7.64__py3-none-any.whl

machineconfig/jobs/installer/linux_scripts/redis.sh

@@ -45,6 +45,7 @@ sudo nala update
 # Install Redis
 echo "📥 Installing Redis..."
 sudo nala install redis -y
+sudo nala install redis-tools -y
 
 echo """✅ INSTALLATION COMPLETE | Redis has been installed successfully
 

machineconfig/jobs/installer/package_groups.py

@@ -1,4 +1,10 @@
-from typing import Literal, TypeAlias, Union
+
+GUI = [
+    "brave",
+    "code",
+    "git",
+    "wezterm",
+]
 
 # AI/LLM Tools - AI-powered coding and chat assistants
 AGENTS = [
@@ -18,6 +24,7 @@ AGENTS = [
     "kilocode",
     "cline",
     "auggie",
+    # "gorilla",
 ]
 
 
@@ -55,9 +62,14 @@ PACKAGES_CODE_EDITORS = [
 # Database Tools - Database clients and visualizers
 PACKAGES_DATABASE = [
     "SqliteBrowser",
+    "sqlite3",
+    "redis",
+    "redis-cli",
+    "postgresql-client",
+    "duckdb",
     "DBeaver",
     "rainfrog",
-    "duckdb",
+
 ]
 
 
@@ -137,21 +149,23 @@ PACKAGES_PRODUCTIVITY = [
     "hx",
 ]
 
-# Miscellaneous Tools - Other tools
-PACKAGES_MISC_DEV = [
+
+# sudo nala install cowsay -y || true
+# sudo nala install lolcat -y || true
+# sudo nala install boxes -y || true
+# sudo nala install figlet -y || true
+# sudo nala install fortune -y || true
+# sudo nala install toilet -y || true
+TERMINAL_EYE_CANDY = [
     "lolcatjs",
     "figlet-cli",
     "boxes",
-    "Gorilla",
-    "Redis",
-    "transmission",
-    "bytehound",
-    "atuin",
-    "xcrawl3r",
-    "obsidian",
-    "istio",
-    "cointop",
-    "nnn",
+    # "transmission",
+    # "bytehound",
+    # "xcrawl3r",
+    # "obsidian",
+    # "istio",
+    # "cointop",
 ]
 
 
@@ -190,6 +204,7 @@ PACKAGES_FILE = [
     # "xplr",
     # "joshuto",
     # "lf",
+    # "nnn",
     "yazi",
     "tere",
     # "exa",
@@ -207,6 +222,7 @@ PACKAGES_TERMINAL_SHELL = [
     "zellij",
     "mprocs",
     "mcfly",
+    "atuin",
     "starship",
     "gotty",
     "ttyd",
@@ -216,74 +232,24 @@ PACKAGES_TERMINAL_SHELL = [
 
 
 
-
-
-PACKAGE_GROUPS: TypeAlias = Literal[
-    "ESSENTIAL",
-    "DEV",
-    "AGENTS",
-    "TUNNELING",
-    "TERMINAL_EMULATORS",
-    "BROWSERS",
-    "CODE_EDITORS",
-    "PRESENTATION",
-    "DATABASE",
-    "DOC_CONVERSION",
-    "MEDIA",
-    "FILE_SHARING",
-    "GIT_DOCKER_TOOLS",
-    "DEV_UTILS",
-    "CODE_ANALYSIS",
-    "PRODUCTIVITY",
-    "MISC_DEV",
-    "SYSTEM_MONITORS",
-    "FILE_TOOLS",
-    "FILE_VIEWERS",
-    "SEARCH",
-    "TERMINAL_SHELL",
-    "CLOUD_UTILS",
-    "WEB_TERMINAL",
-]
-
-
-
-# Main ESSENTIAL package list - combines all subgroups
-ESSENTIAL = [
-    *PACKAGES_CODE_ANALYSIS,
-    *PACKAGES_SYSTEM_MONITORS,
-    *PACKAGES_TERMINAL_SHELL,
-    *PACKAGES_FILE,
-]
-DEV = [
-    *PACKAGES_TERMINAL_EMULATORS,
-    *PACKAGES_BROWSERS,
-    *PACKAGES_CODE_EDITORS,
-    *PACKAGES_DATABASE,
-    *PACKAGES_MEDIA,
-    *PACKAGES_FILE_SHARING,
-    *PACKAGES_DEV_UTILS,
-    *PACKAGES_CODE_ANALYSIS,
-    *PACKAGES_PRODUCTIVITY,
-    *PACKAGES_MISC_DEV,
-]
-
-PACKAGE_GROUP2NAMES: dict[PACKAGE_GROUPS, list[str]] = {
-    "ESSENTIAL": ESSENTIAL,
-    "DEV": DEV,
-    "AGENTS": AGENTS,
-    "TERMINAL_EMULATORS": PACKAGES_TERMINAL_EMULATORS,
-    "BROWSERS": PACKAGES_BROWSERS,
-    "CODE_EDITORS": PACKAGES_CODE_EDITORS,
-    "DATABASE": PACKAGES_DATABASE,
-    "MEDIA": PACKAGES_MEDIA,
-    "FILE_SHARING": PACKAGES_FILE_SHARING,
-    "DEV_UTILS": PACKAGES_DEV_UTILS,
-    "CODE_ANALYSIS": PACKAGES_CODE_ANALYSIS,
-    "PRODUCTIVITY": PACKAGES_PRODUCTIVITY,
-    "MISC_DEV": PACKAGES_MISC_DEV,
-    "SYSTEM_MONITORS": PACKAGES_SYSTEM_MONITORS,
-    "SEARCH": PACKAGES_FILE,
-    "TERMINAL_SHELL": PACKAGES_TERMINAL_SHELL,
+PACKAGE_GROUP2NAMES: dict[str, list[str]] = {
+    "sysabc": ["sysabc"],
+    "termabc": [*PACKAGES_CODE_ANALYSIS, *PACKAGES_SYSTEM_MONITORS, *PACKAGES_TERMINAL_SHELL, *PACKAGES_FILE,],
+    "gui": GUI,
+    "dev": [*PACKAGES_TERMINAL_EMULATORS, *PACKAGES_BROWSERS, *PACKAGES_CODE_EDITORS, *PACKAGES_DATABASE, *PACKAGES_MEDIA, *PACKAGES_FILE_SHARING, *PACKAGES_DEV_UTILS, *PACKAGES_CODE_ANALYSIS, *PACKAGES_PRODUCTIVITY, *TERMINAL_EYE_CANDY,],
+    "dev-utils": PACKAGES_DEV_UTILS,
+    "term-eye-candy": TERMINAL_EYE_CANDY,
+    "agents": AGENTS,
+    "terminal-emulator": PACKAGES_TERMINAL_EMULATORS,
+    "shell": PACKAGES_TERMINAL_SHELL,
+    "browsers": PACKAGES_BROWSERS,
+    "code-editors": PACKAGES_CODE_EDITORS,
+    "code-analysis": PACKAGES_CODE_ANALYSIS,
+    "db": PACKAGES_DATABASE,
+    "media": PACKAGES_MEDIA,
+    "file-sharing": PACKAGES_FILE_SHARING,
+    "productivity": PACKAGES_PRODUCTIVITY,
+    "sys-monitor": PACKAGES_SYSTEM_MONITORS,
+    "search": PACKAGES_FILE,
 }
 
-_ = Union, Literal

machineconfig/logger.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 
 import logging
 import os

machineconfig/profile/create_links_export.py

@@ -15,13 +15,18 @@ ON_CONFLICT_MAPPER: dict[str, ON_CONFLICT_STRICT] = {
     "os": "overwrite-self-managed",
     "bs": "backup-self-managed",
     "od": "overwrite-default-path",
-    "bd": "backup-default-path"
+    "bd": "backup-default-path",
+    "throw-error": "throw-error",
+    "overwrite-self-managed": "overwrite-self-managed",
+    "backup-self-managed": "backup-self-managed",
+    "overwrite-default-path": "overwrite-default-path",
+    "backup-default-path": "backup-default-path",
     }
 
 
 def main_public_from_parser(method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., "--method", "-m", help="Method to use for setting up the config file.")],
                             on_conflict: Annotated[ON_CONFLICT_LOOSE, typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
-                            which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process (default: all)")] = None,
+                            which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = "all",
                             interactive: Annotated[bool, typer.Option(..., "--interactive", "-i", help="Run in interactive mode")] = False):
     """Terminology:
     SOURCE = Self-Managed-Config-File-Path
@@ -59,22 +64,31 @@ def main_public_from_parser(method: Annotated[Literal["symlink", "s", "copy", "c
 
 def main_private_from_parser(method: Annotated[Literal["symlink", "s", "copy", "c"], typer.Option(..., help="Method to use for linking files")],
                              on_conflict: Annotated[ON_CONFLICT_LOOSE, typer.Option(..., help="Action to take on conflict")] = "throw-error",
-                             which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
-                             interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
+                             which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = "all",
+                             interactive: Annotated[bool, typer.Option(..., "--interactive", "-i", help="Run in interactive mode")] = False):
     from machineconfig.profile.create_links import ConfigMapper, read_mapper
     mapper_full = read_mapper()["private"]
     if which is None:
-        assert interactive is True
+        if interactive is False:
+            typer.echo("[red]Error:[/] --which must be provided when not running in interactive mode.")
+            typer.Exit(code=1)
+            return
         from machineconfig.utils.options import choose_from_options
         items_chosen = choose_from_options(msg="Which symlink to create?", options=list(mapper_full.keys()), fzf=True, multi=True)
     else:
-        assert interactive is False
+        if interactive is True:
+            typer.echo("[yellow]Warning:[/] --which is provided, but its not allowed to be used together with --interactive. Ignoring --interactive flag.")
+            typer.Exit(code=0)
+            return
         if which == "all":
             items_chosen = list(mapper_full.keys())
         else:
             items_chosen = which.split(",")
     items_objections: dict[str, list[ConfigMapper]] = {item: mapper_full[item] for item in items_chosen if item in mapper_full}
-
+    if len(items_objections) == 0:
+        typer.echo("[red]Error:[/] No valid items selected.")
+        typer.Exit(code=1)
+        return
     from machineconfig.profile.create_links import apply_mapper
     method_map: dict[str, Literal["symlink", "copy"]] = {
         "s": "symlink",

machineconfig/profile/mapper.toml

@@ -33,9 +33,6 @@ config2 = {this = '~/.cli-m365-all-connections.json', to_this = '~/dotfiles/cred
 config3 = {this = '~/.cli-m365-connection.json',      to_this = '~/dotfiles/creds/tokens/.cli-m365-connection.json'}
 # config2 = {this = '~/.cli-m365-tokens.json',        to_this = '~/dotfiles/creds/tokens/.cli-m365-tokens.json'}
 
-# [bash_linux]
-# bashrc = {this = '~/.inputrc', to_this = '~/dotfiles/shells/bash/.inputrc'}
-
 [remmina]
 data = {this = '~/.var/app/org.remmina.Remmina/data/remmina', to_this = '~/dotfiles/creds/RDP/remmina/data/remmina'}
 
@@ -166,7 +163,7 @@ config = {this = '~/.config/pudb/pudb.cfg', to_this = 'CONFIG_ROOT/settings/pudb
 # AllUsersCurrentHost = {this = 'C:\Windows\System32\WindowsPowerShell\v1.0\Microsoft.PowerShell_profile.ps1', to_this = '~/dotfiles/shells/powershell/AllUsersCurrentHost/Microsoft.PowerShell_profile.ps1'}
 # AllUsersAllHosts = {this = 'C:\Windows\System32\WindowsPowerShell\v1.0\profile.ps1', to_this = '~/dotfiles/shells/windows_powershell/AllUsersAllHosts/profile.ps1'}
 
-[pwsh_windows]
+# [pwsh_windows]
 # CurrentUserCurrentHost = {this = '~/Documents/PowerShell/Microsoft.PowerShell_profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}
 # CurrentUserAllHosts = {this = '~/Documents/PowerShell/profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/profile.ps1'}
 # AllUsersCurrentHost = {this = 'C:\Program Files\PowerShell\7\Microsoft.PowerShell_profile.ps1', to_this = 'CONFIG_ROOT/settings/shells/pwsh/init.ps1'}

machineconfig/scripts/linux/wrap_mcfg

@@ -13,7 +13,7 @@ wrap_in_shell_script() {
 
   local command="$1"
   shift  
-  local RANDOM_NAME=$(date +%s%N | sha256sum | head -c 16)
+  local RANDOM_NAME=$(uuidgen | tr -d '-' | head -c 16)
   local OP_DIR="$HOME/tmp_results/tmp_scripts/machineconfig"
   local OP_PROGRAM_PATH="$OP_DIR/${RANDOM_NAME}.sh"
   export OP_PROGRAM_PATH

machineconfig/scripts/python/croshell.py

@@ -2,30 +2,30 @@
 
 """
 croshell
+
 """
 
 from typing import Annotated, Optional
 import typer
 
 
-
 def croshell(
     path: Annotated[Optional[str], typer.Argument(help="path of file to read.")] = None,
     python: Annotated[bool, typer.Option("--python", "-p", help="flag to use python over IPython.")] = False,
     profile: Annotated[Optional[str], typer.Option("--profile", "-P", help="ipython profile to use, defaults to default profile.")] = None,
     jupyter: Annotated[bool, typer.Option("--jupyter", "-j", help="run in jupyter interactive console")] = False,
     vscode: Annotated[bool, typer.Option("--vscode", "-c", help="open the script in vscode")] = False,
-    streamlit_viewer: Annotated[bool, typer.Option("--streamlit", "-s", help="view in streamlit app")] = False,
+    # streamlit_viewer: Annotated[bool, typer.Option("--streamlit", "-s", help="view in streamlit app")] = False,
     visidata: Annotated[bool, typer.Option("--visidata", "-v", help="open data file in visidata")] = False,
     marimo: Annotated[bool, typer.Option("--marimo", "-m", help="open the notebook using marimo if available")] = False,
 ) -> None:
-    from machineconfig.scripts.python.helpers_croshell.crosh import code, get_read_data_pycode
+    from machineconfig.scripts.python.helpers_croshell.crosh import get_read_python_file_pycode, get_read_data_pycode
     from machineconfig.utils.meta import lambda_to_python_script
+    from machineconfig.utils.path_helper import get_choice_file
     from machineconfig.utils.path_extended import PathExtended
     from pathlib import Path
     from machineconfig.utils.accessories import randstr
     import json
-    from machineconfig.utils.options import choose_from_options
     from rich.console import Console
     from rich.panel import Panel
     console = Console()
@@ -35,41 +35,18 @@ def croshell(
     interactivity = "-i"
     interpreter = "python" if python else "ipython"
     ipython_profile: Optional[str] = profile
-    file_obj = PathExtended.cwd()  # initialization value, could be modified according to args.
-
-    if path == ".":
-        text = "🔍 Searching for Python files..."
-        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
-        options = [str(item) for item in PathExtended.cwd().search("*.py", r=True)]
-        file_selected = choose_from_options(msg="Choose a python file to run", options=options, fzf=True, multi=False)
-        assert isinstance(file_selected, str)
-        program = PathExtended(file_selected).read_text(encoding="utf-8")
-        text = f"📄 Selected file: {PathExtended(file_selected).name}"
-        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
-
-    elif path != "" and path is not None:
-        if streamlit_viewer:
-            #             text = "📊 STARTING STREAMLIT VIEWER"
-            #             console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
-            #             from machineconfig.scripts.python.viewer import run
-            #             py_file_path = run(data_path=args.read, data=None, get_figure=None)
-            #             final_program = f"""
-            # #!/bin/bash
-            # streamlit run {py_file_path}
-            # """
-            #             PROGRAM_PATH.write_text(data=final_program, encoding="utf-8")
-            print("Streamlit viewer is not yet implemented in this version.")
-            return None
-        file_obj = PathExtended(str(path).lstrip()).expanduser().absolute()
-        program = lambda_to_python_script(lambda: get_read_data_pycode(path=str(file_obj)), in_global=True, import_module=False)
-        text = f"📄 Reading data from: {file_obj.name}"
-        console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
+    file_obj = Path.cwd()  # initialization value, could be modified according to args.
+    if path is not None:
+        choice_file = get_choice_file(path=path, suffixes={".*"})
+        if choice_file.suffix == ".py":
+            program = choice_file.read_text(encoding="utf-8")
+            text = f"📄 Selected file: {choice_file.name}"
+            console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
+        else:
+            program = lambda_to_python_script(lambda: get_read_data_pycode(path=str(choice_file)), in_global=True, import_module=False)
+            text = f"📄 Reading data from: {file_obj.name}"
+            console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
     else:  # if nothing is specified, then run in interactive mode.
-        # text = "⌨️  Entering interactive mode"
-        # console.print(Panel(text, title="[bold blue]Info[/bold blue]"))
-        # from machineconfig.scripts.python.croshell import InteractiveShell
-        # InteractiveShell().run()
-        # return None
         program = ""
     preprogram = """
 #%%
@@ -91,7 +68,7 @@ def croshell(
     pyfile.parent.mkdir(parents=True, exist_ok=True)
 
     title = "Reading Data"
-    def_code = lambda_to_python_script(lambda: code(path=str(pyfile), title=title), in_global=False, import_module=False)
+    def_code = lambda_to_python_script(lambda: get_read_python_file_pycode(path=str(pyfile), title=title), in_global=False, import_module=False)
     # print(def_code)
     python_program = preprogram + "\n\n" + def_code + program
     pyfile.write_text(python_program, encoding="utf-8")
@@ -130,7 +107,7 @@ def croshell(
             fire_line = f"uv run --python 3.14 --with visidata,pyarrow vd {str(file_obj)}"
     elif marimo:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--with marimo --project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: requirements = """--python 3.14 --with "marimo,machineconfig[plot]>=7.49" """
+        else: requirements = """--python 3.14 --with "marimo,cowsay,machineconfig[plot]>=7.64" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run --python 3.14 --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
@@ -138,14 +115,14 @@ uv run {requirements} marimo edit --host 0.0.0.0 marimo_nb.py
 """
     elif jupyter:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with jupyterlab """
-        else: requirements = """--with "machineconfig[plot]>=7.49" """
+        else: requirements = """--with "cowsay,machineconfig[plot]>=7.64" """
         fire_line = f"uv run {requirements} jupyter-lab {str(nb_target)}"
     elif vscode:
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv init --python 3.14
 uv venv
-uv add "machineconfig[plot]>=7.49"
+uv add "cowsay,machineconfig[plot]>=7.64"
 # code serve-web
 code --new-window {str(pyfile)}
 """
@@ -153,7 +130,7 @@ code --new-window {str(pyfile)}
         if interpreter == "ipython": profile = f" --profile {ipython_profile} --no-banner"
         else: profile = ""
         if Path.home().joinpath("code/machineconfig").exists(): ve_line = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: ve_line = """--python 3.14 --with "machineconfig[plot]>=7.49" """
+        else: ve_line = """--python 3.14 --with "cowsay,machineconfig[plot]>=7.64" """
         # ve_path_maybe, ipython_profile_maybe = get_ve_path_and_ipython_profile(Path.cwd())
         # --python 3.14
         fire_line = f"uv run {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"

machineconfig/scripts/python/devops.py

@@ -12,17 +12,16 @@ import machineconfig.scripts.python.helpers_devops.cli_nw as cli_network
 
 def install(which: Annotated[Optional[str], typer.Argument(..., help="Comma-separated list of program names to install, or group name if --group flag is set.")] = None,
         group: Annotated[bool, typer.Option(..., "--group", "-g", help="Treat 'which' as a group name. A group is bundle of apps.")] = False,
-        interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Interactive selection of programs to install.")] = False,
+        interactive: Annotated[bool, typer.Option(..., "--interactive", "-i", help="Interactive selection of programs to install.")] = False,
     ) -> None:
-        """📦 Install essential packages"""
-        import machineconfig.utils.installer_utils.installer as installer_entry_point
+        """📦 Install packages"""
+        import machineconfig.utils.installer_utils.installer_cli as installer_entry_point
         installer_entry_point.main(which=which, group=group, interactive=interactive)
 
 
 def get_app():
     app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True, add_help_option=False,
                       add_completion=False)
-    _ = install
     app.command("install", no_args_is_help=True, help="🛠️ [i] Install essential packages")(install)
     app.command("i", no_args_is_help=True, help="Install essential packages", hidden=True)(install)
     app_repos = cli_repos.get_app()

machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=7.49",
+#     "machineconfig>=7.64",
 #     "textual",
 #     "pyperclip",
 # ]