chore: remove dependencies

Author: thewebscraping

pyproject.toml

@@ -4,3 +4,46 @@ build-backend = 'setuptools.build_meta'
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
+
+[tool.black]
+line-length = 120
+target-version = ['py38', 'py39', 'py310', 'py311', 'py312']
+exclude = '''
+/(
+    \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | _build
+  | buck-out
+  | build
+  | dist
+)/
+'''
+
+
+[tool.flake8]
+max-line-length = 120
+max-complexity = 10
+extend-ignore = [
+    "E203",  # Whitespace before ':', which black handles differently than flake8.
+    "W503",  # Line break before binary operator, black's preferred style.
+]
+
+# Comma-separated list of directories to exclude from linting.
+exclude = [
+    ".git",
+    "__pycache__",
+    "docs/source/conf.py",
+    "old",
+    "build",
+    "dist",
+    ".venv",
+]
+
+# Per-file ignores are very useful for specific cases.
+# For example, __init__.py files often have unused imports on purpose.
+per-file-ignores = [
+    "__init__.py:F401", # Ignore "unused import" in __init__.py files
+]

requirements.txt

@@ -1,5 +1,3 @@
 # Base
 chardet~=5.2.0
-requests~=2.32.3
-tqdm~=4.67.1
 idna~=3.10

setup.cfg

@@ -6,8 +6,6 @@ license_file = LICENSE
 python_requires = >=3.8
 install_requires =
     chardet ~= 5.2.0
-    requests ~= 2.32.3
-    tqdm ~= 4.67.1
     idna ~= 3.10
 classifiers =
     Development Status :: 5 - Production/Stable
@@ -46,24 +44,3 @@ exclude =
     examples*
     tools*
     docs*
-
-[flake8]
-max-line-length = 120
-ignore = F821, E203, W503, E501, E231
-per-file-ignores =
-    __init__.py: F405, F403, E402, F401
-
-[tool.black]
-line-length = 120
-include = '\.pyi?$'
-unstable = true
-
-
-[tool.isort]
-atomic = true
-profile = "black"
-line_length = 120
-skip_gitignore = true
-skip_glob = ["tests/data", "profiling"]
-known_first_party = ["black", "blib2to3", "blackd", "_black_version"]
-add_imports = "from __future__ import annotations"

tls_requests/__version__.py

@@ -1,5 +1,7 @@
 __title__ = "wrapper-tls-requests"
-__description__ = "A powerful and lightweight Python library for making secure and reliable HTTP/TLS Fingerprint requests."
+__description__ = (
+    "A powerful and lightweight Python library for making secure and reliable HTTP/TLS Fingerprint requests."
+)
 __url__ = "https://github.com/thewebscraping/tls-requests"
 __author__ = "Tu Pham"
 __author_email__ = "[email protected]"

tls_requests/client.py

@@ -8,7 +8,7 @@
 from typing import (Any, Callable, Literal, Mapping, Optional, Sequence,
                     TypeVar, Union)
 
-from .exceptions import RemoteProtocolError, TooManyRedirects
+from .exceptions import ProxyError, RemoteProtocolError, TooManyRedirects
 from .models import (URL, Auth, BasicAuth, Cookies, HeaderRotator, Headers,
                      Proxy, ProxyRotator, Request, Response, StatusCodes,
                      TLSClient, TLSConfig, TLSIdentifierRotator, URLParams)
