[HTTPXodus] migrate httpx to httpx2 with dual import (closes #1856)

langfuse/_client/client.py

@@ -28,7 +28,10 @@
 )
 
 import backoff
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from opentelemetry import context as otel_context_api
 from opentelemetry import trace as otel_trace_api
 from opentelemetry.sdk.trace import ReadableSpan, TracerProvider

langfuse/_client/resource_manager.py

@@ -23,7 +23,10 @@
 from queue import Full, Queue
 from typing import Any, Callable, Dict, List, Optional, cast
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from opentelemetry import trace as otel_trace_api
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import ReadableSpan, TracerProvider

langfuse/_task_manager/media_manager.py

@@ -4,7 +4,10 @@
 from typing import Any, Callable, Optional, TypeVar, cast
 
 import backoff
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from typing_extensions import ParamSpec
 
 from langfuse._client.environment_variables import LANGFUSE_MEDIA_UPLOAD_ENABLED

langfuse/_utils/request.py

@@ -4,7 +4,10 @@
 from base64 import b64encode
 from typing import Any, List, Union
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 
 from langfuse._utils.serializer import EventSerializer
 from langfuse.logger import langfuse_logger as logger

langfuse/api/client.py

@@ -4,7 +4,10 @@
 
 import typing
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 
 if typing.TYPE_CHECKING:

langfuse/api/core/client_wrapper.py

@@ -2,7 +2,10 @@
 
 import typing
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from .http_client import AsyncHttpClient, HttpClient
 
 

langfuse/api/core/http_client.py

@@ -9,7 +9,10 @@
 from contextlib import asynccontextmanager, contextmanager
 from random import random
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from .file import File, convert_file_dict_to_httpx_tuples
 from .force_multipart import FORCE_MULTIPART
 from .jsonable_encoder import jsonable_encoder

langfuse/api/core/http_response.py

@@ -2,7 +2,10 @@
 
 from typing import Dict, Generic, TypeVar
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 
 # Generic to represent the underlying type of the data wrapped by the HTTP response.
 T = TypeVar("T")

langfuse/api/core/http_sse/_api.py

@@ -4,7 +4,10 @@
 from contextlib import asynccontextmanager, contextmanager
 from typing import Any, AsyncGenerator, AsyncIterator, Iterator, cast
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 from ._decoders import SSEDecoder
 from ._exceptions import SSEError
 from ._models import ServerSentEvent

langfuse/api/core/http_sse/_exceptions.py

@@ -1,6 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 
 
 class SSEError(httpx.TransportError):

langfuse/media.py

@@ -8,7 +8,10 @@
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Any, Literal, Optional, Tuple, TypeVar, cast
 
-import httpx
+try:
+    import httpx2 as httpx
+except ImportError:
+    import httpx
 
 from langfuse.api import MediaContentType
 from langfuse.logger import langfuse_logger as logger

pyproject.toml

@@ -9,6 +9,7 @@ license-files = ["LICENSE"]
 requires-python = ">=3.10,<4.0"
 dependencies = [
     "httpx>=0.15.4,<1.0",
+    "httpx2>=2.12.0; python_version >= \"3.10\"",
     "pydantic>=2,<3",
     "backoff>=1.10.0",
     "wrapt>=1.14,<3",