Moved raw_request functions from stripe module to StripeClient class

README.md

@@ -266,15 +266,16 @@ stripe.add_beta_version("feature_beta", "v3")
 
 ### Custom requests
 
-If you would like to send a request to an undocumented API (for example you are in a private beta), or if you prefer to bypass the method definitions in the library and specify your request details directly, you can use the `raw_request` method on `stripe`.
+If you would like to send a request to an undocumented API (for example you are in a private beta), or if you prefer to bypass the method definitions in the library and specify your request details directly, you can use the `raw_request` method on `StripeClient`.
 
 ```python
-response = stripe.raw_request(
+client = StripeClient("sk_test_...")
+response = client.raw_request(
     "post", "/v1/beta_endpoint", param=123, stripe_version="2022-11-15; feature_beta=v3"
 )
 
-# (Optional) response is a StripeResponse. You can use `stripe.deserialize` to get a StripeObject.
-deserialized_resp = stripe.deserialize(response)
+# (Optional) response is a StripeResponse. You can use `deserialize` on `StripeClient` to get a StripeObject.
+deserialized_resp = client.deserialize(response)
 ```
 
 ### Async

stripe/__init__.py

@@ -55,11 +55,6 @@
     Webhook as Webhook,
     WebhookSignature as WebhookSignature,
 )
-from stripe._raw_request import raw_request as raw_request  # noqa
-from stripe._raw_request import raw_request_async as raw_request_async  # noqa
-from stripe._raw_request import deserialize as deserialize  # noqa
-
-from stripe._preview import preview as preview  # noqa
 
 # StripeClient
 from stripe._stripe_client import StripeClient as StripeClient  # noqa

stripe/_api_requestor.py

@@ -468,7 +468,7 @@ def _args_for_request_with_retries(
         usage: Optional[List[str]] = None,
     ):
         """
-        Mechanism for issuing an API call
+        Mechanism for issuing an API call.  Used by request_raw and request_raw_async.
         """
         request_options = merge_options(self._options, options)
 

stripe/_stripe_client.py

@@ -11,6 +11,7 @@
 
 from stripe._error import AuthenticationError
 from stripe._api_requestor import _APIRequestor
+from stripe._request_options import extract_options_from_dict
 from stripe._requestor_options import RequestorOptions, BaseAddresses
 from stripe._client_options import _ClientOptions
 from stripe._http_client import (
@@ -19,10 +20,13 @@
     new_http_client_async_fallback,
 )
 from stripe._api_version import _ApiVersion
+from stripe._stripe_object import StripeObject
+from stripe._stripe_response import StripeResponse
+from stripe._util import _convert_to_stripe_object
 from stripe._webhook import Webhook, WebhookSignature
 from stripe._event import Event
 
-from typing import Optional, Union, cast
+from typing import Any, Dict, Optional, Union, cast
 
 # Non-generated services
 from stripe._oauth_service import OAuthService
@@ -146,7 +150,7 @@ def __init__(
             **base_addresses,
         }
 