@@ -119,7 +119,11 @@ def __init__(
         self.max_redirects = max_redirects
         self.http2 = http2
         self.verify = verify
-        self.client_identifier = TLSIdentifierRotator.from_file(client_identifier) if isinstance(client_identifier, list) else client_identifier
+        self.client_identifier = (
+            TLSIdentifierRotator.from_file(client_identifier)
+            if isinstance(client_identifier, list)
+            else client_identifier
+        )
         self.encoding = encoding
 
     @property
@@ -174,9 +178,7 @@ def hooks(self) -> Mapping[Literal["request", "response"], list[Callable]]:
     def hooks(self, hooks: HookTypes) -> None:
         self._hooks = self._rebuild_hooks(hooks)
 
-    def prepare_auth(
-        self, request: Request, auth: AuthTypes, *args, **kwargs
-    ) -> Union[Request, Any]:
+    def prepare_auth(self, request: Request, auth: AuthTypes, *args, **kwargs) -> Union[Request, Any]:
         """Build Auth Request instance"""
 
         if isinstance(auth, tuple) and len(auth) == 2:
@@ -222,7 +224,7 @@ def prepare_proxy(self, proxy: ProxyTypes | None) -> Optional[Proxy]:
             return proxy
         if isinstance(proxy, URL):
             return Proxy(str(proxy))
-        raise TypeError(f"Unsupported proxy type: {type(proxy)}")
+        raise ProxyError(f"Unsupported proxy type: {type(proxy)}")
 
     def prepare_tls_identifier(self, identifier: Optional[str, TLSIdentifierRotator]) -> str:
         if isinstance(identifier, str):
@@ -279,19 +281,15 @@ def build_request(
             timeout=timeout or self.timeout,
         )
 
-    def build_hook_request(
-        self, request: Request, *args, **kwargs
-    ) -> Union[Request, Any]:
+    def build_hook_request(self, request: Request, *args, **kwargs) -> Union[Request, Any]:
         request_hooks = self._rebuild_hooks(self.hooks).get("request")
         if isinstance(request_hooks, Sequence):
             for hook in request_hooks:
                 if callable(hook):
                     return hook(request)
         return None
 
-    def build_hook_response(
-        self, response: Response, *args, **kwargs
-    ) -> Union[Response, Any]:
+    def build_hook_response(self, response: Response, *args, **kwargs) -> Union[Response, Any]:
         request_hooks = self._rebuild_hooks(self.hooks).get("response")
         if isinstance(request_hooks, Sequence):
             for hook in request_hooks:
@@ -308,9 +306,7 @@ def _rebuild_hooks(self, hooks: HookTypes):
             }
         return None
 
