machineconfig 6.23__py3-none-any.whl → 8.12__py3-none-any.whl

machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -1,28 +1,47 @@
-import git
-from rich.console import Console
-from rich.panel import Panel
-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, write_shell_script_to_file
 
-import platform
-import subprocess
 from typing import Optional, Literal, Annotated
 
-
-console = Console()
+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", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"], typer.Option(..., "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
+    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
@@ -35,15 +54,23 @@ def main(
     else:
         cloud_resolved = cloud
     repo_local_root = PathExtended.cwd() if repo is None else PathExtended(repo).expanduser().absolute()
-    repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
+    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", repo_local_root.rel2home())  # .delete(sure=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"
-        repo_remote_root.from_cloud(remotepath=remote_path, cloud=cloud_resolved, unzip=True, decrypt=True, rel2home=True, os_specific=False, pwd=pwd)
+        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)
@@ -74,7 +101,17 @@ git pull originEnc master
 
 """
 
-    shell_path = write_shell_script_to_file(shell_script=script)
+    if Path.home().joinpath("code/machineconfig").exists():
+        uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
+        uv_with = None
+    else:
+        uv_with = ["machineconfig>=8.12"]
+        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)
@@ -95,13 +132,13 @@ git pull originEnc master
 
         # ================================================================================
         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.repos_helpers.sync import delete_remote_repo_copy_and_push_local
+            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)
-            return "done"
-        from machineconfig.utils.meta import function_to_script
-        program_1_py = function_to_script(func=func2, call_with_args=None, call_with_kwargs={"remote_repo": str(repo_remote_root), "local_repo": str(repo_local_root), "cloud": cloud_resolved})
-        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable="""uv run --with "machineconfig>=5.87" """)
+        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"""
@@ -114,15 +151,20 @@ sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
 """
-        shell_file_2 = write_shell_script_to_file(shell_script=program_2)
+        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.repos_helpers.sync import inspect_repos
+            from machineconfig.scripts.python.helpers_repos.sync import inspect_repos
             inspect_repos(repo_local_root=repo_local_root, repo_remote_root=repo_remote_root)
-            return "done"
-        program_3_py = function_to_script(func=func, call_with_args=None, 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="""uv run --with "machineconfig>=5.87" """)
+        # 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:"
@@ -131,16 +173,17 @@ 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}
+{program1}
 """
-        shell_file_4 = write_shell_script_to_file(shell_script=program_4)
+        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} 👉 {shell_file_1}")
+        print(f"• {option1:75} 👉 {program1}")
         print(f"• {option2:75} 👉 {shell_file_2}")
-        print(f"• {option3:75} 👉 {shell_file_3}")
+        print(f"• {option3:75} 👉 {program3}")
         print(f"• {option4:75} 👉 {shell_file_4}")
         print("\n\n")
 
@@ -150,21 +193,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 = program1
                 elif choice == option2:
                     program_content = program_2
                 elif choice == option3:
-                    program_content = shell_file_3.read_text(encoding="utf-8")
+                    program_content = program3
                 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 = program1
             case "overwrite-local":
                 program_content = program_2
             case "stop-on-conflict":
-                program_content = shell_file_3.read_text(encoding="utf-8")
+                program_content = program3
             case "remove-rclone-conflict":
                 program_content = program_4
             case _:

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

@@ -20,12 +20,11 @@ def git_operations(
     commit: bool,
     push: bool,
     recursive: bool,
-    no_sync: bool,
+    auto_uv_sync: bool,
 ) -> None:
     
     repos_root = resolve_directory(directory)
