py2ls 0.1.6.8__tar.gz → 0.1.6.9.1__tar.gz

{py2ls-0.1.6.8 → py2ls-0.1.6.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.1.6.8
+Version: 0.1.6.9.1
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com
@@ -9,7 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: CacheControl (>=0.13.1,<0.14.0)
+Requires-Dist: CacheControl (>=0.13.1)
 Requires-Dist: CairoSVG (>=2.7.1,<3.0.0)
 Requires-Dist: Deprecated (>=1.2.14,<2.0.0)
 Requires-Dist: Jinja2 (>=3.1.4,<4.0.0)

{py2ls-0.1.6.8 → py2ls-0.1.6.9.1}/py2ls/ips.py

@@ -841,7 +841,48 @@ def pdf2img(dir_pdf, dir_save=None, page=None, kind="png",verbose=True, **kws):
 
 # dir_pdf = "/Users/macjianfeng/Dropbox/github/python/240308_Python Data Science Handbook.pdf"
 # df_page = pdf2img(dir_pdf, page=[1, 5],dpi=300)
+def get_encoding(fpath, alternative_encodings=None, verbose=False):
+    """
+    Attempt to determine the encoding of a file by trying multiple encodings.
+
+    Parameters:
+    fpath (str): The path to the file.
+    alternative_encodings (list): List of encodings to try. If None, uses a default list.
+    verbose (bool): If True, print detailed information about each attempted encoding.
+
+    Returns:
+    str: The encoding that successfully read the file, or None if no encoding worked.
+    """
+    if alternative_encodings is None:
+        alternative_encodings = [
+            'utf-8', 'latin1', 'windows-1252', 'iso-8859-1',
+            'iso-8859-2', 'iso-8859-3', 'iso-8859-4', 'iso-8859-5',
+            'iso-8859-6', 'iso-8859-7', 'iso-8859-8', 'iso-8859-9',
+            'windows-1250', 'windows-1251', 'windows-1253', 'windows-1254',
+            'windows-1255', 'windows-1256', 'windows-1257', 'windows-1258',
+            'big5', 'gb18030', 'shift_jis', 'euc_jp', 'koi8_r',
+            'mac_roman', 'mac_central_europe', 'mac_greek', 'mac_cyrillic',
+            'mac_arabic', 'mac_hebrew'
+        ]
 
+    if not os.path.isfile(fpath):
+        raise FileNotFoundError(f"The file {fpath} does not exist.")
+
+    for enc in alternative_encodings:
+        try:
+            with open(fpath, mode='r', encoding=enc) as file:
+                file.read()  # Try to read the file
+            if verbose:
+                print(f"Successfully detected encoding: {enc}")
+            return enc
+        except UnicodeDecodeError:
+            if verbose:
+                print(f"Failed to decode with encoding: {enc}")
+            continue
+
+    # If no encoding worked
+    print("No suitable encoding found.")
+    return None
 
 
 def fload(fpath, kind=None, **kwargs):
@@ -979,7 +1020,7 @@ def fload(fpath, kind=None, **kwargs):
     elif kind == "ipynb":
         return load_ipynb(fpath, **kwargs)
     elif kind == "pdf":
-        print('usage:load_pdf(fpath, page="all", verbose=False)')
+        # print('usage:load_pdf(fpath, page="all", verbose=False)')
         return load_pdf(fpath, **kwargs)
     elif kind.lower() in img_types:
         print(f'Image ".{kind}" is loaded.')
@@ -1129,16 +1170,16 @@ def fsave(
         for i, part in enumerate(parts):
             if i % 2 == 0:
                 # Even index: markdown content
-                cells.append(nbf.v4.new_markdown_cell(part.strip()))
+                cells.append(nbformat.v4.new_markdown_cell(part.strip()))
             else:
                 # Odd index: code content
-                cells.append(nbf.v4.new_code_cell(part.strip()))
+                cells.append(nbformat.v4.new_code_cell(part.strip()))
         # Create a new notebook
         nb = nbformat.v4.new_notebook()
         nb['cells'] = cells
         # Write the notebook to a file
         with open(fpath, 'w', encoding='utf-8') as ipynb_file:
-            nbf.write(fpath, ipynb_file)
+            nbformat.write(nb, ipynb_file)
         
     # def save_json(fpath, data, **kwargs):
     #     with open(fpath, "w") as file:
@@ -1350,7 +1391,7 @@ def listdir(
     ascending=True,
     contains=None,
     orient="list",
-    output="df"
+    output="df" # 'list','dict','records','index','series'
 ):
     if not kind.startswith("."):
         kind = "." + kind
@@ -1452,7 +1493,7 @@ def list_func(lib_name, opt="call"):
 def func_list(lib_name, opt="call"):
     return list_func(lib_name, opt=opt)
 
-def newfolder(*args, **kwargs):
+def mkdir(*args, **kwargs):
     """
     newfolder(pardir, chdir)
     Args:
@@ -1464,7 +1505,7 @@ def newfolder(*args, **kwargs):
     """
     overwrite=kwargs.get("overwrite",False)
     for arg in args:
-        if isinstance(arg, str):
+        if isinstance(arg, (str,list)):
             if "/" in arg or "\\" in arg:
                 pardir=arg
                 print(f'pardir{pardir}')

{py2ls-0.1.6.8 → py2ls-0.1.6.9.1}/py2ls/translator.py

@@ -59,7 +59,7 @@ def get_lang_code_iso639():
     lang_code_iso639=dict([*zip(fullname,shortcut)])
     return lang_code_iso639
 
-def detect_lang(text, output='lang',verbose=True):
+def detect_lang(text, output='lang',verbose=False):
     dir_curr_script=os.path.dirname(os.path.abspath(__file__))
     dir_lang_code=dir_curr_script+"/data/lang_code_iso639.json"
     with open(dir_lang_code, "r") as file:
@@ -85,7 +85,7 @@ def is_text(s):
     # no_special = not re.search(r'[^A-Za-z0-9\s]', s)
     return has_alpha and has_non_alpha
 
-def strcmp(search_term, candidates, ignore_case=True, verbose=True, scorer='WR'):
+def strcmp(search_term, candidates, ignore_case=True, verbose=False, scorer='WR'):
     """
     Compares a search term with a list of candidate strings and finds the best match based on similarity score.
 
@@ -392,6 +392,8 @@ def translate(
     Translate text to the target language using the specified translation method (Google Translate or DeepL).
     lang_src (str): e.g., 'english', or 'chinese' when there are two languages, then lang_src must be given
     """
+    # error_verbose = verbose or False
+
     if isinstance(text,list):
         text=merge_text(text)
     text = replace_text(text)
@@ -508,18 +510,19 @@ def translate_with_retry(
         lang_src = detect_lang(text) 
         lang_src = get_language_code(language=lang_src)
     lang = get_language_code(language=lang)
-    print(f"lang:{lang},lang_src:{lang_src}")
     try:
-        print(len(text))
         return try_translate(text,lang=lang,lang_src=lang_src,user_agent=user_agent,service_url=service_urls[0])
     except Exception as e:
-        print("Connection error:", e)
+        if error_verbose:
+            print("Connection error:", e)
         try: 
             time.sleep(1)
             return try_translate(text,lang=lang,lang_src=lang_src,user_agent=user_agent,service_url=service_urls[1])
         except Exception as e:
-            print(f"(translate_with_retry):Connection error with {service_urls}: {e}")
-        print("All service URLs failed. Unable to translate the text.")
+            if error_verbose:
+                print(f"(translate_with_retry):Connection error with {service_urls}: {e}")
+        if error_verbose:
+            print("All service URLs failed. Unable to translate the text.")
         return text
 
 

{py2ls-0.1.6.8 → py2ls-0.1.6.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py2ls"
-version = "0.1.6.8"
+version = "0.1.6.9.1"
 description = "py(thon)2(too)ls"
 authors = ["Jianfeng <Jianfeng.Liu0413@gmail.com>"]
 readme = "README.md"
@@ -19,7 +19,7 @@ auto-editor = "^24.24.1"
 beautifulsoup4 = "^4.12.3"
 bleach = "^6.1.0"
 build = "^1.2.1"
-CacheControl = "^0.13.1"
+CacheControl = ">=0.13.1"
 cairocffi = "^1.7.0"
 CairoSVG = "^2.7.1"
 certifi = "^2024.6.2"