tinybird 4.6.19__tar.gz → 4.6.19.dev0__tar.gz

{tinybird-4.6.19 → tinybird-4.6.19.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.19
+Version: 4.6.19.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,26 +52,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
-4.6.19
-********
-
-- `Changed` ``tb datasource append`` and ``tb datasource replace`` submit remote CSV, NDJSON, and Parquet URLs through the v1 import endpoint by default.
-
-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.18
-********
-
-- `Added` ``Markdown`` is now a valid ``FORMAT`` for SQL queries (for example ``tb sql "SELECT 1 FORMAT Markdown"``), returned as a Markdown table.
-
 4.6.16
 ********
 

{tinybird-4.6.19 → tinybird-4.6.19.dev0}/tinybird/ch_utils/constants.py

@@ -263,5 +263,4 @@ VALID_QUERY_FORMATS = (
     "JSONCompact",
     "JSONStringsEachRowWithProgress",
     "ODBCDriver2",
-    "Markdown",
 )

{tinybird-4.6.19 → tinybird-4.6.19.dev0}/tinybird/ch_utils/engine.py

@@ -440,64 +440,35 @@ def get_engine_config(engine: str):
     )
 
 
-def validate_engine_config(
-    engine: str, args: dict, schema: Optional[str] = None, columns: Optional[List[Dict[str, Any]]] = None
-) -> None:
-    if schema is not None and columns is not None:
-        raise ValueError("You can not use 'schema' and 'columns' at the same time")
-    _, (params, options) = get_engine_config(engine)
-    schema_columns = parse_table_structure(schema) if schema is not None else (columns or [])
-    engine_settings = {key.replace("engine_", ""): value for key, value in args.items()}
-
-    for arg in engine_settings:
-        if not hasattr(TableDetails, arg):
-            raise ValueError(f"engine_{arg} is not a valid option")
-
+def engine_params(columns, params: List[EngineParam], args: Dict):
+    params_values = []
     for p in params:
-        if p.required and p.name not in engine_settings:
+        if p.required and p.name not in args:
             raise ValueError(f"Missing required parameter '{p.name}'")
-        param_value = engine_settings.get(p.name) or p.default_value
+        param_value = args.get(p.name, None) or p.default_value
         if not param_value:
             continue
         if p.is_valid:
             check_is_valid(
-                valid_check=p.is_valid,
-                check_type="parameter",
-                columns=schema_columns,
-                tb_param=p.tb_param,
-                value=param_value,
+                valid_check=p.is_valid, check_type="parameter", columns=columns, tb_param=p.tb_param, value=param_value
             )
-
-    for o in options:
-        if o.required and o.name not in engine_settings:
-            raise ValueError(f"Missing required option '{o.name}'")
-        option_value = engine_settings.get(o.name) or o.default_value
-        if o.is_valid:
-            check_is_valid(
-                valid_check=o.is_valid,
-                check_type="option",
-                columns=schema_columns,
-                tb_param=o.tb_param,
-                value=option_value,
-            )
-
-
-def engine_params(params: List[EngineParam], args: Dict) -> List[str]:
-    params_values = []
-    for p in params:
-        param_value = args.get(p.name, None) or p.default_value
-        if not param_value:
-            continue
         params_values.append(param_value)
     return params_values
 
 
-def engine_options(options: List[EngineOption], args: Dict) -> List[str]:
+def engine_options(columns, options: List[EngineOption], args: Dict):
     options_values = []
     engine_settings = ""
 
     for o in options:
+        if o.required and o.name not in args:
+            raise ValueError(f"Missing required option '{o.name}'")
         option_value = args.get(o.name) or o.default_value
+        if o.is_valid:
+            check_is_valid(
+                valid_check=o.is_valid, check_type="option", columns=columns, tb_param=o.tb_param, value=option_value
+            )
+
         if option_value:
             if o.sql.lower() == "settings":
                 engine_settings = f"{o.sql} {option_value}"
