castor-extractor 0.21.9__py3-none-any.whl → 0.22.1__py3-none-any.whl

castor_extractor/visualization/qlik/client/engine/error.py

@@ -1,5 +1,3 @@
-from typing import Dict, Type
-
 from .constants import (
     ACCESS_DENIED_ERROR_CODE,
     APP_SIZE_EXCEEDED_ERROR_CODE,
@@ -48,7 +46,7 @@ class QlikResponseKeyError(Exception):
     """
 
 
-ERROR_CODE_MAPPING: Dict[int, Type[JsonRpcError]] = {
+ERROR_CODE_MAPPING: dict[int, type[JsonRpcError]] = {
     ACCESS_DENIED_ERROR_CODE: AccessDeniedError,
     APP_SIZE_EXCEEDED_ERROR_CODE: AppSizeExceededError,
     PERSISTENCE_READ_FAILED_ERROR_CODE: PersistenceReadFailedError,

castor_extractor/visualization/qlik/client/master.py

@@ -1,4 +1,4 @@
-from typing import Callable, List, Optional
+from typing import Callable, Optional
 
 from tqdm import tqdm  # type: ignore
 
@@ -7,7 +7,7 @@ from .constants import APP_EXTERNAL_ID_KEY, SCOPED_ASSETS
 from .engine import EngineApiClient, QlikCredentials
 from .rest import RestApiClient
 
-ListedData = List[dict]
+ListedData = list[dict]
 
 
 class MissingAppsScopeError(Exception):
@@ -54,7 +54,7 @@ class QlikMasterClient:
     def __init__(
         self,
         credentials: QlikCredentials,
-        except_http_error_statuses: Optional[List[int]] = None,
+        except_http_error_statuses: Optional[list[int]] = None,
         display_progress: bool = True,
     ):
         self._server_url = credentials.base_url

castor_extractor/visualization/qlik/client/rest.py

@@ -1,5 +1,5 @@
 import logging
-from typing import List, Optional, Union
+from typing import Optional, Union
 from urllib.parse import urljoin
 
 import requests
@@ -20,7 +20,7 @@ from .engine import QlikCredentials
 
 logger = logging.getLogger(__name__)
 
-Response = Union[dict, List[dict]]
+Response = Union[dict, list[dict]]
 
 
 def _session() -> requests.Session:
@@ -62,7 +62,7 @@ class RestApiClient:
     def __init__(
         self,
         credentials: QlikCredentials,
-        except_http_error_statuses: Optional[List[int]] = None,
+        except_http_error_statuses: Optional[list[int]] = None,
     ):
         self._server_url = credentials.base_url
         self._api_key = credentials.api_key
@@ -111,10 +111,10 @@ class RestApiClient:
         except HTTPError as error:
             return self._handle_http_error(error)
 
-    def _pager(self, first_page_url: str) -> List[dict]:
+    def _pager(self, first_page_url: str) -> list[dict]:
         current_page_url = first_page_url
 
-        data: List[dict] = []
+        data: list[dict] = []
         while current_page_url:
             response = self._call(current_page_url)
             if not response:
@@ -130,7 +130,7 @@ class RestApiClient:
             current_page_url = next_page_url
         return data
 
-    def get(self, asset: QlikAsset) -> List[dict]:
+    def get(self, asset: QlikAsset) -> list[dict]:
         """
         Calls the route corresponding to the asset and returns the list of
         corresponding data
@@ -144,7 +144,7 @@ class RestApiClient:
 
         return [_filter_fields(row) for row in data]
 
-    def get_with_scope(self, asset: QlikAsset, app_id: str) -> List[dict]:
+    def get_with_scope(self, asset: QlikAsset, app_id: str) -> list[dict]:
         """
         Calls the route corresponding to the asset scoped on an app_id and
         returns the corresponding data
@@ -157,7 +157,7 @@ class RestApiClient:
         assert isinstance(response, list), RESPONSE_LIST_EXPECTED_MSG
         return response
 
-    def data_connections(self) -> List[dict]:
+    def data_connections(self) -> list[dict]:
         """
         Returns the list of data Connections
 
@@ -165,7 +165,7 @@ class RestApiClient:
         """
         return self.get(QlikAsset.CONNECTIONS)
 
-    def spaces(self) -> List[dict]:
+    def spaces(self) -> list[dict]:
         """
         Returns the list of Spaces
 
@@ -173,7 +173,7 @@ class RestApiClient:
         """
         return self.get(QlikAsset.SPACES)
 
-    def users(self) -> List[dict]:
+    def users(self) -> list[dict]:
         """
         Returns the list of Users
 
@@ -181,7 +181,7 @@ class RestApiClient:
         """
         return self.get(QlikAsset.USERS)
 
-    def apps(self) -> List[dict]:
+    def apps(self) -> list[dict]:
         """
         Returns the list of Apps
 
@@ -189,7 +189,7 @@ class RestApiClient:
         """
         return self.get(QlikAsset.APPS)
 
-    def data_lineage(self, app_id: str) -> List[dict]:
+    def data_lineage(self, app_id: str) -> list[dict]:
         """
         Returns the data lineage for a given source
 

castor_extractor/visualization/qlik/extract.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Iterable, List, Optional, Tuple, Union
+from collections.abc import Iterable
+from typing import Optional, Union
 
 from ...utils import (
     OUTPUT_DIR,
@@ -18,7 +19,7 @@ logger = logging.getLogger(__name__)
 
 def iterate_all_data(
     client: QlikClient,
-) -> Iterable[Tuple[QlikAsset, Union[list, dict]]]:
+) -> Iterable[tuple[QlikAsset, Union[list, dict]]]:
     """Iterate over the extracted data from Qlik"""
 
     logger.info("Extracting CONNECTIONS from REST API")
@@ -47,7 +48,7 @@ def iterate_all_data(
 
 
 def extract_all(
-    except_http_error_statuses: Optional[List[int]] = None, **kwargs
+    except_http_error_statuses: Optional[list[int]] = None, **kwargs
 ) -> None:
     """
     Extract data from Qlik REST API

castor_extractor/visualization/salesforce_reporting/client/rest.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Dict, Iterator, List, Optional
+from collections.abc import Iterator
+from typing import Optional
 
 from ....utils import build_url
 from ....utils.salesforce import SalesforceBaseClient
@@ -49,7 +50,7 @@ class SalesforceReportingClient(SalesforceBaseClient):
             url = self._get_asset_url(asset_type, asset)
             yield {**asset, "Url": url}
 
-    def fetch(self, asset: SalesforceReportingAsset) -> List[Dict]:
+    def fetch(self, asset: SalesforceReportingAsset) -> list[dict]:
         """
         Fetch Salesforce Reporting assets
         """

castor_extractor/visualization/salesforce_reporting/client/soql.py

@@ -1,8 +1,6 @@
-from typing import Dict
-
 from ..assets import SalesforceReportingAsset
 
-queries: Dict[SalesforceReportingAsset, str] = {
+queries: dict[SalesforceReportingAsset, str] = {
     SalesforceReportingAsset.DASHBOARDS: """
         SELECT
             CreatedBy.Id,

castor_extractor/visualization/salesforce_reporting/extract.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Iterable, Tuple, Union
+from collections.abc import Iterable
+from typing import Union
 
 from ...utils import (
     OUTPUT_DIR,
@@ -19,7 +20,7 @@ logger = logging.getLogger(__name__)
 
 def iterate_all_data(
     client: SalesforceReportingClient,
-) -> Iterable[Tuple[str, Union[list, dict]]]:
+) -> Iterable[tuple[str, Union[list, dict]]]:
     """Iterate over the extracted data from Salesforce"""
 
     for asset in SalesforceReportingAsset:

castor_extractor/visualization/sigma/client/client.py

@@ -1,6 +1,7 @@
+from collections.abc import Iterator
 from functools import partial
 from http import HTTPStatus
-from typing import Callable, Dict, Iterator, List, Optional, Tuple
+from typing import Callable, Optional
 
 import requests
 
@@ -19,7 +20,7 @@ from .pagination import SIGMA_API_LIMIT, SigmaPagination
 
 _CONTENT_TYPE = "application/x-www-form-urlencoded"
 
-_DATA_ELEMENTS: Tuple[str, ...] = (
+_DATA_ELEMENTS: tuple[str, ...] = (
     "input-table",
     "pivot-table",
     "table",
@@ -49,7 +50,7 @@ SIGMA_SAFE_MODE = RequestSafeMode(
 
 
 class SigmaBearerAuth(BearerAuth):
-    def __init__(self, host: str, token_payload: Dict[str, str]):
+    def __init__(self, host: str, token_payload: dict[str, str]):
         auth_endpoint = SigmaEndpointFactory.authentication()
         self.authentication_url = build_url(host, auth_endpoint)
         self.token_payload = token_payload
@@ -118,7 +119,7 @@ class SigmaClient(APIClient):
                 "page_id": page_id,
             }
 
-    def _get_all_elements(self, workbooks: List[dict]) -> Iterator[dict]:
+    def _get_all_elements(self, workbooks: list[dict]) -> Iterator[dict]:
         for workbook in workbooks:
             workbook_id = workbook["workbookId"]
 
@@ -132,7 +133,7 @@ class SigmaClient(APIClient):
                     page=page, workbook_id=workbook_id
                 )
 
-    def _get_all_lineages(self, elements: List[dict]) -> Iterator[dict]:
+    def _get_all_lineages(self, elements: list[dict]) -> Iterator[dict]:
         for element in elements:
             workbook_id = element["workbook_id"]
             element_id = element["elementId"]
@@ -145,7 +146,7 @@ class SigmaClient(APIClient):
                 "element_id": element_id,
             }
 
-    def _get_all_queries(self, workbooks: List[dict]) -> Iterator[dict]:
+    def _get_all_queries(self, workbooks: list[dict]) -> Iterator[dict]:
         for workbook in workbooks:
             workbook_id = workbook["workbookId"]
             request = self._get_paginated(
@@ -159,8 +160,8 @@ class SigmaClient(APIClient):
     def fetch(
         self,
         asset: SigmaAsset,
-        workbooks: Optional[List[dict]] = None,
-        elements: Optional[List[dict]] = None,
+        workbooks: Optional[list[dict]] = None,
+        elements: Optional[list[dict]] = None,
     ) -> Iterator[dict]:
         """Returns the needed metadata for the queried asset"""
         if asset == SigmaAsset.DATASETS:

castor_extractor/visualization/sigma/client/credentials.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 from pydantic import Field
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
@@ -21,7 +19,7 @@ class SigmaCredentials(BaseSettings):
     grant_type: str = "client_credentials"
 
     @property
-    def token_payload(self) -> Dict[str, str]:
+    def token_payload(self) -> dict[str, str]:
         return {
             "grant_type": self.grant_type,
             "client_id": self.client_id,

castor_extractor/visualization/sigma/extract.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Iterable, Iterator, Tuple, Union
+from collections.abc import Iterable, Iterator
+from typing import Union
 
 from ...utils import (
     OUTPUT_DIR,
@@ -18,7 +19,7 @@ logger = logging.getLogger(__name__)
 
 def iterate_all_data(
     client: SigmaClient,
-) -> Iterable[Tuple[SigmaAsset, Union[list, Iterator, dict]]]:
+) -> Iterable[tuple[SigmaAsset, Union[list, Iterator, dict]]]:
     """Iterate over the extracted data from Sigma"""
 
     logger.info("Extracting DATASETS from API")

castor_extractor/visualization/tableau/assets.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Set
 
 from ...types import ExternalAsset, classproperty
 
@@ -24,7 +23,7 @@ class TableauAsset(ExternalAsset):
     WORKBOOK_TO_DATASOURCE = "workbooks_to_datasource"
 
     @classproperty
-    def optional(cls) -> Set["TableauAsset"]:
+    def optional(cls) -> set["TableauAsset"]:
         return {
             TableauAsset.DASHBOARD,
             TableauAsset.DASHBOARD_SHEET,

castor_extractor/visualization/tableau/client/client.py

@@ -1,5 +1,4 @@
 import logging
-from typing import List
 
 import tableauserverclient as TSC  # type: ignore
 
@@ -43,7 +42,7 @@ class ApiClient:
         self._page_size = PAGE_SIZE
         self._server.version = TABLEAU_SERVER_VERSION
         self._safe_mode = bool(kwargs.get("safe_mode"))
-        self.errors: List[str] = []
+        self.errors: list[str] = []
 
     @staticmethod
     def name() -> str:

castor_extractor/visualization/tableau/client/client_utils.py

@@ -1,4 +1,5 @@
-from typing import Dict, Iterator, Optional
+from collections.abc import Iterator
+from typing import Optional
 
 from ....utils import SerializedAsset
 from ..assets import TableauAsset
@@ -69,6 +70,6 @@ def query_scroll(
             break
 
 
-def extract_asset(asset: Dict, asset_type: TableauAsset) -> Dict:
+def extract_asset(asset: dict, asset_type: TableauAsset) -> dict:
     """Agnostic function extracting dedicated attributes with define asset"""
     return {key: getattr(asset, key) for key in TSC_FIELDS[asset_type]}

castor_extractor/visualization/tableau/client/credentials.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Dict, Optional
+from typing import Optional
 
 from ....utils import from_env
 
@@ -20,7 +20,7 @@ class CredentialsKey(Enum):
     TABLEAU_SERVER_URL = "server_url"
 
 
-CREDENTIALS_ENV: Dict[CredentialsKey, str] = {
+CREDENTIALS_ENV: dict[CredentialsKey, str] = {
     CredentialsKey.TABLEAU_USER: "CASTOR_TABLEAU_USER",
     CredentialsKey.TABLEAU_PASSWORD: "CASTOR_TABLEAU_PASSWORD",
     CredentialsKey.TABLEAU_TOKEN_NAME: "CASTOR_TABLEAU_TOKEN_NAME",
@@ -89,7 +89,7 @@ class CredentialsApi:
             CredentialsKey.TABLEAU_TOKEN: token,
         }
 
-    def to_dict(self, hide: bool = False) -> Dict[str, str]:
+    def to_dict(self, hide: bool = False) -> dict[str, str]:
         safe = (
             CredentialsKey.TABLEAU_USER,
             CredentialsKey.TABLEAU_SITE_ID,

castor_extractor/visualization/tableau/client/safe_mode.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Dict, List
 
 import tableauserverclient as TSC  # type: ignore
 
@@ -48,7 +47,7 @@ def safe_mode_fetch_usage(client) -> SerializedAsset:
     Returns computed usages when page number is not found
     Log errors if ServerResponseError is return
     """
-    list_usages: List[Dict] = []
+    list_usages: list[dict] = []
     page_number: int = 0
 
     while True:

castor_extractor/visualization/tableau/extract.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Iterable, Tuple
+from collections.abc import Iterable
 
 from ...utils import (
     OUTPUT_DIR,
@@ -19,7 +19,7 @@ logger = logging.getLogger(__name__)
 
 def iterate_all_data(
     client: Client,
-) -> Iterable[Tuple[TableauAsset, list]]:
+) -> Iterable[tuple[TableauAsset, list]]:
     """Iterate over the extracted Data from Tableau"""
 
     logger.info("Extracting USER from Tableau API")

castor_extractor/visualization/tableau/gql_fields.py

@@ -1,6 +1,6 @@
 # Fields which will be use for Tableau GraphQL API
 from enum import Enum
-from typing import Dict, List, Union
+from typing import Union
 
 from .assets import TableauAsset, TableauGraphqlAsset
 
@@ -189,9 +189,9 @@ class GQLQueryFields(Enum):
     """
 
 
-QueryInfo = List[Dict[str, Union[GQLQueryFields, TableauGraphqlAsset]]]
+QueryInfo = list[dict[str, Union[GQLQueryFields, TableauGraphqlAsset]]]
 
-QUERY_FIELDS: Dict[TableauAsset, QueryInfo] = {
+QUERY_FIELDS: dict[TableauAsset, QueryInfo] = {
     TableauAsset.CUSTOM_SQL_TABLE: [
         {
             FIELDS: GQLQueryFields.CUSTOM_SQL_TABLE,

castor_extractor/visualization/tableau/tsc_fields.py

@@ -1,10 +1,9 @@
 # TSC for TableauServerClient: basic REST API to extracting core objects
-from typing import Dict, Set
 
 from .assets import TableauAsset
 
 # TSC fields extracted per assets
-TSC_FIELDS: Dict[TableauAsset, Set[str]] = {
+TSC_FIELDS: dict[TableauAsset, set[str]] = {
     TableauAsset.PROJECT: {
         "id",
         "name",

castor_extractor/visualization/tableau/types.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Tuple, Union
+from typing import Union
 
 from tableauserverclient import ServerResponseError  # type: ignore
 from typing_extensions import Literal
@@ -6,6 +6,6 @@ from typing_extensions import Literal
 from .errors import TableauErrorCode
 
 PageReturn = Union[
-    Tuple[List[Dict], Literal[None]],
-    Tuple[Literal[None], Union[TableauErrorCode, ServerResponseError]],
+    tuple[list[dict], Literal[None]],
+    tuple[Literal[None], Union[TableauErrorCode, ServerResponseError]],
 ]

castor_extractor/visualization/tableau_revamp/client/client_metadata_api.py

@@ -1,4 +1,5 @@
-from typing import Dict, Iterator, Optional
+from collections.abc import Iterator
+from typing import Optional
 
 import tableauserverclient as TSC  # type: ignore
 
@@ -10,7 +11,7 @@ from .gql_queries import FIELDS_QUERIES, GQL_QUERIES, QUERY_TEMPLATE
 
 # increase the value when extraction is too slow
 # decrease the value when timeouts arise
-_CUSTOM_PAGE_SIZE: Dict[TableauRevampAsset, int] = {
+_CUSTOM_PAGE_SIZE: dict[TableauRevampAsset, int] = {
     # for some clients, extraction of columns tend to hit the node limit
     # https://community.tableau.com/s/question/0D54T00000YuK60SAF/metadata-query-nodelimitexceeded-error
     # the workaround is to reduce pagination

castor_extractor/visualization/tableau_revamp/client/client_rest_api.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Dict, Optional
+from typing import Optional
 
 import requests
 import tableauserverclient as TSC  # type: ignore
@@ -40,7 +40,7 @@ class TableauClientRestApi:
         return self._server.http_options["timeout"]
 
     @property
-    def headers(self) -> Dict[str, str]:
+    def headers(self) -> dict[str, str]:
         return {"x-tableau-auth": self._server.auth_token}
 
     def _get_site_name(self) -> str:
@@ -52,7 +52,7 @@ class TableauClientRestApi:
         self,
         url: str,
         page_token: Optional[str] = None,
-    ) -> Dict:
+    ) -> dict:
         if page_token:
             url += f"?page_token={page_token}"
 

castor_extractor/visualization/tableau_revamp/client/client_tsc.py

@@ -1,4 +1,5 @@
-from typing import Any, Dict, Iterable, Iterator
+from collections.abc import Iterable, Iterator
+from typing import Any
 
 import tableauserverclient as TSC  # type: ignore
 
@@ -30,7 +31,7 @@ class TableauClientTSC:
         self,
         data: Iterable,
         asset: TableauRevampAsset,
-    ) -> Iterator[Dict]:
+    ) -> Iterator[dict]:
         keys = REST_FIELDS[asset]
 
         for row in data:

castor_extractor/visualization/tableau_revamp/client/gql_queries.py

@@ -1,5 +1,3 @@
-from typing import Dict, Tuple
-
 from ..assets import TableauRevampAsset
 
 QUERY_TEMPLATE = """
@@ -130,7 +128,7 @@ workbook { id }
 """
 
 
-GQL_QUERIES: Dict[TableauRevampAsset, Tuple[str, str]] = {
+GQL_QUERIES: dict[TableauRevampAsset, tuple[str, str]] = {
     TableauRevampAsset.COLUMN: ("columns", _COLUMNS_QUERY),
     TableauRevampAsset.DASHBOARD: ("dashboards", _DASHBOARDS_QUERY),
     TableauRevampAsset.DATASOURCE: ("datasources", _DATASOURCES_QUERY),

castor_extractor/visualization/tableau_revamp/client/rest_fields.py

@@ -1,9 +1,7 @@
-from typing import Dict, Set
-
 from ..assets import TableauRevampAsset
 
 # list of fields to pick in REST API or TSC responses
-REST_FIELDS: Dict[TableauRevampAsset, Set[str]] = {
+REST_FIELDS: dict[TableauRevampAsset, set[str]] = {
     TableauRevampAsset.DATASOURCE: {
         "id",
         "project_id",

castor_extractor/visualization/tableau_revamp/extract.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Iterable, Tuple
+from collections.abc import Iterable
 
 from ...utils import (
     OUTPUT_DIR,
@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
 
 def iterate_all_data(
     client: TableauRevampClient,
-) -> Iterable[Tuple[TableauRevampAsset, list]]:
+) -> Iterable[tuple[TableauRevampAsset, list]]:
     """Iterate over the extracted Data from Tableau"""
 
     for asset in TableauRevampAsset:

castor_extractor/visualization/thoughtspot/client/client.py

@@ -1,4 +1,5 @@
-from typing import Dict, Iterator, Optional
+from collections.abc import Iterator
+from typing import Optional
 
 import requests
 
@@ -35,7 +36,7 @@ THOUGHTSPOT_SAFE_MODE = RequestSafeMode()
 
 
 class ThoughtspotBearerAuth(BearerAuth):
-    def __init__(self, host: str, token_payload: Dict[str, str]):
+    def __init__(self, host: str, token_payload: dict[str, str]):
         auth_endpoint = ThoughtspotEndpointFactory.authentication()
         self.authentication_url = build_url(host, auth_endpoint)
         self.token_payload = token_payload

castor_extractor/visualization/thoughtspot/client/utils.py

@@ -1,6 +1,6 @@
 import csv
+from collections.abc import Iterator
 from io import StringIO
-from typing import Iterator
 
 
 def usage_liveboard_reader(usage_liveboard_csv: str) -> Iterator[dict]:

castor_extractor/visualization/thoughtspot/extract.py

@@ -1,5 +1,6 @@
 import logging
-from typing import Iterable, Iterator, Tuple, Union
+from collections.abc import Iterable, Iterator
+from typing import Union
 
 from ...utils import (
     OUTPUT_DIR,
@@ -21,7 +22,7 @@ logger = logging.getLogger(__name__)
 
 def iterate_all_data(
     client: ThoughtspotClient,
-) -> Iterable[Tuple[ThoughtspotAsset, Union[list, Iterator, dict]]]:
+) -> Iterable[tuple[ThoughtspotAsset, Union[list, Iterator, dict]]]:
     """Iterate over the extracted data from Thoughtspot"""
 
     for asset in ThoughtspotAsset:

castor_extractor/warehouse/abstract/asset.py

@@ -1,5 +1,4 @@
 from enum import Enum
-from typing import Dict, List, Set, Tuple
 
 from ...types import ExternalAsset, classproperty
 
@@ -26,7 +25,7 @@ class WarehouseAsset(ExternalAsset):
     VIEW_DDL = "view_ddl"
 
     @classproperty
-    def optional(cls) -> Set["WarehouseAsset"]:
+    def optional(cls) -> set["WarehouseAsset"]:
         return {
             WarehouseAsset.ADDITIONAL_COLUMN_LINEAGE,
             WarehouseAsset.ADDITIONAL_TABLE_LINEAGE,
@@ -50,7 +49,7 @@ class WarehouseAssetGroup(Enum):
 
 
 # tuple of supported assets for each group (depends on the technology)
-SupportedAssets = Dict[WarehouseAssetGroup, Tuple[WarehouseAsset, ...]]
+SupportedAssets = dict[WarehouseAssetGroup, tuple[WarehouseAsset, ...]]
 
 # shared by all technologies
 CATALOG_ASSETS = (
@@ -80,13 +79,13 @@ NON_EXTRACTABLE_ASSETS = {WarehouseAssetGroup.EXTERNAL_LINEAGE}
 
 def extractable_asset_groups(
     supported_assets: SupportedAssets,
-) -> List[Tuple[WarehouseAsset, ...]]:
+) -> list[tuple[WarehouseAsset, ...]]:
     """
     helper function to differentiate
     extractable assets vs supported (ingest-able) assets
     """
     groups = set(supported_assets).difference(NON_EXTRACTABLE_ASSETS)
-    extractable: Set[Tuple[WarehouseAsset, ...]] = {
+    extractable: set[tuple[WarehouseAsset, ...]] = {
         supported_assets[group] for group in groups
     }
     return list(extractable)