feat: major release on HTTPX2 migration

packages/gen/gen_ai_hub/_ssl.py

@@ -0,0 +1,15 @@
+"""
+Shared SSL context factory for httpx2 clients.
+
+httpx2 defaults to the OS trust store (truststore). This module preserves
+the pre-migration behaviour of using certifi's CA bundle so existing
+deployments are not affected. Switch callers to verify=True to adopt the
+httpx2 default when ready.
+"""
+import ssl
+import certifi
+
+
+def default_ssl_context() -> ssl.SSLContext:
+    """Return an SSL context backed by certifi's CA bundle."""
+    return ssl.create_default_context(cafile=certifi.where())

packages/gen/gen_ai_hub/batch_service/exceptions.py

@@ -2,7 +2,7 @@
 Exceptions for the batch service module.
 """
 
-import httpx
+import httpx2
 
 
 class BatchServiceError(Exception):
@@ -17,7 +17,7 @@ def __init__(
         request_id: str,
         message: str,
         status_code: int,
-        headers: httpx.Headers,
+        headers: httpx2.Headers,
     ):
         self.request_id = request_id
         self.message = message

packages/gen/gen_ai_hub/batch_service/service.py

@@ -7,7 +7,8 @@
 
 from typing import Optional, Union
 
-import httpx
+import httpx2
+from gen_ai_hub._ssl import default_ssl_context
 
 from gen_ai_hub import GenAIHubProxyClient
 from gen_ai_hub.proxy import get_proxy_client
@@ -25,11 +26,11 @@
 _BASE_PATH = "/llm-batch-service/v1/batches"
 
 
-def _handle_http_error(response: httpx.Response) -> None:
+def _handle_http_error(response: httpx2.Response) -> None:
     """Raises BatchServiceError from a non-2xx httpx response."""
     try:
         response.raise_for_status()
-    except httpx.HTTPStatusError as error:
+    except httpx2.HTTPStatusError as error:
         try:
             payload = response.json()
             request_id = payload.get('request_id', '')
@@ -65,16 +66,16 @@ class BatchService:
     :param resource_group: Value for the ``AI-Resource-Group`` header. Falls back
                         to the resource group on ``proxy_client`` when omitted.
     :type resource_group: str, Optional
-    :param timeout: Default HTTP request timeout passed to httpx.
-    :type timeout: Union[int, float, httpx.Timeout], Optional
+    :param timeout: Default HTTP request timeout passed to httpx2.
+    :type timeout: Union[int, float, httpx2.Timeout], Optional
     """
 
     def __init__(
         self,
         api_url: Optional[str] = None,
         proxy_client: Optional[GenAIHubProxyClient] = None,
         resource_group: Optional[str] = None,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ):
         self.proxy_client = proxy_client or get_proxy_client(proxy_version="gen-ai-hub")
         if api_url:
@@ -84,8 +85,8 @@ def __init__(
             self.api_url = base
         self.resource_group = resource_group
         self.timeout = timeout
-        self.client = httpx.Client(timeout=self.timeout)
-        self.async_client = httpx.AsyncClient(timeout=self.timeout)
+        self.client = httpx2.Client(timeout=self.timeout, verify=default_ssl_context())
+        self.async_client = httpx2.AsyncClient(timeout=self.timeout, verify=default_ssl_context())
 
     # ------------------------------------------------------------------
     # Internal helpers
@@ -98,13 +99,13 @@ def _headers(self) -> dict:
         return headers
 
     def _determine_timeout(
-        self, timeout: Union[int, float, httpx.Timeout, None]
-    ) -> Union[int, float, httpx.Timeout]:
+        self, timeout: Union[int, float, httpx2.Timeout, None]
+    ) -> Union[int, float, httpx2.Timeout]:
         if timeout is not None:
             return timeout
         if self.timeout is not None:
             return self.timeout
-        return httpx.USE_CLIENT_DEFAULT
+        return httpx2.USE_CLIENT_DEFAULT
 
     def _batches_url(self, *segments: str) -> str:
         parts = [self.api_url + _BASE_PATH] + list(segments)