@@ -519,7 +490,7 @@ def check_is_valid(
     columns: List[Dict[str, Any]],
     tb_param: str,
     value: str,
-) -> None:
+):
     """
     >>> check_is_valid(sorting_key_is_valid, 'option', ['column-name'], 'sorting_key', 'date')
 
@@ -536,13 +507,15 @@ def check_is_valid(
         raise ValueError(f"Invalid value '{value}' for {check_type} '{tb_param}', reason: {e}")
 
 
-def build_engine(engine: str, params: List[EngineParam], options: List[EngineOption], args: Dict) -> str:
-    return f"{engine}({', '.join(engine_params(params, args))}) {' '.join(engine_options(options, args))}".strip()
+def build_engine(
+    engine: str, columns: Optional[List], params: List[EngineParam], options: List[EngineOption], args: Dict
+):
+    return f"{engine}({', '.join(engine_params(columns, params, args))}) {' '.join(engine_options(columns, options, args))}".strip()
 
 
 def engine_full_from_dict(
     engine: str, args: dict, schema: Optional[str] = None, columns: Optional[List[Dict[str, Any]]] = None
-) -> str:
+):
     """
     >>> schema = ''
     >>> engine_full_from_dict('wadus', {}, schema=schema)
@@ -633,10 +606,20 @@ def engine_full_from_dict(
     'ReplacingMergeTree(updated_at) PARTITION BY (tuple()) ORDER BY (project_id) SETTINGS index_granularity = 32'
     """
 
-    validate_engine_config(engine, args, schema=schema, columns=columns)
-    name, (params, options) = get_engine_config(engine)
+    if schema is not None and columns is not None:
+        raise ValueError("You can not use 'schema' and 'columns' at the same time")
+    engine_config = get_engine_config(engine)
+    name, (params, options) = engine_config
+    if columns is None and schema is not None:
+        columns = parse_table_structure(schema)
+
     engine_settings = {key.replace("engine_", ""): value for key, value in args.items()}
-    return build_engine(name, params, options, engine_settings)
+
+    for arg in engine_settings:
+        if not hasattr(TableDetails, arg):
+            raise ValueError(f"engine_{arg} is not a valid option")
+
+    return build_engine(name, columns, params, options, engine_settings)
 
 
 def engine_params_from_engine_full(engine_full: str) -> Dict[str, Any]:

{tinybird-4.6.19 → tinybird-4.6.19.dev0}/tinybird/client.py

@@ -408,16 +408,6 @@ class TinyB:
         format: str = "csv",
         replace_options: Optional[Set[str]] = None,
     ) -> Dict[str, Any]:
-        if mode in ("append", "replace"):
-            return await self.datasource_append_url(
-                table_name,
-                url,
-                mode=mode,
-                sql_condition=sql_condition,
-                format=format,
-                replace_options=replace_options,
-            )
-
         params = {"name": table_name, "url": url, "mode": mode, "debug": "blocks_block_log", "format": format}
 
         if sql_condition:
@@ -434,33 +424,6 @@ class TinyB:
 
         return await self.wait_for_job(res["id"], status_callback, backoff_multiplier=1.5, maximum_backoff_seconds=20)
 
-    async def datasource_append_url(
-        self,
-        datasource_name: str,
-        url: str,
-        mode: str = "append",
-        sql_condition: Optional[str] = None,
-        format: str = "csv",
-        replace_options: Optional[Set[str]] = None,
-    ) -> Dict[str, Any]:
-        params = {"format": format, "url": url}
-        if sql_condition:
-            params["replace_condition"] = sql_condition
-        if replace_options:
-            for option in replace_options:
-                params[option] = "true"
-
-        res = await self._req(
-            f"/v1/datasources/{quote(datasource_name, safe='')}/{mode}?{urlencode(params, safe='')}",
-            method="POST",
-            data=b"",
-        )
-        if not isinstance(res, dict):
-            raise RuntimeError("We couldn't confirm that your import started. Please try again.")
-        if "error" in res:
-            raise Exception(res["error"])
-        return res
-
     async def datasource_delete(self, datasource_name: str, force: bool = False, dry_run: bool = False):
         params = {"force": "true" if force else "false", "dry_run": "true" if dry_run else "false"}
         return await self._req(f"/v0/datasources/{datasource_name}?{urlencode(params)}", method="DELETE")

{tinybird-4.6.19 → tinybird-4.6.19.dev0}/tinybird/service_datasources.py

@@ -39,7 +39,6 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "result_rows", "type": "UInt64"},
                 {"name": "url", "type": "Nullable(String)"},
                 {"name": "error", "type": "UInt8"},
-                {"name": "error_message", "type": "Nullable(String)"},
                 {"name": "status_code", "type": "Int32"},
                 {"name": "request_id", "type": "String"},
                 {"name": "parameters", "type": "Map(String, String)"},
@@ -444,21 +443,25 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
             "dateColumn": "run_validation",
             "engine": {
                 "engine": "MergeTree",
-                "sorting_key": "workspace, host, query_hash, run_validation",
+                "sorting_key": "database, host, run_validation, query_hash",
                 "partition_key": "toYYYYMM(run_validation)",
             },
             "columns": [
+                {"name": "host", "type": "LowCardinality(String)"},
                 {"name": "version", "type": "LowCardinality(String)"},
                 {"name": "stable_version", "type": "LowCardinality(String)"},
                 {"name": "query_hash", "type": "UInt64"},
                 {"name": "query_last_execution", "type": "DateTime"},
-                {"name": "resource_type", "type": "LowCardinality(String)"},
-                {"name": "resource_name", "type": "String"},
+                {"name": "region", "type": "String"},
+                {"name": "workspace", "type": "String"},
+                {"name": "database", "type": "String"},
+                {"name": "pipe_name", "type": "String"},
                 {"name": "query_id", "type": "String"},
                 {"name": "query", "type": "String"},
                 {"name": "error_code", "type": "Int16"},
                 {"name": "error", "type": "String"},
                 {"name": "fix_suggestion", "type": "String"},
+                {"name": "fix_suggestion_ai", "type": "String"},
                 {"name": "run_validation", "type": "DateTime"},
             ],
         },
@@ -677,7 +680,6 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "result_rows", "type": "UInt64"},
                 {"name": "url", "type": "Nullable(String)"},
                 {"name": "error", "type": "UInt8"},
-                {"name": "error_message", "type": "Nullable(String)"},
                 {"name": "status_code", "type": "Int32"},
                 {"name": "request_id", "type": "String"},
                 {"name": "parameters", "type": "Map(String, String)"},
@@ -782,7 +784,7 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
         },
         {
             "name": "organization.metrics_logs",
-            "description": "Metrics of your organization's dedicated ClickHouse clusters, sampled roughly every 10 seconds. One row is one metric for one host at one point in time, so filter by metric and group by host or cluster. value is a String: cast it before doing arithmetic, for example toFloat64(value). description carries ClickHouse's own explanation of the metric. The metrics available cover queries and query concurrency, CPU and load, memory, replication lag and queues, MergeTree storage size and part counts, background merges and mutations, connections, caches, and disk space. The exact set depends on the ClickHouse version and the host platform, so list it with SELECT DISTINCT metric FROM organization.metrics_logs. host is an obfuscated identifier of the form cluster_shard, not the real hostname. This data source has a TTL of 30 days.",
+            "description": "Metrics of your organization's dedicated clusters",
             "dateColumn": "timestamp",
             "engine": {
                 "engine": "MergeTree",
@@ -796,7 +798,6 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "metric", "type": "LowCardinality(String)"},
                 {"name": "value", "type": "String"},
                 {"name": "description", "type": "LowCardinality(String)"},
-                {"name": "organization_id", "type": "String"},
             ],
         },
         {

{tinybird-4.6.19 → tinybird-4.6.19.dev0}/tinybird/sql.py

@@ -129,9 +129,15 @@ class TableProjection:
     def add_projection_sql(self):
         return f"ADD {self.to_sql()}"
 
+    def drop_projection_sql(self):
+        return f"DROP PROJECTION IF EXISTS {self.name}"
+
     def materialize_projection_sql(self):
         return f"MATERIALIZE PROJECTION IF EXISTS {self.name}"
 
+    def clear_projection_sql(self):
+        return f"CLEAR PROJECTION IF EXISTS {self.name}"
+
 
 def as_subquery(sql: str) -> str:
     return f"""(\n{sql}\n)"""
@@ -669,9 +675,10 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
                     )
                 advance_single_char()
             return schema[begin:i]
-        # backticked name
-        advance_single_char()
-        return get_backticked()
+        else:
+            # backticked name
+            advance_single_char()
+            return get_backticked()
 
     def parse_expr(lookup: Iterable[SyntaxExpr]) -> str:
         nonlocal i, line, pos

{tinybird-4.6.19 → tinybird-4.6.19.dev0}/tinybird/sql_template.py

@@ -84,7 +84,6 @@ class SQLTemplateException(ValueError):
 JOB_TIMESTAMP_PARAM = "job_timestamp"
 DEFAULT_PARAM_NAMES = ["format", "q"]
 RESERVED_PARAM_NAMES = [
-    "__tb__csv_header",
     "__tb__semver",
     "debug_source_tables",
     "debug",
@@ -143,7 +142,8 @@ def transform_type(
             if x is None:
                 if defined:
                     raise SQLTemplateException(REQUIRED_PARAM_NOT_DEFINED, documentation="/cli/advanced-templates.html")
-                return None
+                else:
+                    return None
         if tester == "String":
             if x is not None:
                 return transform(x)
@@ -167,11 +167,12 @@ def _and(*args, **kwargs):
         tk = k.rsplit("__", 1)
         if len(tk) == 1:
             return "="
-        if tk[1] in operands:
-            return operands[tk[1]]
-        raise SQLTemplateException(
-            f"operand {tk[1]} not supported", documentation="/cli/advanced-templates.html#sql_and"
-        )
+        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"
+            )
 
     return Expression(
         " and ".join([f"{_name(k)} {_op(k)} {expression_wrapper(v, k)}" for k, v in kwargs.items() if v is not None])
@@ -276,7 +277,8 @@ def columns(x, default=None, fn=None):
 
     if fn:
         return Expression(",".join(f"{fn}({str(column(c, c))}) as {c}" for c in _columns))
-    return Expression(",".join(str(column(c, c)) for c in _columns))
+    else:
+        return Expression(",".join(str(column(c, c)) for c in _columns))
 
 
 def column(x, default=None):
@@ -366,10 +368,11 @@ def boolean(x, default=None):
         if default is None:
             return 0
         return boolean(default)
-    if isinstance(x, Placeholder):
+    elif isinstance(x, Placeholder):
         return boolean(default)
-    if isinstance(x, str) and (x == "0" or x.lower() == "false"):
-        return 0
+    elif isinstance(x, str):
+        if x == "0" or x.lower() == "false":
+            return 0
 
     return int(bool(x))
 
@@ -400,7 +403,8 @@ def array_type(types):
                         raise SQLTemplateException(
                             REQUIRED_PARAM_NOT_DEFINED, documentation="/cli/advanced-templates.html"
                         )
-                    return None
+                    else:
+                        return None
             values = []
             list_values = x if type(x) == list else x.split(",")  # noqa: E721
             for i, t in enumerate(list_values):
@@ -740,11 +744,12 @@ def __date_diff(
 
         if unit == "days":
             return int(diff / 86400)
-        if unit == "hours":
+        elif unit == "hours":
             return int(diff / 3600)
-        if unit == "minutes":
+        elif unit == "minutes":
             return int(diff / 60)
-        return int(diff)
+        else:
+            return int(diff)
     except Exception:
         if none_if_error:
             return None
@@ -1343,9 +1348,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) + "'"
-    if isinstance(x, Placeholder):
+    elif isinstance(x, Placeholder):
         return "'__no_value__'"
-    if isinstance(x, Comment):
+    elif isinstance(x, Comment):
         return "-- {x} \n"
     if x is None:
         truncated_name = name[:20] + "..." if len(name) > 20 else name
@@ -1356,7 +1361,10 @@ def expression_wrapper(x, name, escape_arrays: bool = False):
         logging.warning(f"expression_wrapper -> list :{x}:")
 
         try:
-            return f"[{','.join(escape_single_quote_str(item) if isinstance(item, str) else str(item) for item in x)}]"
+            result = (
+                f"[{','.join(escape_single_quote_str(item) if isinstance(item, str) else str(item) for item in x)}]"
+            )
+            return result
         except Exception as e:
             logging.error(f"Error escaping array: {e}")
     return x
@@ -1417,18 +1425,20 @@ 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}")
-            # 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."
-            )
+            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."
+                    )
         except Exception:
             raise SQLTemplateException(
                 f"Cannot access secret '{x}'. Check the secret exists in the Workspace and the token has the required scope."
@@ -1512,12 +1522,14 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
 
             if line:
                 raise SQLTemplateException(f"{message.strip()} line {line[0]}")
-            raise SQLTemplateException(f"{message.strip()}")
+            else:
+                raise SQLTemplateException(f"{message.strip()}")
         except Exception as e:
             if isinstance(e, SQLTemplateException):
                 raise e
-            logging.exception(f"Error on unbound local error: {e}")
-            raise ValueError(str(e))
+            else:
+                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):
@@ -1948,27 +1960,29 @@ 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
-        if type(x) == ast.Name:  # noqa: E721
+        elif type(x) == ast.Name:  # noqa: E721
             return x.id
-        if type(x) == ast.List:  # noqa: E721
+        elif type(x) == ast.List:  # noqa: E721
             # List can hold different types
             return _get_list_var_data(x)
-        if type(x) == ast.BinOp:  # noqa: E721
+        elif 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
-        if type(x) == ast.UnaryOp and type(x.operand) == ast.Constant:  # noqa: E721
+        elif 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
-            return x.operand.value
-        try:
-            return x.id
-        except Exception:
-            # don't let this ruin the parsing
-            pass
+            else:
+                return x.operand.value
+        else:
+            try:
+                return x.id
+            except Exception:
+                # don't let this ruin the parsing
+                pass
         return None
 
     def _get_list_var_data(x):
@@ -1980,7 +1994,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]
-        if type(first_elem) == ast.Name:  # noqa: E721
+        elif type(first_elem) == ast.Name:  # noqa: E721
             return [elem.id for elem in x.elts]
 
         return []
@@ -1999,7 +2013,8 @@ 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:
-            return ast.parse(content)
+            parsed = ast.parse(content)
+            return parsed
         except Exception as e:
             if "AST constructor recursion depth mismatch" not in str(e):
                 raise e
@@ -2027,7 +2042,8 @@ 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
-                    args.append(node_to_value(x))
+                    else:
+                        args.append(node_to_value(x))
 
                 kwargs = {}
                 for x in node.keywords:
@@ -2515,7 +2531,8 @@ 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,
         )
-    raise e
+    else:
+        raise e
 
 
 def render_sql_template(
@@ -2896,12 +2913,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")
-        if "missing 1 required positional argument" in str(e):
+        elif "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",
             )
-        if "not callable" in str(e) or "unhashable type" in str(e):
+        elif "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",
@@ -3046,7 +3063,7 @@ def render_template_with_secrets(
                     )
                 return '""'
             return value
-        if default is not None:
+        elif default is not None:
             if isinstance(default, str) and len(default) == 0:
                 if empty_secret_raises:
                     raise SQLTemplateException(
@@ -3054,9 +3071,10 @@ def render_template_with_secrets(
                     )
                 return '""'
             return default
-        raise SQLTemplateException(
-            f"Cannot access secret '{secret_name}'. Check the secret exists in the Workspace and the token has the required scope."
-        )
+        else:
+            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)

{tinybird-4.6.19 → tinybird-4.6.19.dev0}/tinybird/sql_template_fmt.py

@@ -33,7 +33,8 @@ class TBLine(Line):
         Tinybird => This is overriden from the base Line because we want SQL inside a template to be indented
         https://github.com/tconbeer/sqlfmt/blob/c11775b92d8a45f0e91d871b81a88a894d620bec/src/sqlfmt/line.py#L92
         """
-        return INDENT * (self.depth[0] + self.depth[1])
+        prefix = INDENT * (self.depth[0] + self.depth[1])
+        return prefix
 
 
 def from_nodes(
@@ -105,7 +106,8 @@ def _format_jinja_node(self, node: Node, max_length: int) -> bool:
 
         return tag.is_blackened
 
-    return False
+    else:
+        return False
 
 
 # Some monkey patching
@@ -156,7 +158,8 @@ class TinybirdNodeManager(NodeManager):
             TokenType.SET_OPERATOR,
         ):
             return " ".join(token.token.split())
-        return token.token
+        else:
+            return token.token
 
 
 class TinybirdDialect(ClickHouse):
@@ -227,11 +230,12 @@ class TinybirdDialect(ClickHouse):
         Creates and returns an analyzer that uses the Dialect's rules for lexing
         Custom NodeManager for Tinybird
         """
-        return Analyzer(
+        analyzer = Analyzer(
             line_length=line_length,
             rules=self.get_rules(),
             node_manager=TinybirdNodeManager(self.case_sensitive_names, self.lower_keywords),
         )
+        return analyzer
 
 
 @dataclass
@@ -249,10 +253,11 @@ class TBMode(Mode):
 def _calc_str(self) -> str:
     if self.is_multiline:
         return self.token.token + "\n"
-    marker, comment_text = self._comment_parts()
-    if comment_text == "":
-        return marker + "\n"
-    return marker + " " + comment_text + "\n"
+    else:
+        marker, comment_text = self._comment_parts()
+        if comment_text == "":
+            return marker + "\n"
+        return marker + " " + comment_text + "\n"
 
 
 Comment._calc_str = property(_calc_str)