machineconfig 3.3__py3-none-any.whl → 3.5__py3-none-any.whl

machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py

@@ -1,8 +1,8 @@
 """Set Windows Terminal Settings"""
 
-from machineconfig.utils.utils2 import randstr, read_json
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.io_save import save_json
+from machineconfig.utils.accessories import randstr
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.io import read_json, save_json
 import platform
 
 # from uuid import uuid4

machineconfig/utils/{utils2.py → accessories.py}

@@ -32,35 +32,6 @@ def split[T](iterable: list[T], every: int = 1, to: Optional[int] = None) -> lis
     return list(res)
 
 
-def read_ini(path: "Path", encoding: Optional[str] = None):
-    if not Path(path).exists() or Path(path).is_dir():
-        raise FileNotFoundError(f"File not found or is a directory: {path}")
-    import configparser
-
-    res = configparser.ConfigParser()
-    res.read(filenames=[str(path)], encoding=encoding)
-    return res
-
-
-def read_json(path: "Path", r: bool = False, **kwargs: Any) -> Any:  # return could be list or dict etc
-    import json
-
-    try:
-        mydict = json.loads(Path(path).read_text(encoding="utf-8"), **kwargs)
-    except Exception:
-        import pyjson5
-
-        mydict = pyjson5.loads(Path(path).read_text(encoding="utf-8"), **kwargs)  # file has C-style comments.
-    _ = r
-    return mydict
-
-
-def read_toml(path: "Path"):
-    import tomli
-
-    return tomli.loads(path.read_text(encoding="utf-8"))
-
-
 def pprint(obj: dict[Any, Any], title: str) -> None:
     from rich import inspect
 
@@ -86,3 +57,16 @@ def human_friendly_dict(d: dict[str, Any]) -> dict[str, Any]:
         else:
             result[k] = v
     return result
+
+
+def get_repo_root(path: Path) -> Optional[Path]:
+    from git import Repo, InvalidGitRepositoryError
+
+    try:
+        repo = Repo(str(path), search_parent_directories=True)
+        root = repo.working_tree_dir
+        if root is not None:
+            return Path(root)
+    except InvalidGitRepositoryError:
+        pass
+    return None

machineconfig/utils/code.py

@@ -5,9 +5,9 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.syntax import Syntax
 
-from machineconfig.utils.utils2 import randstr
+from machineconfig.utils.accessories import randstr
 from machineconfig.utils.ve import get_ve_activate_line
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 
 def get_shell_script_executing_python_file(python_file: str, func: Optional[str], ve_path: str, strict_execution: bool = True):

machineconfig/utils/installer.py

@@ -6,9 +6,9 @@ from machineconfig.utils.schemas.installer.installer_types import APP_INSTALLER_
 from rich.console import Console
 from rich.panel import Panel  # Added import
 
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.source_of_truth import INSTALL_VERSION_ROOT
-from machineconfig.utils.utils2 import read_json
+from machineconfig.utils.io import read_json
 
 from typing import Any
 import platform

machineconfig/utils/installer_utils/installer_abc.py

@@ -1,4 +1,4 @@
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.source_of_truth import WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH
 from typing import Optional
 import subprocess

machineconfig/utils/installer_utils/installer_class.py

@@ -1,8 +1,8 @@
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.installer_utils.installer_abc import find_move_delete_linux, find_move_delete_windows
 from machineconfig.utils.source_of_truth import INSTALL_TMP_DIR, INSTALL_VERSION_ROOT, LIBRARY_ROOT
 from machineconfig.utils.options import check_tool_exists
-from machineconfig.utils.utils2 import read_json
+from machineconfig.utils.io import read_json
 from machineconfig.utils.schemas.installer.installer_types import InstallerData, InstallerDataFiles
 
 import platform

machineconfig/utils/io.py

