machineconfig 5.15__py3-none-any.whl → 7.66__py3-none-any.whl

machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -0,0 +1,218 @@
+
+from typing import Optional, Literal, Annotated
+
+import typer
+
+
+def main(
+    cloud: Annotated[Optional[str], typer.Option(..., "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config.")] = None,
+    repo: Annotated[Optional[str], typer.Option(..., "--repo", "-r", help="Path to the local repository. Defaults to current working directory.")] = None,
+    message: Annotated[Optional[str], typer.Option(..., "--message", "-m", help="Commit message for local changes.")] = None,
+    on_conflict: Annotated[Literal["ask", "a",
+                                   "push-local-merge", "p",
+                                   "overwrite-local", "o",
+                                   "stop-on-conflict", "s",
+                                   "remove-rclone-conflict", "r"
+                                   ], typer.Option(..., "--on-conflict", "-o", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
+    pwd: Annotated[Optional[str], typer.Option(..., "--password", help="Password for encryption/decryption of the remote repository.")] = None,
+):
+    on_conflict_mapper: dict[str, Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"]] = {
+        "a": "ask",
+        "ask": "ask",
+        "p": "push-local-merge",
+        "push-local-merge": "push-local-merge",
+        "o": "overwrite-local",
+        "overwrite-local": "overwrite-local",
+        "s": "stop-on-conflict",
+        "stop-on-conflict": "stop-on-conflict",
+        "r": "remove-rclone-conflict",
+        "remove-rclone-conflict": "remove-rclone-conflict",
+    }
+    on_conflict = on_conflict_mapper[on_conflict]
+    import git
+    from rich.console import Console
+    from rich.panel import Panel
+
+    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_uv_command_executing_python_script
+    from pathlib import Path
+    import platform
+    import subprocess
+    console = Console()
+
+    if cloud is None:
+        try:
+            from machineconfig.utils.io import read_ini
+
+            cloud_resolved = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
+            console.print(Panel(f"⚠️  Using default cloud: `{cloud_resolved}` from {DEFAULTS_PATH}", title="Default Cloud", border_style="yellow"))
+        except FileNotFoundError:
+            console.print(Panel(f"❌ ERROR: No cloud profile found\nLocation: {DEFAULTS_PATH}\nPlease set one up or provide one via the --cloud flag.", title="Error", border_style="red"))
+            return ""
+    else:
+        cloud_resolved = cloud
+    repo_local_root = PathExtended.cwd() if repo is None else PathExtended(repo).expanduser().absolute()
+    try:
+        repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
+    except git.InvalidGitRepositoryError:
+        typer.echo(f"[red]Error:[/] The specified path '{repo_local_root}' is not a valid git repository.")
+        typer.Exit(code=1)
+        return ""
+    repo_local_root = PathExtended(repo_local_obj.working_dir)  # cwd might have been in a sub directory of repo_root, so its better to redefine it.
+    local_relative_home = PathExtended(repo_local_root.expanduser().absolute().relative_to(Path.home()))
+    PathExtended(CONFIG_ROOT).joinpath("remote").mkdir(parents=True, exist_ok=True)
+    repo_remote_root = PathExtended(CONFIG_ROOT).joinpath("remote", local_relative_home)
+    repo_remote_root.delete(sure=True)
+    try:
+        console.print(Panel("📥 DOWNLOADING REMOTE REPOSITORY", title_align="left", border_style="blue"))
+        remote_path = repo_local_root.get_remote_path(rel2home=True, os_specific=False, root="myhome") + ".zip.enc"
+        res = repo_remote_root.from_cloud(remotepath=remote_path, cloud=cloud_resolved, unzip=True, decrypt=True, rel2home=True, os_specific=False, pwd=pwd)
+        if res is None:
+            raise AssertionError("Remote repo does not exist.")
+    except AssertionError:
+        console.print(Panel("🆕 Remote repository doesn't exist\n📤 Creating new remote and exiting...", title_align="left", border_style="green"))
+        repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
+        return ""
+
+    repo_remote_obj = git.Repo(repo_remote_root)
+    if repo_remote_obj.is_dirty():
+        console.print(Panel(f"⚠️  WARNING: REMOTE REPOSITORY IS DIRTY\nLocation: {repo_remote_root}\nPlease commit or stash changes before proceeding.", title="Warning", border_style="yellow"))
+
+    script = f"""
+echo ""
+echo 'echo -e "\\033[1;34m═════ COMMITTING LOCAL CHANGES ═════\\033[0m"'
+cd {repo_local_root}
+git status
+git add .
+git commit -am "{message}"
+echo ""
+echo ""
+echo 'echo -e "\\033[1;34m═════ PULLING LATEST FROM REMOTE ═════\\033[0m"'
+cd {repo_local_root}
+echo '-> Trying to removing originEnc remote from local repo if it exists.'
+# git remote remove originEnc
+git remote remove originEnc 2>/dev/null || true
+echo '-> Adding originEnc remote to local repo'
+git remote add originEnc {repo_remote_root}
+echo '-> Fetching originEnc remote.'
+git pull originEnc master
+
+"""
+
+    if Path.home().joinpath("code/machineconfig").exists():
+        uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
+        uv_with = None
+    else:
+        uv_with = ["machineconfig>=7.66"]
+        uv_project_dir = None
+
+    import tempfile
+    shell_path = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
+    shell_path.write_text(script, encoding="utf-8")
+
+    command = f". {shell_path}"
+    if platform.system() == "Windows":
+        completed = subprocess.run(["powershell", "-Command", command], capture_output=True, check=False, text=True)
+    else:
+        completed = subprocess.run(command, shell=True, capture_output=True, check=False, text=True)
+    res = Response.from_completed_process(completed).capture().print()
+
+    if res.is_successful(strict_err=True, strict_returcode=True):
+        console.print(Panel("✅ Pull succeeded!\n🧹 Removing originEnc remote and local copy\n📤 Pushing merged repository to cloud storage", title="Success", border_style="green"))
+        repo_remote_root.delete(sure=True)
+        from git.remote import Remote
+
+        Remote.remove(repo_local_obj, "originEnc")
+        repo_local_root.to_cloud(cloud=cloud_resolved, zip=True, encrypt=True, rel2home=True, pwd=pwd, os_specific=False)
+        return "success"
+    else:
+        console.print(Panel(f"⚠️  MERGE FAILED\n💾 Keeping local copy of remote at:\n📂 {repo_remote_root}", title="Merge Failed", border_style="red"))
+
+        # ================================================================================
+        option1 = "Delete remote copy and push local:"
+        from machineconfig.utils.meta import lambda_to_python_script
+        def func2(remote_repo: str, local_repo: str, cloud: str):
+            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_python_script(lambda: func2(remote_repo=str(repo_remote_root), local_repo=str(repo_local_root), cloud=str(cloud_resolved)),
+in_global=True, import_module=False)
+        program1, _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"""
+rm -rfd {repo_local_root}
+mv {repo_remote_root} {repo_local_root}
+"""
+        if platform.system() in ["Linux", "Darwin"]:
+            program_2 += """
+sudo chmod 600 $HOME/.ssh/*
+sudo chmod 700 $HOME/.ssh
+sudo chmod +x $HOME/dotfiles/scripts/linux -R
+"""
+        import tempfile
+        shell_file_2 = Path(tempfile.mkstemp(suffix=".ps1" if platform.system() == "Windows" else ".sh")[1])
+        shell_file_2.write_text(program_2, encoding="utf-8")
+
+        # ================================================================================
+        option3 = "Inspect repos:"
+        def func(repo_local_root: str, repo_remote_root: str):
+            from machineconfig.scripts.python.helpers_repos.sync import inspect_repos
+            inspect_repos(repo_local_root=repo_local_root, repo_remote_root=repo_remote_root)
+        # 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_python_script(lambda: func(repo_local_root=str(repo_local_root), repo_remote_root=str(repo_remote_root)),
+in_global=True, import_module=False)
+        program3, _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:"
+        program_4 = f"""
+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"
+{program1}
+"""
+        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")
+        # ================================================================================
+
+        console.print(Panel("🔄 RESOLVE MERGE CONFLICT\nChoose an option to resolve the conflict:", title_align="left", border_style="blue"))
+
+        print(f"• {option1:75} 👉 {program1}")
+        print(f"• {option2:75} 👉 {shell_file_2}")
+        print(f"• {option3:75} 👉 {program3}")
+        print(f"• {option4:75} 👉 {shell_file_4}")
+        print("\n\n")
+
+        program_content = None
+        match on_conflict:
+            case "ask":
+                import questionary
+                choice = questionary.select("Choose one option:", choices=[option1, option2, option3, option4]).ask()
+                if choice == option1:
+                    program_content = program1
+                elif choice == option2:
+                    program_content = program_2
+                elif choice == option3:
+                    program_content = program3
+                elif choice == option4:
+                    program_content = program_4
+                else:
+                    raise NotImplementedError(f"Choice {choice} not implemented.")
+            case "push-local-merge":
+                program_content = program1
+            case "overwrite-local":
+                program_content = program_2
+            case "stop-on-conflict":
+                program_content = program3
+            case "remove-rclone-conflict":
+                program_content = program_4
+            case _:
+                raise ValueError(f"Unknown action: {on_conflict}")
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script=program_content)
+    return program_content
+

