machineconfig 1.8__py3-none-any.whl → 1.91__py3-none-any.whl

machineconfig/scripts/python/croshell.py

@@ -8,7 +8,7 @@ import argparse
 # import subprocess
 # import platform
 from crocodile.file_management import P, randstr
-from machineconfig.utils.ve import get_ipython_profile, get_ve_profile
+from machineconfig.utils.ve import get_ipython_profile, get_ve_profile, get_ve_name_and_ipython_profile
 from machineconfig.utils.utils import PROGRAM_PATH, display_options
 
 
@@ -34,8 +34,8 @@ def get_read_data_pycode(path: str):
 p = P(r\'{path}\').absolute()
 try:
     dat = p.readit()
-    if type(dat) == Struct: dat.print(as_config=True, title=p.name)
-    else: print(f"Succcesfully read the file {{p.name}}")
+    if isinstance(dat, dict): Struct(dat).print(as_config=True, title=p.name)
+    else: print(f"Successfully read the file {{p.name}}")
 except Exception as e:
     print(e)
 
@@ -43,7 +43,7 @@ except Exception as e:
     return pycode
 
 
-def get_read_pyfile_pycode(path: P, as_module: bool, cmd: str = ""):
+def get_read_pyfile_pycode(path: P, as_module: bool, cmd: str=""):
     if as_module: pycode = fr"""
 import sys
 sys.path.append(r'{path.parent}')
@@ -72,8 +72,8 @@ def build_parser():
     parser.add_argument("--read", "-r", dest="read", help="read a binary file.", default="")
     parser.add_argument("--file", "-f", dest="file", help="python file path to interpret", default="")
     parser.add_argument("--cmd", "-c", dest="cmd", help="python command to interpret", default="")
-    parser.add_argument("--terminal", "-t", dest="terminal", help=f"specify which terminal to be used. Default console host.", default="")  # can choose `wt`
-    parser.add_argument("--shell", "-S", dest="shell", help=f"specify which shell to be used. Defaults to CMD.", default="")
+    parser.add_argument("--terminal", "-t", dest="terminal", help="specify which terminal to be used. Default console host.", default="")  # can choose `wt`
+    parser.add_argument("--shell", "-S", dest="shell", help="specify which shell to be used. Defaults to CMD.", default="")
 
     args = parser.parse_args()
     # print(f"Crocodile.run: args of the firing command = {args.__dict__}")
@@ -93,17 +93,23 @@ def build_parser():
         options = P.cwd().search("*.py", r=True).apply(str).list
         file = display_options(msg="Choose a python file to run", options=options, fzf=True, multi=False, )
         assert isinstance(file, str)
-        if profile is None: profile = profile = get_ipython_profile(P(file))
+        if profile is None:
+            profile = get_ipython_profile(P(file))
         program = P(file).read_text(encoding='utf-8')
 
     elif args.file != "":
         file = P(args.file.lstrip()).expanduser().absolute()
-        if profile is None: profile = profile = get_ipython_profile(P(file))
+        if profile is None:
+            profile = get_ipython_profile(P(file))
         program = get_read_pyfile_pycode(file, as_module=args.module, cmd=args.cmd)
 
     elif args.read != "":
         file = P(str(args.read).lstrip()).expanduser().absolute()
-        if profile is None: profile = profile = get_ipython_profile(P(file))
+        ve_name_from_file, ipy_profile_from_file = get_ve_name_and_ipython_profile(init_path=P(file))
+        # if profile is None:
+        #     profile = get_ipython_profile(P(file))
+        if profile is None: profile = ipy_profile_from_file
+        if args.ve is None: args.ve = ve_name_from_file
         program = get_read_data_pycode(str(file))
 
     else:  # just run croshell.py interactively
@@ -129,18 +135,21 @@ print_logo(logo="crocodile")
     total_program = preprogram + add_print_header_pycode(str(pyfile), title=title) + program
 
     pyfile.write_text(total_program, encoding='utf-8')
-    if profile is None: profile = "default"
+    if profile is None:
+        profile = get_ipython_profile(P.cwd())
+        # profile = "default"
 
     ve = get_ve_profile(P(file)) if args.ve is None else str(args.ve)
 
     final_program = f"""
-# deactivate
-. activate_ve {ve}
+. $HOME/scripts/activate_ve '{ve}'
 {interpreter} """
-    if interpreter == "ipython": final_program += f"{interactivity} --profile {profile} --no-banner"
+    if interpreter == "ipython":
+        final_program += f"{interactivity} --profile {profile} --no-banner"
     final_program += f" {str(pyfile)}"
     print(f"🔥 sourcing  ... {pyfile}")
-    PROGRAM_PATH.write_text(final_program)
+    # print(f"Running ... {final_program}")
+    PROGRAM_PATH.write_text(data=final_program)
 
     # if platform.system() == "Windows":
         # return subprocess.run([f"powershell", "-Command", res], shell=True, capture_output=False, text=True, check=True)

machineconfig/scripts/python/devops.py

@@ -1,9 +1,8 @@
 
 
-
 """devops
 """
-from crocodile.file_management import P
+
 from machineconfig.utils.utils import display_options, PROGRAM_PATH, write_shell_script
 from platform import system
 from enum import Enum
@@ -49,19 +48,19 @@ def main(which: Optional[str] = None):
 
     elif choice_key == Options.ve.value:
         program = ""
-        reply: bool = False
-        if P.cwd().joinpath(".ve.ini").exists():
-            reply = input("Detected .ve.ini file. Do you want to use it to build ve? (y/[n]): ") == "y"
-            if reply:
-                from machineconfig.utils.ve import get_ve_install_script_from_specs
-                program_win = get_ve_install_script_from_specs(repo_root=P.cwd().str, system="Windows")
-                program_lin = get_ve_install_script_from_specs(repo_root=P.cwd().str, system="Linux")
-                install_reply = input("Proceed with installation? (y/[n]): ") == "y"
-                if not install_reply: program = ""
-                else:
-                    if system() == "Windows": program = program_win
-                    elif system() == "Linux": program = program_lin
-                    else: raise ValueError(f"Unknown system: {system()}")
+        reply: bool=False
+        # if P.cwd().joinpath(".ve.ini").exists():
+        #     reply = input("Detected .ve.ini file. Do you want to use it to build ve? (y/[n]): ") == "y"
+        #     if reply:
+        #         from machineconfig.utils.ve import get_ve_install_script_from_specs
+        #         program_win = get_ve_install_script_from_specs(repo_root=P.cwd().to_str(), system="Windows")
+        #         program_lin = get_ve_install_script_from_specs(repo_root=P.cwd().to_str(), system="Linux")
+        #         install_reply = input("Proceed with installation? (y/[n]): ") == "y"
+        #         if not install_reply: program = ""
+        #         else:
+        #             if system() == "Windows": program = program_win
+        #             elif system() == "Linux": program = program_lin
+        #             else: raise ValueError(f"Unknown system: {system()}")
 
         if not reply:
             from machineconfig.utils.ve import get_ve_install_script
@@ -92,18 +91,18 @@ def main(which: Optional[str] = None):
         program = helper.main()
 
     elif choice_key == Options.ssh_setup.value:
-        program_windows = f"""Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
-        program_linux = f"""curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
+        program_windows = """Invoke-WebRequest https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/openssh_all.ps1 | Invoke-Expression  # https://github.com/thisismygitrepo.keys"""
+        program_linux = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_all.sh | sudo bash  # https://github.com/thisismygitrepo.keys"""
         program = program_linux if system() == "Linux" else program_windows
 
     elif choice_key == Options.ssh_setup_wsl.value:
-        program = f"""curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash"""
+        program = """curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/openssh_wsl.sh | sudo bash"""
 
     elif choice_key == Options.backup.value:
-        from machineconfig.scripts.python.devops_backup_retrieve import main as helper
+        from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve as helper
         program = helper(direction="BACKUP")
     elif choice_key == Options.retreive.value:
-        from machineconfig.scripts.python.devops_backup_retrieve import main as helper
+        from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve as helper
         program = helper(direction="RETRIEVE")
 
     elif choice_key == Options.scheduler.value:

machineconfig/scripts/python/devops_backup_retrieve.py

@@ -4,7 +4,7 @@
 
 # import subprocess
 from crocodile.file_management import Read, P
-from machineconfig.utils.utils import LIBRARY_ROOT, DEFAULTS_PATH, print_code, choose_cloud_interactively, display_options
+from machineconfig.utils.utils import LIBRARY_ROOT, DEFAULTS_PATH, print_code, choose_cloud_interactively, choose_multiple_options
 from machineconfig.scripts.python.cloud_sync import ES
 from platform import system
 from typing import Any, Literal, Optional
@@ -13,23 +13,25 @@ from typing import Any, Literal, Optional
 OPTIONS = Literal["BACKUP", "RETRIEVE"]
 
 
-def main(direction: OPTIONS, which: Optional[str] = None):
+def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None):
     try:
         cloud: str = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
         print(f"\n{'--' *  50}\n ⚠️ Using default cloud: `{cloud}` ⚠️\n{'--' *  50}\n")
     except (FileNotFoundError, KeyError, IndexError): cloud = choose_cloud_interactively()
 
