abstract-utilities 0.2.2.476__tar.gz → 0.2.2.490__tar.gz

{abstract_utilities-0.2.2.476 → abstract_utilities-0.2.2.490}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_utilities
-Version: 0.2.2.476
+Version: 0.2.2.490
 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 → abstract_utilities-0.2.2.490}/setup.py

@@ -4,7 +4,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 setuptools.setup(
     name='abstract_utilities',
-    version='0.2.2.476',
+    version='0.2.2.490',
     author='putkoff',
     author_email='partners@abstractendeavors.com',
     description='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.',

{abstract_utilities-0.2.2.476 → abstract_utilities-0.2.2.490}/src/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-0.2.2.476 → abstract_utilities-0.2.2.490}/src/abstract_utilities/file_utils/file_utils/type_checks.py

@@ -1,34 +1,37 @@
 from .imports import *
 
+def get_user_pass_host_key(**kwargs):
+    args = ['password','user_at_host','host','key','user']
+    kwargs['del_kwarg']=kwargs.get('del_kwarg',False)
+    values,kwargs = get_from_kwargs(*args,**kwargs)
+    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 +45,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-0.2.2.476 → abstract_utilities-0.2.2.490}/src/abstract_utilities/read_write_utils.py

@@ -15,12 +15,13 @@ 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
+from .string_utils import get_from_kwargs
 _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."""
@@ -29,26 +30,82 @@ def string_in_keys(strings, kwargs):
             if s.lower() in key.lower():
                 return key
     return None
-
-
-def get_path(paths):
+def make_dirs(path, exist_ok=True, **kwargs):
+    remote = get_user_pass_host_key(**kwargs)
+    print(remote)
+    if remote:
+        kwargs['cmd'] = f"mkdir -p {path}"
+        print(kwargs)
+        resp = run_pruned_func(run_cmd, **kwargs)
+        print(resp)
+    else:
+        os.makedirs(path, exist_ok=exist_ok)
+    return path
+def make_path(path, home_dir=None, file=None, **kwargs):
+    if not path:
+        return None
+
+    basename = os.path.basename(path)
+    parts = [p for p in path.split('/') if p]
+
+    # Detect whether this is a file or a folder
+    is_file = file if file is not None else ('.' in basename)
+    pieces = parts[:-1] if is_file else parts
+    print(pieces)
+    full_dir = home_dir or '/'
+    for piece in pieces:
+        full_dir = os.path.join(full_dir, piece)
+        make_dirs(full_dir, exist_ok=True, **kwargs)
+        print(f"✅ full_dir == {full_dir}")
+    if is_file:
+        full_dir = os.path.join(full_dir, basename)
+
+    print(f"✅ full_dir == {full_dir}")
+    return full_dir
+def get_rel_path(src,src_rel,dst,**kwargs):
+    if src.startswith(src_rel):
+        nu_src = src[len(src_rel):]
+        nu_src= eatAll(nu_src,'/')
+        directory= eatOuter(dst,'/')
+        rel_path = os.path.join(dst,nu_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)
+        print(rel_path)
+        path = make_path(rel_path,**kwargs)
+        print(f"path == {path}")
+        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 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 +154,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 +207,39 @@ 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 'file_path' in kwargs:
+            del kwargs['file_path']
+        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}'
@@ -181,6 +248,27 @@ def read_from_file(file_path,**kwargs):
     with open(file_path, "r", encoding="utf-8") as f:
         return f.read()
 
+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)
+        print(dst)
+    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)
+    print(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-0.2.2.476 → abstract_utilities-0.2.2.490}/src/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 → abstract_utilities-0.2.2.490}/src/abstract_utilities.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_utilities
-Version: 0.2.2.476
+Version: 0.2.2.490
 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