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

machineconfig/utils/ve.py

@@ -2,10 +2,12 @@
 """python and ve installation related utils
 """
 
-from crocodile.file_management import P, Struct, modify_text, List, Read, Save
+from crocodile.core import Struct, Save, List
+from crocodile.file_management import P, Read
+
 from machineconfig.utils.utils import LIBRARY_ROOT
 import platform
-from dataclasses import dataclass
+from dataclasses import dataclass, asdict
 from typing import Optional, Literal
 
 
@@ -25,7 +27,7 @@ class VE_INI:
 def get_ipython_profile(init_path: P):
     """Relies on .ipy_profile"""
     a_path = init_path
-    ipy_profile: str = "default"
+    ipy_profile: str="default"
     idx = len(a_path.parts)
     while idx >= 0:
         if a_path.joinpath(".ipy_profile").exists():
@@ -37,9 +39,7 @@ def get_ipython_profile(init_path: P):
     else:
         print(f"⚠️ Using default IPython: {ipy_profile}")
     return ipy_profile
-
-
-def get_ve_profile(init_path: P, strict: bool = False):
+def get_ve_profile(init_path: P, strict: bool=False):
     """Relies on .ve_path"""
     ve = ""
     tmp = init_path
@@ -51,8 +51,6 @@ def get_ve_profile(init_path: P, strict: bool = False):
         tmp = tmp.parent
     if ve == "" and strict: raise ValueError("❌ No virtual environment found.")
     return ve
-
-
 def get_ve_name_and_ipython_profile(init_path: P):
     ve_name = "ve"
     ipy_profile = "default"
@@ -68,8 +66,6 @@ def get_ve_name_and_ipython_profile(init_path: P):
             break
         tmp = tmp.parent
     return ve_name, ipy_profile
-
-
 def get_current_ve():
     import sys
     path = P(sys.executable)  # something like ~\\venvs\\ve\\Scripts\\python.exe'
@@ -86,27 +82,26 @@ def get_installed_interpreters() -> list[P]:
         tmp = list(set(items.filter(lambda x: not x.is_symlink() and "-" not in x)))
     List(tmp).print()
     return list(set([P(x) for x in tmp]))
-
-
 def get_ve_specs(ve_path: P) -> dict[str, str]:
     ini = r"[mysection]\n" + ve_path.joinpath("pyvenv.cfg").read_text()
     import configparser
     config = configparser.ConfigParser()
     config.read_string(ini)
     res = dict(config['mysection'])
-    res['version_major_minor'] = ".".join(res['version'].split(".")[0:2])
+    # try:
+    #     res['version_major_minor'] = ".".join(res['version'].split(".")[0:2])
+    # except KeyError:
+    #     # res['version_major_minor'] = ".".join(res['version_info'].split(".")[0:2])
     return res
 
 
-def get_ve_install_script(ve_name: Optional[str] = None, py_version: Optional[str] = None, install_crocodile_and_machineconfig: Optional[bool] = None,
-                          delete_if_exists: bool = True,
-                          system: Optional[Literal["Windows", "Linux"]] = None) -> str:
+def get_ve_install_script(ve_name: Optional[str] = None, py_version: Optional[str] = None,
+                          install_crocodile_and_machineconfig: Optional[bool] = None,
+                          delete_if_exists: bool=True,
+                        #   system: Optional[Literal["Windows", "Linux"]] = None
+                          ) -> str:
     from rich.console import Console
-    if system is None:
-        system_: str = platform.system()
-    else: system_ = system
     console = Console()
-
     if py_version is None:
         print("\n\n")
         console.rule("Existing Python versions", style="bold red")