@@ -0,0 +1,94 @@
+from __future__ import annotations
+
+from typing import Any, Union, Optional, Mapping
+from pathlib import Path
+import json
+import pickle
+import configparser
+
+
+PathLike = Union[str, Path]
+
+
+def _ensure_parent(path: PathLike) -> Path:
+    path_obj = Path(path)
+    path_obj.parent.mkdir(parents=True, exist_ok=True)
+    return path_obj
+
+
+def save_pickle(obj: Any, path: PathLike, verbose: bool = False) -> Path:
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "wb") as fh:
+        pickle.dump(obj, fh, protocol=pickle.HIGHEST_PROTOCOL)
+    if verbose:
+        print(f"Saved pickle -> {path_obj}")
+    return Path(path_obj)
+
+
+def save_json(obj: Any, path: PathLike, indent: Optional[int] = None, verbose: bool = False) -> Path:
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "w", encoding="utf-8") as fh:
+        json.dump(obj, fh, indent=indent, ensure_ascii=False)
+        fh.write("\n")
+    if verbose:
+        print(f"Saved json -> {path_obj}")
+    return Path(path_obj)
+
+
+# def save_toml(obj: Mapping[str, Any], path: PathLike, verbose: bool = False) -> Path:
+#     path_obj = _ensure_parent(path)
+#     with open(path_obj, "w", encoding="utf-8") as fh:
+#         toml.dump(obj, fh)
+#     if verbose:
+#         print(f"Saved toml -> {path_obj}")
+#     return Path(path_obj)
+
+
+# def save_yaml(obj: Any, path: PathLike, verbose: bool = False) -> Path:
+#     path_obj = _ensure_parent(path)
+#     with open(path_obj, "w", encoding="utf-8") as fh:
+#         yaml.safe_dump(obj, fh, sort_keys=False)
+#     if verbose:
+#         print(f"Saved yaml -> {path_obj}")
+#     return Path(path_obj)
+
+
+def save_ini(path: PathLike, obj: Mapping[str, Mapping[str, Any]], verbose: bool = False) -> Path:
+    cp = configparser.ConfigParser()
+    for section, values in obj.items():
+        cp[section] = {str(k): str(v) for k, v in values.items()}
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "w", encoding="utf-8") as fh:
+        cp.write(fh)
+    if verbose:
+        print(f"Saved ini -> {path_obj}")
+    return Path(path_obj)
+
+
+def read_ini(path: "Path", encoding: Optional[str] = None):
+    if not Path(path).exists() or Path(path).is_dir():
+        raise FileNotFoundError(f"File not found or is a directory: {path}")
+    import configparser
+
+    res = configparser.ConfigParser()
+    res.read(filenames=[str(path)], encoding=encoding)
+    return res
+
+
+def read_json(path: "Path", r: bool = False, **kwargs: Any) -> Any:  # return could be list or dict etc
+    import json
+
+    try:
+        mydict = json.loads(Path(path).read_text(encoding="utf-8"), **kwargs)
+    except Exception:
+        import pyjson5
+
+        mydict = pyjson5.loads(Path(path).read_text(encoding="utf-8"), **kwargs)  # file has C-style comments.
+    _ = r
+    return mydict
+
+
+def from_pickle(path: Path) -> Any:
+    import pickle
+
+    return pickle.loads(path.read_bytes())

machineconfig/utils/links.py

@@ -1,5 +1,5 @@
-from machineconfig.utils.path_reduced import PathExtended as PathExtended, PLike
-from machineconfig.utils.utils2 import randstr
+from machineconfig.utils.path_extended import PathExtended as PathExtended, PLike
+from machineconfig.utils.accessories import randstr
 from rich.console import Console
 from rich.panel import Panel
 

machineconfig/utils/notifications.py

@@ -1,16 +1,8 @@
 """Notifications Module"""
 
-# from crocodile.core import install_n_import
-# from crocodile.file_management import P, Read
 from pathlib import Path
-
-# from crocodile.meta import RepeatUntilNoException
 import smtplib
 import imaplib
-
-# from email import message
-# from email import encoders
-# from email.mime.base import MIMEBase
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from typing import Optional, Any, Union
@@ -192,7 +184,6 @@ encryption = ssl
     #     else:
     #         body_file_path = None
     #         assert body is not None, "You must pass either body or body_file."
-    #     from crocodile.meta import Terminal
 
     #     to_str = ",".join(to)
     #     attachments_str = " ".join([f"--attachment {str(p)}" for p in attachments]) if attachments is not None else ""

machineconfig/utils/{path_reduced.py → path_extended.py}

@@ -1,4 +1,4 @@
-from machineconfig.utils.utils2 import randstr
+from machineconfig.utils.accessories import randstr
 
 from datetime import datetime
 import time

machineconfig/utils/{path.py → path_helper.py}

@@ -1,4 +1,4 @@
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.options import choose_one_option
 from machineconfig.utils.source_of_truth import EXCLUDE_DIRS
 from rich.console import Console

machineconfig/utils/procs.py

@@ -8,7 +8,7 @@ from typing import Optional, Any
 from rich.console import Console
 from rich.panel import Panel
 from datetime import datetime, timezone