-        requestor_options = RequestorOptions(
+        self._requestor_options = RequestorOptions(
             api_key=api_key,
             stripe_account=stripe_account,
             stripe_version=stripe_version or _ApiVersion.CURRENT,
@@ -164,7 +168,7 @@ def __init__(
             )
 
         self._requestor = _APIRequestor(
-            options=requestor_options,
+            options=self._requestor_options,
             client=http_client,
         )
 
@@ -280,3 +284,62 @@ def construct_event(
         )
 
         return event
+
+    def raw_request(self, method_: str, url_: str, **params):
+        params = params.copy()
+        options, params = extract_options_from_dict(params)
+        api_mode = params.pop("api_mode", None)
+        base_address = params.pop("base", "api")
+
+        stripe_context = params.pop("stripe_context", None)
+
+        # stripe-context goes *here* and not in api_requestor. Properties
+        # go on api_requestor when you want them to persist onto requests
+        # made when you call instance methods on APIResources that come from
+        # the first request. No need for that here, as we aren't deserializing APIResources
+        if stripe_context is not None:
+            options["headers"] = options.get("headers", {})
+            assert isinstance(options["headers"], dict)
+            options["headers"].update({"Stripe-Context": stripe_context})
+
+        rbody, rcode, rheaders = self._requestor.request_raw(
+            method_,
+            url_,
+            params=params,
+            options=options,
+            base_address=base_address,
+            api_mode=api_mode,
+            usage=["raw_request"],
+        )
+
+        return self._requestor._interpret_response(rbody, rcode, rheaders)
+
+    async def raw_request_async(self, method_: str, url_: str, **params):
+        params = params.copy()
+        options, params = extract_options_from_dict(params)
+        api_mode = params.pop("api_mode", None)
+        base_address = params.pop("base", "api")
+
+        rbody, rcode, rheaders = await self._requestor.request_raw_async(
+            method_,
+            url_,
+            params=params,
+            options=options,
+            base_address=base_address,
+            api_mode=api_mode,
+            usage=["raw_request"],
+        )
+
+        return self._requestor._interpret_response(rbody, rcode, rheaders)
+
+    def deserialize(
+        self,
+        resp: Union[StripeResponse, Dict[str, Any]],
+        params: Optional[Dict[str, Any]] = None,
+    ) -> StripeObject:
+        return _convert_to_stripe_object(
+            resp=resp,
+            params=params,
+            requestor=self._requestor,
+            api_mode="V1",
+        )

tests/test_integration.py

@@ -13,6 +13,8 @@
 from collections import defaultdict
 from typing import List, Dict, Tuple, Optional
 
+from stripe._stripe_client import StripeClient
+
 if platform.python_implementation() == "PyPy":
     pytest.skip("skip integration tests with PyPy", allow_module_level=True)
 
@@ -359,12 +361,16 @@ class MockServerRequestHandler(MyTestHandler):
 
         self.setup_mock_server(MockServerRequestHandler)
 
-        stripe.api_base = "http://localhost:%s" % self.mock_server_port
-
-        resp = await stripe.raw_request_async(
+        client = StripeClient(
+            "sk_test_123",
+            base_addresses={
+                "api": "http://localhost:%s" % self.mock_server_port
+            },
+        )
+        resp = await client.raw_request_async(
             "post", "/v1/customers", description="My test customer"
         )
-        cus = stripe.deserialize(resp.data)
+        cus = client.deserialize(resp.data)
 
         reqs = MockServerRequestHandler.get_requests(1)
         req = reqs[0]
@@ -382,7 +388,6 @@ def do_request(self, n):
                 return super().do_request(n)
 
         self.setup_mock_server(MockServerRequestHandler)
-        stripe.api_base = "http://localhost:%s" % self.mock_server_port
         # If we set HTTPX's generic timeout the test is flaky (sometimes it's a ReadTimeout, sometimes its a ConnectTimeout)
         # so we set only the read timeout specifically.
         hc = stripe.default_http_client
@@ -396,11 +401,18 @@ def do_request(self, n):
             expected_message = "A ServerTimeoutError was raised"
         else:
             raise ValueError(f"Unknown http client: {hc.name}")
-        stripe.max_network_retries = 0
 
         exception = None
         try:
-            await stripe.raw_request_async(
+            client = StripeClient(
+                "sk_test_123",
+                http_client=hc,
+                base_addresses={
+                    "api": "http://localhost:%s" % self.mock_server_port
+                },
+                max_network_retries=0,
+            )
+            await client.raw_request_async(
                 "post", "/v1/customers", description="My test customer"
             )
         except stripe.APIConnectionError as e:
@@ -426,9 +438,15 @@ def do_request(self, n):
             pass
 
         self.setup_mock_server(MockServerRequestHandler)
-        stripe.api_base = "http://localhost:%s" % self.mock_server_port
 
-        await stripe.raw_request_async(
+        client = StripeClient(
+            "sk_test_123",
+            base_addresses={
+                "api": "http://localhost:%s" % self.mock_server_port
+            },
+            max_network_retries=stripe.max_network_retries,
+        )
+        await client.raw_request_async(
             "post", "/v1/customers", description="My test customer"
         )
 
@@ -451,11 +469,16 @@ def do_request(self, n):
             pass
 
         self.setup_mock_server(MockServerRequestHandler)
-        stripe.api_base = "http://localhost:%s" % self.mock_server_port
 
         exception = None
         try:
-            await stripe.raw_request_async(
+            client = StripeClient(
+                "sk_test_123",
+                base_addresses={
+                    "api": "http://localhost:%s" % self.mock_server_port
+                },
+            )
+            await client.raw_request_async(
                 "post", "/v1/customers", description="My test customer"
             )
         except stripe.AuthenticationError as e: