Refractored the code to make connector to work

Author: jprakash-db

.gitignore

@@ -195,7 +195,7 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 
 # End of https://www.toptal.com/developers/gitignore/api/python,macos
 

.idea/.gitignore

@@ -11,7 +11,7 @@
 # # Add the parent directory to sys.path
 # sys.path.append(target_folder_path)
 
-from databricks import sql
+from databricks_sql_connector.src.databricks import sql
 
 # from dotenv import load_dotenv
 

.idea/codeStyles/Project.xml

@@ -0,0 +1,66 @@
+[tool.poetry]
+name = "databricks-sql-connector"
+version = "1.0.0"
+description = "Databricks SQL Connector for Python"
+authors = ["Databricks <[email protected]>"]
+license = "Apache-2.0"
+readme = "README.md"
+packages = [{ include = "databricks", from = "src" }]
+include = ["CHANGELOG.md"]
+
+[tool.poetry.dependencies]
+python = "^3.8.0"
+#thrift = ">=0.16.0,<0.21.0"
+#pandas = [
+#    { version = ">=1.2.5,<2.2.0", python = ">=3.8" }
+#]
+#pyarrow = ">=14.0.1,<17"
+
+#lz4 = "^4.0.2"
+#requests = "^2.18.1"
+#oauthlib = "^3.1.0"
+#numpy = [
+#    { version = "^1.16.6", python = ">=3.8,<3.11" },
+#    { version = "^1.23.4", python = ">=3.11" },
+#]
+#sqlalchemy = { version = ">=2.0.21", optional = true }
+#openpyxl = "^3.0.10"
+#alembic = { version = "^1.0.11", optional = true }
+#urllib3 = ">=1.26"
+#
+#[tool.poetry.extras]
+#sqlalchemy = ["sqlalchemy"]
+#alembic = ["sqlalchemy", "alembic"]
+#
+#[tool.poetry.dev-dependencies]
+#pytest = "^7.1.2"
+#mypy = "^1.10.1"
+#pylint = ">=2.12.0"
+#black = "^22.3.0"
+#pytest-dotenv = "^0.5.2"
+
+#[tool.poetry.urls]
+#"Homepage" = "https://github.com/databricks/databricks-sql-python"
+#"Bug Tracker" = "https://github.com/databricks/databricks-sql-python/issues"
+
+[tool.poetry.plugins."sqlalchemy.dialects"]
+"databricks" = "databricks.sqlalchemy:DatabricksDialect"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+#
+#[tool.mypy]
+#ignore_missing_imports = "true"
+#exclude = ['ttypes\.py$', 'TCLIService\.py$']
+#
+#[tool.black]
+#exclude = '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|\.svn|_build|buck-out|build|dist|thrift_api)/'
+#
+#[tool.pytest.ini_options]
+#markers = {"reviewed" = "Test case has been reviewed by Databricks"}
+#minversion = "6.0"
+#log_cli = "false"
+#log_cli_level = "INFO"
+#testpaths = ["tests", "src/databricks/sqlalchemy/test_local"]
+#env_files = ["test.env"]

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1 @@
+from databricks_sql_connector_core.sql import *

.idea/databricks-sql-python.iml

@@ -5,7 +5,7 @@ description = "Databricks SQL Connector core for Python"
 authors = ["Databricks <[email protected]>"]
 license = "Apache-2.0"
 readme = "README.md"
-packages = [{ include = "databricks", from = "src" }]
+packages = [{ include = "databricks_sql_connector_core", from = "src" }]
 include = ["CHANGELOG.md"]
 
 [tool.poetry.dependencies]

.idea/misc.xml

@@ -1,6 +1,6 @@
 import datetime
 
-from databricks.sql.exc import *
+from databricks_sql_connector_core.sql.exc import *
 
 # PEP 249 module globals
 apilevel = "2.0"

.idea/modules.xml

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import Optional, List
 