@@ -114,130 +109,185 @@ def get_ve_install_script(ve_name: Optional[str] = None, py_version: Optional[st
         List(res).print()
         print("\n\n")
         dotted_py_version = input("Enter python version (3.11): ") or "3.11"
-    else: dotted_py_version = py_version
+    else:
+        dotted_py_version = py_version
 
     if ve_name is None:
-        console.rule(f"Existing virtual environments")
+        console.rule("Existing virtual environments")
         for ve_path in P.home().joinpath("venvs").search("*", files=False):
-            ve_specs = get_ve_specs(ve_path)
-            # console.print(Panel(str(ve_specs), title=ve_path.stem, style="bold blue"))
+            try:
+                ve_specs = get_ve_specs(ve_path)
+            except Exception as _e:
+                continue
             Struct(ve_specs).print(title=ve_path.stem, as_config=True)
         ve_name = input("Enter virtual environment name (tst): ") or "tst"
 
-    if install_crocodile_and_machineconfig is None: croco_mac = input("Install essential repos? (y/[n]): ") == "y"
-    else: croco_mac = install_crocodile_and_machineconfig
+    if install_crocodile_and_machineconfig is None:
+        essential_repos = input("Install essential repos? (y/[n]): ") == "y"
+        other_repos = input("Input space separated other packages: ")
+    else:
+        essential_repos = install_crocodile_and_machineconfig
+        other_repos = ""
 
     env_path = P.home().joinpath("venvs", ve_name)
     if delete_if_exists and env_path.exists():
         sure = input(f"An existing environment found. Are you sure you want to delete {env_path} before making new one? (y/[n]): ") == "y"
-        console.rule(f"Deleting existing enviroment with similar name")
+        console.rule("Deleting existing enviroment with similar name")
         env_path.delete(sure=sure)
 
-    scripts = LIBRARY_ROOT.joinpath(f"setup_{system_.lower()}/ve.{'ps1' if system_ == 'Windows' else 'sh'}").read_text()
-
-    variable_prefix = "$" if system_ == "Windows" else ""
-    line1 = f"{variable_prefix}ve_name='{ve_name}'"
-    line2 = f"{variable_prefix}py_version='{dotted_py_version}'"
-    line_start = "# --- Define ve name and python version here ---"
-    line_end = "# --- End of user defined variables ---"
-    assert line_start in scripts and line_end in scripts, "Script template was mutated beyond recognition."
-    scripts = scripts.split(line_start)[0] + "\n".join([line_start, line1, line2, line_end]) + scripts.split(line_end)[1]
-
-    if croco_mac:  # TODO make this more robust by removing sections of the script as opposed to word placeholders.
-        text = LIBRARY_ROOT.joinpath(f"setup_{system_.lower()}/repos.{'ps1' if system_ == 'Windows' else 'sh'}").read_text()
-        text = modify_text(txt_raw=text, txt_search="ve_name=", txt_alt=f"{variable_prefix}ve_name='{ve_name}'", replace_line=True)
-        scripts += text
+    system = platform.system()
+    if system == "Windows":
+        script = get_ps1_ve_install_script(ve_name=ve_name, py_version=dotted_py_version, use_web=False, system=system)
+    elif system == "Linux":
+        script = get_bash_ve_install_script(ve_name=ve_name, py_version=dotted_py_version, use_web=False, system=system)
+    else:
+        raise NotImplementedError(f"System {system} not supported.")
 
-    # ve_ini_specs = VE_Specs(ve_name=ve_name, py_version=dotted_py_version, ipy_profile="default", os=system_)
-    # ve_ini = VE_INI(specs=ve_ini_specs)
-    return scripts
+    if essential_repos:
+        if system == "Windows":
+            script += "\n" + get_ps1_repos_install_script(ve_name=ve_name, use_web=False, system=system)
+        elif system == "Linux":
+            script += "\n" + get_bash_repos_install_script(ve_name=ve_name, use_web=False, system=system)
+        else:
+            raise NotImplementedError(f"System {system} not supported.")
+
+    if other_repos != "":
+        # TODO: check the quivalent full path of uv on windows $HOME/.local/bin/
+        script += "\nuv pip install " + other_repos
+    # target = repo_root.joinpath(".venv")
+    # source = P.home().joinpath("venvs", ve_name)
+    # if system == "Windows": cmd = f'New-Item -ItemType SymbolicLink -Path "{target}" -Target "{source}"'
+    # elif system == "Linux": cmd = f'ln -s "{source}" "{target}"'
+    # else: raise NotImplementedError(f"System {system} not supported.")
+    # script += f"\n{cmd}"
+
+    link_ve: str=input("Create symlinks? [y/[n]] ") == "y"
+    if link_ve: create_symlinks(repo_root=P.cwd(), ve_name=ve_name, dotted_py_version=dotted_py_version, system=system, ipy_profile="default")
+    make_installation_recipe(repo_root=P.cwd(), ve_name=ve_name, py_version=dotted_py_version)
+    return script
 
 
-def get_ve_install_script_from_specs(repo_root: str, system: Literal["Windows", "Linux"]):
-    ini_file = P(repo_root).joinpath(".ve.ini")
-    assert ini_file.exists(), f"File {ini_file} does not exist."
-    ini = Read.ini(ini_file)
-    ve_name = ini["specs"]["ve_name"]
-    py_version = ini["specs"]["py_version"]
-    ipy_profile = ini["specs"]["ipy_profile"]
+def create_symlinks(repo_root: P, ve_name: str, dotted_py_version: str, system: Literal["Windows", "Linux"], ipy_profile: str):
+    from machineconfig.utils.utils import symlink_func
+    source = repo_root.joinpath(".venv")
+    target = P.home().joinpath("venvs", ve_name)
+    target.mkdir(exist_ok=True, parents=True)  # if ve not created yet, make up a folder at least, so that symlink can be created, then this folder is either populated or recreated by ve creation script.
+    symlink_func(this=source, to_this=target)
 
     # for backward compatibility:
-    ini_file.with_name(".ve_path").write_text(f"~/venvs/{ve_name}")
-    ini_file.with_name(".ipy_profile").write_text(ipy_profile)
-
-    vscode_settings = P(repo_root).joinpath(".vscode/settings.json")
-    if vscode_settings.exists():
-        settings = Read.json(vscode_settings)
+    repo_root.joinpath(".ve_path").write_text(f"~/venvs/{ve_name}")
+    repo_root.joinpath(".ipy_profile").write_text(ipy_profile)
+
+    ve_ini_specs = VE_Specs(ve_name=ve_name, py_version=dotted_py_version, ipy_profile="default", os=system)
+    ve_ini = VE_INI(specs=ve_ini_specs)
+    Save.ini(obj=asdict(ve_ini), path=repo_root.joinpath(".ve.ini"))
+    vscode = repo_root.joinpath(".vscode/settings.json")
+    if vscode.exists():
+        settings = Read.json(vscode)
     else:
         settings = {}
     if system == "Windows":
-        settings["python.defaultInterpreterPath"] = f"~/venvs/{ve_name}/Scripts/python.exe"
+        settings["python.defaultInterpreterPath"] = P.home().joinpath("venvs", ve_name, "Scripts", "python.exe").as_posix()
     elif system == "Linux":
-        settings["python.defaultInterpreterPath"] = f"~/venvs/{ve_name}/bin/python"
-        pass
+        settings["python.defaultInterpreterPath"] = P.home().joinpath("venvs", ve_name, "bin", "python").as_posix()
     else:
         raise NotImplementedError(f"System {system} not supported.")
-    Save.json(obj=settings, path=vscode_settings, indent=4)
+    Save.json(obj=settings, path=vscode, indent=4)
+
 
+def make_installation_recipe(repo_root: str, ve_name: str, py_version: str):
     subpath = "versions/init"
     base_path = P(repo_root).joinpath(subpath).create()
-    if system == "Windows":
-        script = get_ps1_install_template(ve_name=ve_name, py_version=py_version)
-        base_path.joinpath("install_ve.ps1").write_text(script)
-    elif system == "Linux":
-        script = get_bash_install_template(ve_name=ve_name, py_version=py_version)
-        base_path.joinpath("install_ve.sh").write_text(script)
-    else:
-        raise NotImplementedError(f"System {system} not supported.")
-
-    base_path.joinpath("install_requirements.ps1").write_text(get_install_requirements_template(repo_root=P(repo_root), requirements_subpath=subpath))
-    base_path.joinpath("install_requirements.sh").write_text(get_install_requirements_template(repo_root=P(repo_root), requirements_subpath=subpath))
 
-    # vscode:
-    if not system == "Windows":  # symlinks on windows require admin rights.
-        P(repo_root).joinpath(".venv").symlink_to(target=P.home().joinpath("venvs", ve_name), strict=False)
-        # set strict to False since ve doesn't exist yet.
+    system = "Windows"
+    path3 = base_path.joinpath("install_requirements.ps1")
+    if path3.exists(): print(f"❌ File already exists @ {path3}, skipping.")
+    else:
+        install_ve_script = get_ps1_ve_install_script(ve_name=ve_name, py_version=py_version, use_web=True, system=system)
+        install_req_script = get_install_requirements_template(repo_root=P(repo_root), requirements_subpath=subpath, ve_name=ve_name, system=system)
+        path3.write_text(install_ve_script + "\n" + install_req_script)
 
-    return script
+    system= "Linux"
+    path4 = base_path.joinpath("install_requirements.sh")
+    if path4.exists(): print(f"❌ File already exists @ {path4}, skipping.")
+    else:
+        install_ve_script = get_bash_ve_install_script(ve_name=ve_name, py_version=py_version, use_web=True, system=system)
+        install_req_script = get_install_requirements_template(repo_root=P(repo_root), requirements_subpath=subpath, ve_name=ve_name, system=system)
+        path4.write_text(install_ve_script + "\n" + install_req_script)
+    return None
 
 
-def get_ps1_install_template(ve_name: str, py_version: str):
+def get_ps1_ve_install_script(ve_name: str, py_version: str, use_web: bool, system: Literal["Windows", "Linux"]):
+    if use_web:
+        install_line = """(Invoke-WebRequest https://bit.ly/cfgvewindows).Content | Invoke-Expression"""
+    else:
+        install_line = LIBRARY_ROOT.joinpath(f"setup_{system.lower()}/ve.{'ps1' if system == 'Windows' else 'sh'}").read_text()
     template = f"""
 $ve_name = '{ve_name}'
 $py_version = '{py_version}'  # type: ignore
-(Invoke-WebRequest https://bit.ly/cfgvewindows).Content | Invoke-Expression
+{install_line}
 . $HOME/scripts/activate_ve $ve_name
 """
     return template
-def get_bash_install_template(ve_name: str, py_version: str):
+def get_bash_ve_install_script(ve_name: str, py_version: str, use_web: bool, system: Literal["Windows", "Linux"]):
+    if use_web: install_line = """curl -L https://bit.ly/cfgvelinux | bash"""
+    else:
+        install_line = LIBRARY_ROOT.joinpath(f"setup_{system.lower()}/ve.{'ps1' if system == 'Windows' else 'sh'}").read_text()
     template = f"""
 export ve_name='{ve_name}'
 export py_version='{py_version}'  # type: ignore
-curl -L https://bit.ly/cfgvelinux | bash
+{install_line}
 . $HOME/scripts/activate_ve $ve_name
+"""
+    return template
+def get_ps1_repos_install_script(ve_name: str, use_web: bool, system: Literal["Windows", "Linux"]):
+    if use_web: install_line = """(Invoke-WebRequest https://bit.ly/cfgreposwindows).Content | Invoke-Expression"""
+    else:
+        install_line = LIBRARY_ROOT.joinpath(f"setup_{system.lower()}/repos.{'ps1' if system == 'Windows' else 'sh'}").read_text()
+    template = f"""
+$ve_name = '{ve_name}'
+. $HOME/scripts/activate_ve $ve_name
+{install_line}
 """
     return template
 
-
-def get_install_requirements_template(repo_root: P, requirements_subpath: str):
+def get_bash_repos_install_script(ve_name: str, use_web: bool, system: Literal["Windows", "Linux"]):
+    if use_web: install_line = """curl -L https://bit.ly/cfgreposlinux | bash"""
+    else:
+        install_line = LIBRARY_ROOT.joinpath(f"setup_{system.lower()}/repos.{'ps1' if system == 'Windows' else 'sh'}").read_text()
+    template = f"""
+export ve_name='{ve_name}'
+. $HOME/scripts/activate_ve $ve_name
+{install_line}
+"""
+    return template
+def get_install_requirements_template(repo_root: P, requirements_subpath: str, ve_name: str, system: Literal["Windows", "Linux"]):
+    if system == 'Windows':
+        set_e_equivalent = 'Set-StrictMode -Version Latest'  # PowerShell equivalent
+        install_line = """(Invoke-WebRequest https://bit.ly/cfgreposwindows).Content | Invoke-Expression"""
+        activate_ve = fr"""$HOME\venvs\{ve_name}\Scripts\Activate.ps1 -ErrorAction Stop """
+    elif system == 'Linux':
+        set_e_equivalent = 'set -e'  # Bash equivalent
+        install_line = """curl -L https://bit.ly/cfgreposlinux | bash"""
+        activate_ve = fr""". $HOME/venvs/{ve_name}/bin/activate """
+    else: raise NotImplementedError(f"System {system} not supported.")
     return f"""
+    
 # This is a template that is meant to be modified manually to install requirements.txt and editable packages.
 # one can dispense with this and install libraries manually and on adhoc-basis and then use version_checkout utility.
 
-set -e  # exit on error, you don't want to install reqiurements in wrong environment.
+# mkdir -p $HOME/{repo_root.rel2home().as_posix()}
+# cd $HOME/{repo_root.rel2home().as_posix()}
+# git clone URL --depth 2
+
+{set_e_equivalent}
+
 cd $HOME/{repo_root.rel2home().as_posix()}
-. $HOME/scripts/activate_ve
-pip install -r {requirements_subpath}/requirements.txt
-pip install -e .
 
-# cd ~/code; git clone https://github.com/thisismygitrepo/crocodile.git --origin origin
-# cd ~/code/crocodile; git remote set-url origin https://github.com/thisismygitrepo/crocodile.git
-# cd ~/code/crocodile; git remote add origin https://github.com/thisismygitrepo/crocodile.git
-# cd ~/code/crocodile; pip install -e .
+{activate_ve}
 
-# cd ~/code; git clone https://github.com/thisismygitrepo/machineconfig --origin origin
-# cd ~/code/machineconfig; git remote set-url origin https://github.com/thisismygitrepo/machineconfig
-# cd ~/code/machineconfig; git remote add origin https://github.com/thisismygitrepo/machineconfig
-# cd ~/code/machineconfig; pip install -e .
+# {install_line}
+pip install -r {requirements_subpath}/requirements.txt
+# pip install -e .
 
 """