deepctl-cmd-debug-network 0.1.12__tar.gz → 0.5.0__tar.gz

{deepctl_cmd_debug_network-0.1.12 → deepctl_cmd_debug_network-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-cmd-debug-network
-Version: 0.1.12
+Version: 0.5.0
 Summary: Network debug subcommand for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>
@@ -14,12 +14,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: deepctl-core>=0.1.10
-Requires-Dist: click>=8.0.0
-Requires-Dist: rich>=13.0.0
-Requires-Dist: pydantic>=2.0.0
-Requires-Dist: httpx>=0.24.0
-Requires-Dist: requests<3.0,>=2.31
+Requires-Dist: deepctl==0.5.0
+Requires-Dist: deepctl-core==0.5.0
+Requires-Dist: click<9,>=8.2.0
+Requires-Dist: rich<16,>=13.0.0
+Requires-Dist: pydantic<3,>=2.0.0
+Requires-Dist: httpx<1,>=0.24.0
 
 # deepctl-cmd-debug-network
 
@@ -58,11 +58,10 @@ pipx run deepctl --help
 
 ## Dependencies
 
-- `click>=8.0.0`
-- `rich>=13.0.0`
-- `pydantic>=2.0.0`
-- `httpx>=0.24.0`
-- `requests>=2.31,<3.0`
+- `click>=8.2.0,<9`
+- `rich>=13.0.0,<16`
+- `pydantic>=2.0.0,<3`
+- `httpx>=0.24.0,<1`
 
 ## License
 

{deepctl_cmd_debug_network-0.1.12 → deepctl_cmd_debug_network-0.5.0}/README.md

@@ -35,11 +35,10 @@ pipx run deepctl --help
 
 ## Dependencies
 
-- `click>=8.0.0`
-- `rich>=13.0.0`
-- `pydantic>=2.0.0`
-- `httpx>=0.24.0`
-- `requests>=2.31,<3.0`
+- `click>=8.2.0,<9`
+- `rich>=13.0.0,<16`
+- `pydantic>=2.0.0,<3`
+- `httpx>=0.24.0,<1`
 
 ## License
 

{deepctl_cmd_debug_network-0.1.12 → deepctl_cmd_debug_network-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deepctl-cmd-debug-network"
-version = "0.1.12" # x-release-please-version
+version = "0.5.0" # x-release-please-version
 description = "Network debug subcommand for deepctl"
 readme = "README.md"
 license = "MIT"
@@ -21,12 +21,12 @@ classifiers = [
 keywords = ["deepgram", "cli", "debug", "network", "diagnostics"]
 requires-python = ">=3.10"
 dependencies = [
-    "deepctl-core>=0.1.10",
-    "click>=8.0.0",
-    "rich>=13.0.0",
-    "pydantic>=2.0.0",
-    "httpx>=0.24.0",
-    "requests>=2.31,<3.0",
+    "deepctl==0.5.0", # x-release-please-version
+    "deepctl-core==0.5.0", # x-release-please-version
+    "click>=8.2.0,<9",
+    "rich>=13.0.0,<16",
+    "pydantic>=2.0.0,<3",
+    "httpx>=0.24.0,<1",
 ]
 
 [project.scripts]
@@ -41,3 +41,7 @@ package-dir = { "" = "src" }
 [tool.setuptools.packages.find]
 where = ["src"]
 include = ["deepctl_cmd_debug_network*"]
+
+[tool.uv.sources]
+deepctl = { workspace = true }
+deepctl-core = { workspace = true }

{deepctl_cmd_debug_network-0.1.12 → deepctl_cmd_debug_network-0.5.0}/src/deepctl_cmd_debug_network/command.py

@@ -6,12 +6,9 @@ import socket
 import subprocess
 import sys
 import time
-import warnings
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from urllib.parse import urlparse
 
-import requests
-import urllib3
 from deepctl_core import AuthManager, BaseCommand, Config, DeepgramClient
 from rich.console import Console
 from rich.panel import Panel
@@ -28,18 +25,92 @@ from .models import (
     TLSTestResult,
 )
 
+if TYPE_CHECKING:
+    import ssl
+
+    import httpx
+
 console = Console()
 
-# Default Deepgram endpoints to test
-DEEPGRAM_ENDPOINTS = {
-    "api": "https://api.deepgram.com",
-    "auth": "https://auth.dx.deepgram.com",
-}
+
+def _default_host() -> str:
+    """The Deepgram API host (``hosts.DEFAULT_BASE_URL``, via the Transport).
+
+    The default endpoint only: this command sends no credentials anywhere.
+    """
+    from deepctl_core import transport
+
+    return transport.default_host()
+
+
+def _is_ssl_error(exc: BaseException) -> bool:
+    """True when an httpx error was caused by a TLS failure (the case
+    requests raised as SSLError)."""
+    import ssl
+
+    seen: set[int] = set()
+    current: BaseException | None = exc
+    while current is not None and id(current) not in seen:
+        if isinstance(current, ssl.SSLError):
+            return True
+        seen.add(id(current))
+        current = current.__cause__ or current.__context__
+    return False
+
+
+def _requests_ca_bundle() -> str | None:
+    """The CA bundle requests would have used from the environment.
+
+    httpx reads SSL_CERT_FILE and SSL_CERT_DIR itself; when either is set it
+    wins. Otherwise REQUESTS_CA_BUNDLE, then CURL_CA_BUNDLE, as requests
+    resolved them (an empty value counts as unset).
+    """
+    if os.environ.get("SSL_CERT_FILE") or os.environ.get("SSL_CERT_DIR"):
+        return None
+    return (
+        os.environ.get("REQUESTS_CA_BUNDLE") or os.environ.get("CURL_CA_BUNDLE") or None
+    )
+
+
+def _verify_setting(verify: bool) -> "bool | ssl.SSLContext":
+    """httpx's verify argument: False stays False; True becomes an SSL
+    context on the requests-style bundle when one is set in the
+    environment, and otherwise stays True (httpx defaults, which honour
+    SSL_CERT_FILE / SSL_CERT_DIR)."""
+    import ssl
+
+    if not verify:
+        return False
+    bundle = _requests_ca_bundle()
+    if bundle is None:
+        return True
+    if os.path.isdir(bundle):
+        return ssl.create_default_context(capath=bundle)
+    if not os.path.isfile(bundle):
+        # requests' wording for the same mistake.
+        raise OSError(
+            "Could not find a suitable TLS CA certificate bundle, "
+            f"invalid path: {bundle}"
+        )
+    return ssl.create_default_context(cafile=bundle)
+
+
+def _dist_version(name: str) -> str:
+    """Installed version of a distribution, read without importing it."""
+    from importlib.metadata import PackageNotFoundError, version
+
+    try:
+        return version(name)
+    except PackageNotFoundError:
+        return "not installed"
 
 
 class NetworkCommand(BaseCommand):
     """Debug network connectivity issues with Deepgram services."""
 
+    # Tests swap in an httpx.MockTransport; None means the real network.
+    _transport: "httpx.BaseTransport | None" = None
+
     name = "network"
     help = "Debug network connectivity issues with Deepgram services"
     short_help = "Debug network issues"
@@ -64,7 +135,7 @@ class NetworkCommand(BaseCommand):
         return [
             {
                 "names": ["--endpoint", "-e"],
-                "help": ("Specific endpoint to test (default: api.deepgram.com)"),
+                "help": f"Specific endpoint to test (default: {_default_host()})",
                 "type": str,
                 "is_option": True,
             },
@@ -107,6 +178,29 @@ class NetworkCommand(BaseCommand):
             },
         ]
 
+    def _http_client(
+        self, *, timeout: float, verify: bool = True, follow_redirects: bool = False
+    ) -> "httpx.Client":
+        """A throwaway client for one diagnostic request.
+
+        Never the shared CLI client: it carries no credentials (httpx does
+        not read ~/.netrc), and a verify=False client must not outlive its
+        one test. trust_env applies HTTP(S)_PROXY / NO_PROXY as requests did.
+
+        CA trust, first match wins (verify=False skips all of it):
+        SSL_CERT_FILE or SSL_CERT_DIR (read by httpx), then
+        REQUESTS_CA_BUNDLE, then CURL_CA_BUNDLE, then httpx's default bundle.
+        """
+        import httpx
+
+        return httpx.Client(
+            timeout=timeout,
+            verify=_verify_setting(verify),
+            follow_redirects=follow_redirects,
+            trust_env=True,
+            transport=self._transport,
+        )
+
     def handle(
         self,
         config: Config,
@@ -115,7 +209,7 @@ class NetworkCommand(BaseCommand):
         **kwargs: Any,
     ) -> Any:
         """Handle network debug command execution."""
-        endpoint = kwargs.get("endpoint") or "api.deepgram.com"
+        endpoint = kwargs.get("endpoint") or _default_host()
         verbose = kwargs.get("verbose", False)
         skip_commands = kwargs.get("skip_commands", False)
         timeout = kwargs.get("timeout", 10)
@@ -171,7 +265,7 @@ class NetworkCommand(BaseCommand):
                 progress.remove_task(task)
 
             # 5. Python requests tests
-            task = progress.add_task("Testing Python requests library...", total=None)
+            task = progress.add_task("Testing Python HTTP client...", total=None)
             self._test_python_requests(endpoint, result, timeout)
             progress.remove_task(task)
 
@@ -213,8 +307,9 @@ class NetworkCommand(BaseCommand):
         result.environment_info = {
             "python_version": sys.version,
             "platform": sys.platform,
-            "requests_version": requests.__version__,
-            "urllib3_version": getattr(urllib3, "__version__", "unknown"),
+            "requests_version": _dist_version("requests"),
+            "urllib3_version": _dist_version("urllib3"),
+            "httpx_version": _dist_version("httpx"),
             "proxy_env_vars": {
                 "http_proxy": os.environ.get("http_proxy", "Not set"),
                 "https_proxy": os.environ.get("https_proxy", "Not set"),
@@ -270,20 +365,19 @@ class NetworkCommand(BaseCommand):
 
         try:
             start_time = time.time()
-            response = requests.get(
-                f"https://{hostname}/", timeout=timeout, allow_redirects=False
-            )
+            with self._http_client(timeout=timeout) as http:
+                response = http.get(f"https://{hostname}/")
             endpoint_test.response_time_ms = (time.time() - start_time) * 1000
             endpoint_test.status_code = response.status_code
             endpoint_test.reachable = True
             endpoint_test.ssl_valid = True
 
-        except requests.exceptions.SSLError as e:
-            endpoint_test.error = f"SSL Error: {e!s}"
-            endpoint_test.ssl_valid = False
-            result.network_issues_detected = True
         except Exception as e:
-            endpoint_test.error = str(e)
+            if _is_ssl_error(e):
+                endpoint_test.error = f"SSL Error: {e!s}"
+                endpoint_test.ssl_valid = False
+            else:
+                endpoint_test.error = str(e)
             result.network_issues_detected = True
 
         result.endpoint_results.append(endpoint_test)
@@ -446,7 +540,8 @@ class NetworkCommand(BaseCommand):
             else:
                 try:
                     start_time = time.time()
-                    response = requests.head(url, timeout=5, allow_redirects=True)
+                    with self._http_client(timeout=5, follow_redirects=True) as http:
+                        response = http.head(url)
                     endpoint_test.response_time_ms = (time.time() - start_time) * 1000
                     endpoint_test.status_code = response.status_code
                     endpoint_test.accessible = response.status_code < 400
@@ -460,7 +555,8 @@ class NetworkCommand(BaseCommand):
     def _test_python_requests(
         self, hostname: str, result: NetworkDebugResult, timeout: int
     ) -> None:
-        """Test connectivity using Python requests library."""
+        """Test connectivity with Python's HTTP client (httpx), with and
+        without certificate verification. Each request gets its own client."""
         # Test with SSL verification enabled
         test_with_verify = PythonRequestsTest(
             url=f"https://{hostname}/", success=False, ssl_verify_enabled=True
@@ -468,21 +564,18 @@ class NetworkCommand(BaseCommand):
 
         try:
             start_time = time.time()
-            response = requests.get(
-                f"https://{hostname}/",
-                timeout=timeout,
-                verify=True,
-                allow_redirects=False,
-            )
+            with self._http_client(timeout=timeout, verify=True) as http:
+                response = http.get(f"https://{hostname}/")
             test_with_verify.response_time_ms = (time.time() - start_time) * 1000
             test_with_verify.status_code = response.status_code
             test_with_verify.success = True
 
-        except requests.exceptions.SSLError as e:
-            test_with_verify.error = f"SSL verification failed: {e!s}"
-            result.network_issues_detected = True
         except Exception as e:
-            test_with_verify.error = str(e)
+            if _is_ssl_error(e):
+                test_with_verify.error = f"SSL verification failed: {e!s}"
+                result.network_issues_detected = True
+            else:
+                test_with_verify.error = str(e)
 
         result.python_requests_tests.append(test_with_verify)
 
@@ -492,25 +585,17 @@ class NetworkCommand(BaseCommand):
         )
 
         try:
-            # Disable SSL warnings temporarily
-            urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-
+            # An isolated, credential-free client that is closed right after
+            # this one request; nothing else ever sees verify=False.
             start_time = time.time()
-            response = requests.get(
-                f"https://{hostname}/",
-                timeout=timeout,
-                verify=False,
-                allow_redirects=False,
-            )
+            with self._http_client(timeout=timeout, verify=False) as http:
+                response = http.get(f"https://{hostname}/")
             test_without_verify.response_time_ms = (time.time() - start_time) * 1000
             test_without_verify.status_code = response.status_code
             test_without_verify.success = True
 
         except Exception as e:
             test_without_verify.error = str(e)
-        finally:
-            # Re-enable warnings
-            warnings.resetwarnings()
 
         result.python_requests_tests.append(test_without_verify)
 
@@ -663,7 +748,7 @@ class NetworkCommand(BaseCommand):
     ) -> None:
         """Test latency to known Deepgram endpoints."""
         endpoints = [
-            ("api.deepgram.com", "Primary API"),
+            (_default_host(), "Primary API"),
         ]
 
         console.print("\n[bold]Multi-Region Latency:[/bold]")
@@ -694,11 +779,8 @@ class NetworkCommand(BaseCommand):
 
                 # HTTPS connection timing
                 connect_start = time.time()
-                resp = requests.get(
-                    f"https://{hostname}/",
-                    timeout=timeout,
-                    allow_redirects=False,
-                )
+                with self._http_client(timeout=timeout) as http:
+                    resp = http.get(f"https://{hostname}/")
                 total_ms = (time.time() - connect_start) * 1000
                 connect_ms = total_ms - dns_ms if total_ms and dns_ms else None
                 tls_ms = connect_ms * 0.6 if connect_ms else None
@@ -845,7 +927,7 @@ class NetworkCommand(BaseCommand):
 
         # Python Requests Tests
         if result.python_requests_tests:
-            console.print("[bold]Python Requests Library Tests:[/bold]")
+            console.print("[bold]Python HTTP Client Tests (httpx):[/bold]")
             for test in result.python_requests_tests:
                 verify_status = (
                     "with SSL verification"
@@ -976,7 +1058,7 @@ class NetworkCommand(BaseCommand):
             recommendations.append(
                 "ℹ️  Proxy configuration detected. Ensure your proxy allows access to:"
             )
-            recommendations.append("   • api.deepgram.com (port 443)")
+            recommendations.append(f"   • {_default_host()} (port 443)")
             recommendations.append("   • Certificate validation endpoints (port 80)")
 
         # Display recommendations

{deepctl_cmd_debug_network-0.1.12 → deepctl_cmd_debug_network-0.5.0}/src/deepctl_cmd_debug_network/models.py

@@ -70,9 +70,11 @@ class TLSTestResult(BaseModel):
 
 
 class PythonRequestsTest(BaseModel):
-    """Result of testing with Python requests library."""
+    """Result of one Python HTTP client request (the payload keeps its
+    requests-era name; ``library`` says which client made it)."""
 
     url: str
+    library: str = "httpx"
     success: bool
     status_code: int | None = None
     response_time_ms: float | None = None

{deepctl_cmd_debug_network-0.1.12 → deepctl_cmd_debug_network-0.5.0}/src/deepctl_cmd_debug_network.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepctl-cmd-debug-network
-Version: 0.1.12
+Version: 0.5.0
 Summary: Network debug subcommand for deepctl
 Author-email: Deepgram <devrel@deepgram.com>
 Maintainer-email: Deepgram <devrel@deepgram.com>
@@ -14,12 +14,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: deepctl-core>=0.1.10
-Requires-Dist: click>=8.0.0
-Requires-Dist: rich>=13.0.0
-Requires-Dist: pydantic>=2.0.0
-Requires-Dist: httpx>=0.24.0
-Requires-Dist: requests<3.0,>=2.31
+Requires-Dist: deepctl==0.5.0
+Requires-Dist: deepctl-core==0.5.0
+Requires-Dist: click<9,>=8.2.0
+Requires-Dist: rich<16,>=13.0.0
+Requires-Dist: pydantic<3,>=2.0.0
+Requires-Dist: httpx<1,>=0.24.0
 
 # deepctl-cmd-debug-network
 
@@ -58,11 +58,10 @@ pipx run deepctl --help
 
 ## Dependencies
 
-- `click>=8.0.0`
-- `rich>=13.0.0`
-- `pydantic>=2.0.0`
-- `httpx>=0.24.0`
-- `requests>=2.31,<3.0`
+- `click>=8.2.0,<9`
+- `rich>=13.0.0,<16`
+- `pydantic>=2.0.0,<3`
+- `httpx>=0.24.0,<1`
 
 ## License
 

deepctl_cmd_debug_network-0.5.0/src/deepctl_cmd_debug_network.egg-info/requires.txt

@@ -0,0 +1,6 @@
+deepctl==0.5.0
+deepctl-core==0.5.0
+click<9,>=8.2.0
+rich<16,>=13.0.0
+pydantic<3,>=2.0.0
+httpx<1,>=0.24.0

deepctl_cmd_debug_network-0.1.12/src/deepctl_cmd_debug_network.egg-info/requires.txt

@@ -1,6 +0,0 @@
-deepctl-core>=0.1.10
-click>=8.0.0
-rich>=13.0.0
-pydantic>=2.0.0
-httpx>=0.24.0
-requests<3.0,>=2.31