tinybird-cli 5.22.2.dev0__tar.gz → 6.0.1__tar.gz

{tinybird_cli-5.22.2.dev0 → tinybird_cli-6.0.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.22.2.dev0
+Version: 6.0.1
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
 Author-email: support@tinybird.co
-Requires-Python: >=3.9, <3.14
+Requires-Python: >=3.10, <3.14
 Description-Content-Type: text/x-rst
 Requires-Dist: aiofiles==24.1.0
 Requires-Dist: clickhouse-toolset==0.34.dev0
@@ -26,29 +26,11 @@ Requires-Dist: tornado~=6.0.0
 Requires-Dist: urllib3<2,>=1.26.14
 Requires-Dist: wheel
 Requires-Dist: packaging<24,>=23.1
-Provides-Extra: bigquery
-Requires-Dist: gsutil==4.58; extra == "bigquery"
-Requires-Dist: google-api-python-client==2.0.2; extra == "bigquery"
-Requires-Dist: google-auth==1.27.1; extra == "bigquery"
-Requires-Dist: google-auth-httplib2==0.1.0; extra == "bigquery"
-Requires-Dist: google-cloud-storage==2.4.0; extra == "bigquery"
-Requires-Dist: google-cloud-bigquery==2.11.0; extra == "bigquery"
-Provides-Extra: snowflake
-Requires-Dist: snowflake-connector-python~=3.12.3; extra == "snowflake"
-Requires-Dist: gsutil==4.58; extra == "snowflake"
-Requires-Dist: google-api-python-client==2.0.2; extra == "snowflake"
-Requires-Dist: google-auth==1.27.1; extra == "snowflake"
-Requires-Dist: google-auth-httplib2==0.1.0; extra == "snowflake"
-Requires-Dist: google-cloud-storage==2.4.0; extra == "snowflake"
-Requires-Dist: oauth2client==3.0.0; extra == "snowflake"
-Requires-Dist: chardet<4,>=3.0.2; extra == "snowflake"
-Requires-Dist: pyOpenSSL<20.0.0,>=16.2.0; extra == "snowflake"
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
-Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -61,6 +43,22 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.0.1
+***********
+
+- `Fixed` false circular dependency detection when a shared datasource has the same name as a local pipe
+
+6.0.0
+***********
+
+- `Removed` support for Python 3.9. The minimum supported Python version is now 3.10.
+- `Removed` BigQuery and Snowflake CDK connector commands from `tb connection create`
+
+5.22.2
+***********
+
+- `Fixed` tokens in existing datasource files not being updated when using `tb push -f`
+
 5.22.1
 ***********
 

{tinybird_cli-5.22.2.dev0 → tinybird_cli-6.0.1}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '5.22.2.dev0'
-__revision__ = 'e1b50a6'
+__version__ = '6.0.1'
+__revision__ = '8bacae6'

{tinybird_cli-5.22.2.dev0 → tinybird_cli-6.0.1}/tinybird/ch_utils/engine.py

@@ -14,7 +14,6 @@ from ..sql import (
 )
 
 DEFAULT_EMPTY_PARAMETERS = ["ttl", "partition_key", "sorting_key"]
-DEFAULT_JOIN_EMPTY_PARAMETERS = ["join_strictness", "join_type", "key_columns"]
 
 # Currently we only support the simplest TTLs
 # f(X) + toIntervalZ(N)
@@ -62,25 +61,6 @@ class TableDetails:
     >>> ed.to_datafile()
     'ENGINE "MergeTree"\\nENGINE_PARTITION_KEY "toYear(timestamp)"\\nENGINE_SORTING_KEY "timestamp, cityHash64(location)"\\nENGINE_SAMPLING_KEY "cityHash64(location)"\\nENGINE_SETTINGS "index_granularity = 32, index_granularity_bytes = 2048"\\nENGINE_TTL "toDate(timestamp) + INTERVAL 1 DAY"'
 
-    >>> ed = TableDetails({"engine_full": "Join(ANY, LEFT, id)", "engine": "Join", "partition_key": "", "sorting_key": "", "primary_key": "", "sampling_key": ""})
-    >>> ed.engine_full
-    'Join(ANY, LEFT, id)'
-    >>> ed.engine
-    'Join'
-    >>> ed.to_json()
-    {'engine_full': 'Join(ANY, LEFT, id)', 'engine': 'Join', 'join_strictness': 'ANY', 'join_type': 'LEFT', 'key_columns': 'id'}
-    >>> ed.to_datafile()
-    'ENGINE "Join"\\nENGINE_JOIN_STRICTNESS "ANY"\\nENGINE_JOIN_TYPE "LEFT"\\nENGINE_KEY_COLUMNS "id"'
-
-    >>> ed = TableDetails({"database": "d_01", "name": "t_01", "engine": "Join", "join_strictness": "ANY", "join_type": "LEFT", "key_columns": "id"})
-    >>> ed.engine_full == None
-    True
-    >>> ed.engine
-    'Join'
-    >>> ed.to_json()
-    {'engine_full': None, 'engine': 'Join', 'join_strictness': 'ANY', 'join_type': 'LEFT', 'key_columns': 'id'}
-    >>> ed.to_datafile()
-    'ENGINE "Join"\\nENGINE_JOIN_STRICTNESS "ANY"\\nENGINE_JOIN_TYPE "LEFT"\\nENGINE_KEY_COLUMNS "id"'
     >>> ed = TableDetails({ "engine_full": "MergeTree() PARTITION BY toYear(timestamp) ORDER BY (timestamp, cityHash64(location)) SAMPLE BY cityHash64(location) SETTINGS index_granularity = 8192, ttl_only_drop_parts = 1, merge_with_ttl_timeout = 1800 TTL toDate(timestamp) + INTERVAL 1 DAY"})
     >>> ed.engine_full
     'MergeTree() PARTITION BY toYear(timestamp) ORDER BY (timestamp, cityHash64(location)) SAMPLE BY cityHash64(location) SETTINGS index_granularity = 8192, ttl_only_drop_parts = 1, merge_with_ttl_timeout = 1800 TTL toDate(timestamp) + INTERVAL 1 DAY'
@@ -222,21 +202,6 @@ class TableDetails:
         _sign = self.details.get("sign", None)
         return _sign
 
-    @property
-    def join_strictness(self):
-        _join_strictness = self.details.get("join_strictness", None)
-        return _join_strictness
-
-    @property
-    def join_type(self):
-        _join_type = self.details.get("join_type", None)
-        return _join_type
-
-    @property
-    def key_columns(self):
-        _key_columns = self.details.get("key_columns", None)
-        return _key_columns
-
     @property
     def statistics(self) -> Dict[str, Any]:
         return {
@@ -268,12 +233,6 @@ class TableDetails:
             d["sampling_key"] = self.sampling_key
         if self.settings:
             d["settings"] = self.settings
-        if self.join_strictness:
-            d["join_strictness"] = self.join_strictness
-        if self.join_type:
-            d["join_type"] = self.join_type
-        if self.key_columns:
-            d["key_columns"] = self.key_columns
         if self.ver:
             d["ver"] = self.ver
         if self.is_deleted:
@@ -292,10 +251,7 @@ class TableDetails:
             d = {**d, **engine_params}
 
         if include_empty_details:
-            if self.engine and self.engine.lower() == "join":
-                d = set_empty_details(d, DEFAULT_JOIN_EMPTY_PARAMETERS)
-            else:
-                d = set_empty_details(d, DEFAULT_EMPTY_PARAMETERS)
+            d = set_empty_details(d, DEFAULT_EMPTY_PARAMETERS)
 
         if exclude:
             for attr in exclude:
@@ -480,20 +436,6 @@ ENABLED_ENGINES = [
         ],
         MERGETREE_OPTIONS,
     ),
-    # Join(join_strictness, join_type, k1[, k2, ...])
-    engine_config(
-        "Join",
-        [
-            # https://github.com/ClickHouse/ClickHouse/blob/fa8e4e4735b932f08b6beffcb2d069b72de34401/src/Storages/StorageJoin.cpp
-            EngineParam(
-                name="join_strictness", required=True, is_valid=case_insensitive_check(["ANY", "ALL", "SEMI", "ANTI"])
-            ),
-            EngineParam(
-                name="join_type", required=True, is_valid=case_insensitive_check(["LEFT", "INNER", "RIGHT", "FULL"])
-            ),
-            EngineParam(name="key_columns", required=True, is_valid=columns_are_valid),
-        ],
-    ),
     # Null()
     engine_config("Null"),
 ]
