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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtools-cli
-Version: 1.2.3
+Version: 1.2.4
 Summary: Advanced Web Intelligence & Scraping Toolkit with CLI and Web UI
 Author: Abhinav Adarsh
 License-Expression: MIT
@@ -29,7 +29,6 @@ Requires-Dist: Pillow
 Requires-Dist: mtranslate
 Requires-Dist: colorama
 Requires-Dist: playwright
-Requires-Dist: mega.py
 Requires-Dist: pycryptodome
 Requires-Dist: tenacity>=8.2.3
 Requires-Dist: pyreadline3; platform_system == "Windows"

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

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

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

@@ -7,47 +7,59 @@ if sys.stdout.encoding and sys.stdout.encoding.lower() != 'utf-8':
         sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
     except Exception: pass
 
-# --- AUTO-INSTALLER FOR MISSING DEPENDENCIES ---
+# --- AUTO-INSTALLER FOR MISSING/BROKEN DEPENDENCIES ---
 def ensure_dependencies():
-    """Checks and installs missing dependencies at runtime"""
-    dependencies = {
-        "mega": "mega.py",
-        "Crypto": "pycryptodome",
-        "tenacity": "tenacity>=8.2.3"
+    """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)
     }
-    missing = []
     
-    # Check for missing or broken modules
-    for module_name, package_name in dependencies.items():
+    missing_or_broken = []
+    
+    # 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
+    try:
+        import Crypto.PublicKey.RSA
+    except (SyntaxError, AttributeError, ImportError):
+        # SyntaxError means it's the old pycrypto. We must kill it.
+        missing_or_broken.append("pycryptodome")
+    
+    # 2. Check for missing or outdated modules
+    for module_name, (pkg_name, min_v, forced) in check_deps.items():
         try:
-            # We use __import__ to check if the module is available and functional
-            __import__(module_name)
-            
-            # Special check for tenacity version if it exists
-            if module_name == "tenacity":
-                from importlib.metadata import version as get_version
+            mod = __import__(module_name)
+            if min_v:
+                from importlib.metadata import version as get_v
                 try:
-                    v = get_version("tenacity")
-                    major = int(v.split('.')[0])
-                    if major < 8:
-                        missing.append(package_name)
-                except Exception:
-                    pass
-        except Exception:
-            # If import fails for ANY reason (ImportError, AttributeError, etc.)
-            # we mark it as missing/broken so we can try to fix it.
-            missing.append(package_name)
-    
-    if missing:
-        print(f"\n[!] Missing or outdated dependencies detected: {', '.join(missing)}")
-        print("[*] Attempting automatic installation/upgrade...")
+                    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 missing_or_broken:
+        print(f"\n[!] Critical dependency issues detected: {', '.join(missing_or_broken)}")
+        print("[*] Running Forced Clean Repair (Python 3.11+ Stability Patch)...")
         try:
-            # Added --upgrade to ensure tenacity gets bumped if it's too old
-            subprocess.check_call([sys.executable, "-m", "pip", "install", "--upgrade"] + missing)
-            print("[+] Dependencies updated successfully!\n")
+            # Step A: Uninstall known troublemakers
+            subprocess.call([sys.executable, "-m", "pip", "uninstall", "-y", "pycrypto", "tenacity"], 
+                            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"])
+            
+            # Step C: Install mega.py WITHOUT dependencies to avoid downgrading tenacity
+            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")
         except Exception as e:
-            print(f"[-] Auto-installation failed: {e}")
-            print(f"[!] Please run: pip install --upgrade {' '.join(missing)}")
+            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")
 
 ensure_dependencies()
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtools-cli
-Version: 1.2.3
+Version: 1.2.4
 Summary: Advanced Web Intelligence & Scraping Toolkit with CLI and Web UI
 Author: Abhinav Adarsh
 License-Expression: MIT
@@ -29,7 +29,6 @@ Requires-Dist: Pillow
 Requires-Dist: mtranslate
 Requires-Dist: colorama
 Requires-Dist: playwright
-Requires-Dist: mega.py
 Requires-Dist: pycryptodome
 Requires-Dist: tenacity>=8.2.3
 Requires-Dist: pyreadline3; platform_system == "Windows"

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

@@ -9,7 +9,6 @@ Pillow
 mtranslate
 colorama
 playwright
-mega.py
 pycryptodome
 tenacity>=8.2.3