webtools-cli 1.2.4__tar.gz → 1.2.5__tar.gz

{webtools_cli-1.2.4 → webtools_cli-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtools-cli
-Version: 1.2.4
+Version: 1.2.5
 Summary: Advanced Web Intelligence & Scraping Toolkit with CLI and Web UI
 Author: Abhinav Adarsh
 License-Expression: MIT
@@ -30,7 +30,7 @@ Requires-Dist: mtranslate
 Requires-Dist: colorama
 Requires-Dist: playwright
 Requires-Dist: pycryptodome
-Requires-Dist: tenacity>=8.2.3
+Requires-Dist: tenacity<9.0.0,>=8.2.3
 Requires-Dist: pyreadline3; platform_system == "Windows"
 Provides-Extra: playwright
 Requires-Dist: playwright; extra == "playwright"

{webtools_cli-1.2.4 → webtools_cli-1.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "webtools-cli"
-version = "1.2.4"
+version = "1.2.5"
 description = "Advanced Web Intelligence & Scraping Toolkit with CLI and Web UI"
 readme = "README.md"
 license = "MIT"
@@ -37,7 +37,7 @@ dependencies = [
     "colorama",
     "playwright",
     "pycryptodome",
-    "tenacity>=8.2.3",
+    "tenacity>=8.2.3,<9.0.0",
     "pyreadline3; platform_system == 'Windows'",
 ]
 

{webtools_cli-1.2.4 → webtools_cli-1.2.5}/webtools/core.py

@@ -9,57 +9,60 @@ if sys.stdout.encoding and sys.stdout.encoding.lower() != 'utf-8':
 
 # --- AUTO-INSTALLER FOR MISSING/BROKEN DEPENDENCIES ---
 def ensure_dependencies():
-    """Checks and performs a forced clean install of dependencies at runtime"""
-    # Dependencies that must be imported successfully
-    # Format: module_name -> (pip_package_name, min_version_prefix, forced_upgrade)
-    check_deps = {
-        "mega": ("mega.py", None, False),
-        "Crypto": ("pycryptodome", None, True), # Always ensure pycryptodome over pycrypto
-        "tenacity": ("tenacity>=8.2.3", "8", True)
+    """Performs an aggressive forced repair of the environment if issues are detected"""
+    # Dependencies to verify (module_name -> (pip_pkg, min_v, max_v))
+    mandatory = {
+        "mega": ("mega.py", None, None),
+        "Crypto": ("pycryptodome", None, None),
+        "tenacity": ("tenacity>=8.2.3,<9.0.0", "8", "9")
     }
     
-    missing_or_broken = []
+    needs_repair = False
     
-    # 1. Clean up "pycrypto" which causes SyntaxError on Python 3
-    # If we catch a SyntaxError from 'from mega import Mega', it's almost certainly pycrypto
+    # 1. Check for corrupted Crypto namespace (Mixed pycrypto/pycryptodome)
     try:
-        import Crypto.PublicKey.RSA
+        from Crypto.PublicKey import RSA
     except (SyntaxError, AttributeError, ImportError):
-        # SyntaxError means it's the old pycrypto. We must kill it.
-        missing_or_broken.append("pycryptodome")
+        needs_repair = True
     
     # 2. Check for missing or outdated modules
-    for module_name, (pkg_name, min_v, forced) in check_deps.items():
-        try:
-            mod = __import__(module_name)
-            if min_v:
-                from importlib.metadata import version as get_v
-                try:
-                    if int(get_v(module_name).split('.')[0]) < int(min_v):
-                        missing_or_broken.append(pkg_name)
-                except:
-                    if forced: missing_or_broken.append(pkg_name)
-        except:
-            missing_or_broken.append(pkg_name)
+    if not needs_repair:
+        for module, (pkg, min_v, max_v) in mandatory.items():
+            try:
+                mod = __import__(module)
+                if min_v or max_v:
+                    from importlib.metadata import version as get_v
+                    v_str = get_v(module)
+                    major = int(v_str.split('.')[0])
+                    if (min_v and major < int(min_v)) or (max_v and major >= int(max_v)):
+                        needs_repair = True; break
+            except:
+                needs_repair = True; break
 
-    if missing_or_broken:
-        print(f"\n[!] Critical dependency issues detected: {', '.join(missing_or_broken)}")
-        print("[*] Running Forced Clean Repair (Python 3.11+ Stability Patch)...")
+    if needs_repair:
+        print("\n[!] Environment instability detected (Dependency Conflict).")
+        print("[*] Performing Aggressive Environment Repair (Python 3.11+ Stability Patch)...")
         try:
-            # Step A: Uninstall known troublemakers
-            subprocess.call([sys.executable, "-m", "pip", "uninstall", "-y", "pycrypto", "tenacity"], 
+            # A: Deep clean the Crypto and Tenacity namespaces
+            # We uninstall everything that could possibly clash
+            bad_pkgs = ["pycrypto", "pycryptodome", "pycryptodomex", "tenacity", "mega.py"]
+            subprocess.call([sys.executable, "-m", "pip", "uninstall", "-y"] + bad_pkgs, 
                             stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
             
-            # Step B: Install modern core deps
-            subprocess.check_call([sys.executable, "-m", "pip", "install", "--upgrade", "pycryptodome", "tenacity>=8.2.3", "requests"])
+            # B: Forced Reinstall of the MODERN stack
+            # We use --force-reinstall to ensure no broken files remain
+            print("[*] Rebuilding core libraries...")
+            subprocess.check_call([sys.executable, "-m", "pip", "install", "--upgrade", "--force-reinstall", 
+                                   "pycryptodome", "tenacity>=8.2.3,<9.0.0", "requests"])
             
-            # Step C: Install mega.py WITHOUT dependencies to avoid downgrading tenacity
+            # C: Install mega.py WITHOUT its own dependencies (to prevent it from breaking tenacity again)
             subprocess.check_call([sys.executable, "-m", "pip", "install", "mega.py", "--no-deps"])
             
-            print("[+] Environment repaired successfully! Please restart the app if it fails next.\n")
+            print("[+] Environment successfully repaired! Please restart the app.\n")
+            sys.exit(0) # Exit to allow the user to restart with the fresh environment
         except Exception as e:
             print(f"[-] Auto-repair failed: {e}")
-            print("[!] Please run manually: pip uninstall pycrypto tenacity && pip install pycryptodome tenacity>=8.2.3 mega.py --no-deps")
+            print("[!] Please run: pip uninstall -y pycrypto pycryptodome tenacity mega.py && pip install pycryptodome tenacity>=8.2.3,<9.0.0 mega.py --no-deps")
 
 ensure_dependencies()
 

{webtools_cli-1.2.4 → webtools_cli-1.2.5}/webtools_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtools-cli
-Version: 1.2.4
+Version: 1.2.5
 Summary: Advanced Web Intelligence & Scraping Toolkit with CLI and Web UI
 Author: Abhinav Adarsh
 License-Expression: MIT
@@ -30,7 +30,7 @@ Requires-Dist: mtranslate
 Requires-Dist: colorama
 Requires-Dist: playwright
 Requires-Dist: pycryptodome
-Requires-Dist: tenacity>=8.2.3
+Requires-Dist: tenacity<9.0.0,>=8.2.3
 Requires-Dist: pyreadline3; platform_system == "Windows"
 Provides-Extra: playwright
 Requires-Dist: playwright; extra == "playwright"

{webtools_cli-1.2.4 → webtools_cli-1.2.5}/webtools_cli.egg-info/requires.txt

@@ -10,7 +10,7 @@ mtranslate
 colorama
 playwright
 pycryptodome
-tenacity>=8.2.3
+tenacity<9.0.0,>=8.2.3
 
 [:platform_system == "Windows"]
 pyreadline3