abstract-utilities 0.2.2.476__py3-none-any.whl → 0.2.2.486__py3-none-any.whl

abstract_utilities/file_utils/file_utils/imports/module_imports.py

@@ -6,7 +6,8 @@ from ....ssh_utils import *
 from ....env_utils import *
 from ....read_write_utils import *
 from ....abstract_classes import SingletonMeta
-
+from ....string_utils import get_from_kwargs
+from ....abstract_classes import run_pruned_func
 from ....class_utils import get_caller, get_caller_path, get_caller_dir
 
 

abstract_utilities/file_utils/file_utils/type_checks.py

@@ -1,34 +1,36 @@
 from .imports import *
 
+def get_user_pass_host_key(**kwargs):
+    args = ['password','user_at_host','host','key','user']
+    values,kwargs = get_from_kwargs(*args,**kwargs,del_kwarg=False)
+    return values
 
 # --- Base remote checker -----------------------------------------------------
-def _remote_test(path: str, test_flag: str, user_at_host: str, timeout: int = 5) -> bool:
+def _remote_test(path: str, test_flag: str, timeout: int = 5,*args, **kwargs) -> bool:
     """
     Run a remote shell test (e.g. -f, -d) via SSH.
     Returns True if test succeeds, False otherwise.
     """
-    cmd = f"[ {test_flag} {shlex.quote(path)} ] && echo 1 || echo 0"
     try:
-        result = subprocess.check_output(
-            ["ssh", user_at_host, cmd],
-            stderr=subprocess.DEVNULL,
-            text=True,
-            timeout=timeout
-        ).strip()
-        return result == "1"
+        kwargs['cmd']=f"[ {test_flag} {shlex.quote(path)} ] && echo 1 || echo 0"
+        kwargs['text']=True
+        kwargs['timeout']=timeout
+        kwargs['stderr']=subprocess.DEVNULL
+        result = run_pruned_func(run_cmd,**kwargs)
+        return result.strip() == "1"
     except Exception:
         return False
 
 
 # --- Individual path checks --------------------------------------------------
-def is_remote_file(path: str, user_at_host: str) -> bool:
+def is_remote_file(path: str,*args, **kwargs) -> bool:
     """True if remote path is a file."""
-    return _remote_test(path, "-f", user_at_host)
+    return _remote_test(path, "-f", **kwargs)
 
 
-def is_remote_dir(path: str, user_at_host: str) -> bool:
+def is_remote_dir(path: str,*args, **kwargs) -> bool:
     """True if remote path is a directory."""
-    return _remote_test(path, "-d", user_at_host)
+    return _remote_test(path, "-d", **kwargs)
 
 
 def is_local_file(path: str) -> bool:
@@ -42,33 +44,40 @@ def is_local_dir(path: str) -> bool:
 
 
 # --- Unified interface -------------------------------------------------------
-def is_file(path: str,*args, user_at_host: Optional[str] = None,**kwargs) -> bool:
+
+def is_file(path: str,*args,**kwargs) -> bool:
     """Determine if path is a file (works local or remote)."""
-    if user_at_host:
-        return is_remote_file(path, user_at_host)
+    if get_user_pass_host_key(**kwargs):
+        return is_remote_file(path, **kwargs)
     return is_local_file(path)
 
 
-def is_dir(path: str, *args,user_at_host: Optional[str] = None,**kwargs) -> bool:
+def is_dir(path: str, *args,**kwargs) -> bool:
     """Determine if path is a directory (works local or remote)."""
-    if user_at_host:
-        return is_remote_dir(path, user_at_host)
+    if get_user_pass_host_key(**kwargs):
+        return is_remote_dir(path, **kwargs)
     return is_local_dir(path)
 
-
+def is_exists(path: str, *args,**kwargs) -> bool:
+    if is_file(path,**kwargs):
+        return True
+    if is_dir(path,**kwargs):
+        return True
+    return False
 # --- Optional: keep your original all-in-one wrapper ------------------------
 def check_path_type(
     path: str,
-    user_at_host: Optional[str] = None,
+    *args,
+    **kwargs
 ) -> str:
     """
     Return 'file', 'directory', 'missing', or 'unknown'.
     Uses isolated is_file/is_dir functions.
     """