@@ -599,7 +541,7 @@ def engine_full_from_dict(
     >>> engine_full_from_dict('wadus', {}, schema=schema)
     Traceback (most recent call last):
     ...
-    ValueError: Engine wadus is not supported, supported engines include: MergeTree, ReplacingMergeTree, SummingMergeTree, AggregatingMergeTree, CollapsingMergeTree, VersionedCollapsingMergeTree, Join, Null
+    ValueError: Engine wadus is not supported, supported engines include: MergeTree, ReplacingMergeTree, SummingMergeTree, AggregatingMergeTree, CollapsingMergeTree, VersionedCollapsingMergeTree, Null
     >>> schema = ''
     >>> engine_full_from_dict('null', {}, schema=schema)
     'Null()'
@@ -607,19 +549,6 @@ def engine_full_from_dict(
     >>> engine_full_from_dict('null', {}, columns=[])
     'Null()'
 
-    >>> schema = 'cid Int32'
-    >>> engine_full_from_dict('Join', {'join_strictness': 'ANY', 'join_type': 'LEFT', 'key_columns': 'cid'}, schema=schema)
-    'Join(ANY, LEFT, cid)'
-    >>> engine_full_from_dict('Join', {'join_strictness': 'ANY', 'join_type': 'LEFT', 'key_columns': 'cid'}, columns=[{'name': 'cid', 'type': 'Int32', 'codec': None, 'default_value': None, 'nullable': False, 'normalized_name': 'cid'}])
-    'Join(ANY, LEFT, cid)'
-    >>> schema = 'cid1 Int32, cid2 Int8'
-    >>> engine_full_from_dict('Join', {'join_strictness': 'ANY', 'join_type': 'LEFT', 'key_columns': 'cid1, cid2'}, schema=schema)
-    'Join(ANY, LEFT, cid1, cid2)'
-    >>> engine_full_from_dict('Join', {'join_strictness': 'ANY', 'join_type': 'OUTER', 'key_columns': 'cid'}, schema=schema)
-    Traceback (most recent call last):
-    ...
-    ValueError: Invalid value 'OUTER' for parameter 'engine_join_type', reason: valid values are LEFT, INNER, RIGHT, FULL
-
     >>> schema = ''
     >>> engine_full_from_dict('MergeTree', {}, schema=schema)
     'MergeTree() ORDER BY (tuple())'
@@ -715,10 +644,6 @@ def engine_params_from_engine_full(engine_full: str) -> Dict[str, Any]:
     """
     >>> engine_params_from_engine_full("Null()")
     {}
-    >>> engine_params_from_engine_full("Join(ANY, LEFT, id)")
-    {'join_strictness': 'ANY', 'join_type': 'LEFT', 'key_columns': 'id'}
-    >>> engine_params_from_engine_full("Join(ANY, LEFT, k1, k2)")
-    {'join_strictness': 'ANY', 'join_type': 'LEFT', 'key_columns': 'k1, k2'}
     >>> engine_params_from_engine_full("AggregatingMergeTree('/clickhouse/tables/{layer}-{shard}/d_f837aa.sales_by_country_rt__v0_staging_t_00c3091e7530472caebda05e97288a1d', '{replica}') PARTITION BY toYYYYMM(date) ORDER BY (purchase_location, cod_device, date) SETTINGS index_granularity = 8192")
     {}
     >>> engine_params_from_engine_full("ReplicatedSummingMergeTree('/clickhouse/tables/{layer}-{shard}/d_abcf3e.t_69f9da31f4524995b8911e1b24c80ab4', '{replica}') PARTITION BY toYYYYMM(date) ORDER BY (date, purchase_location, sku_rank_lc) SETTINGS index_granularity = 8192")

{tinybird_cli-5.22.2.dev0 → tinybird_cli-6.0.1}/tinybird/client.py

@@ -62,9 +62,7 @@ class JobException(Exception):
 def connector_equals(connector, datafile_params):
     if not connector:
         return False
-    if connector["name"] == datafile_params["kafka_connection_name"]:
-        return True
-    return False
+    return connector["name"] == datafile_params["kafka_connection_name"]
 
 
 def parse_error_response(response: Response) -> str:
@@ -316,15 +314,9 @@ class TinyB:
         response = await self._req(f"/v0/connectors?{urlencode(params)}")
         return response["connectors"]
 
-    async def connections(self, connector: Optional[str] = None, skip_bigquery: Optional[bool] = False):
+    async def connections(self, connector: Optional[str] = None):
         response = await self._req("/v0/connectors")
         connectors = response["connectors"]
-        bigquery_connection = None
-        if not skip_bigquery:
-            bigquery_connection = (
-                await self.bigquery_connection() if connector == "bigquery" or connector is None else None
-            )
-        connectors = [*connectors, bigquery_connection] if bigquery_connection else connectors
         if connector:
             return [
                 {
@@ -348,22 +340,6 @@ class TinyB:
             for c in connectors
         ]
 
-    async def bigquery_connection(self):
-        bigquery_resources = await self.list_gcp_resources()
-        if len(bigquery_resources) == 0:
-            return None
-
-        gcp_account_details: Dict[str, Any] = await self.get_gcp_service_account_details()
-        datasources = await self.datasources()
-        bigquery_datasources = [ds["name"] for ds in datasources if ds["type"] == "bigquery"]
-        return {
-            "id": gcp_account_details["account"].split("@")[0],
-            "service": "bigquery",
-            "name": "bigquery",
-            "linkers": bigquery_datasources,
-            "settings": gcp_account_details,
-        }
-
     async def get_datasource(self, ds_name: str, used_by: bool = False) -> Dict[str, Any]:
         params = {
             "attrs": "used_by" if used_by else "",
@@ -1024,118 +1000,23 @@ class TinyB:
         )
         return [x["topic"] for x in resp["preview"]]
 
-    async def get_gcp_service_account_details(self) -> Dict[str, Any]:
-        return await self._req("/v0/datasources-bigquery-credentials")
-
-    async def list_connectors(self, service: Optional[str] = None) -> List[Dict[str, Any]]:
-        try:
-            params: str = f"?service={service}" if service else ""
-            result = await self._req(f"/v0/connections/{params}")
-            if not result:
-                return []
-
-            return result.get("connectors", [])
-        except Exception:
-            return []
-
     async def get_connector(
         self,
         name_or_id: str,
         service: Optional[str] = None,
         key: Optional[str] = "name",
-        skip_bigquery: Optional[bool] = False,
     ) -> Optional[Dict[str, Any]]:
         return next(
-            (c for c in await self.connections(connector=service, skip_bigquery=skip_bigquery) if c[key] == name_or_id),
+            (c for c in await self.connections(connector=service) if c[key] == name_or_id),
             None,
         )
 
     async def get_connector_by_id(self, connector_id: Optional[str] = None):
         return await self._req(f"/v0/connectors/{connector_id}")
 
-    async def get_snowflake_integration_query(
-        self, role: str, stage: Optional[str], integration: Optional[str]
-    ) -> Optional[Dict[str, Any]]:
-        try:
-            params = {
-                "role": role,
-            }
-            if stage:
-                params["stage"] = stage
-            if integration:
-                params["integration"] = integration
-
-            return await self._req(f"/v0/connectors/snowflake/instructions?{urlencode(params)}")
-        except Exception:
-            return None
-
-    async def list_gcp_resources(self) -> List[Dict[str, Any]]:
-        try:
-            resources = await self._req("/v0/connections/bigquery")
-            if not resources:
-                return []
-
-            return resources.get("items", [])
-        except Exception:
-            return []
-
-    async def check_gcp_read_permissions(self) -> bool:
-        """Returns `True` if our service account (see `TinyB::get_gcp_service_account_details()`)
-        has the proper permissions in GCP.
-
-        Here we assume that we have permissions if we can list resources but currently this
-        logic is wrong under some circumstances.
-
-        See https://gitlab.com/tinybird/analytics/-/issues/6485.
-        """
-        try:
-            items = await self.list_gcp_resources()
-            if not items:
-                return False
-            return len(items) > 0
-        except Exception:
-            return False
-
     async def connector_delete(self, connection_id):
         return await self._req(f"/v0/connectors/{connection_id}", method="DELETE")
 
-    async def connection_create_snowflake(
-        self,
-        account_identifier: str,
-        user: str,
-        password: str,
-        warehouse: str,
-        role: str,
-        connection_name: str,
-        integration: Optional[str],
-        stage: Optional[str],
-    ) -> Dict[str, Any]:
-        params = {
-            "service": "snowflake",
-            "name": connection_name,
-            "account": account_identifier,
-            "username": user,
-            "password": password,
-            "role": role,
-            "warehouse": warehouse,
-        }
-
-        if integration:
-            params["integration"] = integration
-        if stage:
-            params["stage"] = stage
-
-        return await self._req(f"/v0/connectors?{urlencode(params)}", method="POST", data="")
-
-    async def validate_snowflake_connection(self, account_identifier: str, user: str, password: str) -> bool:
-        try:
-            roles = await self.get_snowflake_roles(account_identifier, user, password)
-            if not roles:
-                return False
-            return len(roles) > 0
-        except Exception:
-            return False
-
     async def validate_preview_connection(self, service: str, params: Dict[str, Any]) -> bool:
         params = {"service": service, "dry_run": "true", **params}
         bucket_list = None
@@ -1154,25 +1035,6 @@ class TinyB:
     async def connection_create(self, params: Dict[str, Any]) -> Dict[str, Any]:
         return await self._req(f"/v0/connectors?{urlencode(params)}", method="POST", data="")
 
-    async def get_snowflake_roles(self, account_identifier: str, user: str, password: str) -> Optional[List[str]]:
-        params = {"account": account_identifier, "username": user, "password": password}
-
-        response = await self._req(f"/v0/connectors/snowflake/roles?{urlencode(params)}", method="POST", data="")
-        return response["roles"]
-
-    async def get_snowflake_warehouses(
-        self, account_identifier: str, user: str, password: str, role: str
-    ) -> Optional[List[Dict[str, Any]]]:
-        params = {
-            "account": account_identifier,
-            "username": user,
-            "password": password,
-            "role": role,
-        }
-
-        response = await self._req(f"/v0/connectors/snowflake/warehouses?{urlencode(params)}", method="POST", data="")
-        return response["warehouses"]
-
     async def get_trust_policy(self, service: str) -> Dict[str, Any]:
         return await self._req(f"/v0/integrations/{service}/policies/trust-policy")
 

{tinybird_cli-5.22.2.dev0 → tinybird_cli-6.0.1}/tinybird/config.py

@@ -19,7 +19,6 @@ DEFAULT_LOCALHOST = "http://localhost:8001"
 CURRENT_VERSION = f"{__cli__.__version__}"
 VERSION = f"{__cli__.__version__} (rev {__revision__})"
 DEFAULT_UI_HOST = "https://app.tinybird.co"
-SUPPORTED_CONNECTORS = ["bigquery", "snowflake"]
 PROJECT_PATHS = ["datasources", "datasources/fixtures", "endpoints", "pipes", "tests", "scripts", "deploy"]
 DEPRECATED_PROJECT_PATHS = ["endpoints"]
 MIN_WORKSPACE_ID_LENGTH = 36
@@ -138,7 +137,3 @@ class FeatureFlags:
     @classmethod
     def is_localhost(cls) -> bool:
         return "SET_LOCALHOST" in environ
-
-    @classmethod
-    def enable_snowflake_connector_command(cls) -> bool:
-        return "ENABLE_SNOWFLAKE_CONNECTOR_COMMAND" in environ

{tinybird_cli-5.22.2.dev0 → tinybird_cli-6.0.1}/tinybird/context.py

@@ -11,7 +11,6 @@ hfi_workspace_data: ContextVar["HfiWorkspaceData"] = ContextVar("hfi_workspace_d
 table_id: ContextVar[str] = ContextVar("table_id")
 hfi_frequency: ContextVar[float] = ContextVar("hfi_frequency")
 hfi_frequency_gatherer: ContextVar[float] = ContextVar("hfi_frequency_gatherer")
-use_gatherer: ContextVar[bool] = ContextVar("use_gatherer")
 gatherer_allow_s3_backup_on_user_errors: ContextVar[bool] = ContextVar("gatherer_allow_s3_backup_on_user_errors")
 disable_template_security_validation: ContextVar[bool] = ContextVar("disable_template_security_validation")
 origin: ContextVar[str] = ContextVar("origin")

{tinybird_cli-5.22.2.dev0 → tinybird_cli-6.0.1}/tinybird/datafile_common.py

@@ -81,6 +81,10 @@ from .tornado_template import UnClosedIfError
 os.environ["GIT_PYTHON_REFRESH"] = "quiet"
 from git import HEAD, Diff, GitCommandError, InvalidGitRepositoryError, Repo
 
+# Pre-compiled regex patterns
+_PATTERN_VERSION_NUMBER = re.compile(r"[0-9]+$")
+_PATTERN_VERSIONED_RESOURCE = re.compile(r"([^\s\.]*__v\d+)")
+
 INTERNAL_TABLES: Tuple[str, ...] = (
     "datasources_ops_log",
     "pipe_stats",
@@ -1412,15 +1416,6 @@ async def process_file(
 
         service: Optional[str] = node.get("import_service", None)
 
-        if service and service.lower() == "bigquery":
-            if not await tb_client.check_gcp_read_permissions():
-                raise click.ClickException(FeedbackManager.error_unknown_bq_connection(datasource=datasource["name"]))
-
-            # Bigquery doesn't have a datalink, so we can stop here
-            return params
-
-        # Rest of connectors
-
         connector_id: Optional[str] = node.get("import_connector", None)
         connector_name: Optional[str] = node.get("import_connection_name", None)
         if not connector_name and not connector_id:
@@ -1525,7 +1520,7 @@ async def process_file(
         params.update(get_engine_params(node))
 
         if "import_service" in node or "import_connection_name" in node:
-            VALID_SERVICES: Tuple[str, ...] = ("bigquery", "snowflake", "s3", "s3_iamrole", "gcs", "dynamodb")
+            VALID_SERVICES: Tuple[str, ...] = ("s3", "s3_iamrole", "gcs", "dynamodb")
 
             import_params = await get_import_params(params, node)
 
@@ -1823,7 +1818,10 @@ def find_file_by_name(
                     wk_path, name.replace(f"{wk_name}.", ""), verbose, is_raw, resource=resource
                 )
             if file:
-                return file, _resource
+                # Preserve workspace prefix in the returned filename to avoid conflicts
+                # with local files of the same name (e.g., vendored datasource "workspace.ds"
+                # vs local pipe with same base name)
+                return f"{wk_name}.{file}", _resource
 
     if not is_raw:
         f, raw = find_file_by_name(
@@ -3259,12 +3257,6 @@ async def new_ds(
     ):
         raise click.ClickException(FeedbackManager.error_dynamodb_engine_not_supported(engine=engine_param))
 
-    if engine_param.lower() == "join":
-        deprecation_notice = FeedbackManager.warning_deprecated(
-            warning="Data Sources with Join engine are deprecated and will be removed in the next major release of tinybird-cli. Use MergeTree instead."
-        )
-        click.echo(deprecation_notice)
-
     if not datasource_exists or fork_downstream or fork:
         params = ds["params"]
         params["branch_mode"] = "fork" if fork_downstream or fork else "None"
@@ -3434,19 +3426,15 @@ async def new_ds(
 
     ds_params = ds["params"]
     service = ds_params.get("service")
-    DATASOURCE_VALID_SERVICES_TO_UPDATE = ["bigquery", "snowflake"]
+    DATASOURCE_VALID_SERVICES_TO_UPDATE: List[str] = []
     if datasource_exists and service and service in [*DATASOURCE_VALID_SERVICES_TO_UPDATE, *PREVIEW_CONNECTOR_SERVICES]:
         connector_required_params = {
-            "bigquery": ["service", "cron"],
-            "snowflake": ["connector", "service", "cron", "external_data_source"],
             "s3": ["connector", "service", "cron", "bucket_uri"],
             "s3_iamrole": ["connector", "service", "cron", "bucket_uri"],
             "gcs": ["connector", "service", "cron", "bucket_uri"],
         }.get(service, [])
 
-        connector_at_least_one_required_param = {
-            "bigquery": ["external_data_source", "query"],
-        }.get(service, [])
+        connector_at_least_one_required_param: List[str] = []
 
         if connector_at_least_one_required_param and not any(
             key in ds_params for key in connector_at_least_one_required_param
@@ -3515,6 +3503,10 @@ async def new_ds(
         except Exception as e:
             promote_error_message = str(e)
 
+    # Update token scopes when force-pushing an existing datasource
+    if ds.get("tokens"):
+        await manage_tokens()
+
     if alter_response and make_changes:
         # alter operation finished
         pass
@@ -3701,7 +3693,7 @@ def get_name_version(ds: str) -> Dict[str, Any]:
         return {"name": tk[0], "version": None}
     elif len(tk) == 2:
         if len(tk[1]):
-            if tk[1][0] == "v" and re.match("[0-9]+$", tk[1][1:]):
+            if tk[1][0] == "v" and _PATTERN_VERSION_NUMBER.match(tk[1][1:]):
                 return {"name": tk[0], "version": int(tk[1][1:])}
             else:
                 return {"name": tk[0] + "__" + tk[1], "version": None}
@@ -4359,9 +4351,7 @@ async def folder_push(
         )
         if resource_full_name not in existing_resources:
             return True
-        if force or run_tests:
-            return True
-        return False
+        return force or run_tests
 
     async def push(
         name: str,
@@ -5323,7 +5313,7 @@ async def folder_pull(
 
                             resource_to_write = f"VERSION {k['version']}\n" + resource_to_write
                         if resource_to_write:
-                            matches = re.findall(r"([^\s\.]*__v\d+)", resource_to_write)
+                            matches = _PATTERN_VERSIONED_RESOURCE.findall(resource_to_write)
                             for match in set(matches):
                                 m = match.split("__v")[0]
                                 if m in resources or m in resource_names:
@@ -5545,9 +5535,7 @@ async def diff_files(
 
 
 def is_endpoint(resource: Optional[Dict[str, Any]]) -> bool:
-    if resource and len(resource.get("tokens", [])) != 0 and resource.get("resource") == "pipes":
-        return True
-    return False
+    return bool(resource and len(resource.get("tokens", [])) != 0 and resource.get("resource") == "pipes")
 
 
 def is_materialized(resource: Optional[Dict[str, Any]]) -> bool:
@@ -5608,9 +5596,7 @@ def get_target_materialized_data_source_name(resource: Optional[Dict[str, Any]])
 
 
 def is_datasource(resource: Optional[Dict[str, Any]]) -> bool:
-    if resource and resource.get("resource") == "datasources":
-        return True
-    return False
+    return bool(resource and resource.get("resource") == "datasources")
 
 
 async def create_release(
@@ -5661,15 +5647,13 @@ def update_connector_params(service: str, ds_params: Dict[str, Any], connector_r
     """
     Update connector parameters for a given service, ensuring required parameters exist.
 
-    :param service: The name of the service (e.g., 'bigquery').
+    :param service: The name of the service (e.g., 's3').
     :param ds_params: The data source parameters to be checked.
     :param connector_required_params: The list of required parameters for the connector.
     :return: None
     """
 
-    connector_at_least_one_required_param: List[str] = {
-        "bigquery": ["external_data_source", "query"],
-    }.get(service, [])
+    connector_at_least_one_required_param: List[str] = []
 
     # Handle the "at least one param" requirement
     if connector_at_least_one_required_param and not any(

{tinybird_cli-5.22.2.dev0 → tinybird_cli-6.0.1}/tinybird/datatypes.py

@@ -35,6 +35,7 @@ date_pattern = re.compile(r"\d\d\d\d-\d\d-\d\d$")
 
 datetime64_type_pattern = re.compile(r"^DateTime64(\([1-9](, ?'.+')?\))?$")
 datetime_type_pattern = re.compile(r"^DateTime(\(('.+')?)?\)?$")
+date_type_pattern = re.compile(r"^Date(\(('.+')?)?\)?$")
 
 # List from https://github.com/tinybirdco/ClickHousePrivate/blob/153473d9c1c871974688a1d72dcff7a13fc2076c/src/DataTypes/Serializations/SerializationBool.cpp#L216
 bool_allowed_values = {
@@ -95,6 +96,18 @@ def is_type_datetime(type_to_check: str) -> bool:
     return datetime_type_pattern.match(type_to_check) is not None
 
 
+def is_type_date(type_to_check: str) -> bool:
+    """
+    >>> is_type_date('Date')
+    True
+    >>> is_type_date('Date()')
+    True
+    >>> is_type_date("date")
+    False
+    """
+    return date_type_pattern.match(type_to_check) is not None
+
+
 def string_test(x: str) -> bool:
     return True