-    bu_file: dict[str, Any] = LIBRARY_ROOT.joinpath("profile/backup.toml").readit()
+    bu_file: dict[str, Any] = Read.toml(LIBRARY_ROOT.joinpath("profile/backup.toml"))
     if system() == "Linux": bu_file = {key: val for key, val in bu_file.items() if "windows" not in key}
     elif system() == "Windows": bu_file = {key: val for key, val in bu_file.items() if "linux" not in key}
 
     if which is None:
-        choice_key = display_options(msg=f"WHICH FILE of the following do you want to {direction}?", options=['all'] + list(bu_file.keys()))
-        assert isinstance(choice_key, str)
-    else: choice_key = which
+        choices = choose_multiple_options(msg=f"WHICH FILE of the following do you want to {direction}?", options=['all'] + list(bu_file.keys()))
+    else:
+        choices = which.split(",") if isinstance(which, str) else which
 
-    if choice_key == "all": items = bu_file
-    else: items = {choice_key: bu_file[choice_key]}
+    if "all" in choices: items = bu_file
+    else:
+        # items = {choices: bu_file[choices]}
+        items = {key: val for key, val in bu_file.items() if key in choices}
 
     program = f"""$cloud = "{cloud}:{ES}" \n """ if system() == "Windows" else f"""cloud="{cloud}:{ES}" \n """
     for item_name, item in items.items():
