Switch HTTPX support

requirements.txt

@@ -1,3 +1,3 @@
-requests>=2.28.1
+httpx[brotli,socks]>=0.27.0
 click>=8.0.4
 ffmpeg-progress-yield>=0.7.8

src/phub/core.py

@@ -6,7 +6,7 @@
 import logging
 import random
 
-import requests
+import httpx
 from typing import Iterable, Union
 from functools import cached_property
 
@@ -94,12 +94,13 @@ def reset(self) -> None:
         '''
 
         # Initialise session
-        self.session = requests.Session()
-        self._clear_granted_token()
+        self.session = httpx.Client(
+            headers = consts.HEADERS,
+            cookies = consts.COOKIES,
+            follow_redirects = True
+        )
 
-        # Insert cookies & headers
-        self.session.headers = consts.HEADERS
-        self.session.cookies.update(consts.COOKIES)
+        self._clear_granted_token()
 
         if self.bypass_geo_blocking:
             ip = random.choice(consts.GEO_BYPASS_IPs)
@@ -120,7 +121,7 @@ def call(self,
              headers: dict = None,
              timeout: float = consts.CALL_TIMEOUT,
              throw: bool = True,
-             silent: bool = False) -> requests.Response:
+             silent: bool = False) -> httpx.Response:
         '''
         Used internally to send a request or an API call.
 
@@ -167,7 +168,7 @@ def call(self,
                     url = url,
                     headers = headers,
                     data = data,
-                    timeout = timeout,
+                    timeout = timeout
                 )
 
                 # Silent 429 errors

src/phub/modules/download.py

@@ -2,7 +2,6 @@
 
 import time
 import logging
-import requests.adapters
 from pathlib import Path
 from ffmpeg_progress_yield import FfmpegProgress
 from typing import TYPE_CHECKING, Callable, Union
@@ -122,7 +121,7 @@ def _thread(client: Client, url: str, timeout: int) -> bytes:
     '''
     try:
         response = client.call(url, timeout=timeout, silent=True)
-        response.raise_for_status()  # Assuming client.call returns an object with a similar interface to requests.Response
+        response.raise_for_status()
         return (url, response.content, True)
 
     except Exception as e:
@@ -138,11 +137,7 @@ def _base_threaded(client: Client, segments: list[str], callback: CallbackType,
     logging.info('Threaded download initiated')
     buffer = {}
     length = len(segments)
-    logger.info('Mounting download adapter')
-    old_adapter = client.session.adapters.get('https://')
-    adapter = requests.adapters.HTTPAdapter(pool_maxsize = max_workers)
-    client.session.mount('https://', adapter)
-
+
     with Pool(max_workers=max_workers) as executor:
         future_to_url = {executor.submit(_thread, client, url, timeout): url for url in segments}
 
@@ -157,7 +152,6 @@ def _base_threaded(client: Client, segments: list[str], callback: CallbackType,
             except Exception as e:
                 logging.warning(f"Error processing segment {url}: {e}")
 
-    client.session.mount('https://', old_adapter)
     return buffer
 
 def threaded(max_workers: int = 20,