[HTTPXodus] migrate httpx to httpx2 with dual import

pyproject.toml

@@ -12,6 +12,7 @@ authors = [{ name = "Replicate, Inc." }]
 requires-python = ">=3.8"
 dependencies = [
     "httpx>=0.21.0,<1",
+    "httpx2>=2.12.0; python_version >= \"3.10\"",
     "packaging",
     "pydantic>1.10.7",
     "typing_extensions>=4.5.0",

replicate/client.py

@@ -16,7 +16,10 @@
     Union,
 )
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from typing_extensions import Unpack
 
 from replicate.__about__ import __version__

replicate/exceptions.py

@@ -1,6 +1,9 @@
 from typing import TYPE_CHECKING, Optional
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 
 if TYPE_CHECKING:
     from replicate.prediction import Prediction

replicate/prediction.py

@@ -16,7 +16,10 @@
     overload,
 )
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from typing_extensions import NotRequired, TypedDict, Unpack
 
 from replicate.exceptions import ModelError, ReplicateError

replicate/stream.py

@@ -10,7 +10,10 @@
     Union,
 )
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from typing_extensions import Unpack
 
 from replicate import identifier

replicate/webhook.py

@@ -11,6 +11,9 @@
 from replicate.resource import Namespace, Resource
 
 if TYPE_CHECKING:
+    try:
+    import httpx2 as httpx
+except ImportError:
     import httpx