machineconfig 1.95__py3-none-any.whl → 1.97__py3-none-any.whl

machineconfig/scripts/linux/wifi_conn

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# check below if VIRTUAL_ENV is set
+# if [ -z "$VIRTUAL_ENV" ]; then
+source $HOME/scripts/activate_ve 've'
+# fi
+
+op_script=$HOME/tmp_results/shells/python_return_command.sh
+if [ -f "$op_script" ]; then
+  rm $op_script
+fi
+
+python machineconfig.scripts.python.wifi_conn
+
+if [ -f "$op_script" ]; then
+  chmod +x $op_script
+  source $op_script
+fi
+
+
+# check below if VIRTUAL_ENV enviroment variable exist, then deactivate it, otherwise skip
+if [ -n "$VIRTUAL_ENV" ]; then
+  deactivate
+fi

machineconfig/scripts/python/ai/init.py

@@ -0,0 +1,56 @@
+
+
+from pathlib import Path
+from git import Repo
+
+# def add_config_for_curor(repo_root: Path, config_f):
+
+def add_ai_configs(repo_root: Path):
+    import machineconfig as mc
+    mc_root = Path(mc.__file__).parent
+
+    try:
+        _repo_obj = Repo(repo_root)
+    except Exception as e:
+        print(f"Error initializing git repo: {e}")
+        return
+
+    rules_dir = mc_root.joinpath("scripts/python/ai/rules")
+
+    python_rules_file = rules_dir.joinpath("python/dev.md")
+
+    tmp = repo_root.joinpath(".cursor/rules/python_dev.mdc")
+    tmp.parent.mkdir(parents=True, exist_ok=True)
+    tmp.write_text(data=python_rules_file.read_text(), encoding="utf-8")
+
+    # as per: https://docs.github.com/en/copilot/how-tos/configure-custom-instructions/add-repository-instructions
+    # Copilot Chat on github website chat
+    tmp = repo_root.joinpath(".github/copilot-instructions.md")
+    tmp.parent.mkdir(parents=True, exist_ok=True)
+    tmp.write_text(data=python_rules_file.read_text(), encoding="utf-8")
+
+    tmp = repo_root.joinpath(".github/instructions/python01.instructions.md")
+    tmp.parent.mkdir(parents=True, exist_ok=True)
+    tmp.write_text(data=python_rules_file.read_text(), encoding="utf-8")
+
+    tmp = repo_root.joinpath("CLAUDE.md")
+    tmp.write_text(data=python_rules_file.read_text(), encoding="utf-8")
+    tmp = repo_root.joinpath("GEMINI.md")
+    tmp.write_text(data=python_rules_file.read_text(), encoding="utf-8")
+
+    dot_ai_dir = repo_root.joinpath(".ai")
+    dot_ai_dir.mkdir(parents=True, exist_ok=True)
+    dot_git_ignore_path = dot_ai_dir.joinpath(".gitignore")
+    if dot_git_ignore_path.exists():
+        dot_git_ignore_content = dot_git_ignore_path.read_text(encoding="utf-8")
+        to_add: list[str] = []
+        if ".links" not in dot_git_ignore_content: to_add.append(".links")
+        if "notebooks" not in dot_git_ignore_content: to_add.append("notebooks")
+        if ".ai" not in dot_git_ignore_content: to_add.append(".ai")
+        # if "*.ipynb"
+        if len(to_add) > 0:
+            dot_git_ignore_path.write_text(data=dot_git_ignore_content + "\n" + "\n".join(to_add), encoding="utf-8")
+
+
+if __name__ == "__main__":
+    add_ai_configs(repo_root=Path.cwd())

machineconfig/scripts/python/ai/rules/python/dev.md

