Just before cleanup

Author: Sebastian Molenda

pubnub/endpoints/file_operations/download_file.py

@@ -2,7 +2,6 @@
 from pubnub.enums import HttpMethod, PNOperationType
 from pubnub.crypto import PubNubFileCrypto
 from pubnub.models.consumer.file import PNDownloadFileResult
-from pubnub.request_handlers.requests_handler import RequestsRequestHandler
 from pubnub.endpoints.file_operations.get_file_url import GetFileDownloadUrl
 from warnings import warn
 from urllib.parse import urlparse, parse_qs
@@ -86,4 +85,4 @@ def sync(self):
         return super(DownloadFileNative, self).sync()
 
     def pn_async(self, callback):
-        return RequestsRequestHandler(self._pubnub).async_file_based_operation(self.sync, callback, "File Download")
+        self._pubnub.get_request_handler().async_file_based_operation(self.sync, callback, "File Download")

pubnub/endpoints/file_operations/send_file.py

@@ -5,7 +5,6 @@
 from pubnub.models.consumer.file import PNSendFileResult
 from pubnub.endpoints.file_operations.publish_file_message import PublishFileMessage
 from pubnub.endpoints.file_operations.fetch_upload_details import FetchFileUploadS3Data
-from pubnub.request_handlers.requests_handler import RequestsRequestHandler
 from pubnub.endpoints.mixins import TimeTokenOverrideMixin
 from warnings import warn
 
@@ -152,4 +151,4 @@ def sync(self):
         return response_envelope
 
     def pn_async(self, callback):
-        return RequestsRequestHandler(self._pubnub).async_file_based_operation(self.sync, callback, "File Download")
+        self._pubnub.get_request_handler().async_file_based_operation(self.sync, callback, "File Download")

pubnub/pubnub.py

@@ -2,33 +2,45 @@
 import logging
 import threading
 
+from typing import Type
 from threading import Event
 from queue import Queue, Empty
-from . import utils
-from .request_handlers.base import BaseRequestHandler
-from .request_handlers.requests_handler import RequestsRequestHandler
-from .callbacks import SubscribeCallback, ReconnectionCallback
-from .endpoints.presence.heartbeat import Heartbeat
-from .endpoints.presence.leave import Leave
-from .endpoints.pubsub.subscribe import Subscribe
-from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType, PNReconnectionPolicy
-from .managers import SubscriptionManager, PublishSequenceManager, ReconnectionManager, TelemetryManager
-from .models.consumer.common import PNStatus
-from .pnconfiguration import PNConfiguration
-from .pubnub_core import PubNubCore
-from .structures import PlatformOptions
-from .workers import SubscribeMessageWorker
+from pubnub import utils
+from pubnub.request_handlers.base import BaseRequestHandler
+from pubnub.request_handlers.httpx import HttpxRequestHandler
+from pubnub.callbacks import SubscribeCallback, ReconnectionCallback
+from pubnub.endpoints.presence.heartbeat import Heartbeat
+from pubnub.endpoints.presence.leave import Leave
+from pubnub.endpoints.pubsub.subscribe import Subscribe
+from pubnub.enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType, PNReconnectionPolicy
+from pubnub.managers import SubscriptionManager, PublishSequenceManager, ReconnectionManager, TelemetryManager
+from pubnub.models.consumer.common import PNStatus
+from pubnub.pnconfiguration import PNConfiguration
+from pubnub.pubnub_core import PubNubCore
+from pubnub.structures import PlatformOptions
+from pubnub.workers import SubscribeMessageWorker
 
 logger = logging.getLogger("pubnub")
 
 
 class PubNub(PubNubCore):
     """PubNub Python API"""
 
-    def __init__(self, config):
+    def __init__(self, config: PNConfiguration, *, custom_request_handler: Type[BaseRequestHandler] = None):
+        """ PubNub instance constructor
+
+        Parameters:
+            config (PNConfiguration): PNConfiguration instance (required)
+            custom_request_handler (BaseRequestHandler): Custom request handler class (optional)
+
+        """
         assert isinstance(config, PNConfiguration)
         PubNubCore.__init__(self, config)
-        self._request_handler = RequestsRequestHandler(self)
+
+        if isinstance(custom_request_handler, BaseRequestHandler):
+            self._request_handler = custom_request_handler(self)
+        else:
+            self._request_handler = HttpxRequestHandler(self)
 
         if self.config.enable_subscribe:
             self._subscription_manager = NativeSubscriptionManager(self)
