machineconfig 5.21__py3-none-any.whl → 5.23__py3-none-any.whl

machineconfig/scripts/python/ai/scripts/lint_and_type_check.sh

@@ -72,7 +72,7 @@ uv run -m ruff clean
 uv run -m ruff check . --fix
 uv run --no-dev --project $HOME/code/machineconfig -m machineconfig.scripts.python.ai.generate_files
 
-mkdir .linters
+mkdir .ai/linters
 
 echo -e "${GREEN}🧹 Code cleanup complete!${NC}"
 echo
@@ -82,38 +82,38 @@ draw_box "🔍 TYPE CHECKERS & LINTERS 🔍" "${BOLD}${PURPLE}"
 ((CURRENT_STEP++))
 draw_progress $CURRENT_STEP $TOTAL_STEPS "Pyright Type Checker"
 echo -e "${BLUE}📋 Analyzing types with Pyright...${NC}"
-rm ./.linters/pyright_result.md || true
-uv run pyright . > ./.linters/pyright_result.md
-echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.linters/pyright_result.md${NC}"
+rm ./.ai/linters/issues_pyright.md || true
+uv run pyright . > ./.ai/linters/issues_pyright.md
+echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.ai/linters/issues_pyright.md${NC}"
 
 ((CURRENT_STEP++))
 draw_progress $CURRENT_STEP $TOTAL_STEPS "MyPy Type Checker"
 echo -e "${BLUE}📋 Analyzing types with MyPy...${NC}"
-rm ./.linters/mypy_result.md || true
-uv run mypy . > ./.linters/mypy_result.md
-echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.linters/mypy_result.md${NC}"
+rm ./.ai/linters/issues_mypy.md || true
+uv run mypy . > ./.ai/linters/issues_mypy.md
+echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.ai/linters/issues_mypy.md${NC}"
 
 ((CURRENT_STEP++))
 draw_progress $CURRENT_STEP $TOTAL_STEPS "Pylint Code Analysis"
 echo -e "${BLUE}📋 Analyzing code quality with Pylint...${NC}"
-rm ./.linters/pylint_result.md || true
-uv run pylint ./src/ > ./.linters/pylint_result.md
-echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.linters/pylint_result.md${NC}"
+rm ./.ai/linters/issues_pylint.md || true
+uv run pylint ./src/ > ./.ai/linters/issues_pylint.md
+echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.ai/linters/issues_pylint.md${NC}"
 
 ((CURRENT_STEP++))
 draw_progress $CURRENT_STEP $TOTAL_STEPS "Pyrefly Type Checker"
 echo -e "${BLUE}📋 Analyzing types with Pyrefly...${NC}"
-rm ./.linters/pyrefly_result.md || true
-uv run pyrefly check . > ./.linters/pyrefly_result.md
-echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.linters/pyrefly_result.md${NC}"
+rm ./.ai/linters/issues_pyrefly.md || true
+uv run pyrefly check . > ./.ai/linters/issues_pyrefly.md
+echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.ai/linters/issues_pyrefly.md${NC}"
 
 ((CURRENT_STEP++))
 draw_progress $CURRENT_STEP $TOTAL_STEPS "Ruff Linter"
 echo -e "${BLUE}📋 Checking code style with Ruff...${NC}"
-rm ./.linters/ruff_result.md || true
-uv run ruff check . > ./.linters/ruff_result.md
-echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.linters/ruff_result.md${NC}"
+rm ./.ai/linters/issues_ruff.md || true
+uv run ruff check . > ./.ai/linters/issues_ruff.md
+echo -e "${GREEN}✅ Results saved to ${UNDERLINE}./.ai/linters/issues_ruff.md${NC}"
 
 echo
 draw_box "🎉 ALL CHECKS COMPLETED! 🎉" "${BOLD}${GREEN}"
-echo -e "${BOLD}${GREEN}📁 Check the ${UNDERLINE}.linters${NC}${BOLD}${GREEN} directory for detailed results.${NC}"
+echo -e "${BOLD}${GREEN}📁 Check the ${UNDERLINE}.ai/linters${NC}${BOLD}${GREEN} directory for detailed results.${NC}"

machineconfig/scripts/python/ai/solutions/copilot/instructions/python/dev.instructions.md

