tinybird 4.6.17.dev0__tar.gz → 4.6.18__tar.gz

{tinybird-4.6.17.dev0 → tinybird-4.6.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.17.dev0
+Version: 4.6.18
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,21 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.18
+********
+
+- `Fixed` CLI commands (for example ``tb migrate-to-forward``) no longer abort on startup when the best-effort refresh of the cached workspace id/name fails for a reason other than authentication.
+
+4.6.17
+********
+
+- `Added` ``tb job retry <job_id>`` to retry eligible import and S3/GCS sync jobs in ``error`` or ``cancelled`` status.
+
+4.6.16
+********
+
+- `Fixed` ``tb deployment promote --wait`` and ``tb deployment discard --wait`` no longer hang forever when the server reports the old/discarded deployment removal as ``failed``; the CLI now detects the failure, prints the deployment errors, and exits non-zero.
+
 4.6.15
 ********
 

{tinybird-4.6.17.dev0 → tinybird-4.6.18}/tinybird/ch_utils/engine.py

@@ -111,8 +111,7 @@ class TableDetails:
 
     @property
     def version(self):
-        _version = self.details.get("version", None)
-        return _version
+        return self.details.get("version", None)
 
     def is_replicated(self) -> bool:
         engine: Optional[str] = self.details.get("engine", None)
@@ -183,6 +182,7 @@ class TableDetails:
         settings = self.details.get("settings", None)
         if settings and settings.strip().lower() != "index_granularity = 8192":
             return settings
+        return None
 
     @property
     def ttl(self):
@@ -190,23 +190,19 @@ class TableDetails:
 
     @property
     def ver(self):
-        _ver = self.details.get("ver", None)
-        return _ver
+        return self.details.get("ver", None)
 
     @property
     def is_deleted(self):
-        _is_deleted = self.details.get("is_deleted", None)
-        return _is_deleted
+        return self.details.get("is_deleted", None)
 
     @property
     def columns(self):
-        _columns = self.details.get("columns", None)
-        return _columns
+        return self.details.get("columns", None)
 
     @property
     def sign(self):
-        _sign = self.details.get("sign", None)
-        return _sign
+        return self.details.get("sign", None)
 
     @property
     def statistics(self) -> Dict[str, Any]:
@@ -699,8 +695,7 @@ def ttl_from_engine(engine: str) -> Optional[str]:
         return None
     settings_array = engine.split(" SETTINGS ")
     settings = " SETTINGS " + settings_array[1] if len(settings_array) > 1 else None
-    ttl = ttl_array[1][: -(len(settings))] if settings else ttl_array[1]
-    return ttl
+    return ttl_array[1][: -(len(settings))] if settings else ttl_array[1]
 
 
 def ttl_condition_from_engine_full(engine_full: Optional[str]) -> Optional[str]:

{tinybird-4.6.17.dev0 → tinybird-4.6.18}/tinybird/client.py

@@ -266,14 +266,13 @@ class TinyB:
 
     async def alter_tokens(self, name: str, scopes: List[str]):
         if not scopes:
-            return
+            return None
         scopes_url: str = "&".join([f"scope={scope}" for scope in scopes])
         url = f"/v0/tokens/{name}"
         if len(url + "?" + scopes_url) > TinyB.MAX_GET_LENGTH:
             return await self._req(url, method="PUT", data=scopes_url)
-        else:
-            url = url + "?" + scopes_url
-            return await self._req(url, method="PUT", data="")
+        url = url + "?" + scopes_url
+        return await self._req(url, method="PUT", data="")
 
     async def datasources(self, branch: Optional[str] = None, used_by: bool = False) -> List[Dict[str, Any]]:
         params = {}
@@ -294,16 +293,13 @@ class TinyB:
         return await self._req(f"/v0/variables/{name}")
 
     async def create_secret(self, name: str, value: str):
-        response = await self._req("/v0/variables", method="POST", data={"name": name, "value": value})
-        return response
+        return await self._req("/v0/variables", method="POST", data={"name": name, "value": value})
 
     async def update_secret(self, name: str, value: str):
-        response = await self._req(f"/v0/variables/{name}", method="PUT", data={"value": value})
-        return response
+        return await self._req(f"/v0/variables/{name}", method="PUT", data={"value": value})
 
     async def delete_secret(self, name: str):
-        response = await self._req(f"/v0/variables/{name}", method="DELETE")
-        return response
+        return await self._req(f"/v0/variables/{name}", method="DELETE")
 
     async def get_connections(self, service: Optional[str] = None):
         params = {}
@@ -577,8 +573,7 @@ class TinyB:
         node_name = node["params"]["name"] if node.get("params", None) else node["name"]
         if datasource_name:
             params["datasource"] = datasource_name
-        response = await self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/analysis?{urlencode(params)}")
-        return response
+        return await self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/analysis?{urlencode(params)}")
 
     async def populate_node(
         self,
@@ -600,10 +595,7 @@ class TinyB:
             params.update({"populate_condition": populate_condition})
         if on_demand_compute:
             params.update({"on_demand_compute": "true"})
-        response = await self._req(
-            f"/v0/pipes/{pipe_name}/nodes/{node_name}/population?{urlencode(params)}", method="POST"
-        )
-        return response
+        return await self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/population?{urlencode(params)}", method="POST")
 
     async def pipes(self, branch=None, dependencies: bool = False, node_attrs=None, attrs=None) -> List[Dict[str, Any]]:
         params = {
@@ -635,9 +627,8 @@ class TinyB:
         query_string = urlencode(params)
         if len(url + "?" + query_string) > TinyB.MAX_GET_LENGTH:
             return await self._req(f"/v0/pipes/{pipe_name_or_uid}.{format}", method="POST", data=params)
-        else:
-            url = url + "?" + query_string
-            return await self._req(url)
+        url = url + "?" + query_string
+        return await self._req(url)
 
     async def pipe_create(self, pipe_name: str, sql: str):
         return await self._req(
@@ -726,8 +717,7 @@ class TinyB:
 
         if len(sql) > TinyB.MAX_GET_LENGTH:
             return await self._req(f"/v0/sql?{urlencode(params)}", data=sql, method="POST")
-        else:
-            return await self._req(f"/v0/sql?q={quote(sql, safe='')}&{urlencode(params)}")
+        return await self._req(f"/v0/sql?q={quote(sql, safe='')}&{urlencode(params)}")
 
     async def jobs(self, status=None):
         jobs = (await self._req("/v0/jobs"))["jobs"]
@@ -922,7 +912,7 @@ class TinyB:
 
     async def add_workspaces_to_organization(self, organization_id: str, workspace_ids: List[str]):
         if not workspace_ids:
-            return
+            return None
         return await self._req(
             f"/v0/organizations/{organization_id}/workspaces",
             method="PUT",
@@ -1105,8 +1095,7 @@ class TinyB:
                 from tinybird.sql_toolset import format_sql
 
                 return format_sql(sql)
-            else:
-                return await self._sql_get_format_remote(sql, with_clickhouse_format)
+            return await self._sql_get_format_remote(sql, with_clickhouse_format)
         except ModuleNotFoundError:
             return await self._sql_get_format_remote(sql, with_clickhouse_format)
 
@@ -1168,8 +1157,7 @@ class TinyB:
         return next((connector for connector in result["connectors"] if connector_equals(connector, kwargs)), None)
 
     async def regions(self):
-        regions = await self._req("/v0/regions")
-        return regions
+        return await self._req("/v0/regions")
 
     async def datasource_query_copy(self, datasource_name: str, sql_query: str):
         params = {"copy_to": datasource_name}

{tinybird-4.6.17.dev0 → tinybird-4.6.18}/tinybird/datafile/common.py

@@ -502,13 +502,12 @@ class Datafile:
                     f"For Kafka sinks, provide 'export_kafka_topic'. "
                     f"For S3/GCS sinks, provide 'export_bucket_uri' and 'export_file_template'."
                 )
-            else:
-                # There are some export parameters, but they don't match known patterns
-                raise DatafileValidationError(
-                    f"Sink node {repr(node['name'])} has unrecognized export parameters: {export_params}. "
-                    f"For Kafka sinks, use 'export_kafka_topic'. "
-                    f"For S3/GCS sinks, use 'export_bucket_uri' and 'export_file_template'."
-                )
+            # There are some export parameters, but they don't match known patterns
+            raise DatafileValidationError(
+                f"Sink node {repr(node['name'])} has unrecognized export parameters: {export_params}. "
+                f"For Kafka sinks, use 'export_kafka_topic'. "
+                f"For S3/GCS sinks, use 'export_bucket_uri' and 'export_file_template'."
+            )
 
         # Validate schedule format (common for both Kafka and S3/GCS)
         export_schedule = node.get("export_schedule")
@@ -1073,8 +1072,7 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
     # Find the first SyntaxExpr in lookup that matches the schema at the current offset
     def lookahead_matches(lookup: Iterable) -> Optional[SyntaxExpr]:
         s = schema[i:]
-        match = next((x for x in lookup if x.regex.match(s)), None)
-        return match
+        return next((x for x in lookup if x.regex.match(s)), None)
 
     def advance_single_char() -> None:
         nonlocal i, line, pos
@@ -1122,10 +1120,9 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
                     )
                 advance_single_char()
             return schema[begin:i]
-        else:
-            # backticked name
-            advance_single_char()
-            return get_backticked()
+        # backticked name
+        advance_single_char()
+        return get_backticked()
 
     def parse_expr(lookup: Iterable[SyntaxExpr], attribute: str) -> str:
         """Parse an expression for an attribute.
@@ -1296,10 +1293,9 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
                     or "incompatible data types between aggregate function" in str(e).lower()
                 ):
                     raise SchemaSyntaxError(message=str(e), lineno=line, pos=type_start_pos)
-                else:
-                    # TODO(eclbg): The resulting error message is a bit confusing, as the clickhouse error contains some
-                    # references to positions that don't match the position in the schema.
-                    raise SchemaSyntaxError(f"Error parsing type: {e}", lineno=line, pos=type_start_pos)
+                # TODO(eclbg): The resulting error message is a bit confusing, as the clickhouse error contains some
+                # references to positions that don't match the position in the schema.
+                raise SchemaSyntaxError(f"Error parsing type: {e}", lineno=line, pos=type_start_pos)
             except ModuleNotFoundError:
                 pass
             _type = detected_type
@@ -1690,8 +1686,9 @@ def parse(
 
             if severity == "error":
                 return raise_deprecation_error
-            elif severity == "warning":
+            if severity == "warning":
                 return add_deprecation_warning
+            return None
 
         return inner
 
@@ -2238,12 +2235,11 @@ def parse(
     except IndexError as e:
         if "node" in line.lower():
             raise click.ClickException(FeedbackManager.error_missing_node_name())
-        elif "sql" in line.lower():
+        if "sql" in line.lower():
             raise click.ClickException(FeedbackManager.error_missing_sql_command())
-        elif "datasource" in line.lower():
+        if "datasource" in line.lower():
             raise click.ClickException(FeedbackManager.error_missing_datasource_name())
-        else:
-            raise ValidationException(f"Validation error, found {line} in line {str(lineno)}: {str(e)}", lineno=lineno)
+        raise ValidationException(f"Validation error, found {line} in line {str(lineno)}: {str(e)}", lineno=lineno)
     except IncludeFileNotFoundException as e:
         raise IncludeFileNotFoundException(str(e), lineno=lineno)
     except Exception as e:
@@ -2577,12 +2573,11 @@ def get_name_version(ds: str) -> Dict[str, Any]:
     tk = ds.rsplit("__", 2)
     if len(tk) == 1:
         return {"name": tk[0], "version": None}
-    elif len(tk) == 2:
+    if len(tk) == 2:
         if len(tk[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}
+            return {"name": tk[0] + "__" + tk[1], "version": None}
     elif len(tk) == 3 and len(tk[2]):
         if tk[2] == "checker":
             return {"name": tk[0] + "__" + tk[1] + "__" + tk[2], "version": None}

{tinybird-4.6.17.dev0 → tinybird-4.6.18}/tinybird/git_settings.py

@@ -137,9 +137,7 @@ def bump_version(version: str, next_version: Optional[str]) -> str:
 
 
 def get_default_init_files_deploy(workspace_name: str) -> Dict[str, str]:
-    modified_files = {
+    return {
         path.replace("tinybird_", f"tinybird_{workspace_name.lower()}_"): content
         for path, content in DEFAULT_INIT_FILES_DEPLOY.items()
     }
-
-    return modified_files

{tinybird-4.6.17.dev0 → tinybird-4.6.18}/tinybird/service_datasources.py

@@ -335,13 +335,14 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
             ],
         },
         {
-            "name": "tinybird.rate_limits_log",
-            "description": "Endpoint concurrency limiter transitions in your workspace.",
+            "name": "tinybird.cluster_control_log",
+            "description": "Actions applied by cluster control in your workspace to keep the load of your cluster under control: one row every time cluster control applies, updates, or clears the concurrency limit of an endpoint. rate_limit_type is the control family, currently always endpoint_concurrency. action is the transition: applied, updated, or cleared. limit_metadata is a JSON object with the inputs of the decision and the resulting limit, read it with JSONExtract functions; its keys are max_concurrent_queries (UInt64, the limit in force after the transition), change_reason (String), analysis_window_seconds (UInt64), and the nullable estimated_qps, request_count, observed_qps, error_count, success_count, error_to_success_ratio, rate_limited_request_count, degradation_reason, pipe_cpu_time, total_cpu_time, pipe_cpu_ratio and max_cpu_ratio. This data source has a TTL of 6 months.",
             "dateColumn": "timestamp",
             "engine": {
                 "engine": "MergeTree",
                 "sorting_key": "timestamp, pipe_name",
                 "partition_key": "toYYYYMM(timestamp)",
+                "ttl": "toStartOfMonth(toDateTime(timestamp)) + toIntervalMonth(6)",
             },
             "columns": [
                 {"name": "timestamp", "type": "DateTime64(3)"},
@@ -732,13 +733,14 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
             ],
         },
         {
-            "name": "organization.rate_limits_log",
-            "description": "Endpoint concurrency limiter transitions across the organization.",
+            "name": "organization.cluster_control_log",
+            "description": "Actions applied by cluster control across all the workspaces in your organization to keep the load of your cluster under control: one row every time cluster control applies, updates, or clears the concurrency limit of an endpoint. workspace_id and workspace_name identify the affected workspace. rate_limit_type is the control family, currently always endpoint_concurrency. action is the transition: applied, updated, or cleared. limit_metadata is a JSON object with the inputs of the decision and the resulting limit, read it with JSONExtract functions; its keys are max_concurrent_queries (UInt64, the limit in force after the transition), change_reason (String), analysis_window_seconds (UInt64), and the nullable estimated_qps, request_count, observed_qps, error_count, success_count, error_to_success_ratio, rate_limited_request_count, degradation_reason, pipe_cpu_time, total_cpu_time, pipe_cpu_ratio and max_cpu_ratio. This data source has a TTL of 6 months.",
             "dateColumn": "timestamp",
             "engine": {
                 "engine": "MergeTree",
                 "sorting_key": "workspace_id, timestamp, pipe_name",
                 "partition_key": "toYYYYMM(timestamp)",
+                "ttl": "toStartOfMonth(toDateTime(timestamp)) + toIntervalMonth(6)",
             },
             "columns": [
                 {"name": "timestamp", "type": "DateTime64(3)"},

{tinybird-4.6.17.dev0 → tinybird-4.6.18}/tinybird/sql.py

@@ -675,10 +675,9 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
                     )
                 advance_single_char()
             return schema[begin:i]
-        else:
-            # backticked name
-            advance_single_char()
-            return get_backticked()
+        # backticked name
+        advance_single_char()
+        return get_backticked()
 
     def parse_expr(lookup: Iterable[SyntaxExpr]) -> str:
         nonlocal i, line, pos

{tinybird-4.6.17.dev0 → tinybird-4.6.18}/tinybird/sql_template.py

@@ -142,8 +142,7 @@ def transform_type(
             if x is None:
                 if defined:
                     raise SQLTemplateException(REQUIRED_PARAM_NOT_DEFINED, documentation="/cli/advanced-templates.html")
-                else:
-                    return None
+                return None
         if tester == "String":
             if x is not None:
                 return transform(x)
@@ -167,12 +166,11 @@ def _and(*args, **kwargs):
         tk = k.rsplit("__", 1)
         if len(tk) == 1:
             return "="
-        else:
-            if tk[1] in operands:
-                return operands[tk[1]]
-            raise SQLTemplateException(
-                f"operand {tk[1]} not supported", documentation="/cli/advanced-templates.html#sql_and"
-            )
+        if tk[1] in operands:
+            return operands[tk[1]]
+        raise SQLTemplateException(
+            f"operand {tk[1]} not supported", documentation="/cli/advanced-templates.html#sql_and"
+        )
 
     return Expression(
         " and ".join([f"{_name(k)} {_op(k)} {expression_wrapper(v, k)}" for k, v in kwargs.items() if v is not None])
@@ -277,8 +275,7 @@ def columns(x, default=None, fn=None):
 
     if fn:
         return Expression(",".join(f"{fn}({str(column(c, c))}) as {c}" for c in _columns))
-    else:
-        return Expression(",".join(str(column(c, c)) for c in _columns))
+    return Expression(",".join(str(column(c, c)) for c in _columns))
 
 
 def column(x, default=None):
@@ -368,11 +365,10 @@ def boolean(x, default=None):
         if default is None:
             return 0
         return boolean(default)
-    elif isinstance(x, Placeholder):
+    if isinstance(x, Placeholder):
         return boolean(default)
-    elif isinstance(x, str):
-        if x == "0" or x.lower() == "false":
-            return 0
+    if isinstance(x, str) and (x == "0" or x.lower() == "false"):
+        return 0
 
     return int(bool(x))
 
@@ -403,8 +399,7 @@ def array_type(types):
                         raise SQLTemplateException(
                             REQUIRED_PARAM_NOT_DEFINED, documentation="/cli/advanced-templates.html"
                         )
-                    else:
-                        return None
+                    return None
             values = []
             list_values = x if type(x) == list else x.split(",")  # noqa: E721
             for i, t in enumerate(list_values):
@@ -744,12 +739,11 @@ def __date_diff(
 
         if unit == "days":
             return int(diff / 86400)
-        elif unit == "hours":
+        if unit == "hours":
             return int(diff / 3600)
-        elif unit == "minutes":
+        if unit == "minutes":
             return int(diff / 60)
-        else:
-            return int(diff)
+        return int(diff)
     except Exception:
         if none_if_error:
             return None
@@ -1348,9 +1342,9 @@ def escape_single_quote_str(s):
 def expression_wrapper(x, name, escape_arrays: bool = False):
     if type(x) in (unicode_type, bytes, str):
         return "'" + sqlescape_for_string_expression(x) + "'"
-    elif isinstance(x, Placeholder):
+    if isinstance(x, Placeholder):
         return "'__no_value__'"
-    elif isinstance(x, Comment):
+    if isinstance(x, Comment):
         return "-- {x} \n"
     if x is None:
         truncated_name = name[:20] + "..." if len(name) > 20 else name
@@ -1361,10 +1355,7 @@ def expression_wrapper(x, name, escape_arrays: bool = False):
         logging.warning(f"expression_wrapper -> list :{x}:")
 
         try:
-            result = (
-                f"[{','.join(escape_single_quote_str(item) if isinstance(item, str) else str(item) for item in x)}]"
-            )
-            return result
+            return f"[{','.join(escape_single_quote_str(item) if isinstance(item, str) else str(item) for item in x)}]"
         except Exception as e:
             logging.error(f"Error escaping array: {e}")
     return x
@@ -1425,20 +1416,18 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
                 # secret available: Always use workspace secret regardless of test mode
                 template_execution_results.add_ch_param(x)
                 return Symbol("{" + sqlescape(x) + ": String}")
-            else:
-                # secret not available: Check test mode and defaults
-                is_test_mode = TB_SECRET_IN_TEST_MODE in template_execution_results
-                if default is not None:
-                    # Use provided default value
-                    return default
-                elif is_test_mode:
-                    # In test mode without default - return placeholder
-                    return Symbol("{" + sqlescape(x) + ": String}")
-                else:
-                    # Not in test mode, no secret, no default - raise error
-                    raise SQLTemplateException(
-                        f"Cannot access secret '{x}'. Check the secret exists in the Workspace and the token has the required scope."
-                    )
+            # secret not available: Check test mode and defaults
+            is_test_mode = TB_SECRET_IN_TEST_MODE in template_execution_results
+            if default is not None:
+                # Use provided default value
+                return default
+            if is_test_mode:
+                # In test mode without default - return placeholder
+                return Symbol("{" + sqlescape(x) + ": String}")
+            # Not in test mode, no secret, no default - raise error
+            raise SQLTemplateException(
+                f"Cannot access secret '{x}'. Check the secret exists in the Workspace and the token has the required scope."
+            )
         except Exception:
             raise SQLTemplateException(
                 f"Cannot access secret '{x}'. Check the secret exists in the Workspace and the token has the required scope."
@@ -1522,14 +1511,12 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
 
             if line:
                 raise SQLTemplateException(f"{message.strip()} line {line[0]}")
-            else:
-                raise SQLTemplateException(f"{message.strip()}")
+            raise SQLTemplateException(f"{message.strip()}")
         except Exception as e:
             if isinstance(e, SQLTemplateException):
                 raise e
-            else:
-                logging.exception(f"Error on unbound local error: {e}")
-                raise ValueError(str(e))
+            logging.exception(f"Error on unbound local error: {e}")
+            raise ValueError(str(e))
     except TypeError as e:
         error = str(e)
         if "not supported between instances of 'Placeholder' and " in str(e):
@@ -1960,29 +1947,27 @@ def get_var_data(content, node_id=None):
         # ast.Constant nodes, so .value holds str/bytes/int/float/bool/None.
         if type(x) == ast.Constant:  # noqa: E721
             return x.value
-        elif type(x) == ast.Name:  # noqa: E721
+        if type(x) == ast.Name:  # noqa: E721
             return x.id
-        elif type(x) == ast.List:  # noqa: E721
+        if type(x) == ast.List:  # noqa: E721
             # List can hold different types
             return _get_list_var_data(x)
-        elif type(x) == ast.BinOp:  # noqa: E721
+        if type(x) == ast.BinOp:  # noqa: E721
             # in this case there could be several variables
             # if that's the case the left one is the main
             r = node_to_value(x.left)
             if not r:
                 r = node_to_value(x.right)
             return r
-        elif type(x) == ast.UnaryOp and type(x.operand) == ast.Constant:  # noqa: E721
+        if type(x) == ast.UnaryOp and type(x.operand) == ast.Constant:  # noqa: E721
             if type(x.op) == ast.USub:  # noqa: E721
                 return x.operand.value * -1
-            else:
-                return x.operand.value
-        else:
-            try:
-                return x.id
-            except Exception:
-                # don't let this ruin the parsing
-                pass
+            return x.operand.value
+        try:
+            return x.id
+        except Exception:
+            # don't let this ruin the parsing
+            pass
         return None
 
     def _get_list_var_data(x):
@@ -1994,7 +1979,7 @@ def get_var_data(content, node_id=None):
         # ast.Bytes/ast.Str/ast.Num/ast.NameConstant (removed in 3.14).
         if type(first_elem) == ast.Constant:  # noqa: E721
             return [elem.value for elem in x.elts]
-        elif type(first_elem) == ast.Name:  # noqa: E721
+        if type(first_elem) == ast.Name:  # noqa: E721
             return [elem.id for elem in x.elts]
 
         return []
@@ -2013,8 +1998,7 @@ def get_var_data(content, node_id=None):
     # to just `ast.parse(content)` once we confirm all environments use patched Python versions.
     def parse_content(content, retries=0):
         try:
-            parsed = ast.parse(content)
-            return parsed
+            return ast.parse(content)
         except Exception as e:
             if "AST constructor recursion depth mismatch" not in str(e):
                 raise e
@@ -2042,8 +2026,7 @@ def get_var_data(content, node_id=None):
                     if type(x) == ast.Call:  # noqa: E721
                         # Nested calls are traversed via `ast.iter_child_nodes` below.
                         continue
-                    else:
-                        args.append(node_to_value(x))
+                    args.append(node_to_value(x))
 
                 kwargs = {}
                 for x in node.keywords:
@@ -2531,8 +2514,7 @@ def format_SQLTemplateException_message(e: SQLTemplateException, vars_and_types:
             f"{REQUIRED_PARAM_NOT_DEFINED}. Check the parameters {join_with_different_last_separator(vars_with_default_none)}. Please provide a value or set a default value in the pipe code.",
             e.documentation,
         )
-    else:
-        raise e
+    raise e
 
 
 def render_sql_template(
@@ -2913,12 +2895,12 @@ def render_sql_template(
         # https://gitlab.com/tinybird/analytics/-/issues/943
         if "length" in v and not v["length"]:
             raise SQLTemplateException("length cannot be used as a variable name or as a function inside of a template")
-        elif "missing 1 required positional argument" in str(e):
+        if "missing 1 required positional argument" in str(e):
             raise SQLTemplateException(
                 "one of the transform type functions is missing an argument",
                 documentation="/cli/advanced-templates.html#transform-types-functions",
             )
-        elif "not callable" in str(e) or "unhashable type" in str(e):
+        if "not callable" in str(e) or "unhashable type" in str(e):
             raise SQLTemplateException(
                 "wrong syntax, you might be using a not valid function inside a control block",
                 documentation="/cli/advanced-templates.html",
@@ -3063,7 +3045,7 @@ def render_template_with_secrets(
                     )
                 return '""'
             return value
-        elif default is not None:
+        if default is not None:
             if isinstance(default, str) and len(default) == 0:
                 if empty_secret_raises:
                     raise SQLTemplateException(
@@ -3071,10 +3053,9 @@ def render_template_with_secrets(
                     )
                 return '""'
             return default
-        else:
-            raise SQLTemplateException(
-                f"Cannot access secret '{secret_name}'. Check the secret exists in the Workspace and the token has the required scope."
-            )
+        raise SQLTemplateException(
+            f"Cannot access secret '{secret_name}'. Check the secret exists in the Workspace and the token has the required scope."
+        )
 
     # Create the template
     t = Template(content, name=name, autoescape=None)