-    def _rebuild_redirect_request(
-        self, request: Request, response: Response
-    ) -> Request:
+    def _rebuild_redirect_request(self, request: Request, response: Response) -> Request:
         """Rebuild Redirect Request"""
 
         return Request(
@@ -357,7 +353,8 @@ def _rebuild_redirect_url(self, request: Request, response: Response) -> URL:
                     self.config.sessionId = str(uuid.uuid4())
                 else:
                     raise RemoteProtocolError(
-                        "Switching remote scheme from HTTP/2 to HTTP/1 is not supported. Please initialize Client with parameter `http2` to `auto`."
+                        "Switching remote scheme from HTTP/2 to HTTP/1 is not supported. Please initialize Client with"
+                        " parameter `http2` to `auto`."
                     )
 
         setattr(url, "_url", None)  # reset url
@@ -366,9 +363,7 @@ def _rebuild_redirect_url(self, request: Request, response: Response) -> URL:
 
         return url
 
-    def _send(
-        self, request: Request, *, history: list = None, start: float = None
-    ) -> Response:
+    def _send(self, request: Request, *, history: list = None, start: float = None) -> Response:
         start = start or time.perf_counter()
         tls_identifier = self.prepare_tls_identifier(self.client_identifier)
         config = self.prepare_config(request, tls_identifier=tls_identifier)
@@ -401,14 +396,10 @@ def close(self) -> None:
 
     def __enter__(self: T) -> T:
         if self._state == ClientState.OPENED:
-            raise RuntimeError(
-                "It is not possible to open a client instance more than once."
-            )
+            raise RuntimeError("It is not possible to open a client instance more than once.")
 
         if self._state == ClientState.CLOSED:
-            raise RuntimeError(
-                "The client instance cannot be reopened after it has been closed."
-            )
+            raise RuntimeError("The client instance cannot be reopened after it has been closed.")
 
         self._state = ClientState.OPENED
         return self
@@ -518,7 +509,9 @@ def send(
         if isinstance(self.proxy, ProxyRotator) and response.request.proxy:
             proxy_success = 200 <= response.status_code < 500 and response.status_code not in [407]
             self.proxy.mark_result(
-                proxy=response.request.proxy, success=proxy_success, latency=response.elapsed
+                proxy=response.request.proxy,
+                success=proxy_success,
+                latency=response.elapsed,
             )
 
         if self.hooks.get("response"):
@@ -780,7 +773,7 @@ async def aprepare_proxy(self, proxy: ProxyTypes | None) -> Optional[Proxy]:
             return proxy
         if isinstance(proxy, URL):
             return Proxy(str(proxy))
-        raise TypeError(f"Unsupported proxy type: {type(proxy)}")
+        raise ProxyError(f"Unsupported proxy type: {type(proxy)}")
 
     async def aprepare_tls_identifier(self, identifier) -> str:
         if isinstance(identifier, str):
@@ -1078,7 +1071,9 @@ async def send(
         if isinstance(self.proxy, ProxyRotator) and response.request.proxy:
             proxy_success = 200 <= response.status_code < 500 and response.status_code not in [407]
             await self.proxy.amark_result(
-                proxy=response.request.proxy, success=proxy_success, latency=response.elapsed
+                proxy=response.request.proxy,
+                success=proxy_success,
+                latency=response.elapsed,
             )
 
         if self.hooks.get("response"):
@@ -1091,9 +1086,7 @@ async def send(
         await response.aclose()
         return response
 
-    async def _send(
-        self, request: Request, *, history: list = None, start: float = None
-    ) -> Response:
+    async def _send(self, request: Request, *, history: list = None, start: float = None) -> Response:
         start = start or time.perf_counter()
         tls_identifier = await self.aprepare_tls_identifier(self.client_identifier)
         config = self.prepare_config(request, tls_identifier=tls_identifier)
@@ -1123,14 +1116,10 @@ async def aclose(self) -> None:
 
     async def __aenter__(self: A) -> A:
         if self._state == ClientState.OPENED:
-            raise RuntimeError(
-                "It is not possible to open a client instance more than once."
-            )
+            raise RuntimeError("It is not possible to open a client instance more than once.")
 
         if self._state == ClientState.CLOSED:
-            raise RuntimeError(
-                "The client instance cannot be reopened after it has been closed."
-            )
+            raise RuntimeError("The client instance cannot be reopened after it has been closed.")
 
         self._state = ClientState.OPENED
         return self

tls_requests/exceptions.py

@@ -6,15 +6,18 @@
     pass
 
 __all__ = [
+    "AuthenticationError",
     "CookieConflictError",
     "HTTPError",
-    "URLError",
-    "RemoteProtocolError",
+    "HeaderError",
     "ProtocolError",
+    "RemoteProtocolError",
     "StreamConsumed",
     "StreamError",
-    "TooManyRedirects",
     "TLSError",
+    "RotatorError",
+    "TooManyRedirects",
+    "URLError",
 ]
 
 
@@ -31,6 +34,14 @@ def __init__(self, message: str, **kwargs) -> None:
         super().__init__(message)
 
 
+class AuthenticationError(HTTPError):
+    """Authentication Error"""
+
+
+class HeaderError(HTTPError):
+    """Header Error"""
+
+
 class ProtocolError(HTTPError):
     """Protocol Error"""
 
@@ -81,3 +92,7 @@ class StreamConsumed(StreamError):
 
 class StreamClosed(StreamError):
     pass
+
+
+class RotatorError(HTTPError):
+    pass

tls_requests/models/auth.py

@@ -1,7 +1,8 @@
 from base64 import b64encode
 from typing import Any, Union
 
-from tls_requests.models.request import Request
+from ..exceptions import AuthenticationError
+from .request import Request
 
 
 class Auth:
@@ -22,16 +23,14 @@ def build_auth(self, request: Request):
         return self._build_auth_headers(request)
 
     def _build_auth_headers(self, request: Request):
-        auth_token = b64encode(
-            b":".join([self._encode(self.username), self._encode(self.password)])
-        ).decode()
+        auth_token = b64encode(b":".join([self._encode(self.username), self._encode(self.password)])).decode()
         request.headers["Authorization"] = "Basic %s" % auth_token
 
     def _encode(self, value: Union[str, bytes]) -> bytes:
         if isinstance(self.username, str):
             value = value.encode("latin1")
 
         if not isinstance(value, bytes):
-            raise TypeError("`username` or `password` parameter must be str or byte.")
+            raise AuthenticationError("`username` or `password` parameter must be str or byte.")
 
         return value