@@ -122,7 +123,7 @@ def create(
         output_uri: str,
         provider: str,
         model: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchCreateResponse:
         """Create a new batch processing job.
 
@@ -137,7 +138,7 @@ def create(
         :param model: Model name (e.g. ``"gpt-4.1-mini"``).
         :type model: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchCreateResponse` with the job ID and initial status.
         """
         body = BatchCreateRequest(
@@ -158,12 +159,12 @@ def create(
 
     def list(
         self,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchListResponse:
         """List all batch jobs for the current resource group.
 
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchListResponse` containing the batch summaries.
         """
         response = self.client.get(
@@ -178,14 +179,14 @@ def list(
     def get(
         self,
         batch_id: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchDetailResponse:
         """Retrieve details of a specific batch job.
 
         :param batch_id: UUID of the batch job.
         :type batch_id: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchDetailResponse` with full job details.
         """
         response = self.client.get(
@@ -200,14 +201,14 @@ def get(
     def get_status(
         self,
         batch_id: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchStatusResponse:
         """Retrieve the current status of a batch job.
 
         :param batch_id: UUID of the batch job.
         :type batch_id: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchStatusResponse` with current and target status.
         """
         response = self.client.get(
@@ -222,14 +223,14 @@ def get_status(
     def cancel(
         self,
         batch_id: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchCancelResponse:
         """Schedule a batch job for cancellation.
 
         :param batch_id: UUID of the batch job.
         :type batch_id: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchCancelResponse` confirming the cancellation request.
         """
         response = self.client.patch(
@@ -244,14 +245,14 @@ def cancel(
     def delete(
         self,
         batch_id: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchDeleteResponse:
         """Delete a batch job (only allowed for terminal states: COMPLETED, FAILED, CANCELLED).
 
         :param batch_id: UUID of the batch job.
         :type batch_id: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchDeleteResponse` confirming the deletion.
         """
         response = self.client.delete(
@@ -275,7 +276,7 @@ async def acreate(
         output_uri: str,
         provider: str,
         model: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchCreateResponse:
         """Async variant of :meth:`create`.
 
@@ -290,7 +291,7 @@ async def acreate(
         :param model: Model name (e.g. ``"gpt-4.1-mini"``).
         :type model: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchCreateResponse` with the job ID and initial status.
         """
         body = BatchCreateRequest(
@@ -311,12 +312,12 @@ async def acreate(
 
     async def alist(
         self,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchListResponse:
         """Async variant of :meth:`list`.
 
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchListResponse` containing the batch summaries.
         """
         response = await self.async_client.get(
@@ -331,14 +332,14 @@ async def alist(
     async def aget(
         self,
         batch_id: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchDetailResponse:
         """Async variant of :meth:`get`.
 
         :param batch_id: UUID of the batch job.
         :type batch_id: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchDetailResponse` with full job details.
         """
         response = await self.async_client.get(
@@ -353,14 +354,14 @@ async def aget(
     async def aget_status(
         self,
         batch_id: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchStatusResponse:
         """Async variant of :meth:`get_status`.
 
         :param batch_id: UUID of the batch job.
         :type batch_id: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchStatusResponse` with current and target status.
         """
         response = await self.async_client.get(
@@ -375,14 +376,14 @@ async def aget_status(
     async def acancel(
         self,
         batch_id: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchCancelResponse:
         """Async variant of :meth:`cancel`.
 
         :param batch_id: UUID of the batch job.
         :type batch_id: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchCancelResponse` confirming the cancellation request.
         """
         response = await self.async_client.patch(
@@ -397,14 +398,14 @@ async def acancel(
     async def adelete(
         self,
         batch_id: str,
-        timeout: Union[int, float, httpx.Timeout, None] = None,
+        timeout: Union[int, float, httpx2.Timeout, None] = None,
     ) -> BatchDeleteResponse:
         """Async variant of :meth:`delete`.
 
         :param batch_id: UUID of the batch job.
         :type batch_id: str
         :param timeout: Per-request timeout override.
-        :type timeout: Union[int, float, httpx.Timeout], Optional
+        :type timeout: Union[int, float, httpx2.Timeout], Optional
         :returns: :class:`BatchDeleteResponse` confirming the deletion.
         """
         response = await self.async_client.delete(

packages/gen/gen_ai_hub/orchestration/exceptions.py

@@ -1,4 +1,4 @@
-import httpx
+import httpx2
 from typing import Dict, Any
 
 
@@ -12,7 +12,7 @@ class OrchestrationError(Exception):
     def __init__(
         self,
         request_id: str,
-        http_headers: httpx.Headers,
+        http_headers: httpx2.Headers,
         message: str,
         code: int,
         location: str,
@@ -24,7 +24,7 @@ def __init__(
         :param request_id: unique identifier for the request
         :type request_id: str
         :param http_headers: the HTTP headers associated with the error, useful in case of e.g. rate limiting.
-        :type http_headers: httpx.Headers
+        :type http_headers: httpx2.Headers
         :param message: Detailed error message describing the issue.
         :type message: str
         :param code: Error code associated with the specific type of failure