remove repetition from Session.__init__

Signed-off-by: varun-edachali-dbx <[email protected]>

Author: varun-edachali-dbx

src/databricks/sql/backend/thrift_backend.py

@@ -592,17 +592,17 @@ def open_session(self, session_configuration, catalog, schema) -> SessionId:
             response = self.make_request(self._client.OpenSession, open_session_req)
             self._check_initial_namespace(catalog, schema, response)
             self._check_protocol_version(response)
-            self._session_id_hex = (
-                self.handle_to_hex_id(response.sessionHandle)
-                if response.sessionHandle
-                else None
-            )
+
             properties = (
                 {"serverProtocolVersion": response.serverProtocolVersion}
                 if response.serverProtocolVersion
                 else {}
             )
-            return SessionId.from_thrift_handle(response.sessionHandle, properties)
+            session_id = SessionId.from_thrift_handle(
+                response.sessionHandle, properties
+            )
+            self._session_id_hex = session_id.hex_guid
+            return session_id
         except:
             self._transport.close()
             raise

src/databricks/sql/client.py

@@ -242,47 +242,15 @@ def read(self) -> Optional[OAuthToken]:
 
         self.disable_pandas = kwargs.get("_disable_pandas", False)
         self.lz4_compression = kwargs.get("enable_query_result_lz4_compression", True)
-
-        auth_provider = get_python_sql_connector_auth_provider(
-            server_hostname, **kwargs
-        )
+        self.use_cloud_fetch = kwargs.get("use_cloud_fetch", True)
+        self._cursors = []  # type: List[Cursor]
 
         self.server_telemetry_enabled = True
         self.client_telemetry_enabled = kwargs.get("enable_telemetry", False)
         self.telemetry_enabled = (
             self.client_telemetry_enabled and self.server_telemetry_enabled
         )
 
-        user_agent_entry = kwargs.get("user_agent_entry")
-        if user_agent_entry is None:
-            user_agent_entry = kwargs.get("_user_agent_entry")
-            if user_agent_entry is not None:
-                logger.warning(
-                    "[WARN] Parameter '_user_agent_entry' is deprecated; use 'user_agent_entry' instead. "
-                    "This parameter will be removed in the upcoming releases."
-                )
-
-        if user_agent_entry:
-            useragent_header = "{}/{} ({})".format(
-                USER_AGENT_NAME, __version__, user_agent_entry
-            )
-        else:
-            useragent_header = "{}/{}".format(USER_AGENT_NAME, __version__)
-
-        base_headers = [("User-Agent", useragent_header)]
-
-        self._ssl_options = SSLOptions(
-            # Double negation is generally a bad thing, but we have to keep backward compatibility
-            tls_verify=not kwargs.get(
-                "_tls_no_verify", False
-            ),  # by default - verify cert and host
-            tls_verify_hostname=kwargs.get("_tls_verify_hostname", True),
-            tls_trusted_ca_file=kwargs.get("_tls_trusted_ca_file"),
-            tls_client_cert_file=kwargs.get("_tls_client_cert_file"),
-            tls_client_cert_key_file=kwargs.get("_tls_client_cert_key_file"),
-            tls_client_cert_key_password=kwargs.get("_tls_client_cert_key_password"),
-        )
-
         self.session = Session(
             server_hostname,
             http_path,
@@ -303,8 +271,8 @@ def read(self) -> Optional[OAuthToken]:
         TelemetryClientFactory.initialize_telemetry_client(
             telemetry_enabled=self.telemetry_enabled,
             session_id_hex=self.get_session_id_hex(),
-            auth_provider=auth_provider,
-            host_url=self.host,
+            auth_provider=self.session.auth_provider,
+            host_url=self.session.host,
         )
 
         self._telemetry_client = TelemetryClientFactory.get_telemetry_client(
@@ -314,15 +282,15 @@ def read(self) -> Optional[OAuthToken]:
         driver_connection_params = DriverConnectionParameters(
             http_path=http_path,
             mode=DatabricksClientType.THRIFT,
-            host_info=HostDetails(host_url=server_hostname, port=self.port),
-            auth_mech=TelemetryHelper.get_auth_mechanism(auth_provider),
-            auth_flow=TelemetryHelper.get_auth_flow(auth_provider),
+            host_info=HostDetails(host_url=server_hostname, port=self.session.port),
+            auth_mech=TelemetryHelper.get_auth_mechanism(self.session.auth_provider),
+            auth_flow=TelemetryHelper.get_auth_flow(self.session.auth_provider),
             socket_timeout=kwargs.get("_socket_timeout", None),
         )
 
         self._telemetry_client.export_initial_telemetry_log(
             driver_connection_params=driver_connection_params,
-            user_agent=useragent_header,
+            user_agent=self.session.useragent_header,
         )
 
     def _set_use_inline_params_with_warning(self, value: Union[bool, str]):
@@ -446,8 +414,6 @@ def _close(self, close_cursors=True) -> None:
         except Exception as e:
             logger.error(f"Attempt to close session raised a local exception: {e}")
 
-        self.open = False
-
         TelemetryClientFactory.close(self.get_session_id_hex())
 
     def commit(self):

src/databricks/sql/session.py

@@ -40,7 +40,7 @@ def __init__(
         self.catalog = catalog
         self.schema = schema
 
-        auth_provider = get_python_sql_connector_auth_provider(
+        self.auth_provider = get_python_sql_connector_auth_provider(
             server_hostname, **kwargs
         )
 
@@ -54,13 +54,13 @@ def __init__(
                 )
 
         if user_agent_entry:
-            useragent_header = "{}/{} ({})".format(
+            self.useragent_header = "{}/{} ({})".format(
                 USER_AGENT_NAME, __version__, user_agent_entry
             )
         else:
-            useragent_header = "{}/{}".format(USER_AGENT_NAME, __version__)
+            self.useragent_header = "{}/{}".format(USER_AGENT_NAME, __version__)
 
-        base_headers = [("User-Agent", useragent_header)]
+        base_headers = [("User-Agent", self.useragent_header)]
 
         self._ssl_options = SSLOptions(
             # Double negation is generally a bad thing, but we have to keep backward compatibility
@@ -79,7 +79,7 @@ def __init__(
             self.port,
             http_path,
             (http_headers or []) + base_headers,
-            auth_provider,
+            self.auth_provider,
             ssl_options=self._ssl_options,
             _use_arrow_native_complex_types=_use_arrow_native_complex_types,
             **kwargs,