mirror of
https://github.com/apache/superset.git
synced 2026-04-19 08:04:53 +00:00
chore(pre-commit): Add pyupgrade and pycln hooks (#24197)
This commit is contained in:
@@ -18,7 +18,8 @@ import json
|
||||
import logging
|
||||
import re
|
||||
from datetime import datetime
|
||||
from typing import Any, Dict, List, Optional, Pattern, Tuple, TYPE_CHECKING
|
||||
from re import Pattern
|
||||
from typing import Any, Optional, TYPE_CHECKING
|
||||
from urllib import parse
|
||||
|
||||
from apispec import APISpec
|
||||
@@ -107,7 +108,7 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
"P1Y": "DATE_TRUNC('YEAR', {col})",
|
||||
}
|
||||
|
||||
custom_errors: Dict[Pattern[str], Tuple[str, SupersetErrorType, Dict[str, Any]]] = {
|
||||
custom_errors: dict[Pattern[str], tuple[str, SupersetErrorType, dict[str, Any]]] = {
|
||||
OBJECT_DOES_NOT_EXIST_REGEX: (
|
||||
__("%(object)s does not exist in this database."),
|
||||
SupersetErrorType.OBJECT_DOES_NOT_EXIST_ERROR,
|
||||
@@ -124,13 +125,13 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
}
|
||||
|
||||
@staticmethod
|
||||
def get_extra_params(database: "Database") -> Dict[str, Any]:
|
||||
def get_extra_params(database: "Database") -> dict[str, Any]:
|
||||
"""
|
||||
Add a user agent to be used in the requests.
|
||||
"""
|
||||
extra: Dict[str, Any] = BaseEngineSpec.get_extra_params(database)
|
||||
engine_params: Dict[str, Any] = extra.setdefault("engine_params", {})
|
||||
connect_args: Dict[str, Any] = engine_params.setdefault("connect_args", {})
|
||||
extra: dict[str, Any] = BaseEngineSpec.get_extra_params(database)
|
||||
engine_params: dict[str, Any] = extra.setdefault("engine_params", {})
|
||||
connect_args: dict[str, Any] = engine_params.setdefault("connect_args", {})
|
||||
|
||||
connect_args.setdefault("application", USER_AGENT)
|
||||
|
||||
@@ -140,10 +141,10 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
def adjust_engine_params(
|
||||
cls,
|
||||
uri: URL,
|
||||
connect_args: Dict[str, Any],
|
||||
connect_args: dict[str, Any],
|
||||
catalog: Optional[str] = None,
|
||||
schema: Optional[str] = None,
|
||||
) -> Tuple[URL, Dict[str, Any]]:
|
||||
) -> tuple[URL, dict[str, Any]]:
|
||||
database = uri.database
|
||||
if "/" in database:
|
||||
database = database.split("/")[0]
|
||||
@@ -157,7 +158,7 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
def get_schema_from_engine_params(
|
||||
cls,
|
||||
sqlalchemy_uri: URL,
|
||||
connect_args: Dict[str, Any],
|
||||
connect_args: dict[str, Any],
|
||||
) -> Optional[str]:
|
||||
"""
|
||||
Return the configured schema.
|
||||
@@ -174,7 +175,7 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
cls,
|
||||
database: "Database",
|
||||
inspector: Inspector,
|
||||
) -> List[str]:
|
||||
) -> list[str]:
|
||||
"""
|
||||
Return all catalogs.
|
||||
|
||||
@@ -197,7 +198,7 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
|
||||
@classmethod
|
||||
def convert_dttm(
|
||||
cls, target_type: str, dttm: datetime, db_extra: Optional[Dict[str, Any]] = None
|
||||
cls, target_type: str, dttm: datetime, db_extra: Optional[dict[str, Any]] = None
|
||||
) -> Optional[str]:
|
||||
sqla_type = cls.get_sqla_column_type(target_type)
|
||||
|
||||
@@ -261,7 +262,7 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
cls,
|
||||
parameters: SnowflakeParametersType,
|
||||
encrypted_extra: Optional[ # pylint: disable=unused-argument
|
||||
Dict[str, Any]
|
||||
dict[str, Any]
|
||||
] = None,
|
||||
) -> str:
|
||||
return str(
|
||||
@@ -283,7 +284,7 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
cls,
|
||||
uri: str,
|
||||
encrypted_extra: Optional[ # pylint: disable=unused-argument
|
||||
Dict[str, str]
|
||||
dict[str, str]
|
||||
] = None,
|
||||
) -> Any:
|
||||
url = make_url_safe(uri)
|
||||
@@ -300,8 +301,8 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
@classmethod
|
||||
def validate_parameters(
|
||||
cls, properties: BasicPropertiesType
|
||||
) -> List[SupersetError]:
|
||||
errors: List[SupersetError] = []
|
||||
) -> list[SupersetError]:
|
||||
errors: list[SupersetError] = []
|
||||
required = {
|
||||
"warehouse",
|
||||
"username",
|
||||
@@ -346,7 +347,7 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec):
|
||||
@staticmethod
|
||||
def update_params_from_encrypted_extra(
|
||||
database: "Database",
|
||||
params: Dict[str, Any],
|
||||
params: dict[str, Any],
|
||||
) -> None:
|
||||
if not database.encrypted_extra:
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user