-from machineconfig.utils.utils2 import pprint
+from machineconfig.utils.accessories import pprint
 
 console = Console()
 

machineconfig/utils/{utils5.py → scheduler.py}

@@ -3,7 +3,8 @@ from typing import Callable, Optional, Union, Any, NoReturn, TypeVar, Protocol,
 import logging
 import time
 from datetime import datetime, timezone, timedelta
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
+from machineconfig.utils.io import from_pickle
+from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 
 class LoggerTemplate(Protocol):
@@ -108,7 +109,7 @@ class Scheduler:
             # "logfile": self.logger.file_path
         }
         summ.update(sess_stats)
-        from machineconfig.utils.utils2 import get_repr
+        from machineconfig.utils.accessories import get_repr
 
         tmp = get_repr(summ)
         self.logger.critical("\n--> Scheduler has finished running a session. \n" + tmp + "\n" + "-" * 100)
@@ -157,12 +158,6 @@ def to_pickle(obj: Any, path: Path) -> None:
     path.write_bytes(pickle.dumps(obj))
 
 
-def from_pickle(path: Path) -> Any:
-    import pickle
-
-    return pickle.loads(path.read_bytes())
-
-
 class Cache(Generic[T]):  # This class helps to accelrate access to latest data coming from expensive function. The class has two flavours, memory-based and disk-based variants."""
     # source_func: Callable[[], T]
     def __init__(

machineconfig/utils/ssh.py

@@ -3,8 +3,8 @@ import os
 from dataclasses import dataclass
 import rich.console
 from machineconfig.utils.terminal import Terminal, Response, MACHINE
-from machineconfig.utils.path_reduced import PathExtended, PLike, OPLike
-from machineconfig.utils.utils2 import pprint
+from machineconfig.utils.path_extended import PathExtended, PLike, OPLike
+from machineconfig.utils.accessories import pprint
 # from machineconfig.utils.ve import get_ve_activate_line
 
 

machineconfig/utils/terminal.py

@@ -1,4 +1,4 @@
-from machineconfig.utils.path_reduced import PathExtended, OPLike
+from machineconfig.utils.path_extended import PathExtended, OPLike
 import subprocess
 from typing import Any, BinaryIO, Optional, Union
 import platform
@@ -219,9 +219,19 @@ class Terminal:
 
     @staticmethod
     def get_header(wdir: OPLike, toolbox: bool):
+        if toolbox:
+            toobox_code = """
+try:
+    from crocodile.toolbox import *
+except ImportError:
+    print("Crocodile not found, skipping import.")
+    pass
+"""
+        else:
+            toobox_code = "# No toolbox import."
         return f"""
 # >> Code prepended
-{"from crocodile.toolbox import *" if toolbox else "# No toolbox import."}
+{toobox_code}
 {'''sys.path.insert(0, r'{wdir}') ''' if wdir is not None else "# No path insertion."}
 # >> End of header, start of script passed
 """

machineconfig/utils/ve.py

@@ -1,8 +1,7 @@
-from machineconfig.utils.path_reduced import PathExtended as PathExtended
-from machineconfig.utils.utils2 import read_ini
+from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.io import read_ini
 import platform
 from typing import Optional
-from pathlib import Path
 
 
 def get_ve_path_and_ipython_profile(init_path: PathExtended) -> tuple[Optional[str], Optional[str]]:
@@ -39,19 +38,6 @@ def get_ve_path_and_ipython_profile(init_path: PathExtended) -> tuple[Optional[s
     return ve_path, ipy_profile
 
 
-def get_repo_root(path: Path) -> Optional[Path]:
-    from git import Repo, InvalidGitRepositoryError
-
-    try:
-        repo = Repo(str(path), search_parent_directories=True)
-        root = repo.working_tree_dir
-        if root is not None:
-            return Path(root)
-    except InvalidGitRepositoryError:
-        pass
-    return None
-
-
 def get_ve_activate_line(ve_root: str):
     if platform.system() == "Windows":
         activate_ve_line = f". {ve_root}/Scripts/activate.ps1"

{machineconfig-3.3.dist-info → machineconfig-3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.3
+Version: 3.5
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -24,9 +24,6 @@ Requires-Dist: gitpython>=3.1.44
 Requires-Dist: pyfzf>=0.3.1
 Requires-Dist: rclone-python>=0.1.23
 Requires-Dist: pyjson5>=1.6.9
-Requires-Dist: pyyaml>=6.0.2
-Requires-Dist: toml>=0.10.2
-Requires-Dist: tomli>=2.2.1
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: docs