-from databricks.sql.auth.authenticators import (
+from databricks_sql_connector_core.sql.auth.authenticators import (
     AuthProvider,
     AccessTokenAuthProvider,
     ExternalAuthProvider,

.idea/vcs.xml

@@ -3,12 +3,12 @@
 import logging
 from typing import Callable, Dict, List
 
-from databricks.sql.auth.oauth import OAuthManager
-from databricks.sql.auth.endpoint import get_oauth_endpoints, infer_cloud_from_host
+from databricks_sql_connector_core.sql.auth.oauth import OAuthManager
+from databricks_sql_connector_core.sql.auth.endpoint import get_oauth_endpoints, infer_cloud_from_host
 
 # Private API: this is an evolving interface and it will change in the future.
 # Please must not depend on it in your applications.
-from databricks.sql.experimental.oauth_persistence import OAuthToken, OAuthPersistence
+from databricks_sql_connector_core.sql.experimental.oauth_persistence import OAuthToken, OAuthPersistence
 
 
 class AuthProvider:

check.py

@@ -13,8 +13,8 @@
 from oauthlib.oauth2.rfc6749.errors import OAuth2Error
 from requests.exceptions import RequestException
 
-from databricks.sql.auth.oauth_http_handler import OAuthHttpSingleRequestHandler
-from databricks.sql.auth.endpoint import OAuthEndpointCollection
+from databricks_sql_connector_core.sql.auth.oauth_http_handler import OAuthHttpSingleRequestHandler
+from databricks_sql_connector_core.sql.auth.endpoint import OAuthEndpointCollection
 
 logger = logging.getLogger(__name__)
 

databricks_sql_connector/pyproject.toml

@@ -14,7 +14,7 @@
 from urllib3 import Retry
 from urllib3.util.retry import RequestHistory
 
-from databricks.sql.exc import (
+from databricks_sql_connector_core.sql.exc import (
     CursorAlreadyClosedError,
     MaxRetryDurationError,
     NonRecoverableNetworkError,

databricks_sql_connector_core/src/databricks/sql/auth/__init__.py renamed to databricks_sql_connector/src/databricks/__init__.py

@@ -15,7 +15,7 @@
 
 from urllib3 import HTTPConnectionPool, HTTPSConnectionPool, ProxyManager
 from urllib3.util import make_headers
-from databricks.sql.auth.retry import CommandType, DatabricksRetryPolicy
+from databricks_sql_connector_core.sql.auth.retry import CommandType, DatabricksRetryPolicy
 
 
 class THttpClient(thrift.transport.THttpClient.THttpClient):

databricks_sql_connector/src/databricks/sql.py

@@ -12,24 +12,24 @@
 import decimal
 from uuid import UUID
 
-from databricks.sql import __version__
-from databricks.sql import *
-from databricks.sql.exc import (
+from databricks_sql_connector_core.sql import __version__
+from databricks_sql_connector_core.sql import *
+from databricks_sql_connector_core.sql.exc import (
     OperationalError,
     SessionAlreadyClosedError,
     CursorAlreadyClosedError,
 )
-from databricks.sql.thrift_api.TCLIService import ttypes
-from databricks.sql.thrift_backend import ThriftBackend
-from databricks.sql.utils import (
+from databricks_sql_connector_core.sql.thrift_api.TCLIService import ttypes
+from databricks_sql_connector_core.sql.thrift_backend import ThriftBackend
+from databricks_sql_connector_core.sql.utils import (
     ExecuteResponse,
     ParamEscaper,
     inject_parameters,
     transform_paramstyle,
     ArrowQueue,
     ColumnQueue
 )
-from databricks.sql.parameters.native import (
+from databricks_sql_connector_core.sql.parameters.native import (
     DbsqlParameterBase,
     TDbsqlParameter,
     TParameterDict,
@@ -41,11 +41,11 @@
 )
 
 
-from databricks.sql.types import Row
-from databricks.sql.auth.auth import get_python_sql_connector_auth_provider
-from databricks.sql.experimental.oauth_persistence import OAuthPersistence
+from databricks_sql_connector_core.sql.types import Row
+from databricks_sql_connector_core.sql.auth.auth import get_python_sql_connector_auth_provider
+from databricks_sql_connector_core.sql.experimental.oauth_persistence import OAuthPersistence
 
-from databricks.sql.thrift_api.TCLIService.ttypes import (
+from databricks_sql_connector_core.sql.thrift_api.TCLIService.ttypes import (
     TSparkParameter,
 )
 

databricks_sql_connector_core/src/databricks/sqlalchemy/__init__.py renamed to databricks_sql_connector/src/databricks/sqlalchemy.py

@@ -4,12 +4,12 @@
 from concurrent.futures import ThreadPoolExecutor, Future
 from typing import List, Union
 
-from databricks.sql.cloudfetch.downloader import (
+from databricks_sql_connector_core.sql.cloudfetch.downloader import (
     ResultSetDownloadHandler,
     DownloadableResultSettings,
     DownloadedFile,
 )
-from databricks.sql.thrift_api.TCLIService.ttypes import TSparkArrowResultLink
+from databricks_sql_connector_core.sql.thrift_api.TCLIService.ttypes import TSparkArrowResultLink
 
 logger = logging.getLogger(__name__)
 

databricks_sql_connector_core/pyproject.toml

@@ -7,9 +7,9 @@
 import lz4.frame
 import time
 
-from databricks.sql.thrift_api.TCLIService.ttypes import TSparkArrowResultLink
+from databricks_sql_connector_core.sql.thrift_api.TCLIService.ttypes import TSparkArrowResultLink
 
-from databricks.sql.exc import Error
+from databricks_sql_connector_core.sql.exc import Error
 
 logger = logging.getLogger(__name__)
 

databricks_sql_connector_core/src/databricks/__init__.py renamed to databricks_sql_connector_core/src/databricks_sql_connector_core/__init__.py

@@ -1,4 +1,4 @@
-from databricks.sql.parameters.native import (
+from databricks_sql_connector_core.sql.parameters.native import (
     IntegerParameter,
     StringParameter,
     BigIntegerParameter,

databricks_sql_connector_core/src/databricks/sql/__init__.py renamed to databricks_sql_connector_core/src/databricks_sql_connector_core/sql/__init__.py

@@ -3,8 +3,8 @@
 from enum import Enum, auto
 from typing import Optional, Sequence
 
-from databricks.sql.exc import NotSupportedError
-from databricks.sql.thrift_api.TCLIService.ttypes import (
+from databricks_sql_connector_core.sql.exc import NotSupportedError
+from databricks_sql_connector_core.sql.thrift_api.TCLIService.ttypes import (
     TSparkParameter,
     TSparkParameterValue,
 )