feat: use httpx instead of requests

mybox/compute.py

@@ -2,14 +2,14 @@
 from abc import ABC, abstractmethod
 from typing import Annotated, Any
 
-import requests
 from bs4 import BeautifulSoup
 from jsonpath_ng import JSONPath as JSONPathT  # type: ignore
 from jsonpath_ng.ext import parse as jsonpath_parse  # type: ignore
 from pydantic import BaseModel, ConfigDict, field_validator
 from pydantic.functional_validators import BeforeValidator
 
 from .filters import Filters, choose
+from .utils import http_get
 
 
 class ValueC(BaseModel, ABC):
@@ -57,7 +57,7 @@ async def compute(self) -> str:
 
 class URL(Derived):
     async def derived_value(self, contents: str) -> str:
-        return requests.get(contents).text
+        return await http_get(contents)
 
 
 class JSONPath(Derived, Filters):

mybox/package/github.py

@@ -1,14 +1,20 @@
+import json
 import os
 from dataclasses import dataclass
 from subprocess import CalledProcessError
 from typing import Any, Iterator, Optional
 
-import requests
 from pydantic import Field
 
 from ..driver import OS, Architecture
 from ..filters import Filter, Filters, choose
-from ..utils import allow_singular_none, async_cached, async_cached_lock, run_output
+from ..utils import (
+    allow_singular_none,
+    async_cached,
+    async_cached_lock,
+    http_get,
+    run_output,
+)
 from .archive import ArchivePackage
 
 
@@ -34,10 +40,9 @@ async def github_api(url: str) -> Any:
     if token:
         headers["Authorization"] = f"token {token}"
 
-    result = requests.get(f"https://api.github.com/{url}", headers=headers)
-    result.raise_for_status()
+    result = await http_get(f"https://api.github.com/{url}", headers=headers)
 
-    return result.json()
+    return json.loads(result)
 
 
 @dataclass

mybox/package/installer/brew.py

@@ -2,10 +2,8 @@
 from dataclasses import dataclass
 from typing import Optional
 
-import requests
-
 from ...driver import RunResultOutput
-from ...utils import async_cached, async_cached_lock
+from ...utils import async_cached, async_cached_lock, http_get
 from .base import PackageCacheInstaller, PackageVersionInfo
 
 
@@ -172,10 +170,9 @@ async def get_package_info(
         # If queried for installed packages, check for any casks with the same
         # names as installed formulae
         if not package:
-            cask_response = requests.get("https://formulae.brew.sh/api/cask.json")
-            cask_response.raise_for_status()
+            cask_response = await http_get("https://formulae.brew.sh/api/cask.json")
 
-            all_casks = cask_response.json()
+            all_casks = json.loads(cask_response)
             for cask in all_casks:
                 name = cask["token"]
                 if name not in results:

mybox/package/system.py

@@ -33,7 +33,7 @@ async def url(self) -> Optional[str]:
 
     async def get_remote_version(self) -> str:
         if url := await self.url():
-            return url_version(url)
+            return await url_version(url)
         if self.auto_updates:
             return "latest"
         return await (await self.installer()).latest_version(self.system)

mybox/package/url.py

@@ -35,4 +35,4 @@ def derive_name(self) -> str:
         return name
 
     async def get_remote_version(self) -> str:
-        return url_version(await self.url())
+        return await url_version(await self.url())

mybox/utils.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Any, Callable, Coroutine, Iterable, Optional, TypeVar, overload
 
-import requests
+import httpx
 import trio
 from pydantic import field_validator
 
@@ -79,8 +79,17 @@ def flatten(items: Iterable[Iterable[T]]) -> list[T]:
     return [item for sublist in items for item in sublist]
 
 
-def url_version(url: str) -> str:
-    head_response = requests.head(url, allow_redirects=True)
+http_client = httpx.AsyncClient()
+
+
+async def http_get(url: str, headers: Optional[dict[str, str]] = None) -> str:
+    response = await http_client.get(url, headers=headers)
+    response.raise_for_status()
+    return response.text
+
+
+async def url_version(url: str) -> str:
+    head_response = await http_client.head(url, follow_redirects=True)
     return head_response.headers["etag"]
 
 

pyproject.toml

@@ -11,12 +11,12 @@ license = "GPL-3.0-or-later"
 pydantic = "^2.8.2"
 python = "^3.11"
 PyYAML = "^6.0.2"
-requests = "^2.32.3"
 trio = "^0.26.2"
 tqdm = "^4.66.5"
 typed-argparse = "^0.3.1"
 jsonpath-ng = "^1.6.1"
 beautifulsoup4 = "^4.12.3"
+httpx = "^0.27.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.8.0"
@@ -31,7 +31,6 @@ pytest-trio = "^0.8.0"
 trio-typing = {extras = ["mypy"], version = "^0.10.0"}
 types-beautifulsoup4 = "^4.12.0.7"
 types-PyYAML = "^6.0.12.12"
-types-requests = "^2.31.0.10"
 types-tqdm = "^4.66.0.4"
 
 [tool.poetry.scripts]