get_request_headers combomethod

Author: kclowes

tests/core/providers/test_async_http_provider.py

@@ -94,8 +94,8 @@ async def test_async_user_provided_session() -> None:
     assert cached_session == session
 
 
-def test_get_request_headers():
-    provider = AsyncHTTPProvider()
+@pytest.mark.parametrize("provider", (AsyncHTTPProvider(), AsyncHTTPProvider))
+def test_get_request_headers(provider):
     headers = provider.get_request_headers()
     assert len(headers) == 2
     assert headers["Content-Type"] == "application/json"

tests/core/providers/test_http_provider.py

@@ -101,8 +101,8 @@ def test_user_provided_session():
     assert adapter._pool_maxsize == 20
 
 
-def test_get_request_headers():
-    provider = HTTPProvider()
+@pytest.mark.parametrize("provider", (HTTPProvider(), HTTPProvider))
+def test_get_request_headers(provider):
     headers = provider.get_request_headers()
     assert len(headers) == 2
     assert headers["Content-Type"] == "application/json"

web3/_utils/http.py

@@ -1,9 +1,29 @@
+from typing import (
+    TYPE_CHECKING,
+    Type,
+    Union,
+)
+
+if TYPE_CHECKING:
+    from web3 import (
+        AsyncHTTPProvider,
+        HTTPProvider,
+    )
+
 DEFAULT_HTTP_TIMEOUT = 30.0
 
 
-def construct_user_agent(class_type: type) -> str:
+def construct_user_agent(
+    class_type: Union[
+        "AsyncHTTPProvider",
+        "HTTPProvider",
+        Type["HTTPProvider"],
+        Type["AsyncHTTPProvider"],
+    ],
+    class_name: str,
+) -> str:
     from web3 import (
         __version__ as web3_version,
     )
 
-    return f"web3.py/{web3_version}/{class_type.__module__}.{class_type.__qualname__}"
+    return f"web3.py/{web3_version}/{class_type.__module__}.{class_name}"

web3/providers/rpc/async_rpc.py

@@ -19,6 +19,7 @@
     URI,
 )
 from eth_utils import (
+    combomethod,
     to_dict,
 )
 
@@ -67,6 +68,7 @@ def __init__(
         **kwargs: Any,
     ) -> None:
         self._request_session_manager = HTTPSessionManager()
+        self.initialized = True
 
         if endpoint_uri is None:
             self.endpoint_uri = (
@@ -108,10 +110,16 @@ def get_request_kwargs(self) -> Iterable[Tuple[str, Any]]:
             yield "headers", self.get_request_headers()
         yield from self._request_kwargs.items()
 
-    def get_request_headers(self) -> Dict[str, str]:
+    @combomethod
+    def get_request_headers(cls) -> Dict[str, str]:
+        if isinstance(cls, AsyncHTTPProvider):
+            cls_name = cls.__class__.__name__
+        else:
+            cls_name = cls.__name__
+
         return {
             "Content-Type": "application/json",
-            "User-Agent": construct_user_agent(type(self)),
+            "User-Agent": construct_user_agent(cls, cls_name),
         }
 
     async def _make_request(self, method: RPCEndpoint, request_data: bytes) -> bytes:

web3/providers/rpc/rpc.py

@@ -16,6 +16,7 @@
     URI,
 )
 from eth_utils import (
+    combomethod,
     to_dict,
 )
 import requests
@@ -70,6 +71,7 @@ def __init__(
         ] = empty,
         **kwargs: Any,
     ) -> None:
+        self.initialized = True
         self._request_session_manager = HTTPSessionManager()
 
         if endpoint_uri is None:
@@ -116,10 +118,16 @@ def get_request_kwargs(self) -> Iterable[Tuple[str, Any]]:
             yield "headers", self.get_request_headers()
         yield from self._request_kwargs.items()
 
-    def get_request_headers(self) -> Dict[str, str]:
+    @combomethod
+    def get_request_headers(cls) -> Dict[str, str]:
+        if isinstance(cls, HTTPProvider):
+            cls_name = cls.__class__.__name__
+        else:
+            cls_name = cls.__name__
+
         return {
             "Content-Type": "application/json",
-            "User-Agent": construct_user_agent(type(self)),
+            "User-Agent": construct_user_agent(cls, cls_name),
         }
 
     def _make_request(self, method: RPCEndpoint, request_data: bytes) -> bytes: