abstract-utilities 0.2.2.467__tar.gz → 0.2.2.469__tar.gz

{abstract_utilities-0.2.2.467 → abstract_utilities-0.2.2.469}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_utilities
-Version: 0.2.2.467
+Version: 0.2.2.469
 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.467 → abstract_utilities-0.2.2.469}/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.467',
+    version='0.2.2.469',
     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.469/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.467 → abstract_utilities-0.2.2.469}/src/abstract_utilities/file_utils/imports/file_functions.py

@@ -1,5 +1,5 @@
 from .imports import *
-def get_caller_path():
+def get_caller_path(i=None):
     i = i or 1
     frame = inspect.stack()[i]
     return os.path.abspath(frame.filename)

{abstract_utilities-0.2.2.467 → abstract_utilities-0.2.2.469}/src/abstract_utilities/file_utils/imports/imports.py

@@ -5,10 +5,34 @@
 #     from ..imports import *
 # ============================================================
 
+
+import os
+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 pathlib import Path
+
 from datetime import datetime
 from types import ModuleType
 
@@ -38,3 +62,4 @@ 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.469/src/abstract_utilities/robust_reader/imports/imports.py

@@ -0,0 +1,3 @@
+from ...abstract_classes import SingletonMeta
+from ..pdf_utils import *
+from ...read_write_utils import *

{abstract_utilities-0.2.2.467 → abstract_utilities-0.2.2.469}/src/abstract_utilities/robust_readers/import_utils/__init__.py

@@ -4,3 +4,4 @@ from .import_utils import *
 from .sysroot_utils import *
 from .utils import *
 from .safe_import_utils import *
+from .clean_imports import *

abstract_utilities-0.2.2.469/src/abstract_utilities/robust_readers/import_utils/clean_imports.py

@@ -0,0 +1,215 @@
+from abstract_utilities import read_from_file,eatAll,inspect, os
+import_tag = 'import '
+from_tag = 'from '
+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:
+    """
+    Converts the input object to a list. If the object is already a list, it is returned as is.
+    
+    Args:
+        obj: The object to convert.
+        
+    Returns:
+        list: The object as a list.
+    """
+    if isinstance(obj,str):
+        if ',' in obj:
+            obj = obj.split(',')
+    if isinstance(obj,set) or isinstance(obj,tuple):
+        return list(obj)
+    if isinstance(obj, list):
+        return obj
+    return [obj]
+def getAlphas(lower=True,capitalize=False,listObj=False):
+    obj = ''
+    alphas = 'abcdefghijklmoprstuvwxyz'
+    if lower:
+        obj+=alphas
+    if capitalize:
+        obj+=alphas.upper()
+    if listObj:
+        obj = list(obj)
+    return obj
+def getInts(string=False,listObj=False):
+    obj=12345678909
+    if string:
+        obj = str(obj)
+    if listObj:
+        obj = list(obj)
+    return obj
+def get_alpha_ints(ints=True,alpha=True,lower=True,capitalize=True,string=True,listObj=True):
+    objs = [] if listObj else ""
+    if ints:
+        objs+=getInts(string=string,listObj=listObj)
+    if alpha:
+        objs+=getAlphas(lower=lower,capitalize=capitalize,listObj=listObj)
+    return objs
+def eatElse(
+    stringObj,
+    chars=None,
+    ints=True,
+    alpha=True,
+    lower=True,
+    capitalize=True,
+    string=True,
+    listObj=True
+):
+    alpha_ints = get_alpha_ints(
+        ints=True,
+        alpha=True,
+        lower=True,
+        capitalize=True,
+        string=True,
+        listObj=True
+        )
+    chars = make_list(chars or [])+alpha_ints
+
+    while True:
+        if stringObj:
+            str_0 = stringObj[0] not in chars
+            str_1 = stringObj[-1] not in chars
+            str_eat = str_0 or str_1
+            if not str_eat:
+                return stringObj
+            if stringObj and str_0:
+                stringObj = stringObj[1:] if len(stringObj) !=1 else ""
+            if stringObj and str_1:
+                stringObj = stringObj[:-1] if len(stringObj) !=1 else ""   
+        else:
+            return stringObj
+def clean_line(line):
+    return eatAll(line,[' ','','\t','\n'])
+def is_line_import(line):
+    if line and (line.startswith(from_tag) or line.startswith(import_tag)):
+        return True
+    return False
+def is_line_group_import(line):
+    if line and (line.startswith(from_tag) and import_tag in line):
+        return True
+    return False
+def get_import_pkg(line):
+    if is_line_group_import(line):
+    
+        return clean_line(line.split(from_tag)[1].split(import_tag)[0])
+def get_imports_from_import_pkg(line):
+    if is_line_group_import(line):
+        return get_cleaned_import_list(line,commaClean=True)
+##def is_local_or_import(pkg_name,file_path):
+##    dirname = os.path.dirname(file_path)
+##    parts = part for part in dirname.split('/') if part]
+##    i=0
+##    pkg = pkg_name
+##    while True:
+##        if pkg and pkg.startswith('.'):
+##            i +=1
+##            pkg=pkg[1:] if len(pkg)>1 else ""
+##        else:
+##            if i > 1 and len(parts)>=i:
+##                pkg = '.'.join(parts[:-i])
+##                .{pkg}"
+##        parts
+    
+    
+def add_imports_to_import_pkg_js(import_pkg,imports,import_pkg_js=None):
+    import_pkg_js = import_pkg_js or {}
+    imports = clean_imports(imports)
+    if import_pkg not in import_pkg_js:
+        i = len(import_pkg_js["nulines"])
+        import_pkg_js[import_pkg]={"imports":imports,"line":i}
+        import_line = f"from {import_pkg} import "
+        if import_pkg == "import":
+            import_line = import_tag
+        import_pkg_js["nulines"].append(import_line)
+    else:
+        import_pkg_js[import_pkg]["imports"]+=imports
+    return import_pkg_js
+def update_import_pkg_js(line,import_pkg_js=None):
+    import_pkg_js = import_pkg_js or {}
+    if is_line_group_import(line):
+        import_pkg = get_import_pkg(line)
+        imports = get_imports_from_import_pkg(line)
+        import_pkg_js = add_imports_to_import_pkg_js(import_pkg,imports,import_pkg_js=import_pkg_js)
+    else:
+        if len(import_pkg_js["nulines"]) >0 and line == '' and is_line_import(import_pkg_js["nulines"][-1]):
+            pass
+        else:
+            import_pkg_js["nulines"].append(line)
+    return import_pkg_js
+def is_from_line_group(line):
+    if line and line.startswith(from_tag) and import_tag in line and '(' in line:
+        import_spl = line.split(import_tag)[-1]
+        import_spl_clean = clean_line(line)
+        if not import_spl_clean.endswith(')'):
+            return True
+    return False
+def clean_imports(imports,commaClean=True):
+    chars=["*"]
+    if not commaClean:
+        chars.append(',')
+    if isinstance(imports,str):
+        imports = imports.split(',')
+    return [eatElse(imp,chars=chars) for imp in imports if imp]
+def get_cleaned_import_list(line,commaClean=True):
+    cleaned_import_list=[]
+    if import_tag in line:
+        imports = line.split(import_tag)[1]
+        cleaned_import_list+=clean_imports(imports,commaClean=commaClean)
+    return cleaned_import_list
+def clean_imports(text=None,file_path=None,write=False):
+    text = text or ''
+    imports_js = {}
+    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
+    is_from_group = False
+    import_pkg_js={"nulines":[],"file_path":file_path}
+    for line in lines:
+        if line.startswith(import_tag) and ' from ' not in line:
+            cleaned_import_list = get_cleaned_import_list(line)
+            import_pkg_js = add_imports_to_import_pkg_js("import",cleaned_import_list,import_pkg_js=import_pkg_js)
+        else:
+            if is_from_group:
+                import_pkg=is_from_group
+                line = clean_line(line)
+                if line.endswith(')'):
+                   is_from_group=False
+                   line=line[:-1]
+                imports_from_import_pkg = clean_imports(line)
+                import_pkg_js = add_imports_to_import_pkg_js(import_pkg,imports_from_import_pkg,import_pkg_js=import_pkg_js)
+                
+            else:
+                import_pkg_js=update_import_pkg_js(line,import_pkg_js=import_pkg_js)
+            if is_from_line_group(line) and is_from_group == False:
+                
+                is_from_group=get_import_pkg(line)
+    nu_lines = import_pkg_js["nulines"]
+    for pkg,values in import_pkg_js.items():
+        comments = []
+        if pkg not in ["nulines","file_path"]: 
+            line = values.get('line')
+            imports = values.get('imports')
+            for i,imp in enumerate(imports):
+                if '#' in imp:
+                    imp_spl = imp.split('#')
+                    comments.append(imp_spl[-1])
+                    imports[i] = clean_line(imp_spl[0])
+            imports = list(set(imports))   
+            if '*' in imports:
+                imports="*"
+            else:
+                imports=','.join(imports)
+                if comments:
+                    comments=','.join(comments)
+                    imports+=f" #{comments}"
+                    
+            nu_lines[line] += imports
+    contents = '\n'.join(nu_lines)
+    if file_path and write:
+        write_to_file(contents=contents,file_path=file_path)
+    return contents

