abstract-utilities 0.2.2.463__tar.gz → 0.2.2.499__tar.gz

{abstract_utilities-0.2.2.463 → abstract_utilities-0.2.2.499}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_utilities
-Version: 0.2.2.463
+Version: 0.2.2.499
 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.463 → abstract_utilities-0.2.2.499}/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.463',
+    version='0.2.2.499',
     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.463 → abstract_utilities-0.2.2.499}/src/abstract_utilities/__init__.py

@@ -4,7 +4,6 @@ from datetime import datetime
 from typing import *
 from .hash_utils import *
 ##from .dynimport import get_abstract_import,import_symbols_to_parent,call_for_all_tabs
-from .robust_readers import *
 from .dynimport import get_abstract_import
 from .json_utils import (unified_json_loader,
                          find_keys,
@@ -116,10 +115,10 @@ from .parse_utils import (num_tokens_from_string,
 
 from .log_utils import get_caller_info,get_logFile,print_or_log,get_json_call_response,initialize_call_log
 from .error_utils import try_func
-from .class_utils import alias,get_class_inputs,get_set_attr
 from .ssh_utils import *
 from .env_utils import *
 from .path_utils import *
 from .file_utils import *
 from .file_utils import call_for_all_tabs
 from .string_utils import *
+from .class_utils import alias,get_class_inputs,get_set_attr,get_caller_path,get_caller_dir

{abstract_utilities-0.2.2.463 → abstract_utilities-0.2.2.499}/src/abstract_utilities/class_utils.py

@@ -405,4 +405,3 @@ def get_caller_dir(i: Optional[int] = None) -> str:
     abspath = get_caller_path(depth + 1)
     return os.path.dirname(abspath)
 
-

{abstract_utilities-0.2.2.463/src/abstract_utilities/robust_reader/imports → abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils}/__init__.py

@@ -1 +1,2 @@
 from .imports import *
+from .src import *

{abstract_utilities-0.2.2.463 → abstract_utilities-0.2.2.499}/src/abstract_utilities/file_utils/imports/__init__.py

@@ -1,5 +1,4 @@
 from .constants import *
-from .imports import *
 from .module_imports import *
 from .classes import *
-from .file_functions import *
+from .imports import *

abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils/imports/clean_imps.py

@@ -0,0 +1,158 @@
+from abstract_utilities import read_from_file, eatAll
+import os, sys, re, inspect
+from typing import *
+
+# ============================================================
+# Constants
+# ============================================================
+import_tag = 'import '
+from_tag = 'from '
+
+# ============================================================
+# Helpers
+# ============================================================
+def get_caller_path(i=None):
+    i = i or 1
+    frame = inspect.stack()[i]
+    return os.path.abspath(frame.filename)
+
+def make_list(obj: any) -> list:
+    if isinstance(obj, str) and ',' in obj:
+        obj = obj.split(',')
+    if isinstance(obj, (set, tuple)):
+        return list(obj)
+    if isinstance(obj, list):
+        return obj
+    return [obj]
+
+def eatElse(stringObj, chars=None):
+    chars = make_list(chars or []) + list('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_')
+    while stringObj:
+        if stringObj and stringObj[0] not in chars:
+            stringObj = stringObj[1:]
+            continue
+        if stringObj and stringObj[-1] not in chars:
+            stringObj = stringObj[:-1]
+            continue
+        break
+    return stringObj
+
+def clean_line(line):
+    return eatAll(line, [' ', '', '\t', '\n'])
+
+def is_line_import(line):
+    return bool(line and line.startswith(import_tag) and 'from ' not in line)
+
+def is_line_from_import(line):
+    return bool(line and line.startswith(from_tag) and ' import ' in line)
+
+def is_from_group_start(line):
+    return bool(line and line.startswith(from_tag) and 'import' in line and '(' in line and not line.rstrip().endswith(')'))
+
+def is_from_group_end(line):
+    return bool(line and ')' in line)
+
+def clean_imports(imports):
+    if isinstance(imports, str):
+        imports = imports.split(',')
+    return [eatElse(imp.strip()) for imp in imports if imp.strip()]
+
+# ============================================================
+# Combine lone import statements
+# ============================================================
+def combine_lone_imports(text=None, file_path=None):
+    text = text or ''
+    if file_path and os.path.isfile(file_path):
+        text += read_from_file(file_path)
+    lines = text.split('\n')
+
+    cleaned_import_list = []
+    nu_lines = []
+    j = None
+
+    for i, line in enumerate(lines):
+        if is_line_import(line):
+            if j is None:
+                nu_lines.append(import_tag)
+                j = i
+            cleaned_import_list += clean_imports(line.split(import_tag)[1])
+        else:
+            nu_lines.append(line)
+
+    if j is None:
+        return '\n'.join(nu_lines)
+    cleaned_import_list = sorted(set(cleaned_import_list))
+    nu_lines[j] += ', '.join(cleaned_import_list)
+    return '\n'.join(nu_lines)
+
+# ============================================================
+# Merge repeated 'from pkg import ...' (1-line only)
+# Preserve multi-line grouped imports
+# ============================================================
+def merge_from_import_groups(text=None, file_path=None):
+    if file_path and os.path.isfile(file_path):
+        text = read_from_file(file_path)
+    text = text or ''
+    lines = text.split('\n')
+
+    pkg_to_imports: Dict[str, Set[str]] = {}
+    pkg_to_line_index: Dict[str, int] = {}
+    nu_lines: List[str] = []
+
+    in_group = False
+    for i, line in enumerate(lines):
+        stripped = line.strip()
+
+        # preserve multi-line grouped blocks intact
+        if in_group:
+            nu_lines.append(line)
+            if is_from_group_end(line):
+                in_group = False
+            continue
+
+        if is_from_group_start(line):
+            in_group = True
+            nu_lines.append(line)
+            continue
+
+        if is_line_from_import(line):
+            try:
+                pkg_part, imps_part = line.split(' import ', 1)
+                pkg_name = pkg_part.replace('from ', '').strip()
+                imps = clean_imports(imps_part)
+            except Exception:
+                nu_lines.append(line)
+                continue
+
+            if pkg_name not in pkg_to_imports:
+                pkg_to_imports[pkg_name] = set(imps)
+                pkg_to_line_index[pkg_name] = len(nu_lines)
+                nu_lines.append(line)
+            else:
+                pkg_to_imports[pkg_name].update(imps)
+        else:
+            nu_lines.append(line)
+
+    # Rewrite first occurrences
+    for pkg, idx in pkg_to_line_index.items():
+        all_imps = sorted(pkg_to_imports[pkg])
+        nu_lines[idx] = f"from {pkg} import {', '.join(all_imps)}"
+
+    return '\n'.join(nu_lines)
+
+# ============================================================
+# Pipeline
+# ============================================================
+def clean_imports_pipeline(path: str):
+    raw = read_from_file(path)
+    step1 = combine_lone_imports(text=raw)
+    step2 = merge_from_import_groups(text=step1)
+    return step2
+
+# ============================================================
+# Standalone Run
+# ============================================================
+if __name__ == "__main__":
+    abs_path = "/home/flerb/Documents/pythonTools/modules/src/modules/abstract_utilities/src/abstract_utilities/file_utils/imports/imports.py"
+    cleaned = clean_imports_pipeline(abs_path)
+    print(cleaned)

{abstract_utilities-0.2.2.463 → abstract_utilities-0.2.2.499}/src/abstract_utilities/file_utils/imports/constants.py

@@ -4,8 +4,11 @@ from .module_imports import *
 class ScanConfig:
     allowed_exts: Set[str]
     unallowed_exts: Set[str]
+    allowed_types: Set[str]
     exclude_types: Set[str]
+    allowed_dirs: List[str] = field(default_factory=list)
     exclude_dirs: List[str] = field(default_factory=list)
+    allowed_patterns: List[str] = field(default_factory=list)
     exclude_patterns: List[str] = field(default_factory=list)
 DEFAULT_ALLOWED_EXTS: Set[str] = {
     ".py", ".pyw",                             # python
@@ -37,3 +40,6 @@ DEFAULT_EXCLUDE_PATTERNS: Set[str] = {
 REMOTE_RE = re.compile(r"^(?P<host>[^:\s]+@[^:\s]+):(?P<path>/.*)$")
 AllowedPredicate = Optional[Callable[[str], bool]]
 DEFAULT_EXCLUDE_FILE_PATTERNS=DEFAULT_EXCLUDE_PATTERNS
+DEFAULT_ALLOWED_PATTENS="*"
+DEFAULT_ALLOWED_DIRS="*"
+DEFAULT_ALLOWED_TYPES="*"

abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils/imports/imports.py

@@ -0,0 +1,65 @@
+# ============================================================
+# abstract_utilities/imports/imports.py
+# Global imports hub — everything imported here will be
+# automatically available to any module that does:
+#     from ..imports import *
+# ============================================================
+
+
+import os,re
+import sys, importlib,os
+import sys, importlib, os, inspect
+from pathlib import Path
+import os,sys
+
+
+
+from typing import *
+import re
+
+from typing import *
+from types import MethodType
+import os,re, sys, importlib, inspect, os, importlib.util, hashlib
+import os,tempfile,shutil,logging,ezodf,fnmatch,pytesseract,pdfplumber
+import pandas as pd
+import geopandas as gpd
+from datetime import datetime
+
+from typing import *
+from werkzeug.utils import secure_filename
+from werkzeug.datastructures import FileStorage
+from pdf2image import convert_from_path   # only used for OCR fallback
+# ---- Core standard library modules -------------------------
+import os, sys, re, shlex, glob, platform, textwrap, subprocess, inspect, json, time
+import tempfile, shutil, logging, pathlib, fnmatch, importlib, importlib.util, types
+
+from datetime import datetime
+from types import ModuleType
+
+# ---- Dataclasses and typing --------------------------------
+from dataclasses import dataclass, field
+from typing import (
+    Any, Optional, List, Dict, Set, Tuple,
+    Iterable, Callable, Literal, Union, TypeVar
+)
+
+# ---- Common 3rd-party dependencies --------------------------
+import pandas as pd
+import geopandas as gpd
+import pytesseract
+import pdfplumber
+import PyPDF2
+import ezodf
+from pdf2image import convert_from_path
+from werkzeug.utils import secure_filename
+from werkzeug.datastructures import FileStorage
+
+# ---- Helpers ------------------------------------------------
+import textwrap as tw
+from pprint import pprint
+
+# ============================================================
+# AUTO-EXPORT ALL NON-PRIVATE NAMES
+# ============================================================
+__all__ = [name for name in globals() if not name.startswith("_")]
+

abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils/imports/module_imports.py

@@ -0,0 +1,12 @@
+
+from ...string_clean import eatAll
+from ...list_utils import make_list
+from ...type_utils import get_media_exts, is_media_type, MIME_TYPES, is_str
+from ...ssh_utils import *
+from ...env_utils import *
+from ...read_write_utils import read_from_file,write_to_file
+from ...abstract_classes import SingletonMeta
+from ...log_utils import get_logFile
+from ...class_utils import get_caller, get_caller_path, get_caller_dir
+from ...ssh_utils import run_cmd
+from ...string_utils import get_from_kwargs

{abstract_utilities-0.2.2.463/src/abstract_utilities/file_utils/imports → abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils}/module_imports.py

@@ -1,10 +1,12 @@
+from .imports import *
 from ...string_clean import eatAll
 from ...list_utils import make_list
-from ...type_utils import get_media_exts, is_media_type,MIME_TYPES,is_str
+from ...type_utils import get_media_exts, is_media_type, MIME_TYPES, is_str
 from ...ssh_utils import *
 from ...env_utils import *
 from ...read_write_utils import *
 from ...abstract_classes import SingletonMeta
 from ...log_utils import get_logFile
-from ...class_utils import get_caller,get_caller_path,get_caller_dir
-from ...ssh_utils  import run_cmd
+from ...class_utils import get_caller, get_caller_path, get_caller_dir
+from ...ssh_utils import run_cmd
+

{abstract_utilities-0.2.2.463/src/abstract_utilities/file_utils/file_utils → abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils/src}/__init__.py

@@ -6,3 +6,5 @@ from .pdf_utils import *
 from .file_reader import *
 from .find_collect import *
 from .type_checks import *
+from .initFunctionsGen import call_for_all_tabs,get_for_all_tabs
+

{abstract_utilities-0.2.2.463/src/abstract_utilities/file_utils/file_utils → abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils/src}/file_filters.py

@@ -1,4 +1,4 @@
-from .imports import *
+from ..imports import *
 from .filter_params import *
 from .file_utils import *
 ##from abstract_utilities import make_list,get_media_exts, is_media_type
@@ -8,21 +8,27 @@ def collect_filepaths(
     cfg: ScanConfig=None,
     allowed_exts: Optional[Set[str]] = False,
     unallowed_exts: Optional[Set[str]] = False,
+    allowed_types: Optional[Set[str]] = False,
     exclude_types: Optional[Set[str]] = False,
+    allowed_dirs: Optional[List[str]] = False,
     exclude_dirs: Optional[List[str]] = False,
+    allowed_patterns: Optional[List[str]] = False,
     exclude_patterns: Optional[List[str]] = False,
     add=False,
     allowed: Optional[Callable[[str], bool]] = None,
     **kwargs
     ) -> List[str]:
     cfg = cfg or define_defaults(
-                                allowed_exts=allowed_exts,
-                                unallowed_exts=unallowed_exts,
-                                exclude_types=exclude_types,
-                                exclude_dirs=exclude_dirs,
-                                exclude_patterns=exclude_patterns,
-                                add = add
-                                )
+            allowed_exts = allowed_exts,
+            unallowed_exts = unallowed_exts,
+            allowed_types = allowed_types,
+            exclude_types = exclude_types,
+            allowed_dirs = allowed_dirs,
+            exclude_dirs = exclude_dirs,
+            allowed_patterns = allowed_patterns,
+            exclude_patterns = exclude_patterns,
+            add = add
+        )
     allowed = allowed or make_allowed_predicate(cfg)
     directories = make_list(directory)
     roots = [r for r in directories if r]

{abstract_utilities-0.2.2.463/src/abstract_utilities/file_utils/file_utils → abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils/src}/file_reader.py

@@ -1,5 +1,5 @@
 # file_reader.py
-from .imports import *
+from ..imports import *
 # -------- Public API drop-ins that mirror your originals --------
 from .filter_params import *
 from .file_filters import *

{abstract_utilities-0.2.2.463/src/abstract_utilities/file_utils/file_utils → abstract_utilities-0.2.2.499/src/abstract_utilities/file_utils/src}/file_utils.py

@@ -1,9 +1,6 @@
-from pathlib import Path
-from typing import *
-import fnmatch, os, glob
-from .filter_params import *
-from .imports import *
 
+from .filter_params import *
+from ..imports import *
 ##from abstract_utilities import make_list,get_media_exts, is_media_type
 def get_allowed_predicate(allowed=None):
     if allowed != False:
@@ -60,8 +57,11 @@ def get_files_and_dirs(
     cfg: Optional["ScanConfig"] = None,
     allowed_exts: Optional[Set[str]] = False,
     unallowed_exts: Optional[Set[str]] = False,
+    allowed_types: Optional[Set[str]] = False,
     exclude_types: Optional[Set[str]] = False,
+    allowed_dirs: Optional[List[str]] = False,
     exclude_dirs: Optional[List[str]] = False,
+    allowed_patterns: Optional[List[str]] = False,
     exclude_patterns: Optional[List[str]] = False,
     add = False,
     recursive: bool = True,
@@ -69,11 +69,14 @@ def get_files_and_dirs(
     **kwargs
     ):
     cfg = cfg or define_defaults(
-        allowed_exts=allowed_exts,
-        unallowed_exts=unallowed_exts,
-        exclude_types=exclude_types,
-        exclude_dirs=exclude_dirs,
-        exclude_patterns=exclude_patterns,
+            allowed_exts = allowed_exts,
+            unallowed_exts = unallowed_exts,
+            allowed_types = allowed_types,
+            exclude_types = exclude_types,
+            allowed_dirs = allowed_dirs,
+            exclude_dirs = exclude_dirs,
+            allowed_patterns = allowed_patterns,
+            exclude_patterns = exclude_patterns,
         add=add
         )
     allowed = make_allowed_predicate(cfg)
@@ -90,48 +93,109 @@ def get_files_and_dirs(
         files = get_allowed_files(items,allowed=allowed)
     return dirs,files
 def make_allowed_predicate(cfg: ScanConfig) -> Callable[[str], bool]:
+    """
+    Build a predicate that returns True if a given path is considered allowed
+    under the given ScanConfig. Applies allowed_* and exclude_* logic symmetrically.
+    """
     def allowed(path: str) -> bool:
         p = Path(path)
         name = p.name.lower()
         path_str = str(p).lower()
-        # A) directories
+
+        # --------------------
+        # A) directory filters
+        # --------------------
         if cfg.exclude_dirs:
             for dpat in cfg.exclude_dirs:
-                if dpat in path_str or fnmatch.fnmatch(name, dpat.lower()):
-                    if p.is_dir() or dpat in path_str:
+                dpat_l = dpat.lower()
+                if dpat_l in path_str or fnmatch.fnmatch(name, dpat_l):
+                    if p.is_dir() or dpat_l in path_str:
                         return False
 
+        if cfg.allowed_dirs and cfg.allowed_dirs != ["*"]:
+            # must be in at least one allowed dir
+            if not any(
+                fnmatch.fnmatch(path_str, f"*{dpat.lower()}*") for dpat in cfg.allowed_dirs
+            ):
+                return False
+
+        # --------------------
+        # B) pattern filters
+        # --------------------
+        if cfg.allowed_patterns and cfg.allowed_patterns != ["*"]:
+            if not any(fnmatch.fnmatch(name, pat.lower()) for pat in cfg.allowed_patterns):
+                return False
+
         if cfg.exclude_patterns:
-            # B) filename patterns
             for pat in cfg.exclude_patterns:
                 if fnmatch.fnmatch(name, pat.lower()):
                     return False
 
-        # C) extension gates
+        # --------------------
+        # C) extension filters
+        # --------------------
         if p.is_file():
             ext = p.suffix.lower()
-            if (cfg.allowed_exts and ext not in cfg.allowed_exts) or (cfg.unallowed_exts and ext in cfg.unallowed_exts):
+            if cfg.allowed_exts and ext not in cfg.allowed_exts:
+                return False
+            if cfg.unallowed_exts and ext in cfg.unallowed_exts:
+                return False
+
+        # --------------------
+        # D) type filters (optional)
+        # --------------------
+        if cfg.allowed_types and cfg.allowed_types != {"*"}:
+            if not any(t in path_str for t in cfg.allowed_types):
                 return False
+        if cfg.exclude_types and cfg.exclude_types != {"*"}:
+            if any(t in path_str for t in cfg.exclude_types):
+                return False
+
         return True
+
     return allowed
+def correct_kwargs(**kwargs):
+    for key,values in kwargs.items():
+        if key.startswith('excluded'):
+            post_fix = key.split('_')[-1]
+            correct_key = f'exclude_{post_fix}'
+            correct_vals = kwargs.get(correct_key)
+            kwargs[correct_key]=combine_params(correct_vals,values)
+            del kwargs[key]
+    
 def collect_filepaths(
     directory: List[str],
     cfg: ScanConfig=None,
     allowed_exts: Optional[Set[str]] = False,
     unallowed_exts: Optional[Set[str]] = False,
+    allowed_types: Optional[Set[str]] = False,
     exclude_types: Optional[Set[str]] = False,
+    allowed_dirs: Optional[List[str]] = False,
     exclude_dirs: Optional[List[str]] = False,
+    allowed_patterns: Optional[List[str]] = False,
     exclude_patterns: Optional[List[str]] = False,
     add=False,
     allowed: Optional[Callable[[str], bool]] = None,
     **kwargs
     ) -> List[str]:
+    kwargs = correct_kwargs(allowed_exts = allowed_exts,
+        unallowed_exts = unallowed_exts,
+        allowed_types = allowed_types,
+        exclude_types = exclude_types,
+        allowed_dirs = allowed_dirs,
+        exclude_dirs = exclude_dirs,
+        allowed_patterns = allowed_patterns,
+        exclude_patterns = exclude_patterns,
+        **kwargs)
     cfg = cfg or define_defaults(
-                                allowed_exts=allowed_exts,
-                                unallowed_exts=unallowed_exts,
-                                exclude_types=exclude_types,
-                                exclude_dirs=exclude_dirs,
-                                exclude_patterns=exclude_patterns,
+            allowed_exts = allowed_exts,
+            unallowed_exts = unallowed_exts,
+            allowed_types = allowed_types,
+            exclude_types = exclude_types,
+            allowed_dirs = allowed_dirs,
+            exclude_dirs = exclude_dirs,
+            allowed_patterns = allowed_patterns,
+            exclude_patterns = exclude_patterns,
                                 add = add
                                 )
     allowed = allowed or make_allowed_predicate(cfg)