machineconfig/scripts/python/{count_lines.py → helpers_repos/count_lines.py}

@@ -1,5 +1,5 @@
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Annotated
 from git import Repo
 from collections import defaultdict
 from datetime import datetime
@@ -18,12 +18,12 @@ app = typer.Typer()
 
 
 def count_lines_in_commit(commit: "Any") -> int:
-    total_lines = 0
-    for file in commit.stats.files:
-        if str(file).endswith(".py"):
-            blob = commit.tree / file
-            total_lines += len(blob.data_stream.read().decode("utf-8").splitlines())
-    return total_lines
+    _total_lines = 0
+    for _file in commit.stats.files:
+        if str(_file).endswith(".py"):
+            _blob = commit.tree / _file
+            _total_lines += len(_blob.data_stream.read().decode("utf-8").splitlines())
+    return _total_lines
 
 
 def count_historical_loc(repo_path: str) -> int:
@@ -82,7 +82,7 @@ def get_default_branch(repo: Repo) -> str:
 
 
 @app.command()
-def count_historical(repo_path: str = typer.Argument(..., help="Path to the git repository")):
+def count_historical(repo_path: Annotated[str, typer.Argument(..., help="Path to the git repository")]):
     """Count total historical lines of Python code in the repository."""
     print(f"Analyzing repository: {repo_path}")
     total_loc: int = count_historical_loc(repo_path)