@@ -0,0 +1,31 @@
+
+
+Hello
+=====
+
+
+# Development Environment and tooling:
+* To initialize a python project, use `uv init --python 3.13`
+* To create virtual env, use `uv venv`.
+* Please run any python file using `uv run $file.py`
+* Same for tools, e.g. `un run python pytest blah`
+* To add a package, use `uv add <package_name>`.
+    * Please never mention versions of package, so uv will bring the latest.
+    * On this note, I have to say that I am seriously concerned about AI using very outdated coding style.
+        * Use python 3.13 syntax features.
+        * Use modern standards, e.g. Path from pathlib.
+
+* Never touch `pyproject.toml` manually, this file is strictly managed by `uv` tool on your behalf.
+* If you are writing a test or any temporary script for discovering or undestanding something as an intermediate step, then,
+  please keep all your temp scripts and files under ./.ai/tmp_scripts directory, its included in .gitignore and won't litter the repo.
+  Its also nice if you create a subdirectory therein to contain relevant files for the task at hand, to avoid confusion with other files from other ai agents working simulataneously on other things.
+
+# Style
+* Please type hint all the code. Use fully quilaified types, not just generics like dict, list, etc, rather dict[str, int], list[float], etc.
+* Use triple quotes and triple double quotes f-strings for string formatting and avoid when possible all goofy escaping when interpolation.
+* Make sure all the code is rigorous, no lazy stuff.
+    * For example, always avoid default values in arguments of functions. Those are evil and cause confusion. Always be explicit
+* Please avoid writing READMe files and avoid docstring and comments in code unless absolutely necessary. Use clear naming conventions instead of documenting.
+
+# Preferences:
+* If needed, opt for polars not pandas, whenever possible.

machineconfig/scripts/python/archive/im2text.py

@@ -3,8 +3,6 @@
 
 
 # # import sys
-# from crocodile.msc.odds import capture_from_webcam
-# from crocodile.meta import Terminal
 # from rich.console import Console
 # from rich.panel import Panel
 # import pytesseract
@@ -22,7 +20,7 @@
 # # import cv2
 # # img_cv = cv2.imread(r'C:\Users\alex\Downloads\name.jpg')
 
-# # sys.path.insert(0, P.home().joinpath("AppData/Local/Tesseract-OCR").str)
+# # sys.path.insert(0, PathExtended.home().joinpath("AppData/Local/Tesseract-OCR").str)
 # # import pytesseract
 # # print(pytesseract.image_to_string(img_cv))
 

machineconfig/scripts/python/choose_wezterm_theme.py

@@ -2,7 +2,7 @@
 Choose a theme for Wezterm
 """
 
-from machineconfig.utils.utils import choose_one_option, P
+from machineconfig.utils.utils import choose_one_option, PathExtended
 from typing import Any
 import time
 from rich.panel import Panel
@@ -51,13 +51,13 @@ def main2():
 
 def set_theme(theme: str):
     print(f"🔄 Setting WezTerm theme to: {theme}")
-    txt_lines = P("~/.config/wezterm/wezterm.lua").expanduser().read_text().splitlines()
+    txt_lines = PathExtended("~/.config/wezterm/wezterm.lua").expanduser().read_text().splitlines()
     res_lines = []
     for line in txt_lines:
         if 'config.color_scheme = ' in line:
             res_lines.append(f"config.color_scheme = '{theme}'")
         else: res_lines.append(line)
-    P("~/.config/wezterm/wezterm.lua").expanduser().write_text('\n'.join(res_lines))
+    PathExtended("~/.config/wezterm/wezterm.lua").expanduser().write_text('\n'.join(res_lines))
     time.sleep(0.1)
     print("💾 Configuration saved")
 

machineconfig/scripts/python/cloud_copy.py

@@ -2,8 +2,7 @@
 CC
 """
 
-from crocodile.file_management import P
-from crocodile.core import Struct
+from machineconfig.utils.path_reduced import P as PathExtended
 from crocodile.meta import RepeatUntilNoException
 import getpass
 import argparse
@@ -15,6 +14,7 @@ from machineconfig.scripts.python.helpers.cloud_helpers import ArgsDefaults, Arg
 from rich.console import Console
 from rich.panel import Panel
 from rich.progress import Progress
+from machineconfig.utils.utils2 import pprint
 
 console = Console()
 
