Skip to content

Commit 7e34a35

Browse files
fix mypy
Signed-off-by: Vikrant Puppala <vikrant.puppala@databricks.com>
1 parent 341d1c5 commit 7e34a35

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

src/databricks/sql/auth/thrift_http_client.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323

2424

2525
class THttpClient(thrift.transport.THttpClient.THttpClient):
26+
realhost: Optional[str]
27+
realport: Optional[int]
28+
proxy_uri: Optional[str]
29+
proxy_auth: Optional[Dict[str, str]]
30+
2631
def __init__(
2732
self,
2833
auth_provider,
@@ -75,7 +80,7 @@ def __init__(
7580
self.realhost = self.host
7681
self.realport = self.port
7782
# this is passed to ProxyManager
78-
self.proxy_uri: str = proxy_uri
83+
self.proxy_uri = proxy_uri
7984
self.host = parsed_proxy.hostname
8085
self.port = parsed_proxy.port
8186
self.proxy_auth = proxy_auth

src/databricks/sql/backend/sea/utils/http_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class SeaHttpClient:
3333
retry_policy: Union[DatabricksRetryPolicy, int]
3434
_pool: Optional[Union[HTTPConnectionPool, HTTPSConnectionPool]]
3535
proxy_uri: Optional[str]
36-
proxy_host: Optional[str]
37-
proxy_port: Optional[int]
3836
proxy_auth: Optional[Dict[str, str]]
37+
realhost: Optional[str]
38+
realport: Optional[int]
3939

4040
def __init__(
4141
self,
@@ -172,8 +172,8 @@ def _open(self):
172172
proxy_headers=self.proxy_auth,
173173
)
174174
self._pool = proxy_manager.connection_from_host(
175-
host=self.proxy_host,
176-
port=self.proxy_port,
175+
host=self.realhost,
176+
port=self.realport,
177177
scheme=self.scheme,
178178
pool_kwargs=pool_kwargs,
179179
)

src/databricks/sql/common/http_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def detect_and_parse_proxy(
6060
return proxy, proxy_headers
6161

6262

63-
def _generate_negotiate_headers(proxy_hostname: str) -> Optional[Dict[str, str]]:
63+
def _generate_negotiate_headers(proxy_hostname: Optional[str]) -> Optional[Dict[str, str]]:
6464
"""Generate Kerberos/SPNEGO authentication headers"""
6565
try:
6666
from requests_kerberos import HTTPKerberosAuth

src/databricks/sql/common/unified_http_client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def request_context(
231231
**kwargs: Additional arguments passed to urllib3 request
232232
233233
Yields:
234-
urllib3.HTTPResponse: The HTTP response object
234+
urllib3.BaseHTTPResponse: The HTTP response object
235235
"""
236236
logger.debug(
237237
"Making %s request to %s", method, urllib.parse.urlparse(url).netloc
@@ -268,7 +268,7 @@ def request(
268268
url: str,
269269
headers: Optional[Dict[str, str]] = None,
270270
**kwargs,
271-
) -> urllib3.HTTPResponse:
271+
) -> urllib3.BaseHTTPResponse:
272272
"""
273273
Make an HTTP request.
274274
@@ -279,12 +279,12 @@ def request(
279279
**kwargs: Additional arguments passed to urllib3 request
280280
281281
Returns:
282-
urllib3.HTTPResponse: The HTTP response object with data and metadata pre-loaded
282+
urllib3.BaseHTTPResponse: The HTTP response object with data and metadata pre-loaded
283283
"""
284284
with self.request_context(method, url, headers=headers, **kwargs) as response:
285285
# Read the response data to ensure it's available after context exit
286286
# Note: status and headers remain accessible after close(), only data needs caching
287-
response._body = response.data
287+
response.read()
288288
return response
289289

290290
def using_proxy(self) -> bool:

0 commit comments

Comments
 (0)