{abstract_utilities-0.2.2.467 → abstract_utilities-0.2.2.469}/src/abstract_utilities.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_utilities
-Version: 0.2.2.467
+Version: 0.2.2.469
 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.467 → abstract_utilities-0.2.2.469}/src/abstract_utilities.egg-info/SOURCES.txt

@@ -66,6 +66,7 @@ src/abstract_utilities/file_utils/file_utils/imports/imports.py
 src/abstract_utilities/file_utils/file_utils/imports/module_imports.py
 src/abstract_utilities/file_utils/imports/__init__.py
 src/abstract_utilities/file_utils/imports/classes.py
+src/abstract_utilities/file_utils/imports/clean_imps.py
 src/abstract_utilities/file_utils/imports/constants.py
 src/abstract_utilities/file_utils/imports/file_functions.py
 src/abstract_utilities/file_utils/imports/imports.py
@@ -80,6 +81,7 @@ src/abstract_utilities/robust_readers/__init__.py
 src/abstract_utilities/robust_readers/imports.py
 src/abstract_utilities/robust_readers/initFuncGen.py
 src/abstract_utilities/robust_readers/import_utils/__init__.py
+src/abstract_utilities/robust_readers/import_utils/clean_imports.py
 src/abstract_utilities/robust_readers/import_utils/dot_utils.py
 src/abstract_utilities/robust_readers/import_utils/function_utils.py
 src/abstract_utilities/robust_readers/import_utils/import_utils.py

abstract_utilities-0.2.2.467/src/abstract_utilities/robust_reader/imports/imports.py

@@ -1,12 +0,0 @@
-import os,tempfile,shutil,logging,ezodf,fnmatch,pytesseract,pdfplumber
-import pandas as pd
-import geopandas as gpd
-from datetime import datetime
-from pathlib import Path
-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
-from ...abstract_classes import SingletonMeta
-from ..pdf_utils import *
-from ...read_write_utils import *