-    auto_uv_sync = not no_sync
-    from machineconfig.scripts.python.repos_helpers.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),
@@ -39,7 +38,8 @@ 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_ROOT).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]
@@ -68,7 +68,7 @@ def clone_from_specs(
     
     typer.echo("\n📥 Cloning or checking out repositories...")
     spec_path = resolve_spec_path(directory, cloud)
-    from machineconfig.scripts.python.repos_helpers.clone import clone_repos
+    from machineconfig.scripts.python.helpers_repos.clone import clone_repos
     clone_repos(
         spec_path=spec_path,
         preferred_remote=None,

machineconfig/scripts/python/helpers_repos/grource.py

@@ -100,7 +100,7 @@ def install_gource_windows(version: Optional[str] = None) -> None:
 
 
 def visualize(
-    repo: Annotated[str, typer.Option("--repo", "-r", help="Path to git repository to visualize")] = Path.cwd().__str__(),
+    repo: Annotated[str, typer.Option("--repo", "-r", help="Path to git repository to visualize")] = ".",
     output_file: Annotated[Optional[Path], typer.Option("--output", "-o", help="Output video file (e.g., output.mp4). If specified, gource will render to video.")] = None,
     resolution: Annotated[str, typer.Option("--resolution", "-res", help="Video resolution (e.g., 1920x1080, 1280x720)")] = "1920x1080",
     seconds_per_day: Annotated[float, typer.Option("--seconds-per-day", "-spd", help="Speed of simulation (lower = faster)")] = 0.1,
@@ -334,7 +334,7 @@ def install(
 
 
 if __name__ == "__main__":
-    app = typer.Typer(help="Gource visualization tool for git repositories")
+    app = typer.Typer(help="Gource visualization tool for git repositories", add_help_option=False, add_completion=False)
     app.command()(install)
     app.command()(visualize)
     app()

machineconfig/scripts/python/{repos_helpers → helpers_repos}/record.py

@@ -186,7 +186,7 @@ def record_repos_recursively(repos_root: str, r: bool, progress: Progress | None
     return res
 
 
-def main(repos_root: Path):
+def main_record(repos_root: Path):
     print("\n📝 Recording repositories...")
     repos_root = PathExtended(repos_root).expanduser().absolute()
 
@@ -242,7 +242,8 @@ def main(repos_root: Path):
     tree_structure = build_tree_structure(repo_records, repos_root)
     print(tree_structure)
 
-    save_path = CONFIG_ROOT.joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
+    relative_repos_root = PathExtended(repos_root).expanduser().absolute().relative_to(Path.home())
+    save_path = CONFIG_ROOT.joinpath("repos").joinpath(relative_repos_root).joinpath("repos.json")
     save_json(obj=res, path=save_path, indent=4)
     pprint(f"📁 Result saved at {PathExtended(save_path)}")
     print(">>>>>>>>> Finished Recording")

machineconfig/scripts/python/helpers_repos/repo_analyzer_1.py

@@ -0,0 +1,160 @@
+
+
+import subprocess
+
+from git import Repo
+from collections import defaultdict
+from datetime import datetime, date
+from typing import Any, Dict, List, Optional, Union
+from pathlib import Path
+
+
+
+def count_historical_line_edits(repo_path: str) -> int:
+
+    repo = Repo(repo_path)
+    last_commit = next(repo.iter_commits())
+    total_lines, total_files = count_python_lines(last_commit)
+    print(f"Total lines of Python code in latest commit ({last_commit.hexsha[:8]}): {total_lines} across {total_files} files")
+
+    gitcs_viz(repo_path=repo_path, pull_full_history=True)
+
+    file_line_counts: "Dict[str, int]" = defaultdict(int)
+    total_commits: int = sum(1 for _ in repo.iter_commits())
+    print(f"Total commits to process: {total_commits}")
+    for i, commit in enumerate(repo.iter_commits(), 1):
+        if i % 100 == 0 or i == total_commits:
+            print(f"Processing commit {i}/{total_commits} ({i / total_commits:.1%})")
+        try:
+            # Handle initial commits that have no parents
+            if not commit.parents:
+                # For initial commit, count all lines in Python files
+                for file in commit.stats.files:
+                    if str(file).endswith(".py"):
+                        file_line_counts[str(file)] += commit.stats.files[file]["insertions"]
+            else:
+                # For commits with parents, use stats
+                for file in commit.stats.files:
+                    if str(file).endswith(".py"):
+                        file_line_counts[str(file)] += commit.stats.files[file]["insertions"]
+        except Exception:
+            # If stats fail (e.g., corrupted parent), skip this commit
+            print(f"Warning: Could not get stats for commit {commit.hexsha[:8]}, skipping")
+            continue
+
+    print(f"\nProcessed files: {len(file_line_counts)}")
+    res = sum(file_line_counts.values())
+    print(f"Total historical lines of Python code: {res}")
+    return res
+
+
+
+
+def count_lines_changed_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
+def count_python_lines(commit: "Any") -> tuple[int, int]:
+    """Count total lines in Python files for a specific commit"""
+    total_lines = 0
+    total_files = 0
+    try:
+        for blob in commit.tree.traverse():
+            if blob.path.endswith(".py"):
+                try:
+                    content = blob.data_stream.read().decode("utf-8")
+                    total_lines += len(content.splitlines())
+                    total_files += 1
+                except Exception as _e:
+                    continue
+    except Exception as e:
+        print(f"Error traversing commit {commit.hexsha[:8]}: {e}")
+        pass
+    return total_lines, total_files
+
+
+def get_default_branch(repo: Repo) -> str:
+    """Get the default branch name of the repository"""
+    try:
+        _ = repo.refs["main"]
+        return "main"  # First try 'main'
+    except IndexError:
+        try:
+            _ = repo.refs["master"]
+            return "master"  # Then try 'master'
+        except IndexError:
+            return repo.head.reference.name  # If neither exists, get the branch the HEAD is pointing to
+
+
+
+def gitcs_viz(repo_path: Union[str, Path], email: Optional[str] = None, pull_full_history: bool = False) -> None:
+    """Invoke the gitcs CLI across 6-month windows covering the repo history.
+    
+    Args:
+        repo_path: Path to the git repository
+        email: Optional email filter for gitcs
+        pull_full_history: If True, unshallow the repo to fetch full history (useful for shallow clones)
+    """
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
+    install_if_missing("gitcs")
+
+    repo_path = Path(repo_path).expanduser().resolve()
+    repo = Repo(repo_path)
+    
+    # Check if repo is shallow and optionally unshallow it
+    if pull_full_history:
+        shallow_file = Path(repo.git_dir) / "shallow"
+        if shallow_file.exists():
+            print("🔄 Detected shallow clone. Fetching full history...")
+            try:
+                repo.git.fetch("--unshallow")
+                print("✅ Successfully fetched full history")
+            except Exception as e:
+                print(f"⚠️ Failed to unshallow repository: {e}")
+                print("Continuing with available history...")
+        else:
+            print("ℹ️ Repository already has full history")
+    
+    branch_name = get_default_branch(repo)
+    commits: "List[Any]" = list(repo.iter_commits(branch_name))
+    if not commits:
+        print("⚠️ No commits found; skipping gitcs visualization.")
+        return
+
+    from datetime import timezone
+
+    commit_dates = [datetime.fromtimestamp(commit.committed_date, tz=timezone.utc).date() for commit in commits]
+    min_year = min(commit_dates).year
+    max_year = max(commit_dates).year
+
+    print(f"📆 gitcs windows: {min_year}-01-01 → {max_year}-12-31 (fixed half-year slices)")
+
+    chunk_idx = 1
+    for year in range(min_year, max_year + 1):
+        windows = [(date(year, 1, 1), date(year, 6, 30)), (date(year, 7, 1), date(year, 12, 31))]
+        for chunk_start, chunk_end in windows:
+            cmd = ["gitcs", "--since", chunk_start.isoformat(), "--until", chunk_end.isoformat()]
+            if email:
+                cmd.extend(["--email", email])
+
+            print(f"\n===== gitcs chunk {chunk_idx}: {chunk_start.isoformat()} → {chunk_end.isoformat()} =====")
+            try:
+                completed = subprocess.run(cmd, cwd=str(repo_path), capture_output=True, text=True, input=f"{repo_path}\n")
+            except FileNotFoundError:
+                print("❌ gitcs CLI is not available on PATH; aborting visualization.")
+                return
+
+            if completed.stdout.strip():
+                print(completed.stdout.strip())
+            if completed.stderr.strip():
+                print(completed.stderr.strip())
+            if completed.returncode != 0:
+                print(f"⚠️ gitcs exited with code {completed.returncode} for this range.")
+
+            chunk_idx += 1
+
+
+