sideload 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

sideload/cli.py

@@ -33,9 +33,19 @@ console = Console()
 
 
 class SideloadClient:
-    def __init__(self, jsonbin_token: str, collection_id: str):
+    def __init__(
+        self,
+        jsonbin_token: str,
+        collection_id: str,
+        verify_ssl: bool = True,
+        key_type: str = "master"
+    ):
         self.collection_id = collection_id
-        self.connector = JSONBinConnector(jsonbin_token)
+        self.connector = JSONBinConnector(
+            jsonbin_token,
+            verify_ssl=verify_ssl,
+            key_type=key_type
+        )
         self.manager = SideloadBinManager(self.connector)
 
     def __enter__(self):
@@ -117,7 +127,7 @@ class SideloadClient:
         return self.manager.get_sideload_data(bin_id)
 
     def download_packages(
-        self, package_names: List[str], output_dir: Path
+        self, package_names: List[str], output_dir: Path, debug: bool = False
     ) -> List[Path]:
         """Download all packages to a temporary directory"""
         downloaded_files = []
@@ -128,6 +138,7 @@ class SideloadClient:
             BarColumn(),
             TaskProgressColumn(),
             console=console,
+            disable=debug,  # Disable progress bar in debug mode
         ) as progress:
             download_task = progress.add_task(
                 "Downloading packages...", total=len(package_names)
@@ -142,18 +153,23 @@ class SideloadClient:
 
                 # Download using pip to temporary directory
                 try:
+                    cmd = [
+                        sys.executable,
+                        "-m",
+                        "pip",
+                        "download",
+                        "--no-deps",
+                        "--dest",
+                        str(output_dir),
+                        package_name,
+                    ]
+
+                    if debug:
+                        console.print(f"[dim]Running: {' '.join(cmd)}[/dim]")
+
                     subprocess.run(
-                        [
-                            sys.executable,
-                            "-m",
-                            "pip",
-                            "download",
-                            "--no-deps",
-                            "--dest",
-                            str(output_dir),
-                            package_name,
-                        ],
-                        capture_output=True,
+                        cmd,
+                        capture_output=not debug,
                         text=True,
                         check=True,
                     )
@@ -162,10 +178,13 @@ class SideloadClient:
                     wheel_files = list(output_dir.glob(f"{package_name}*.whl"))
                     if wheel_files:
                         downloaded_files.append(wheel_files[0])
+                        if debug:
+                            console.print(f"[green]✓ Downloaded: {wheel_files[0].name}[/green]")
 
                 except subprocess.CalledProcessError as e:
+                    error_msg = e.stderr if hasattr(e, 'stderr') and e.stderr else str(e)
                     console.print(
-                        f"❌ Failed to download {package_name}: {e.stderr}", style="red"
+                        f"❌ Failed to download {package_name}: {error_msg}", style="red"
                     )
                     continue
 
@@ -204,6 +223,7 @@ class SideloadClient:
                 BarColumn(),
                 TaskProgressColumn(),
                 console=console,
+                disable=debug,  # Disable progress bar in debug mode
             ) as progress:
                 extract_task = progress.add_task(
                     "Extracting packages...", total=len(wheel_files)
@@ -217,6 +237,9 @@ class SideloadClient:
                         completed=i,
                     )
 
+                    if debug:
+                        console.print(f"\n[cyan]Extracting package {i + 1}/{len(wheel_files)}: {package_name}[/cyan]")
+
                     # Extract wheel file (it's just a zip)
                     import zipfile
 
@@ -274,6 +297,7 @@ class SideloadClient:
                     BarColumn(),
                     TaskProgressColumn(),
                     console=console,
+                    disable=debug,  # Disable progress bar in debug mode
                 ) as progress:
                     reassemble_task = progress.add_task(
                         "Reassembling file...", total=len(part_files)
@@ -287,6 +311,9 @@ class SideloadClient:
                                 completed=i,
                             )
 
+                            if debug:
+                                console.print(f"[dim]Reading part {i + 1}/{len(part_files)}: {part_file.name} ({part_file.stat().st_size:,} bytes)[/dim]")
+
                             with open(part_file, "rb") as part:
                                 output_file.write(part.read())
 
@@ -363,6 +390,17 @@ Examples:
         type=Path,
         help="Working directory for extraction (for debugging, defaults to temp directory)",
     )