@@ -90,7 +90,7 @@ def count_historical(repo_path: str = typer.Argument(..., help="Path to the git
 
 
 @app.command()
-def analyze_over_time(repo_path: str = typer.Argument(..., help="Path to the git repository")):
+def analyze_over_time(repo_path: Annotated[str, typer.Argument(..., help="Path to the git repository")]):
     """Analyze a git repository to track Python code size over time with visualization."""
     repo: Repo = Repo(repo_path)
     branch_name: str = get_default_branch(repo)
@@ -336,7 +336,7 @@ def _print_python_files_by_size_impl(repo_path: str) -> "Union[pl.DataFrame, Exc
 
 
 @app.command()
-def print_python_files_by_size(repo_path: str = typer.Argument(..., help="Path to the git repository")):
+def print_python_files_by_size(repo_path: Annotated[str, typer.Argument(..., help="Path to the git repository")]):
     """Print Python files sorted by size with visualizations."""
     result = _print_python_files_by_size_impl(repo_path)
     if isinstance(result, Exception):

machineconfig/scripts/python/helpers_repos/count_lines_frontend.py

@@ -0,0 +1,17 @@
+
+import typer
+from typing import Annotated
+
+
+def analyze_repo_development(repo_path: Annotated[str, typer.Argument(..., help="Path to the git repository")]):
+    from machineconfig.scripts.python.helpers_repos import count_lines
+    from pathlib import Path
+    count_lines_path = Path(count_lines.__file__)
+    # --project $HOME/code/ machineconfig --group plot
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=7.66" {count_lines_path} analyze-over-time {repo_path}"""
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(cmd)
+
+
+if __name__ == "__main__":
+    pass

machineconfig/scripts/python/{repos_helper.py → helpers_repos/entrypoint.py}

@@ -3,19 +3,11 @@
 
 from typing import Optional
 from pathlib import Path
-from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
+from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH
 
 import typer
 
 
-
-def print_banner() -> None:
-    typer.echo("\n" + "=" * 50)
-    typer.echo("📂 Welcome to the Repository Manager")
-    typer.echo("=" * 50 + "\n")
-
-
-
 def resolve_directory(directory: Optional[str]) -> Path:
     if directory is None:
         directory = Path.cwd().as_posix()
@@ -28,12 +20,11 @@ def git_operations(
     commit: bool,
     push: bool,
     recursive: bool,
-    no_sync: bool,
+    auto_uv_sync: bool,
 ) -> None:
-    print_banner()
+    
     repos_root = resolve_directory(directory)
-    auto_sync = not no_sync
-    from machineconfig.scripts.python.repos_helper_action import perform_git_operations
+    from machineconfig.scripts.python.helpers_repos.action import perform_git_operations
     from machineconfig.utils.path_extended import PathExtended
     perform_git_operations(
         repos_root=PathExtended(repos_root),
@@ -41,13 +32,14 @@ def git_operations(
         commit=commit,
         push=push,
         recursive=recursive,
-        auto_sync=auto_sync,
+        auto_uv_sync=auto_uv_sync,
     )
 def resolve_spec_path(directory: Optional[str], cloud: Optional[str]) -> Path:
     repos_root = resolve_directory(directory)
     from machineconfig.utils.path_extended import PathExtended
     if not repos_root.exists() or repos_root.name != "repos.json":
-        candidate = Path(CONFIG_PATH).joinpath("repos").joinpath(PathExtended(repos_root).rel2home()).joinpath("repos.json")
+        relative_repos_root = PathExtended(repos_root).expanduser().absolute().relative_to(Path.home())
+        candidate = Path(CONFIG_ROOT).joinpath("repos").joinpath(relative_repos_root).joinpath("repos.json")
         repos_root = candidate
         if not repos_root.exists():
             cloud_name: Optional[str]
@@ -73,10 +65,10 @@ def clone_from_specs(
     checkout_branch_flag: bool,
     checkout_commit_flag: bool,
 ) -> None:
-    print_banner()
+    
     typer.echo("\n📥 Cloning or checking out repositories...")
     spec_path = resolve_spec_path(directory, cloud)
-    from machineconfig.scripts.python.repos_helper_clone import clone_repos
+    from machineconfig.scripts.python.helpers_repos.clone import clone_repos
     clone_repos(
         spec_path=spec_path,
         preferred_remote=None,