@@ -42,11 +44,18 @@ def main(direction: OPTIONS, which: Optional[str] = None):
         if flags: flags = "-" + flags
         if direction == "BACKUP": program += f"""\ncloud_copy "{P(item['path']).as_posix()}" $cloud {flags}\n"""
         elif direction == "RETRIEVE": program += f"""\ncloud_copy $cloud "{P(item['path']).as_posix()}" {flags}\n"""
-        else: raise RuntimeError(f"Unknown direction: {direction}")
-        if item_name == "dotfiles" and system() == "Linux": program += f"""\nchmod 700 ~/.ssh/*\n"""
+        else:
+            raise RuntimeError(f"Unknown direction: {direction}")
+        if item_name == "dotfiles" and system() == "Linux": program += """\nchmod 700 ~/.ssh/*\n"""
     print_code(program, lexer="shell", desc=f"{direction} script")
     return program
 
 
+def main(direction: OPTIONS, which: Optional[str] = None):
+    code = main_backup_retrieve(direction=direction, which=which)
+    from machineconfig.utils.utils import write_shell_script
+    write_shell_script(program=code, desc="backup_retrieve.sh")
+
+
 if __name__ == "__main__":
     pass

machineconfig/scripts/python/devops_devapps_install.py

@@ -3,76 +3,100 @@
 """
 
 # import subprocess
+from tqdm import tqdm
 from crocodile.core import List as L
 from machineconfig.utils.utils import LIBRARY_ROOT, choose_multiple_options
-from machineconfig.utils.installer import get_installers, Installer, install_all
+from machineconfig.utils.installer import get_installers, install_all, Installer, get_all_dicts
 from platform import system
-from typing import Any, Optional, Literal, TypeAlias
+from typing import Any, Optional, Literal, TypeAlias, get_args
 
 
-WHICH: TypeAlias = Literal["AllEssentials", "EssentialsAndOthers", "SystemInstallers", "OtherDevApps", "PrecheckedCloudInstaller"]
+WHICH_CAT: TypeAlias = Literal["AllEssentials", "EssentialsAndOthers", "SystemInstallers", "PrecheckedCloudInstaller"]
 
 
-def main(which: Optional[str] = None):
-    sys = system()
-    installers = get_installers(dev=False, system=sys) + get_installers(dev=True, system=sys)
-    default = "AllEssentials"
-    options = ["SystemInstallers", "OtherDevApps", "EssentialsAndOthers", "PrecheckedCloudInstaller"]
-    options = [default] + options
-    options = [x.get_description() for x in installers] + options
+def main(which: Optional[WHICH_CAT | str] = None):
 
-    if which is not None:
-        return get_program(program_name=which, options=options, installers=list(installers))
+    if which is not None and which in get_args(WHICH_CAT):  # install by category
+        return get_programs_by_category(program_name=which)  # type: ignore
+
+    if which is not None:  # install by name
+        program_total = ""
+        for a_which in (which.split(",") if type(which) == str else which):
+            kv = {}
+            for _category, v in get_all_dicts(system=system()).items():
+                kv.update(v)
+            if a_which not in kv:
+                raise ValueError(f"{a_which=} not found in {kv.keys()}")
+            print(f"Installing {a_which}", kv[a_which])
+            installer = Installer.from_dict(name=a_which, d=kv[a_which])
+            print(installer)
+            program = installer.install_robust(version=None)  # finish the task
+            program = "echo 'Finished Installation'"  # write an empty program
+            program_total += "\n" + program
+        return program_total
+
+    # interactive installation
+    installers = [Installer.from_dict(d=vd, name=name) for __kat, vds in get_all_dicts(system=system()).items() for name, vd in vds.items()]
+    options = [x.get_description() for x in tqdm(installers, desc="Checking installed programs")] + list(get_args(WHICH_CAT))
+    program_names = choose_multiple_options(msg="", options=options, header="CHOOSE DEV APP", default="AllEssentials")
 
-    program_names = choose_multiple_options(msg="", options=options, header="CHOOSE DEV APP", default=str(default))
     total_program = ""
-    for which in program_names:
-        assert isinstance(which, str), f"program_name is not a string: {which}"
-        total_program += "\n" + get_program(program_name=which, options=options, installers=list(installers))
+    for _an_idx, a_program_name in enumerate(program_names):
+        print(a_program_name)
+        if a_program_name in get_args(WHICH_CAT):
+            total_program += "\n" + get_programs_by_category(program_name=a_program_name)  # type: ignore
+        else:
+            an_installer = installers[options.index(a_program_name)]
+            total_program += "\n" + an_installer.install_robust(version=None)  # finish the task
     return total_program
 
 
-def get_program(program_name: str, options: list[str], installers: list[Installer]):
-    if program_name == "AllEssentials" or program_name == "EssentialsAndOthers":
-        installers_ = get_installers(dev=False, system=system())
-        if program_name == "EssentialsAndOthers":
-            installers_ += get_installers(dev=True, system=system())
-        install_all(installers=L(installers))
-        program = ""
-    elif program_name == "SystemInstallers":
-        if system() == "Windows": options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text())
-        elif system() == "Linux": options_system = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps.sh").read_text())
-        else: raise NotImplementedError(f"System {system()} not supported")
-        program_names = choose_multiple_options(msg="", options=sorted(list(options_system.keys())), header="CHOOSE DEV APP")
-        program = ""
-        for name in program_names:
-            sub_program = options_system[name]
-            if sub_program.startswith("#winget"): sub_program = sub_program[1:]
-            program += "\n" + sub_program
-    elif program_name == "OtherDevApps":
-        installers = get_installers(dev=True, system=system())
-        options__: list[str] = [x.get_description() for x in installers]
-        program_names = choose_multiple_options(msg="", options=sorted(options__) + ["all"], header="CHOOSE DEV APP")
-        if "all" in program_names: program_names = options__
-        program = ""
-        for name in program_names:
-            try:
-                idx = options__.index(name)
-            except ValueError as ve:
-                print(f"{name=}")
-                print(f"{options__=}")
-                raise ve
-            sub_program = installers[idx].install_robust(version=None)  # finish the task
-    elif program_name == "PrecheckedCloudInstaller":
-        from machineconfig.jobs.python.check_installations import PrecheckedCloudInstaller
-        ci = PrecheckedCloudInstaller()
-        ci.download_safe_apps(name="AllEssentials")
-        program = ""
-    else:
-        idx = options.index(program_name)
-        print(installers[idx])
-        program = installers[idx].install_robust(version=None)  # finish the task
-        program = "echo 'Finished Installation'"  # write an empty program
+def get_programs_by_category(program_name: WHICH_CAT):
+    match program_name:
+        case "AllEssentials" | "EssentialsAndOthers":
+            installers_ = get_installers(dev=False, system=system())
+            if program_name == "EssentialsAndOthers":
+                installers_ += get_installers(dev=True, system=system())
+            install_all(installers=L(installers_))
+            program = ""
+
+        case "SystemInstallers":
+            if system() == "Windows": options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text())
+            elif system() == "Linux":
+                options_system_1 = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps_dev.sh").read_text())
+                options_system_2 = parse_apps_installer_linux(LIBRARY_ROOT.joinpath("setup_linux/apps.sh").read_text())
+                options_system = {**options_system_1, **options_system_2}
+            else: raise NotImplementedError(f"System {system()} not supported")
+            program_names = choose_multiple_options(msg="", options=sorted(list(options_system.keys())), header="CHOOSE DEV APP")
+            program = ""
+            for name in program_names:
+                sub_program = options_system[name]
+                if sub_program.startswith("#winget"): sub_program = sub_program[1:]
+                program += "\n" + sub_program
+
+        # case "OtherDevApps":
+        #     installers = get_installers(dev=True, system=system())
+        #     options__: list[str] = [x.get_description() for x in tqdm(installers, desc="Checking installed programs")]
+        #     program_names = choose_multiple_options(msg="", options=sorted(options__) + ["all"], header="CHOOSE DEV APP")
+        #     if "all" in program_names: program_names = options__
+        #     program = ""
+        #     print("Installing:")
+        #     L(program_names).print()
+        #     for name in program_names:
+        #         try:
+        #             idx = options__.index(name)
+        #         except ValueError as ve:
+        #             print(f"{name=}")
+        #             print(f"{options__=}")
+        #             raise ve
+        #         print(f"Installing {name}")
+        #         sub_program = installers[idx].install_robust(version=None)  # finish the task
+
+        case  "PrecheckedCloudInstaller":
+            from machineconfig.jobs.python.check_installations import PrecheckedCloudInstaller
+            ci = PrecheckedCloudInstaller()
+            ci.download_safe_apps(name="AllEssentials")
+            program = ""
     return program
 
 

machineconfig/scripts/python/devops_update_repos.py

@@ -3,7 +3,6 @@
 """
 
 from crocodile.file_management import P, Read