+    download_parser.add_argument(
+        "--no-verify-ssl",
+        action="store_true",
+        help="Disable SSL certificate verification for JSONBin API",
+    )
+    download_parser.add_argument(
+        "--jsonbin-key-type",
+        choices=["master", "access"],
+        default=None,
+        help="JSONBin key type to use (default: from JSONBIN_KEY_TYPE env or 'master')",
+    )
 
     args = parser.parse_args()
 
@@ -377,6 +415,19 @@ Examples:
         jsonbin_token = args.token or os.environ.get("JSONBIN_TOKEN")
         collection_id = args.collection or os.environ.get("SIDELOAD_COLLECTION_ID")
 
+        # Get SSL verification setting (CLI flag overrides env var)
+        verify_ssl = not args.no_verify_ssl
+        if args.no_verify_ssl:
+            # If CLI flag is set, disable SSL verification
+            verify_ssl = False
+        else:
+            # Otherwise check environment variable (default to True)
+            env_verify = os.environ.get("JSONBIN_VERIFY_SSL", "true").lower()
+            verify_ssl = env_verify in ("true", "1", "yes")
+
+        # Get key type (CLI arg > env var > default)
+        key_type = args.jsonbin_key_type or os.environ.get("JSONBIN_KEY_TYPE", "master").lower()
+
         if not jsonbin_token:
             console.print(
                 "❌ JSONBin token required. Set JSONBIN_TOKEN environment variable or use --token",
@@ -394,8 +445,19 @@ Examples:
         # Ensure output directory exists
         args.output.mkdir(parents=True, exist_ok=True)
 
+        # Show debug flags if enabled
+        if args.debug:
+            console.print("\n[bold cyan]Debug Mode Enabled[/bold cyan]")
+            console.print(f"  [dim]URL:[/dim] {args.url}")
+            console.print(f"  [dim]Output:[/dim] {args.output}")
+            console.print(f"  [dim]Work Directory:[/dim] {args.work_dir or 'temp (auto-cleanup)'}")
+            console.print(f"  [dim]Collection ID:[/dim] {collection_id}")
+            console.print(f"  [dim]SSL Verification:[/dim] {verify_ssl}")
+            console.print(f"  [dim]JSONBin Key Type:[/dim] {key_type}")
+            console.print()
+
         try:
-            with SideloadClient(jsonbin_token, collection_id) as client:
+            with SideloadClient(jsonbin_token, collection_id, verify_ssl, key_type) as client:
                 # Create the request
                 console.print(
                     f"🌐 Requesting download for: [bold blue]{args.url}[/bold blue]"
@@ -425,7 +487,7 @@ Examples:
 
                 with tempfile.TemporaryDirectory() as temp_dir:
                     temp_path = Path(temp_dir)
-                    wheel_files = client.download_packages(package_names, temp_path)
+                    wheel_files = client.download_packages(package_names, temp_path, args.debug)
 
                     if not wheel_files:
                         console.print(

sideload/jsonbin_connector.py

@@ -2,13 +2,26 @@ import os
 import httpx
 
 JSONBIN_TOKEN = os.environ["JSONBIN_TOKEN"]
+JSONBIN_VERIFY_SSL = os.environ.get("JSONBIN_VERIFY_SSL", "true").lower() in ("true", "1", "yes")
+JSONBIN_KEY_TYPE = os.environ.get("JSONBIN_KEY_TYPE", "master").lower()  # "master" or "access"
 
 
 class JSONBinConnector:
-    def __init__(self):
+    def __init__(self, verify_ssl: bool = None, key_type: str = None):
+        # Use provided values or fall back to environment variables
+        verify = JSONBIN_VERIFY_SSL if verify_ssl is None else verify_ssl
+        key_type = key_type or JSONBIN_KEY_TYPE
+
+        # Determine the key header to use
+        if key_type == "access":
+            key_header = "X-Access-Key"
+        else:
+            key_header = "X-Master-Key"
+
         self.client = httpx.Client(
             base_url="https://api.jsonbin.io/v3",
-            headers={"X-Master-Key": JSONBIN_TOKEN, "Content-Type": "application/json"},
+            headers={key_header: JSONBIN_TOKEN, "Content-Type": "application/json"},
+            verify=verify,
         )
 
     def get_collections(self) -> list:

sideload/jsonbin_old.py

@@ -11,19 +11,35 @@ from typing import Dict, List, Optional, Any
 class JSONBinConnector:
     """A connector for JSONBin.io API with httpx"""
 
-    def __init__(self, api_token: str, base_url: str = "https://api.jsonbin.io/v3"):
+    def __init__(
+        self,
+        api_token: str,
+        base_url: str = "https://api.jsonbin.io/v3",
+        verify_ssl: bool = True,
+        key_type: str = "master"
+    ):
         """
         Initialize the JSONBin connector
 
         Args:
             api_token: JSONBin API token
             base_url: JSONBin API base URL
+            verify_ssl: Whether to verify SSL certificates (default: True)
+            key_type: Type of key to use - "master" or "access" (default: "master")
         """
         self.api_token = api_token
         self.base_url = base_url
+
+        # Determine the key header to use
+        if key_type == "access":
+            key_header = "X-Access-Key"
+        else:
+            key_header = "X-Master-Key"
+
         self.client = httpx.Client(
             base_url=base_url,
-            headers={"X-Master-Key": api_token, "Content-Type": "application/json"},
+            headers={key_header: api_token, "Content-Type": "application/json"},
+            verify=verify_ssl,
         )
 
     def __enter__(self):

{sideload-1.1.0.dist-info → sideload-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sideload
-Version: 1.1.0
+Version: 1.3.0
 Summary: Download large files via PyPI packages
 Author: Sygmei
 Author-email: Sygmei <3835355+Sygmei@users.noreply.github.com>

sideload-1.3.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+sideload/__init__.py,sha256=Y3rHLtR7n0sjLXrn-BEcrbIHx-9uE1tPZkooavo7xcA,222
+sideload/cli.py,sha256=8CcoZf9_7XHzlFA9XBBZn19RRNAbrFfRshVIWWSaFhQ,20186
+sideload/jsonbin.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sideload/jsonbin_connector.py,sha256=IS7YdSBZeZMoTwOyA1I0T7aw36-KERYNnD324dRRI5A,2305
+sideload/jsonbin_old.py,sha256=Rs657F3dTtdoxVYolByuyINABCIQx_VLxwxgdne1mws,8865
+sideload/main.py,sha256=EiZguc4-ug8RM6vXkZuXW_ps8jFWoAfeKBBNy7FX-F0,7600
+sideload/scripts/cleanup_pypi.py,sha256=CouuOhnbpSbrFc1KhlOeZAuajVVpGF9d4qwFpIKkEvY,5906
+sideload-1.3.0.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
+sideload-1.3.0.dist-info/entry_points.txt,sha256=7ULrIjaVhrxMhuddTeoPjeIrqmIvVc9cSU3lZU2_YqE,44
+sideload-1.3.0.dist-info/METADATA,sha256=r0lod7DO3pFy-v0M9HQQFHKTiPih1jCApRnwZWVRZ8o,4281
+sideload-1.3.0.dist-info/RECORD,,

sideload-1.1.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-sideload/__init__.py,sha256=Y3rHLtR7n0sjLXrn-BEcrbIHx-9uE1tPZkooavo7xcA,222
-sideload/cli.py,sha256=zGcpAJ_j4ZrqWln3lQfZ2kO8TD_AW2PjAfVo3BvRIwM,17465
-sideload/jsonbin.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sideload/jsonbin_connector.py,sha256=HtR1Pwnpm5jfYcmnvcug9HaKxFpsyJBXYYlLuzWPiTE,1680
-sideload/jsonbin_old.py,sha256=ve21WsV7Ay60moFfrR4lSM_JRZNqo4z5v69cNw0Iqo0,8411
-sideload/main.py,sha256=EiZguc4-ug8RM6vXkZuXW_ps8jFWoAfeKBBNy7FX-F0,7600
-sideload/scripts/cleanup_pypi.py,sha256=CouuOhnbpSbrFc1KhlOeZAuajVVpGF9d4qwFpIKkEvY,5906
-sideload-1.1.0.dist-info/WHEEL,sha256=-neZj6nU9KAMg2CnCY6T3w8J53nx1kFGw_9HfoSzM60,79
-sideload-1.1.0.dist-info/entry_points.txt,sha256=7ULrIjaVhrxMhuddTeoPjeIrqmIvVc9cSU3lZU2_YqE,44
-sideload-1.1.0.dist-info/METADATA,sha256=AGrmSEXpybApWqfbA3uv9MHaGY2wUXo_poyPHWVRvd8,4281
-sideload-1.1.0.dist-info/RECORD,,