Merge pull request #1474 from weaviate/update_httpx

Enable new httpx versions

Author: dirkkul

requirements-devel.txt

@@ -1,4 +1,4 @@
-httpx==0.25.2
+httpx==0.26.0
 validators==0.34.0
 authlib==1.3.1
 grpcio==1.66.2

setup.cfg

@@ -29,7 +29,7 @@ packages =
 platforms = any
 include_package_data = True
 install_requires =
-    httpx>=0.25.0,<=0.27.0
+    httpx>=0.26.0,<0.29.0
     validators==0.34.0
     authlib>=1.2.1,<1.3.2
     pydantic>=2.8.0,<3.0.0

weaviate/connect/authentication_async.py

@@ -17,7 +17,7 @@
 from ..warnings import _Warnings
 
 if TYPE_CHECKING:
-    from .base import _ConnectionBase
+    from . import ConnectionV4
 
 AUTH_DEFAULT_TIMEOUT = 5
 OIDC_CONFIG = Dict[str, Union[str, List[str]]]
@@ -28,7 +28,7 @@ def __init__(
         self,
         oidc_config: OIDC_CONFIG,
         credentials: AuthCredentials,
-        connection: _ConnectionBase,
+        connection: ConnectionV4,
     ) -> None:
         self._credentials: AuthCredentials = credentials
         self._connection = connection
@@ -48,7 +48,7 @@ def __init__(
 
     @classmethod
     async def use(
-        cls, oidc_config: OIDC_CONFIG, credentials: AuthCredentials, connection: _ConnectionBase
+        cls, oidc_config: OIDC_CONFIG, credentials: AuthCredentials, connection: ConnectionV4
     ) -> _Auth:
         auth = cls(oidc_config, credentials, connection)
         auth._token_endpoint = await auth._get_token_endpoint()
@@ -76,7 +76,7 @@ async def _validate(self, oidc_config: OIDC_CONFIG) -> None:
     async def _get_token_endpoint(self) -> str:
         if self._token_endpoint is not None:
             return self._token_endpoint
-        async with httpx.AsyncClient(proxies=self._connection.get_proxies()) as client:
+        async with httpx.AsyncClient(mounts=self._connection._make_mounts()) as client:
             response_auth = await client.get(self._open_id_config_url)
         response_auth_json = _decode_json_response_dict(response_auth, "Get token endpoint")
         assert response_auth_json is not None

weaviate/connect/base.py

@@ -1,7 +1,6 @@
 import datetime
 import os
 import time
-from abc import ABC, abstractmethod
 from typing import Any, Dict, Mapping, Sequence, Tuple, TypeVar, Union, cast, Optional
 from urllib.parse import urlparse
 
@@ -139,17 +138,7 @@ def _http_url(self) -> str:
         return f"{self._http_scheme}://{self.http.host}:{self.http.port}"
 
 
-class _ConnectionBase(ABC):
-    @abstractmethod
-    def get_current_bearer_token(self) -> str:
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_proxies(self) -> dict:
-        raise NotImplementedError
-
-
-def _get_proxies(proxies: Union[dict, str, Proxies, None], trust_env: bool) -> dict:
+def _get_proxies(proxies: Union[dict, str, Proxies, None], trust_env: bool) -> Dict[str, str]:
     """
     Get proxies as dict, compatible with 'requests' library.
     NOTE: 'proxies' has priority over 'trust_env', i.e. if 'proxies' is NOT None, 'trust_env'

weaviate/connect/v4.py

@@ -44,7 +44,6 @@
 from weaviate.connect.base import (
     ConnectionParams,
     JSONPayload,
-    _ConnectionBase,
     _get_proxies,
 )
 from weaviate.connect.integrations import _IntegrationConfig
@@ -87,7 +86,7 @@ def __post_init__(self) -> None:
             self.ok = self.ok_in
 
 
-class ConnectionV4(_ConnectionBase):
+class ConnectionV4:
     """
     Connection class used to communicate to a weaviate instance.
     """
@@ -217,7 +216,7 @@ def set_integrations(self, integrations_config: List[_IntegrationConfig]) -> Non
             self._headers.update(integration._to_header())
             self.__additional_headers.update(integration._to_header())
 
-    def __make_mounts(self) -> Dict[str, AsyncHTTPTransport]:
+    def _make_mounts(self) -> Dict[str, AsyncHTTPTransport]:
         return {
             f"{key}://" if key == "http" or key == "https" else key: AsyncHTTPTransport(
                 limits=Limits(
@@ -235,7 +234,7 @@ def __make_mounts(self) -> Dict[str, AsyncHTTPTransport]:
     def __make_async_client(self) -> AsyncClient:
         return AsyncClient(
             headers=self._headers,
-            mounts=self.__make_mounts(),
+            mounts=self._make_mounts(),
             trust_env=self.__trust_env,
         )
 
@@ -596,7 +595,7 @@ def server_version(self) -> str:
         """
         return str(self._weaviate_version)
 
-    def get_proxies(self) -> dict:
+    def get_proxies(self) -> Dict[str, str]:
         return self._proxies
 
     @property