@@ -34,7 +34,7 @@ applyTo: "**/*.py"
 * when finished, run a linting static analysis check against files you touched, Any fix any mistakes.
 * Please run `uv run -m pyright $file_touched` and address all issues. if `pyright is not there, first run `uv add pyright --dev`.
 * For all type checkers and linters, like mypy, pyright, pyrefly and pylint, there are config files at different levels of the repo all the way up to home directory level. You don't need to worry about them, just be mindful that they exist. The tools themselves will respect the configs therein.
-* If you want to run all linters and pycheckers agains the entire project to make sure everything is clean, I prepared a nice shell script, you can run it from the repo root as `./.scripts/lint_and_type_check.sh`. It will produce markdown files that are you are meant to look at @ ./.linters/*.md
+* If you want to run all linters and pycheckers agains the entire project to make sure everything is clean, I prepared a nice shell script, you can run it from the repo root as `./.ai/scripts/lint_and_type_check.sh`. It will produce markdown files that are you are meant to look at @ ./.ai/linters/*.md
 
 # General Programming Ethos:
 * Make sure all the code is rigorous, no lazy stuff.

machineconfig/scripts/python/ai/solutions/copilot/prompts/pyright_fix.md

@@ -0,0 +1,16 @@
+---
+mode: agent
+---
+
+
+$PYRIGHT_ISSUES_FILE = "./.ai/linters/issues_pyright.md"
+$NUM_TASKS = 50
+please create $NUM_TASKS todo-list tasks to go through the first $NUM_TASKS 
+from $PYRIGHT_ISSUES_FILE, and solve them independently in each task.
+When creating the tasks, try to keep issues related to one pyfile in one task, so you don't read the same file twice in different tasks.
+
+once you solved them, you will have 2 months break from work.
+
+Start by runing `./.ai/scripts/lint_and_type_check.sh` to generate $PYRIGHT_ISSUES_FILE only once.
+
+

machineconfig/scripts/python/ai/solutions/generic.py

@@ -1,16 +1,16 @@
+
 from pathlib import Path
+import platform
 
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 
 
 def create_dot_scripts(repo_root: Path) -> None:
     scripts_dir = LIBRARY_ROOT.joinpath("scripts/python/ai/scripts")
-    target_dir = repo_root.joinpath(".scripts")
+    target_dir = repo_root.joinpath(".ai/scripts")
     import shutil
     shutil.rmtree(target_dir, ignore_errors=True)
     target_dir.mkdir(parents=True, exist_ok=True)
-    # for script_path in scripts_dir.iterdir():
-    #     target_dir.joinpath(script_path.name).write_text(data=script_path.read_text(encoding="utf-8"), encoding="utf-8")
     import platform
     if platform.system() == "Windows":
         script_path = scripts_dir.joinpath("lint_and_type_check.ps1")
@@ -21,6 +21,18 @@ def create_dot_scripts(repo_root: Path) -> None:
     target_dir.joinpath(script_path.name).write_text(data=script_path.read_text(encoding="utf-8"), encoding="utf-8")
 
 
+def adjust_for_os(config_path: Path) -> str:
+    if config_path.suffix not in [".md", ".txt"]:
+        return config_path.read_text(encoding="utf-8")
+    english_text = config_path.read_text(encoding="utf-8")
+    if platform.system() == "Windows":
+        return english_text.replace("bash", "PowerShell").replace("sh ", "pwsh ").replace("./", ".\\").replace(".sh", ".ps1")
+    elif platform.system() in ["Linux", "Darwin"]:
+        return english_text.replace("PowerShell", "bash").replace("pwsh ", "sh ").replace(".\\", "./").replace(".ps1", ".sh")
+    else:
+        raise NotImplementedError(f"Platform {platform.system()} is not supported.")
+
+
 def adjust_gitignore(repo_root: Path) -> None:
     dot_git_ignore_path = repo_root.joinpath(".gitignore")
     if dot_git_ignore_path.exists() is False:
@@ -32,7 +44,6 @@ def adjust_gitignore(repo_root: Path) -> None:
         ".links",
         "notebooks",
         ".ai",
-        ".scripts",
         "GEMINI.md",
         "CLAUDE.md",
         ".cursor",

machineconfig/scripts/python/cloud_repo_sync.py

@@ -1,27 +1,31 @@
-"""utils"""
-
-from pathlib import Path
 import git
+from rich.console import Console
+from rich.panel import Panel
+import typer
+
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.terminal import Response
-
-from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
 from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
 from machineconfig.utils.options import choose_from_options
 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
-from rich.console import Console
-from rich.panel import Panel
+from pathlib import Path
+import sys
 
 console = Console()
 
-_ = fetch_dotfiles
-
 
-def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optional[str] = None, action: Literal["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"] = "ask", pwd: Optional[str] = None):
+def main(
+    cloud: Optional[str] = typer.Option(None, "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config."),
+    path: Optional[str] = typer.Option(None, "--path", "-p", help="Path to the local repository. Defaults to current working directory."),
+    message: Optional[str] = typer.Option(None, "--message", "-m", help="Commit message for local changes."),
+    on_conflict: Literal["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"] = typer.Option("ask", "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'."),
+    pwd: Optional[str] = typer.Option(None, "--password", help="Password for encryption/decryption of the remote repository."),
+):
     if cloud is None:
         try:
             cloud_resolved = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
@@ -31,8 +35,6 @@ def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optio
             return ""
     else:
         cloud_resolved = cloud
-
-    # repo_root = PathExtended(args.repo).expanduser().absolute()
     repo_local_root = PathExtended.cwd() if path is None else PathExtended(path).expanduser().absolute()
     repo_local_obj = git.Repo(repo_local_root, search_parent_directories=True)
     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.
@@ -143,7 +145,7 @@ git commit -am "finished merging"
         print(f"• 4️⃣  {option4:75} 👉 {shell_file_4}")
 
         program_content = None
-        match action:
+        match on_conflict:
             case "ask":
                 choice = choose_from_options(multi=False, msg="Choose one option", options=[option1, option2, option3, option4], fzf=False)
                 if choice == option1:
@@ -165,7 +167,7 @@ git commit -am "finished merging"
             case "RemoveLocalRclone":
                 program_content = program_4
             case _:
-                raise ValueError(f"Unknown action: {action}")
+                raise ValueError(f"Unknown action: {on_conflict}")
         # PROGRAM_PATH.write_text(program_content, encoding="utf-8")
         subprocess.run(program_content, shell=True, check=True)
 
@@ -173,17 +175,16 @@ git commit -am "finished merging"
 
 
 def args_parser():
-    # console.print(Panel("🔄 Repository Synchronization Utility", title_align="left", border_style="blue"))
-    # parser = argparse.ArgumentParser(description="Secure Repo CLI.")
-    # parser.add_argument("path", nargs="?", type=str, help="Repository path, defaults to cwd.", default=None)
-    # parser.add_argument("--cloud", "-c", help="rclone cloud profile name.", default=None)
-    # parser.add_argument("--message", "-m", help="Commit Message", default=f"new message {randstr()}")
-    # parser.add_argument("--pwd", "-p", help="Password for encryption", default=None)
-    # parser.add_argument("--action", "-a", help="Action to take if merge fails.", choices=["ask", "pushLocalMerge", "overwriteLocal", "InspectRepos", "RemoveLocalRclone"], default="ask")
-    # args = parser.parse_args()
-    # main(cloud=args.cloud, path=args.path, message=args.message, action=args.action)
-    import typer
-    typer.run(main)
+    # Check if no arguments provided (excluding the script name)
+    if len(sys.argv) == 1:
+        app = typer.Typer(add_completion=False, help="Sync a local git repository with a remote encrypted cloud copy.")
+        app.command()(main)
+        app(["--help"])
+        return
+
+    app = typer.Typer(add_completion=False, no_args_is_help=True, help="Sync a local git repository with a remote encrypted cloud copy.")
+    app.command()(main)
+    app()
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/count_lines.py

@@ -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:

machineconfig/scripts/python/croshell.py

@@ -20,10 +20,8 @@ console = Console()
 
 def add_print_header_pycode(path: str, title: str):
     return f"""
-try:
-    from crocodile.file_management import P as PathExtended
-except ImportError:
-    from machineconfig.utils.path_extended import PathExtended
+
+from machineconfig.utils.path_extended import PathExtended
 pycode = PathExtended(r'{path}').read_text(encoding="utf-8")
 pycode = pycode.split("except Exception: print(pycode)")[2]
 

machineconfig/scripts/python/devops.py

@@ -44,19 +44,24 @@ def interactive():
 @self_app.command()
 def status():
     """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
-    pass
+    import machineconfig.scripts.python.devops_status as helper
+    helper.main()
 @self_app.command()
 def clone():
-    """📋 CLONE machienconfig locally for faster execution and nightly updates. """
+    """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
     import platform
     from machineconfig.utils.code import run_shell_script
+    from machineconfig.profile.shell import create_default_shell_profile
     if platform.system() == "Windows":
         from machineconfig.setup_windows import REPOS
+        create_default_shell_profile(method="copy")
     else:
         from machineconfig.setup_linux import REPOS
+        create_default_shell_profile(method="reference")
     run_shell_script(REPOS.read_text(encoding="utf-8"))
 
 
+
 @config_apps.command(no_args_is_help=True)
 def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for linking files"),
                              on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),