smartystreets-python-sdk 5.5.0__tar.gz → 5.6.0__tar.gz

{smartystreets_python_sdk-5.5.0 → smartystreets_python_sdk-5.6.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: smartystreets_python_sdk
-Version: 5.5.0
+Version: 5.6.0
 Summary: An official library to help Python developers easily access the SmartyStreets APIs
 Home-page: https://github.com/smartystreets/smartystreets-python-sdk
-Download-URL: https://github.com/smartystreets/smartystreets-python-sdk/tarball/5.5.0
+Download-URL: https://github.com/smartystreets/smartystreets-python-sdk/tarball/5.6.0
 Author: SmartyStreets SDK Team
 Author-email: support@smartystreets.com
 License: Apache 2

{smartystreets_python_sdk-5.5.0 → smartystreets_python_sdk-5.6.0}/smartystreets_python_sdk/client_builder.py

@@ -62,7 +62,7 @@ class ClientBuilder:
 
     def with_sender(self, sender):
         """
-        Default is a series of nested senders. (See build_sender()
+        Sets the innermost HTTP transport sender while keeping the full middleware chain intact.
 
         Returns self to accommodate method chaining.
         """
@@ -255,15 +255,30 @@ class ClientBuilder:
 
     def build_sender(self):
         if self.http_sender is not None:
-            return self.http_sender
-
-        sender = smarty.RequestsSender(self.max_timeout, self.proxy, self.ip, self.pool_size)
-        sender.debug = self.debug
+            conflicts = []
+            if self.max_timeout != 10:
+                conflicts.append("with_max_timeout()")
+            if self.proxy is not None:
+                conflicts.append("with_http_proxy()/with_https_proxy()")
+            if self.debug is not None:
+                conflicts.append("with_debug()")
+            if self.pool_size is not None:
+                conflicts.append("with_connection_pool_size()")
+            if conflicts:
+                raise ValueError("with_sender() cannot be combined with: {}. These options only apply to the built-in HTTP transport.".format(", ".join(conflicts)))
+            sender = self.http_sender
+        else:
+            sender = smarty.RequestsSender(self.max_timeout, self.proxy, self.pool_size)
+            sender.debug = self.debug
 
         sender = smarty.StatusCodeSender(sender)
 
-        if self.header is not None:
-            sender = smarty.CustomHeaderSender(self.header, sender, self.append_headers)
+        effective_header = dict(self.header) if self.header is not None else {}
+        if self.ip is not None:
+            effective_header['X-Forwarded-For'] = self.ip
+
+        if effective_header:
+            sender = smarty.CustomHeaderSender(effective_header, sender, self.append_headers)
 
         if self.custom_queries is not None:
             sender = smarty.CustomQuerySender(self.custom_queries, sender)

{smartystreets_python_sdk-5.5.0 → smartystreets_python_sdk-5.6.0}/smartystreets_python_sdk/requests_sender.py

@@ -6,17 +6,15 @@ import smartystreets_python_sdk_version as version
 
 
 class RequestsSender:
-    def __init__(self, max_timeout=None, proxy=None, ip=None, pool_size=None):
+    def __init__(self, max_timeout=None, proxy=None, pool_size=None):
         self.session = Session()
         self.max_timeout = max_timeout or 10
         self.proxy = proxy
         self.debug = None
-        self.ip = ip
         self.pool_size = pool_size
 
     def send(self, smarty_request):
-        ip = self.ip
-        request = build_request(smarty_request, ip)
+        request = build_request(smarty_request)
         if (self.pool_size != None):
             adapter = requests.adapters.HTTPAdapter(pool_connections=self.pool_size, pool_maxsize=self.pool_size)
             self.session.mount('https://', adapter)
@@ -50,15 +48,13 @@ class RequestsSender:
             return {'http': proxy_string, 'https': proxy_string}
 
 
-def build_request(smarty_request, ip=None):
+def build_request(smarty_request):
     try:
         request = Request(url=smarty_request.url_prefix, params=smarty_request.parameters)
         request.headers['User-Agent'] = "smartystreets (sdk:python@{})".format(version.__version__)
         request.headers['Content-Type'] = smarty_request.content_type
         if smarty_request.referer:
             request.headers['Referer'] = smarty_request.referer
-        if ip != None:
-            request.headers['X-Forwarded-For'] = ip
         if smarty_request.auth:
             request.auth = smarty_request.auth
         if smarty_request.payload:

{smartystreets_python_sdk-5.5.0 → smartystreets_python_sdk-5.6.0}/smartystreets_python_sdk.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: smartystreets_python_sdk
-Version: 5.5.0
+Version: 5.6.0
 Summary: An official library to help Python developers easily access the SmartyStreets APIs
 Home-page: https://github.com/smartystreets/smartystreets-python-sdk
-Download-URL: https://github.com/smartystreets/smartystreets-python-sdk/tarball/5.5.0
+Download-URL: https://github.com/smartystreets/smartystreets-python-sdk/tarball/5.6.0
 Author: SmartyStreets SDK Team
 Author-email: support@smartystreets.com
 License: Apache 2

{smartystreets_python_sdk-5.5.0 → smartystreets_python_sdk-5.6.0}/smartystreets_python_sdk_version/__init__.py

@@ -1,2 +1,2 @@
 __version__ = '0.0.0'  # DO NOT EDIT (this is updated by a build job when a new release is published)
-__version__="5.5.0"
+__version__="5.6.0"