-    if user_at_host:
-        if is_remote_file(path, user_at_host):
+    if get_user_pass_host_key(**kwargs):
+        if is_remote_file(path,**kwargs):
             return "file"
-        elif is_remote_dir(path, user_at_host):
+        elif is_remote_dir(path,**kwargs):
             return "directory"
         else:
             return "missing"

abstract_utilities/read_write_utils.py

@@ -15,12 +15,12 @@ Usage:
 import os
 import shlex
 from .ssh_utils.utils import run_cmd,get_print_sudo_cmd,run_local_cmd,run_remote_cmd
-from .file_utils.file_utils.type_checks import is_file,is_dir
+from .file_utils.file_utils.type_checks import is_file,is_dir,get_user_pass_host_key,is_exists
 from .abstract_classes import run_pruned_func
 _FILE_PATH_KEYS = ['file', 'filepath', 'file_path', 'path', 'directory', 'f', 'dst', 'dest']
 _CONTENTS_KEYS = ['cont', 'content', 'contents', 'data', 'datas', 'dat', 'src', 'source']
 
-
+            
 # --- Helper utilities --------------------------------------------------------
 def string_in_keys(strings, kwargs):
     """Find a matching keyword in kwargs that contains any of the given substrings."""
@@ -30,25 +30,60 @@ def string_in_keys(strings, kwargs):
                 return key
     return None
 
-
-def get_path(paths):
+def make_dirs(path,exist_ok=True,**kwargs):
+    if exist_ok or (not exist_ok and not is_dir(path,**kwargs)):
+        if get_user_pass_host_key(**kwargs):
+            kwargs['cmd']=f"mkdir {path}"
+            run_pruned_func(run_cmd,**kwargs)
+        else:
+            os.makedirs(path,exist_ok=exist_ok)
+    return path
+def path_join(*args):
+    path = None
+    for i,arg in enumerate(args):
+        if arg:
+            if i == 0:
+                path = arg
+            else:
+                path = os.path.join(path,arg)
+    return path
+def make_path(path,home_dir=None,file=None,**kwargs):
+    if path:
+        basename = os.path.basename(path)
+        parts = path.split('/')
+        parts = [part for part in parts if part]
+        
+        full_dir = home_dir or ''
+        if file == True or (file == None and ('.' in basename)):
+            pieces = parts[:-1] if len(parts) > 1 else []
+        else:
+            pieces=parts
+            basename=None
+        for piece in pieces:
+            full_dir = os.path.join(full_dir,piece)
+            make_dirs(full_dir,exist_ok=True,**kwargs)
+        if basename:
+            full_dir=path_join(full_dir,basename)
+        print(f"full_dir == {full_dir}")
+        return full_dir
+def get_path(paths,**kwargs):
     """Return the first valid path among given paths."""
     for path in paths:
         if isinstance(path, str):
-            if os.path.isfile(path):
+            if is_file(path,**kwargs):
                 return path
             dirname = os.path.dirname(path)
-            if os.path.exists(dirname):
+            if is_exists(dirname,**kwargs):
                 return path
     return None
 
 
-def break_down_find_existing(path):
+def break_down_find_existing(path,**kwargs):
     """Return the first non-existent subpath within a path chain."""
     test_path = ''
     for part in path.split(os.sep):
         test_path = os.path.join(test_path, part)
-        if not os.path.exists(test_path):
+        if not is_exists(test_path,**kwargs):
             return test_path if test_path else None
     return test_path
 