-from crocodile.core import install_n_import
 from machineconfig.utils.utils import DEFAULTS_PATH
 from platform import system
 
@@ -11,7 +10,7 @@ from platform import system
 sep = "\n"
 
 
-def main(verbose: bool = True) -> str:
+def main(verbose: bool=True) -> str:
     _ = verbose
     repos: list[str] = ["~/code/crocodile", "~/code/machineconfig", ]
     try:
@@ -20,10 +19,10 @@ def main(verbose: bool = True) -> str:
         repos += tmp
     except (FileNotFoundError, KeyError, IndexError):
         print(f"Missing {DEFAULTS_PATH} or section [general] or key repos. Using default repos.")
-        print(f"""It should look like this:
+        print("""It should look like this:
 [general]
 repos = ~/code/repo1,~/code/repo2
-rclone_config_name = onedriveWork
+rclone_config_name = onedrivePersonal
 email_config_name = Yahoo3
 to_email = myemail@email.com
 """)
@@ -31,7 +30,8 @@ to_email = myemail@email.com
     repos_objs = []
     for a_package_path in repos:
         try:
-            repo = install_n_import("git", "gitpython").Repo(str(P(a_package_path).expanduser()), search_parent_directories=True)
+            import git
+            repo = git.Repo(str(P(a_package_path).expanduser()), search_parent_directories=True)
             repos_objs.append(repo)
         except Exception as ex:
             print(ex)

machineconfig/scripts/python/dotfile.py

@@ -4,7 +4,7 @@
 
 
 from crocodile.file_management import P
-from machineconfig.profile.create import symlink
+from machineconfig.profile.create import symlink_func
 from machineconfig.utils.utils import LIBRARY_ROOT, REPO_ROOT
 import argparse
 
@@ -16,7 +16,7 @@ def main():
     # FLAGS
     parser.add_argument("--overwrite", "-o", help="Overwrite.", action="store_true")  # default is False
     # optional
-    parser.add_argument("-d", "--dest", help=f"destination folder", default="")
+    parser.add_argument("-d", "--dest", help="destination folder", default="")
 
     args = parser.parse_args()
     orig_path = P(args.file).expanduser().absolute()
@@ -28,9 +28,9 @@ def main():
         new_path = REPO_ROOT.joinpath(junction)
     else: new_path = P(args.dest).expanduser().absolute().create().joinpath(orig_path.name)
 
-    symlink(this=orig_path, to_this=new_path, prioritize_to_this=args.overwrite)
+    symlink_func(this=orig_path, to_this=new_path, prioritize_to_this=args.overwrite)
 
-    print(f"Map completed. To enshrine this mapping, add the following line to the mapper.toml file:")
+    print("Map completed. To enshrine this mapping, add the following line to the mapper.toml file:")
     print(f"nano {LIBRARY_ROOT}/symlinks/mapper.toml")
     print(f"""
 [{new_path.parent.name}]