@@ -40,10 +52,22 @@ def __init__(self, config):
     def sdk_platform(self):
         return ""
 
-    def set_request_handler(self, handler):
+    def set_request_handler(self, handler: BaseRequestHandler):
+        """Set custom request handler
+
+        Parametrers:
+            handler (BaseRequestHandler): Instance of custom request handler
+        """
         assert isinstance(handler, BaseRequestHandler)
         self._request_handler = handler
 
+    def get_request_handler(self) -> BaseRequestHandler:
+        """Get instance of request handler
+
+        Return: handler(BaseRequestHandler): Instance of request handler
+        """
+        return self._request_handler
+
     def request_sync(self, endpoint_call_options):
         platform_options = PlatformOptions(self.headers, self.config)
 

pubnub/pubnub_asyncio.py

@@ -18,6 +18,9 @@
 from pubnub.endpoints.presence.leave import Leave
 from pubnub.endpoints.pubsub.subscribe import Subscribe
 from pubnub.pubnub_core import PubNubCore
+from pubnub.request_handlers.base import BaseRequestHandler
+from pubnub.request_handlers.httpx import HttpxRequestHandler
+from pubnub.request_handlers.requests import RequestsRequestHandler
 from pubnub.workers import SubscribeMessageWorker
 from pubnub.managers import SubscriptionManager, PublishSequenceManager, ReconnectionManager, TelemetryManager
 from pubnub import utils
@@ -46,7 +49,7 @@ class PubNubAsyncio(PubNubCore):
     PubNub Python SDK for asyncio framework
     """
 
-    def __init__(self, config, custom_event_loop=None, subscription_manager=None):
+    def __init__(self, config, custom_event_loop=None, subscription_manager=None, *, custom_request_handler=None):
         super(PubNubAsyncio, self).__init__(config)
         self.event_loop = custom_event_loop or asyncio.get_event_loop()
 
@@ -55,6 +58,11 @@ def __init__(self, config, custom_event_loop=None, subscription_manager=None):
 
         self._connector = PubNubAsyncHTTPTransport()
 
+        if isinstance(custom_request_handler, BaseRequestHandler):
+            self._request_handler = custom_request_handler(self)
+        else:
+            self._request_handler = RequestsRequestHandler(self)
+
         if not subscription_manager:
             subscription_manager = EventEngineSubscriptionManager
 

pubnub/request_handlers/requests_handler.py renamed to pubnub/request_handlers/httpx.py

@@ -23,18 +23,12 @@
 logger = logging.getLogger("pubnub")
 
 
-class RequestsRequestHandler(BaseRequestHandler):
+class HttpxRequestHandler(BaseRequestHandler):
     """ PubNub Python SDK Native requests handler based on `requests` HTTP library. """
     ENDPOINT_THREAD_COUNTER: int = 0
 
     def __init__(self, pubnub):
         self.session = httpx.Client()
-        # self.session = Session()
-
-        # self.session.mount('http://%s' % pubnub.config.origin, HTTPAdapter(max_retries=1, pool_maxsize=500))
-        # self.session.mount('https://%s' % pubnub.config.origin, HTTPAdapter(max_retries=1, pool_maxsize=500))
-        # self.session.mount('http://%s/v2/subscribe' % pubnub.config.origin, HTTPAdapter(pool_maxsize=500))
-        # self.session.mount('https://%s/v2/subscribe' % pubnub.config.origin, HTTPAdapter(pool_maxsize=500))
 
         self.pubnub = pubnub
 
@@ -89,11 +83,11 @@ def execute_callback_in_separate_thread(
     ):
         client = AsyncHTTPClient(callback_to_invoke_in_another_thread)
 
-        RequestsRequestHandler.ENDPOINT_THREAD_COUNTER += 1
+        HttpxRequestHandler.ENDPOINT_THREAD_COUNTER += 1
 
         thread = threading.Thread(
             target=client.run,
-            name=f"Thread-{operation_name}-{RequestsRequestHandler.ENDPOINT_THREAD_COUNTER}",
+            name=f"Thread-{operation_name}-{HttpxRequestHandler.ENDPOINT_THREAD_COUNTER}",
             daemon=self.pubnub.config.daemon
         ).start()