diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3d2891cba7..54f92ab876 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ exclude: '^(.*egg.info.*|.*/parameters.py|docs/).*$' default_language_version: - python: python3.10 + python: python3.9 repos: - repo: https://github.com/asottile/pyupgrade rev: v2.31.1 diff --git a/src/snowflake/snowpark/_internal/server_connection.py b/src/snowflake/snowpark/_internal/server_connection.py index d57e03be11..94df8ceb9c 100644 --- a/src/snowflake/snowpark/_internal/server_connection.py +++ b/src/snowflake/snowpark/_internal/server_connection.py @@ -25,7 +25,7 @@ ) from snowflake.connector import SnowflakeConnection, connect -from snowflake.connector.constants import ENV_VAR_PARTNER, FIELD_ID_TO_NAME +from snowflake.connector.constants import FIELD_ID_TO_NAME from snowflake.connector.cursor import ResultMetadata, SnowflakeCursor from snowflake.connector.errors import Error, NotSupportedError, ProgrammingError from snowflake.connector.network import ReauthenticationRequest @@ -82,6 +82,9 @@ logger = getLogger(__name__) +# backward compatibility constant +ENV_VAR_PARTNER = "SF_PARTNER" + # parameters needed for usage tracking PARAM_APPLICATION = "application" PARAM_INTERNAL_APPLICATION_NAME = "internal_application_name" diff --git a/src/snowflake/snowpark/async_job.py b/src/snowflake/snowpark/async_job.py index 2840a19602..7bae2324fc 100644 --- a/src/snowflake/snowpark/async_job.py +++ b/src/snowflake/snowpark/async_job.py @@ -7,7 +7,6 @@ from typing import TYPE_CHECKING, Iterator, List, Literal, Optional, Union import snowflake.snowpark -from snowflake.connector.cursor import ASYNC_RETRY_PATTERN from snowflake.connector.errors import DatabaseError from snowflake.connector.options import pandas from snowflake.snowpark._internal.analyzer.analyzer_utils import result_scan_statement @@ -27,6 +26,8 @@ _logger = getLogger(__name__) +ASYNC_RETRY_PATTERN = [1, 1, 2, 3, 4, 8, 10] + class _AsyncResultType(Enum): ROW = "row" diff --git a/src/snowflake/snowpark/mock/_telemetry.py b/src/snowflake/snowpark/mock/_telemetry.py index 0b8f437a9b..2c090d0617 100644 --- a/src/snowflake/snowpark/mock/_telemetry.py +++ b/src/snowflake/snowpark/mock/_telemetry.py @@ -9,9 +9,9 @@ import uuid from datetime import datetime from enum import Enum +from http.client import OK from typing import Optional -from snowflake.connector.compat import OK from snowflake.connector.secret_detector import SecretDetector from snowflake.connector.telemetry_oob import TelemetryService from snowflake.snowpark._internal.utils import (