machineconfig 6.53__tar.gz → 6.54__tar.gz

{machineconfig-6.53/src/machineconfig.egg-info → machineconfig-6.54}/PKG-INFO

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

{machineconfig-6.53 → machineconfig-6.54}/pyproject.toml

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

{machineconfig-6.53 → machineconfig-6.54}/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -1,24 +1,21 @@
 
 from types import FunctionType
-from typing import Literal
+from typing import Optional, Literal
 from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
 from pathlib import Path
 
-def get_fire_command_and_artifact_files(func: FunctionType):
+def get_fire_tab_using_uv(func: FunctionType, uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> tuple[TabConfig, Path]:
     from machineconfig.utils.meta import lambda_to_defstring
     py_script =  lambda_to_defstring(lmb=lambda: func, in_global=True)
-    from machineconfig.utils.accessories import randstr
-    py_script_path = Path.home().joinpath("tmp_results", "tmp_py_scripts", f"tmp_{randstr(10)}.py")
-    py_script_path.parent.mkdir(parents=True, exist_ok=True)
-    py_script_path.write_text(py_script, encoding="utf-8")
-    command_to_run = f"uv run {py_script_path}"
+    from machineconfig.utils.code import get_uv_command_executing_python_script
+    command_to_run, py_script_path = get_uv_command_executing_python_script(python_script=py_script, uv_with=uv_with, uv_project_dir=uv_project_dir)
     tab_config: TabConfig = {
         "command": command_to_run,
         "startDir": "$HOME",
         "tabName": func.__name__
     }
     return tab_config, py_script_path
-def get_fire_command_and_artifact_files_v2(func: FunctionType):
+def get_fire_tab_using_fire(func: FunctionType):
     import inspect
     path = Path(inspect.getfile(func))
     path_relative = path.relative_to(Path.home())
@@ -36,10 +33,10 @@ def make_layout_from_functions(functions: list[FunctionType], tab_configs: list[
     for a_func in functions:
         match method:
             case "script":
-                tab_config, artifact_files_1 = get_fire_command_and_artifact_files(a_func)
+                tab_config, artifact_files_1 = get_fire_tab_using_uv(a_func, uv_with=None, uv_project_dir=None)
                 artifact_files = [artifact_files_1]
             case "fire":
-                tab_config = get_fire_command_and_artifact_files_v2(a_func)
+                tab_config = get_fire_tab_using_fire(a_func)
                 artifact_files = []
         tabs2artifacts.append((tab_config, artifact_files))
     list_of_tabs = [tab for tab, _ in tabs2artifacts] + tab_configs

{machineconfig-6.53 → machineconfig-6.54}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -6,7 +6,7 @@ import typer
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.terminal import Response
 from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH
-from machineconfig.utils.code import get_shell_file_executing_python_script
+from machineconfig.utils.code import get_uv_command_executing_python_script
 from pathlib import Path
 import platform
 import subprocess
@@ -112,7 +112,7 @@ git pull originEnc master
             from machineconfig.scripts.python.helpers_repos.sync import delete_remote_repo_copy_and_push_local
             delete_remote_repo_copy_and_push_local(remote_repo=remote_repo, local_repo=local_repo, cloud=cloud)
         program_1_py = lambda_to_defstring(lambda: func2(remote_repo=str(repo_remote_root), local_repo=str(repo_local_root), cloud=str(cloud_resolved)), in_global=True)
-        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, uv_with=uv_with, uv_project_dir=uv_project_dir)
+        uv_command_1, _pyfile1 = get_uv_command_executing_python_script(python_script=program_1_py, uv_with=uv_with, uv_project_dir=uv_project_dir)
         # ================================================================================
         option2 = "Delete local repo and replace it with remote copy:"
         program_2 = f"""
@@ -137,7 +137,7 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
         # program_3_py = function_to_script(func=func, call_with_kwargs={"repo_local_root": str(repo_local_root), "repo_remote_root": str(repo_remote_root)})
         # shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable=executable)
         program_3_py = lambda_to_defstring(lambda: func(repo_local_root=str(repo_local_root), repo_remote_root=str(repo_remote_root)), in_global=True)
-        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, uv_with=uv_with, uv_project_dir=uv_project_dir)
+        uv_command_3, _pyfile3 = get_uv_command_executing_python_script(python_script=program_3_py, uv_with=uv_with, uv_project_dir=uv_project_dir)
         # ================================================================================
 
         option4 = "Remove problematic rclone file from repo and replace with remote:"
@@ -146,7 +146,7 @@ rm $HOME/dotfiles/creds/rclone/rclone.conf
 cp $HOME/.config/machineconfig/remote/dotfiles/creds/rclone/rclone.conf $HOME/dotfiles/creds/rclone
 cd $HOME/dotfiles
 git commit -am "finished merging"
-. {shell_file_1}
+{uv_command_1}
 """
         shell_file_4 = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
         shell_file_4.write_text(program_4, encoding="utf-8")
@@ -154,9 +154,9 @@ git commit -am "finished merging"
 
         console.print(Panel("🔄 RESOLVE MERGE CONFLICT\nChoose an option to resolve the conflict:", title_align="left", border_style="blue"))
 
-        print(f"• {option1:75} 👉 {shell_file_1}")
+        print(f"• {option1:75} 👉 {uv_command_1}")
         print(f"• {option2:75} 👉 {shell_file_2}")
-        print(f"• {option3:75} 👉 {shell_file_3}")
+        print(f"• {option3:75} 👉 {uv_command_3}")
         print(f"• {option4:75} 👉 {shell_file_4}")
         print("\n\n")
 
@@ -166,21 +166,21 @@ git commit -am "finished merging"
                 import questionary
                 choice = questionary.select("Choose one option:", choices=[option1, option2, option3, option4]).ask()
                 if choice == option1:
-                    program_content = shell_file_1.read_text(encoding="utf-8")
+                    program_content = uv_command_1
                 elif choice == option2:
                     program_content = program_2
                 elif choice == option3:
-                    program_content = shell_file_3.read_text(encoding="utf-8")
+                    program_content = uv_command_3
                 elif choice == option4:
                     program_content = program_4
                 else:
                     raise NotImplementedError(f"Choice {choice} not implemented.")
             case "push-local-merge":
-                program_content = shell_file_1.read_text(encoding="utf-8")
+                program_content = uv_command_1
             case "overwrite-local":
                 program_content = program_2
             case "stop-on-conflict":
-                program_content = shell_file_3.read_text(encoding="utf-8")
+                program_content = uv_command_3
             case "remove-rclone-conflict":
                 program_content = program_4
             case _:

{machineconfig-6.53 → machineconfig-6.54}/src/machineconfig/utils/code.py

@@ -1,5 +1,6 @@
+
 import atexit
-import platform
+# import platform
 from typing import Optional
 import subprocess
 from machineconfig.utils.accessories import randstr
@@ -23,34 +24,23 @@ def print_code(code: str, lexer: str, desc: str, subtitle: str = ""):
     console.print(Panel(Syntax(code=code, lexer=lexer), title=f"📄 {desc}", subtitle=subtitle), style="bold red")
 
 
-def get_shell_file_executing_python_script(python_script: str, uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> Path:
+def get_uv_command_executing_python_script(python_script: str, uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> tuple[str, Path]:
     python_file = PathExtended.tmp().joinpath("tmp_scripts", "python", randstr() + ".py")
     python_file.parent.mkdir(parents=True, exist_ok=True)
-    python_file.write_text(python_script, encoding="utf-8")
     if uv_with is not None and len(uv_with) > 0:
+        uv_with.append("rich")
         uv_with_arg = "--with " + '"' + ",".join(uv_with) + '"'
     else:
-        uv_with_arg = ""
+        uv_with_arg = "--with rich"
     if uv_project_dir is not None:
         uv_project_dir_arg = "--project" + f' "{uv_project_dir}"'
     else:
         uv_project_dir_arg = ""
-    
     from machineconfig.utils.meta import lambda_to_defstring
     print_code_string = lambda_to_defstring(lambda: print_code(code=python_script, lexer="python", desc="Temporary Python Script", subtitle="Executing via shell script"), in_global=True)
-    python_file_tmp = PathExtended.tmp().joinpath("tmp_scripts", "python", randstr() + ".py")
-    python_file_tmp.parent.mkdir(parents=True, exist_ok=True)
-    python_file_tmp.write_text(print_code_string, encoding="utf-8")
-
-    shell_script = f"""
-uv run --with rich {python_file_tmp}
-uv run {uv_with_arg} {uv_project_dir_arg}  {str(python_file)} 
-"""
-    
-    shell_path = PathExtended.tmp().joinpath("tmp_scripts", "shell", randstr() + (".ps1" if platform.system() == "Windows" else ".sh"))
-    shell_path.parent.mkdir(parents=True, exist_ok=True)
-    shell_path.write_text(shell_script, encoding="utf-8")    
-    return shell_path
+    python_file.write_text(print_code_string + "\n" + python_script, encoding="utf-8")
+    shell_script = f"""uv run {uv_with_arg} {uv_project_dir_arg}  {str(python_file)} """
+    return shell_script, python_file
 
 
 def run_shell_script(script: str, display_script: bool = True, clean_env: bool = False):

{machineconfig-6.53 → machineconfig-6.54}/src/machineconfig/utils/ssh.py

@@ -189,10 +189,10 @@ class SSH:
     def run_py(self, python_code: str, uv_with: Optional[list[str]], uv_project_dir: Optional[str],
                description: str, verbose_output: bool, strict_stderr: bool, strict_return_code: bool) -> Response:
         from machineconfig.utils.accessories import randstr
-        cmd_path = Path.home().joinpath(f"{DEFAULT_PICKLE_SUBDIR}/runpy_{randstr()}.py")
-        cmd_path.parent.mkdir(parents=True, exist_ok=True)
-        cmd_path.write_text(python_code, encoding="utf-8")
-        self.copy_from_here(source_path=cmd_path, target_path=None, compress_with_zip=False, recursive=False, overwrite_existing=False)
+        py_path = Path.home().joinpath(f"{DEFAULT_PICKLE_SUBDIR}/runpy_{randstr()}.py")
+        py_path.parent.mkdir(parents=True, exist_ok=True)
+        py_path.write_text(python_code, encoding="utf-8")
+        self.copy_from_here(source_path=py_path, target_path=None, compress_with_zip=False, recursive=False, overwrite_existing=False)
         if uv_with is not None and len(uv_with) > 0:
             with_clause = " --with " + '"' + ",".join(uv_with) + '"'
         else:
@@ -201,7 +201,7 @@ class SSH:
             with_clause += f" --project {uv_project_dir}"
         else:
             with_clause += ""
-        uv_cmd = f"""{UV_RUN_CMD} {with_clause} python {cmd_path.relative_to(Path.home())}"""
+        uv_cmd = f"""{UV_RUN_CMD} {with_clause} python {py_path.relative_to(Path.home())}"""
         return self.run_shell(command=uv_cmd, verbose_output=verbose_output, description=description or f"run_py on {self.get_remote_repr(add_machine=False)}", strict_stderr=strict_stderr, strict_return_code=strict_return_code)
 
     def run_py_func(self, func: Callable[..., Any], uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> Response:

{machineconfig-6.53 → machineconfig-6.54/src/machineconfig.egg-info}/PKG-INFO

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