@@ -22,7 +22,7 @@ console = Console()
 def get_securely_shared_file(url: Optional[str] = None, folder: Optional[str] = None) -> None:
     console.print(Panel("🚀 Secure File Downloader", title="[bold blue]Downloader[/bold blue]", border_style="blue"))
     
-    folder_obj = P.cwd() if folder is None else P(folder)
+    folder_obj = PathExtended.cwd() if folder is None else PathExtended(folder)
     print(f"📂 Target folder: {folder_obj}")
     
     if os.environ.get("DECRYPTION_PASSWORD") is not None:
@@ -42,14 +42,14 @@ def get_securely_shared_file(url: Optional[str] = None, folder: Optional[str] =
     console.print(Panel("📡 Downloading from URL...", title="[bold blue]Download[/bold blue]", border_style="blue"))
     with Progress(transient=True) as progress:
         _task = progress.add_task("Downloading... ", total=None)
-        url_obj = P(url).download(folder=folder_obj)
+        url_obj = PathExtended(url).download(folder=folder_obj)
         
     console.print(Panel(f"📥 Downloaded file: {url_obj}", title="[bold green]Success[/bold green]", border_style="green"))
     
     console.print(Panel("🔐 Decrypting and extracting...", title="[bold blue]Processing[/bold blue]", border_style="blue"))
     with Progress(transient=True) as progress:
         _task = progress.add_task("Decrypting... ", total=None)
-        tmp_folder = P.tmpdir(prefix="tmp_unzip")
+        tmp_folder = PathExtended.tmpdir(prefix="tmp_unzip")
         try:
             res = url_obj.decrypt(pwd=pwd, inplace=True).unzip(inplace=True, folder=tmp_folder)
             res.search("*").apply(lambda x: x.move(folder=folder_obj, overwrite=True))
@@ -107,7 +107,7 @@ def arg_parser() -> None:
     cloud, source, target = parse_cloud_source_target(args=args_obj, source=source, target=target)
     
     console.print(Panel("⚙️  Configuration:", title="[bold blue]Config[/bold blue]", border_style="blue"))
-    Struct(args_obj.__dict__).print(as_config=True, title="CLI config")
+    pprint(args_obj.__dict__, "CLI config")
 
     if args_obj.key is not None:
         console.print(Panel("❌ Key-based encryption is not supported yet", title="[bold red]Error[/bold red]", border_style="red"))
@@ -116,7 +116,7 @@ def arg_parser() -> None:
     if cloud in source:
         console.print(Panel(f"📥 DOWNLOADING FROM CLOUD\n☁️  Cloud: {cloud}\n📂 Source: {source.replace(cloud + ':', '')}\n🎯 Target: {target}", title="[bold blue]Download[/bold blue]", border_style="blue", width=152))
         
-        P(target).from_cloud(cloud=cloud, remotepath=source.replace(cloud + ":", ""),
+        PathExtended(target).from_cloud(cloud=cloud, remotepath=source.replace(cloud + ":", ""),
                             unzip=args_obj.zip, decrypt=args_obj.encrypt, pwd=args_obj.pwd,
                             overwrite=args_obj.overwrite,
                             rel2home=args_obj.rel2home, os_specific=args_obj.os_specific, root=args_obj.root, strict=False,
@@ -126,7 +126,7 @@ def arg_parser() -> None:
     elif cloud in target:
         console.print(Panel(f"📤 UPLOADING TO CLOUD\n☁️  Cloud: {cloud}\n📂 Source: {source}\n🎯 Target: {target.replace(cloud + ':', '')}", title="[bold blue]Upload[/bold blue]", border_style="blue", width=152))
         
-        res = P(source).to_cloud(cloud=cloud, remotepath=target.replace(cloud + ":", ""),
+        res = PathExtended(source).to_cloud(cloud=cloud, remotepath=target.replace(cloud + ":", ""),
                                     zip=args_obj.zip, encrypt=args_obj.encrypt, pwd=args_obj.pwd,
                                     rel2home=args_obj.rel2home, root=args_obj.root, os_specific=args_obj.os_specific, strict=False,
                                     share=args_obj.share)
@@ -134,8 +134,8 @@ def arg_parser() -> None:
         
         if args_obj.share:
             fname = f".share_url_{cloud}"
-            if P(source).is_dir(): share_url_path = P(source).joinpath(fname)
-            else: share_url_path = P(source).with_suffix(fname)
+            if PathExtended(source).is_dir(): share_url_path = PathExtended(source).joinpath(fname)
+            else: share_url_path = PathExtended(source).with_suffix(fname)
             share_url_path.write_text(res.as_url_str())
             console.print(Panel(f"🔗 SHARE URL GENERATED\n📝 URL file: {share_url_path}\n🌍 {res.as_url_str()}", title="[bold blue]Share[/bold blue]", border_style="blue", width=152))
     else: 

machineconfig/scripts/python/cloud_manager.py

@@ -1,99 +1,77 @@
-"""Run cloud manager.
-"""
-
-# from machineconfig.cluster.loader_runner import CloudManager
-from crocodile.file_management import P  # Add import for P
-from rich.console import Console  # Add import for Console
-from rich.panel import Panel  # Add import for Panel
-import argparse
-
-
-console = Console()
-
-BOX_WIDTH = 150  # width for box drawing
-
-
-def print_section_title(title: str):
-    """Prints a section title formatted nicely with a border and padding."""
-    console = Console()
-    console.print(Panel(title, title_align="left", expand=False))
-
-
-class CloudManager:
-    """Manages cloud operations like syncing, comparing, and listing files."""
-
-    def compare_local_and_cloud(self, sub_path: P):
-        """Compares local and cloud files and prints a summary."""
-        local_files, cloud_files = self._get_local_and_cloud_files(sub_path)
-        title1 = f"Comparing Local and Cloud: {sub_path.name}"
-        run_line = f"Local files: {len(local_files)}"
-        cloud_line = f"Cloud files: {len(cloud_files)}"
-        console = Console()
-        console.print(Panel(f"{title1}\n{run_line}\n{cloud_line}", title_align="left", expand=False))
-
-    def list_cloud_files(self, sub_path: P):
-        """Lists files in the cloud directory."""
-        cloud_files = self._get_cloud_files(sub_path)
-        title = f"Cloud Files in {sub_path.name}: {len(cloud_files)}"
-        console = Console()
-        console.print(Panel(title, title_align="left", expand=False))
-
-
-def main():
-    console = Console() # Add console initialization
-    console.print(Panel("☁️  Cloud Manager", title_align="left", expand=False))
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-c", "--cloud", help="Rclone Config Name", action="store", type=str, default=None)
-    parser.add_argument("-s", "--serve", help="Start job server", action="store_true", default=False)
-    parser.add_argument("-R", "--reset_local", help="Clear local cache", action="store_true", default=False)
-    parser.add_argument("-r", "--rerun_jobs", help="Re-run jobs by bringing them back from wherever to the queue.", action="store_true", default=False)
-    parser.add_argument("-L", "--release_lock", help="Release lock.", action="store_true", default=False)
-    parser.add_argument("-f", "--queue_failed_jobs", help="Bring failed jobs back to queued jobs for a re-trial.", action="store_true", default=False)
-    parser.add_argument("-m", "--monitor_cloud", help="Monitor workers instead of running a job server.", action="store_true", default=False)
-    parser.add_argument("-j", "--num_jobs", help="Number of jobs the server will run in parallel.", action="store", type=int, default=1)
-    args = parser.parse_args()
-
-    init_line = f"🔧 Initializing Cloud Manager with {args.num_jobs} worker{'s' if args.num_jobs > 1 else ''}"
-    console.print(Panel(init_line, title_align="left", expand=False))
-
-    cm = CloudManager(max_jobs=args.num_jobs, cloud=args.cloud, reset_local=args.reset_local)
-
-    if args.release_lock:
-        line = "🔓 Releasing lock..."
-        console.print(Panel(line, title_align="left", expand=False))
-        cm.claim_lock()
-        cm.release_lock()
-        print("✅ Lock successfully released")
-
-    if args.queue_failed_jobs:
-        line = "🔄 Requeuing failed jobs..."
-        console.print(Panel(line, title_align="left", expand=False))
-        cm.clean_failed_jobs_mess()
-        print("✅ Failed jobs moved to queue")
-
-    if args.rerun_jobs:
-        line = "🔁 Rerunning jobs..."
-        console.print(Panel(line, title_align="left", expand=False))
-        cm.rerun_jobs()
-        print("✅ Jobs restarted successfully")
-
-    if args.monitor_cloud:
-        title = "👁️  STARTING CLOUD MONITOR"
-        console.print(Panel(title, title_align="left", expand=False))
-        cm.run_monitor()
-
-    if args.serve:
-        title1 = "🚀 STARTING JOB SERVER"
-        run_line = f"💻 Running {args.num_jobs} worker{'s' if args.num_jobs > 1 else ''}"
-        cloud_line = f"☁️  Cloud: {args.cloud if args.cloud else 'Default'}"
-        console.print(Panel(f"{title1}\n{run_line}\n{cloud_line}", title_align="left", expand=False))
-
-    title = "✅ Cloud Manager finished successfully"
-    console.print(Panel(title, title_align="left", expand=False))
-    import sys
-    sys.exit(0)
-
-
-if __name__ == '__main__':
-    main()
+# """Run cloud manager.
+# """
+
+# from machineconfig.cluster.cloud_manager import CloudManager
+# from rich.console import Console  # Add import for Console
+# from rich.panel import Panel  # Add import for Panel
+# import argparse
+
+# console = Console()
+
+# BOX_WIDTH = 150  # width for box drawing
+
+
+# def print_section_title(title: str):
+#     """Prints a section title formatted nicely with a border and padding."""
+#     console = Console()
+#     console.print(Panel(title, title_align="left", expand=False))
+
+
+# def main():
+#     console = Console() # Add console initialization
+#     console.print(Panel("☁️  Cloud Manager", title_align="left", expand=False))
+
+#     parser = argparse.ArgumentParser()
+#     parser.add_argument("-c", "--cloud", help="Rclone Config Name", action="store", type=str, default=None)
+#     parser.add_argument("-s", "--serve", help="Start job server", action="store_true", default=False)
+#     parser.add_argument("-R", "--reset_local", help="Clear local cache", action="store_true", default=False)
+#     parser.add_argument("-r", "--rerun_jobs", help="Re-run jobs by bringing them back from wherever to the queue.", action="store_true", default=False)
+#     parser.add_argument("-L", "--release_lock", help="Release lock.", action="store_true", default=False)
+#     parser.add_argument("-f", "--queue_failed_jobs", help="Bring failed jobs back to queued jobs for a re-trial.", action="store_true", default=False)
+#     parser.add_argument("-m", "--monitor_cloud", help="Monitor workers instead of running a job server.", action="store_true", default=False)
+#     parser.add_argument("-j", "--num_jobs", help="Number of jobs the server will run in parallel.", action="store", type=int, default=1)
+#     args = parser.parse_args()
+
+#     init_line = f"🔧 Initializing Cloud Manager with {args.num_jobs} worker{'s' if args.num_jobs > 1 else ''}"
+#     console.print(Panel(init_line, title_align="left", expand=False))
+
+#     cm = CloudManager(max_jobs=args.num_jobs, cloud=args.cloud, reset_local=args.reset_local)
+
+#     if args.release_lock:
+#         line = "🔓 Releasing lock..."
+#         console.print(Panel(line, title_align="left", expand=False))
+#         cm.claim_lock()
+#         cm.release_lock()
+#         print("✅ Lock successfully released")
+
+#     if args.queue_failed_jobs:
+#         line = "🔄 Requeuing failed jobs..."
+#         console.print(Panel(line, title_align="left", expand=False))
+#         cm.clean_failed_jobs_mess()
+#         print("✅ Failed jobs moved to queue")
+
+#     if args.rerun_jobs:
+#         line = "🔁 Rerunning jobs..."
+#         console.print(Panel(line, title_align="left", expand=False))
+#         cm.rerun_jobs()
+#         print("✅ Jobs restarted successfully")
+
+#     if args.monitor_cloud:
+#         title = "👁️  STARTING CLOUD MONITOR"
+#         console.print(Panel(title, title_align="left", expand=False))
+#         cm.run_monitor()
+
+#     if args.serve:
+#         title1 = "🚀 STARTING JOB SERVER"
+#         run_line = f"💻 Running {args.num_jobs} worker{'s' if args.num_jobs > 1 else ''}"
+#         cloud_line = f"☁️  Cloud: {args.cloud if args.cloud else 'Default'}"
+#         console.print(Panel(f"{title1}\n{run_line}\n{cloud_line}", title_align="left", expand=False))
+
+#     title = "✅ Cloud Manager finished successfully"
+#     console.print(Panel(title, title_align="left", expand=False))
+#     import sys
+#     sys.exit(0)
+
+
+# if __name__ == '__main__':
+#     main()

machineconfig/scripts/python/cloud_mount.py

@@ -3,7 +3,8 @@
 
 
 from machineconfig.utils.utils import PROGRAM_PATH, choose_one_option
-from crocodile.file_management import P, Read
+from machineconfig.utils.utils2 import read_ini
+from machineconfig.utils.path_reduced import P as PathExtended
 
 import platform
 import argparse
@@ -18,17 +19,16 @@ DEFAULT_MOUNT = "~/data/rclone"
 
 
 def get_rclone_config():
-    if platform.system() == "Windows": config = Read.ini(P.home().joinpath("AppData/Roaming/rclone/rclone.conf"))
-    elif platform.system() == "Linux": config = Read.ini(P.home().joinpath(".config/rclone/rclone.conf"))
+    if platform.system() == "Windows": config = read_ini(PathExtended.home().joinpath("AppData/Roaming/rclone/rclone.conf"))
+    elif platform.system() in ["Linux", "Darwin"]: config = read_ini(PathExtended.home().joinpath(".config/rclone/rclone.conf"))
     else: raise ValueError("unsupported platform")
     return config
 
 
 def get_mprocs_mount_txt(cloud: str, rclone_cmd: str, cloud_brand: str):  # cloud_brand = config[cloud]["type"]
-    # config = Read.ini(P.home().joinpath(".config/rclone/rclone.conf"))
     header = f"{' ' + cloud + ' | ' + cloud_brand + ' '}".center(50, "=")
     if platform.system() == "Windows":
-        sub_text_path = P.tmpfile(suffix=".ps1").write_text(f"""
+        sub_text_path = PathExtended.tmpfile(suffix=".ps1").write_text(f"""
 echo "{header}"
 iex 'rclone about {cloud}:'
 echo 'See {DEFAULT_MOUNT}/{cloud} for the mounted cloud'
@@ -59,19 +59,20 @@ def mount(cloud: Optional[str], network: Optional[str], destination: Optional[st
 
     if network is None:
         if destination is None:
-            mount_loc = P(DEFAULT_MOUNT).expanduser().joinpath(cloud)
+            mount_loc = PathExtended(DEFAULT_MOUNT).expanduser().joinpath(cloud)
         else:
-            mount_loc = P(destination)
+            mount_loc = PathExtended(destination)
         
         mount_info = f"📂 Mount location: {mount_loc}"
         console.print(Panel(mount_info, border_style="blue"))
 
         if platform.system() == "Windows":
             print("🪟 Creating mount directory on Windows...")
-            mount_loc.parent.create()
-        elif platform.system() == "Linux":
-            print("🐧 Creating mount directory on Linux...")
-            try: mount_loc.create()
+            mount_loc.parent.mkdir(parents=True, exist_ok=True)
+        elif platform.system() in ["Linux", "Darwin"]:
+            system_name = "Linux" if platform.system() == "Linux" else "macOS"
+            print(f"🐧 Creating mount directory on {system_name}...")
+            try: mount_loc.mkdir(parents=True, exist_ok=True)
             except (FileExistsError, OSError) as err:
                 # We need a umount command here.
                 warning_line = "⚠️  WARNING: Mount directory issue"
@@ -94,7 +95,7 @@ def mount(cloud: Optional[str], network: Optional[str], destination: Optional[st
         txt = f"""
 wt --window 0 --profile "Windows PowerShell" --startingDirectory "$HOME/data/rclone" `; split-pane --horizontal  --profile "Command Prompt" --size 0.2 powershell -Command "{mount_cmd}" `; split-pane --vertical --profile "Windows PowerShell" --size 0.2 powershell -NoExit -Command "rclone about {cloud}:"  `; move-focus up
 """
-    elif platform.system() == "Linux": txt = f"""
+    elif platform.system() in ["Linux", "Darwin"]: txt = f"""
 
 ZJ_SESSIONS=$(zellij list-sessions)
 

machineconfig/scripts/python/cloud_repo_sync.py

@@ -1,9 +1,9 @@
 """utils"""
 
 import git
-from crocodile.file_management import P, Read
+from machineconfig.utils.path_reduced import P as PathExtended
 from crocodile.meta import Terminal
-from crocodile.core import randstr
+from machineconfig.utils.utils2 import randstr, read_ini
 
 from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles
 from machineconfig.utils.utils import CONFIG_PATH, DEFAULTS_PATH, PROGRAM_PATH, choose_one_option
@@ -13,7 +13,7 @@ import argparse
 from typing import Optional, Literal
 from rich.console import Console
 from rich.panel import Panel
-from rich.text import Text
+# from rich.text import Text
 
 console = Console()
 
@@ -25,18 +25,18 @@ def main(cloud: Optional[str] = None, path: Optional[str] = None, message: Optio
          pwd: Optional[str] = None):
     if cloud is None:
         try:
-            cloud_resolved = Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
+            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_root = P(args.repo).expanduser().absolute()
-    repo_local_root = P.cwd() if path is None else P(path).expanduser().absolute()
+    # 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 = P(repo_local_obj.working_dir)  # cwd might have been in a sub directory of repo_root, so its better to redefine it.
-    CONFIG_PATH.joinpath("remote").create()
+    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.
+    CONFIG_PATH.joinpath("remote").mkdir(parents=True, exist_ok=True)
     repo_remote_root = CONFIG_PATH.joinpath("remote", repo_local_root.rel2home())  # .delete(sure=True)
     
     try:
@@ -82,6 +82,7 @@ git pull originEnc master
         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"))
 
@@ -89,7 +90,7 @@ git pull originEnc master
         option1 = 'Delete remote copy and push local:'
         program_1_py = f"""
 from machineconfig.scripts.python.helpers.repo_sync_helpers import delete_remote_repo_copy_and_push_local as func
-func(remote_repo=r'{repo_remote_root.to_str()}', local_repo=r'{repo_local_root.to_str()}', cloud=r'{cloud_resolved}')
+func(remote_repo=r'{str(repo_remote_root)}', local_repo=r'{str(repo_local_root)}', cloud=r'{cloud_resolved}')
 """
         shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_name="ve")
         # ================================================================================
@@ -99,7 +100,7 @@ func(remote_repo=r'{repo_remote_root.to_str()}', local_repo=r'{repo_local_root.t
 rm -rfd {repo_local_root}
 mv {repo_remote_root} {repo_local_root}
 """
-        if platform.system() == "Linux": program_2 += """
+        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
@@ -111,7 +112,7 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
         option3 = 'Inspect repos:'
         program_3_py = f"""
 from machineconfig.scripts.python.helper.repo_sync_helpers import inspect_repos as func
-func(repo_local_root=r'{repo_local_root.to_str()}', repo_remote_root=r'{repo_remote_root.to_str()}')
+func(repo_local_root=r'{str(repo_local_root)}', repo_remote_root=r'{str(repo_remote_root)}')
 """
         shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_name="ve")
         # ================================================================================
@@ -147,6 +148,8 @@ git commit -am "finished merging"
             case "overwriteLocal": program_content = program_2
             case "InspectRepos": program_content = shell_file_3.read_text()
             case "RemoveLocalRclone": program_content = program_4
+            case _: 
+                raise ValueError(f"Unknown action: {action}")
         PROGRAM_PATH.write_text(program_content)
     return program_content