@@ -97,8 +132,8 @@ def write_to_path(
 
     # shell command that fully overwrites
     # (no append, replaces contents entirely)
-    base_cmd = f"echo {quoted_data} > {quoted_path}"
-
+    base_cmd = f'sudo sh -c "echo {quoted_data} > {quoted_path}"'
+    input(base_cmd)
     # optional sudo password injection
     full_cmd = get_print_sudo_cmd(
         cmd=base_cmd,
@@ -150,29 +185,37 @@ def write_to_file(*args, **kwargs):
     Returns the file_path written.
     """
     file_path, contents = check_read_write_params(*args, **kwargs)
+    values,kwargs = get_from_kwargs(['file_path','contents'],del_kwarg=True,**kwargs)
+    dirname = os.path.dirname(file_path)
+    
     if contents is None:
         raise ValueError("Missing contents to write.")
     user_at_host = kwargs.get("user_at_host")
-    if user_at_host:
+    if get_user_pass_host_key(**kwargs):
+        make_dirs(dirname, exist_ok=True,**kwargs)
         kwargs["cwd"] = kwargs.get('cwd') or os.path.dirname(file_path)
         # sanitize for shell safety
         quoted_path = shlex.quote(file_path)
         quoted_data = shlex.quote(str(contents))
         # shell command that fully overwrites
         # (no append, replaces contents entirely)
-        kwargs["cmd"] = f"echo {quoted_data} > {quoted_path}"
-        return run_pruned_func(run_cmd,**kwargs)
-
-
-    os.makedirs(os.path.dirname(file_path) or ".", exist_ok=True)
+        kwargs["cmd"] = f'sh -c "echo {quoted_data} > {quoted_path}"'
+        if not kwargs.get('password') and not kwargs.get('key'):
+            kwargs["cmd"]=f'sudo {kwargs["cmd"]}'
+        result = run_pruned_func(run_cmd,**kwargs)
+        if not is_file(file_path,**kwargs) or str(contents) != read_from_file(file_path,**kwargs):
+            kwargs["cmd"]=f'sudo {kwargs["cmd"]}'
+            result = run_pruned_func(run_cmd,**kwargs)
+        return result
+
+    make_dirs(dirname or ".", exist_ok=True)
     with open(file_path, "w", encoding="utf-8") as f:
         f.write(str(contents))
     return file_path
 
 
 def read_from_file(file_path,**kwargs):
-    user_at_host = kwargs.get("user_at_host")
-    if user_at_host:
+    if get_user_pass_host_key(**kwargs):
         kwargs["cwd"] = kwargs.get('cwd') or os.path.dirname(file_path)
         basename = os.path.basename(file_path)
         kwargs["cmd"] = f'cat {basename}'
@@ -180,7 +223,36 @@ def read_from_file(file_path,**kwargs):
     """Read text content from a file."""
     with open(file_path, "r", encoding="utf-8") as f:
         return f.read()
-
+def get_rel_path(src,src_rel,directory):
+    if src.startswith(src_rel):
+        src = src[len(src_rel):]
+        rel_path = os.path.join(directory,src)
+        return rel_path
+def make_relative_path(src,src_rel,dst,**kwargs):
+    print(f"src == {src}\nsrc_rel == {src_rel}\dst == {dst}")
+    if src.startswith(src_rel):
+        rel_path = get_rel_path(src,src_rel,dst)
+        path = make_path(src,home_dir=rel_path,**kwargs)
+        print(f"path == {path}")
+        return path
+def copy_dirs(dirs,dst,src_rel=None,**kwargs):
+    for src in dirs:
+        if rel_path:
+            dst = make_relative_path(src,src_rel,dst,**kwargs)
+        make_path(dst,**kwargs)
+        
+def copy_file(src,dst,rel_path=None,**kwargs):
+    if rel_path:
+        dst = make_relative_path(src,rel_path,dst,**kwargs)
+    if get_user_pass_host_key(**kwargs):
+        contents=read_from_file(src,**kwargs)
+        write_to_file(contents=contents,file_path=dst,**kwargs)
+    else:
+        shutil.copy(src,dst)
+    return dst
+def copy_files(files,dst,rel_path=None,**kwargs):
+    for file in files:
+        copy_file(src=file,dst=dst,rel_path=rel_path,**kwargs)
 
 def create_and_read_file(*args, **kwargs):
     """

abstract_utilities/string_utils.py

@@ -1,13 +1,16 @@
 from .list_utils import make_list
 def get_from_kwargs(*args,**kwargs):
+    del_kwarg = kwargs.get('del_kwargs',False)
     values = {}
     for key in args:
         if key:
             key = str(key)
             if key in kwargs:
                 values[key] = kwargs.get(key)
-                del kwargs[key]
+                if del_kwarg:
+                    del kwargs[key]
     return values,kwargs
+
 def replace_it(string,item,rep):
     if item in string:
         string = string.replace(item,rep)

{abstract_utilities-0.2.2.476.dist-info → abstract_utilities-0.2.2.486.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_utilities
-Version: 0.2.2.476
+Version: 0.2.2.486
 Summary: abstract_utilities is a collection of utility modules providing a variety of functions to aid in tasks such as data comparison, list manipulation, JSON handling, string manipulation, mathematical computations, and time operations.
 Home-page: https://github.com/AbstractEndeavors/abstract_utilities
 Author: putkoff

{abstract_utilities-0.2.2.476.dist-info → abstract_utilities-0.2.2.486.dist-info}/RECORD

@@ -14,10 +14,10 @@ abstract_utilities/log_utils.py,sha256=W74Y-CmdQP4Kj88HmAgejVxWgyWlvgCKMwLvOfyFf
 abstract_utilities/math_utils.py,sha256=0o1ls1En03UAkYmxTBildCCJDfHygmNuvVnrNrLYtK0,6578
 abstract_utilities/parse_utils.py,sha256=Z5OGRwHuzCzY91fz0JJojk1BPAo1XF2quNNLuBF4_Vk,18602
 abstract_utilities/path_utils.py,sha256=X_U9cPBbNu5Wi0F3hQE0gXQX1gfhzxhxALbairTEOZU,19252
-abstract_utilities/read_write_utils.py,sha256=S8Sj0mtErRze9uOOzdWl2ZreREdXKKQMbyQKC75c_Vc,6921
+abstract_utilities/read_write_utils.py,sha256=fqkSJye7Nme0t3oDBNahdwg2az2iaLL1C23G_ZYJhsw,9899
 abstract_utilities/safe_utils.py,sha256=_uoZny6dJjopVakOiaf0UIZcvRRXMh51FpfDUooe0xY,3733
 abstract_utilities/string_clean.py,sha256=oQv85J-mA4sP2NJwbTI-1k0RXw7V0AmqZolYaAZvex4,6916
-abstract_utilities/string_utils.py,sha256=ElDfw6lW-0UxhHUml3YFvSapEEx_3F-jabpieBsFQPw,1563
+abstract_utilities/string_utils.py,sha256=PnII0wFQBchVzFjhvEHP9ej1zxLehsRKodtc8Qol4-8,1645
 abstract_utilities/tetsts.py,sha256=PrejTUew5dAAqNb4erMJwfdSHxDyuuHGWY2fMlWk5hk,21
 abstract_utilities/thread_utils.py,sha256=LhE1ylSuOKkkMErBf6SjZprjO_vfh3IKfvNKJQiCxho,5460
 abstract_utilities/time_utils.py,sha256=yikMjn7i-OBKfmOujfNtDz4R0VTMgi3dfQNrCIZUbQU,13052
@@ -50,12 +50,12 @@ abstract_utilities/file_utils/file_utils/find_collect.py,sha256=bPM7EDrNHlvwZx7C
 abstract_utilities/file_utils/file_utils/imports.py,sha256=rF3zdWY98UKuSPwzEzhG0H4cfIVjLqCW3FwsGqFeakE,319
 abstract_utilities/file_utils/file_utils/map_utils.py,sha256=B_MlkLP8s-o0yU0R3Y2LcTpBntBzysJO18qq181xz9c,1043
 abstract_utilities/file_utils/file_utils/pdf_utils.py,sha256=D_wg8h-SapCvqinxRIKxMri1jWZNpr5jGvKq9EJePfY,10335
-abstract_utilities/file_utils/file_utils/type_checks.py,sha256=S1k5lDM1Qd5g1FE_KqIE1aWexsFI0Af9droRI6qVb30,2576
+abstract_utilities/file_utils/file_utils/type_checks.py,sha256=JnmlcWIQO8d_sjoreVfWh6fCSM1Q0foyFptiH82jjYA,2852
 abstract_utilities/file_utils/file_utils/imports/__init__.py,sha256=Mip2n-nY1PLvaWtwTeVs0rdVd6J3_jfwKmIyGYxf9Vo,72
 abstract_utilities/file_utils/file_utils/imports/constants.py,sha256=eIeSj48vtfa8CTYKuuZXbgJQepBrMracfVguaSuN41U,1626
 abstract_utilities/file_utils/file_utils/imports/file_functions.py,sha256=25yta20DDsdgenXYjpm4Ma3Fd6WK9Q16EjyhcZubDFg,291
 abstract_utilities/file_utils/file_utils/imports/imports.py,sha256=nLtDCj-E9htQ1rbbISevHSqviUGCxgCoTZ7KTAQrCpU,1488
-abstract_utilities/file_utils/file_utils/imports/module_imports.py,sha256=pvRkjtWxQ9R4TisCKMQ9asDak63Y9eMGbpCB7DsEyqs,453
+abstract_utilities/file_utils/file_utils/imports/module_imports.py,sha256=BG_eTb_lnOOHCye_aXYc0CoESzFtXw_8qMMEH3CPLmU,546
 abstract_utilities/file_utils/imports/__init__.py,sha256=PRJBiiPT7oElD3RvHTW80Xd5rIIMdzGN23FD5IkszDI,101
 abstract_utilities/file_utils/imports/classes.py,sha256=zw16D_h5AxJiks4ydbqkWkXVfvgmE-BpiC4eKInY_KI,12259
 abstract_utilities/file_utils/imports/clean_imps.py,sha256=DB_NEKR8YLla5qCkTMuNscMoTnipEm3nCWnaH8wqQDc,5287
@@ -86,7 +86,7 @@ abstract_utilities/ssh_utils/classes.py,sha256=3Q9BfLpyagNFYyiF4bt-5UCezeUJv9NK9
 abstract_utilities/ssh_utils/imports.py,sha256=oX8WAv-pkhizzko_h3fIUp9Vhsse4nR7RN2vwONxIx0,317
 abstract_utilities/ssh_utils/pexpect_utils.py,sha256=JBdOIXBTXAqE5TrsFjmPWJgwSaWyRJN8rbJ6y3_zKPY,10556
 abstract_utilities/ssh_utils/utils.py,sha256=smUWAx3nW1h0etTndJ_te9bkUX5YzQ8kYd9_gD1TXLk,4882
-abstract_utilities-0.2.2.476.dist-info/METADATA,sha256=4vgPx6ciV6eiuiUxluheuDUAxNFTgwQfS2743hc2_IE,28108
-abstract_utilities-0.2.2.476.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-abstract_utilities-0.2.2.476.dist-info/top_level.txt,sha256=BF0GZ0xVFfN1K-hFIWPO3viNsOs1sSF86n1vHBg39FM,19
-abstract_utilities-0.2.2.476.dist-info/RECORD,,
+abstract_utilities-0.2.2.486.dist-info/METADATA,sha256=0EqZTJGtthi0euiqfGHYcJ14puRMb_4ov_VZHODTT1Q,28108
+abstract_utilities-0.2.2.486.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+abstract_utilities-0.2.2.486.dist-info/top_level.txt,sha256=BF0GZ0xVFfN1K-hFIWPO3viNsOs1sSF86n1vHBg39FM,19
+abstract_utilities-0.2.2.486.dist-info/RECORD,,