tinybird 4.6.19.dev0__tar.gz → 4.6.20.dev0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.19.dev0
+Version: 4.6.20.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,11 @@ 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
 ********
 

{tinybird-4.6.19.dev0 → tinybird-4.6.20.dev0}/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.19.dev0 → tinybird-4.6.20.dev0}/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)

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

@@ -33,8 +33,7 @@ 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
         """
-        prefix = INDENT * (self.depth[0] + self.depth[1])
-        return prefix
+        return INDENT * (self.depth[0] + self.depth[1])
 
 
 def from_nodes(
@@ -106,8 +105,7 @@ def _format_jinja_node(self, node: Node, max_length: int) -> bool:
 
         return tag.is_blackened
 
-    else:
-        return False
+    return False
 
 
 # Some monkey patching
@@ -158,8 +156,7 @@ class TinybirdNodeManager(NodeManager):
             TokenType.SET_OPERATOR,
         ):
             return " ".join(token.token.split())
-        else:
-            return token.token
+        return token.token
 
 
 class TinybirdDialect(ClickHouse):
@@ -230,12 +227,11 @@ class TinybirdDialect(ClickHouse):
         Creates and returns an analyzer that uses the Dialect's rules for lexing
         Custom NodeManager for Tinybird
         """
-        analyzer = Analyzer(
+        return Analyzer(
             line_length=line_length,
             rules=self.get_rules(),
             node_manager=TinybirdNodeManager(self.case_sensitive_names, self.lower_keywords),
         )
-        return analyzer
 
 
 @dataclass
@@ -253,11 +249,10 @@ class TBMode(Mode):
 def _calc_str(self) -> str:
     if self.is_multiline:
         return self.token.token + "\n"
-    else:
-        marker, comment_text = self._comment_parts()
-        if comment_text == "":
-            return marker + "\n"
-        return marker + " " + comment_text + "\n"
+    marker, comment_text = self._comment_parts()
+    if comment_text == "":
+        return marker + "\n"
+    return marker + " " + comment_text + "\n"
 
 
 Comment._calc_str = property(_calc_str)

{tinybird-4.6.19.dev0 → tinybird-4.6.20.dev0}/tinybird/sql_toolset.py

@@ -314,9 +314,9 @@ def _sql_get_used_tables_impl(
             msg = str(e)
             if "is restricted. Contact support@tinybird.co" in msg:
                 raise InvalidFunction(msg=msg) from e
-            elif "Unknown function tb_secret" in msg:
+            if "Unknown function tb_secret" in msg:
                 raise InvalidFunction(msg="Unknown function tb_secret. Usage: {{tb_secret('secret_name')}}") from e
-            elif "Unknown function tb_var" in msg:
+            if "Unknown function tb_var" in msg:
                 raise InvalidFunction(msg="Unknown function tb_var. Usage: {{tb_var('var_name')}}") from e
             raise
         # Do not cache this fallback result: the returned sql string can contain
@@ -660,9 +660,7 @@ def replace_tables(
 
     # Fix for empty database names in JOINs - remove empty backticks like ``.table_name
     # that are generated when chquery.replace_tables processes tuples with empty database names
-    sql = sql.replace("``.", "")
-
-    return sql
+    return sql.replace("``.", "")
 
 
 def is_invalid_resource(

{tinybird-4.6.19.dev0 → tinybird-4.6.20.dev0}/tinybird/syncasync.py

@@ -142,8 +142,7 @@ class Local:
             storage = self._get_storage()
             if key in storage:
                 return storage[key]
-            else:
-                raise AttributeError(f"{self!r} object has no attribute {key!r}")
+            raise AttributeError(f"{self!r} object has no attribute {key!r}")
 
     def __setattr__(self, key, value):
         if key in ("_context_refs", "_thread_critical", "_thread_lock", "_attr_name"):
@@ -151,6 +150,7 @@ class Local:
         with self._thread_lock:
             storage = self._get_storage()
             storage[key] = value
+        return None
 
     def __delattr__(self, key):
         with self._thread_lock:
@@ -252,13 +252,12 @@ def _iscoroutinefunction_or_partial(func: Any) -> bool:
     # this to exist. Code taken from CPython.
     if sys.version_info >= (3, 8):
         return asyncio.iscoroutinefunction(func)
-    else:
-        while inspect.ismethod(func):
-            func = func.__func__
-        while isinstance(func, functools.partial):
-            func = func.func
+    while inspect.ismethod(func):
+        func = func.__func__
+    while isinstance(func, functools.partial):
+        func = func.func
 
-        return asyncio.iscoroutinefunction(func)
+    return asyncio.iscoroutinefunction(func)
 
 
 class ThreadSensitiveContext:
@@ -660,9 +659,8 @@ class SyncToAsync:
             if hasattr(asyncio, "current_task"):
                 # Python 3.7 and up
                 return asyncio.current_task()
-            else:
-                # Python 3.6
-                return asyncio.Task.current_task()
+            # Python 3.6
+            return asyncio.Task.current_task()
         except RuntimeError:
             return None
 

{tinybird-4.6.19.dev0 → tinybird-4.6.20.dev0}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '4.6.19.dev0'
-__revision__ = '92350bf'
+__version__ = '4.6.20.dev0'
+__revision__ = 'fee8cae'

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

@@ -272,14 +272,13 @@ class TinyB:
 
     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 self._req(url, method="PUT", data=scopes_url)
-        else:
-            url = url + "?" + scopes_url
-            return self._req(url, method="PUT", data="")
+        url = url + "?" + scopes_url
+        return self._req(url, method="PUT", data="")
 
     def datasources(self, branch: Optional[str] = None, attrs: Optional[str] = None) -> List[Dict[str, Any]]:
         params = {}
@@ -300,16 +299,13 @@ class TinyB:
         return self._req(f"/v0/variables/{name}")
 
     def create_secret(self, name: str, value: str):
-        response = self._req("/v0/variables", method="POST", data={"name": name, "value": value})
-        return response
+        return self._req("/v0/variables", method="POST", data={"name": name, "value": value})
 
     def update_secret(self, name: str, value: str):
-        response = self._req(f"/v0/variables/{name}", method="PUT", data={"value": value})
-        return response
+        return self._req(f"/v0/variables/{name}", method="PUT", data={"value": value})
 
     def delete_secret(self, name: str):
-        response = self._req(f"/v0/variables/{name}", method="DELETE")
-        return response
+        return self._req(f"/v0/variables/{name}", method="DELETE")
 
     def get_connections(self, service: Optional[str] = None):
         params = {}
@@ -537,7 +533,7 @@ class TinyB:
             if projection_mode:
                 params["projection_mode"] = projection_mode
             return self._req(f"/v1/datasources/{datasource_name}/delete", method="POST", data=params)
-        elif dry_run:
+        if dry_run:
             params["dry_run"] = "true"
         return self._req(f"/v0/datasources/{datasource_name}/delete", method="POST", data=params)
 
@@ -635,8 +631,7 @@ class TinyB:
         node_name = node["params"]["name"] if node.get("params", None) else node["name"]
         if datasource_name:
             params["datasource"] = datasource_name
-        response = self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/analysis?{urlencode(params)}")
-        return response
+        return self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/analysis?{urlencode(params)}")
 
     def populate_node(
         self,
@@ -654,8 +649,7 @@ class TinyB:
             params.update({"populate_condition": populate_condition})
         if on_demand_compute:
             params.update({"on_demand_compute": "true"})
-        response = self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/population?{urlencode(params)}", method="POST")
-        return response
+        return self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/population?{urlencode(params)}", method="POST")
 
     def pipes(self, branch=None, dependencies: bool = False, node_attrs=None, attrs=None) -> List[Dict[str, Any]]:
         params = {
@@ -687,9 +681,8 @@ class TinyB:
         query_string = urlencode(params)
         if len(url + "?" + query_string) > TinyB.MAX_GET_LENGTH:
             return self._req(f"/v0/pipes/{pipe_name_or_uid}.{format}", method="POST", data=params)
-        else:
-            url = url + "?" + query_string
-            return self._req(url)
+        url = url + "?" + query_string
+        return self._req(url)
 
     def pipe_create(self, pipe_name: str, sql: str):
         return self._req(f"/v0/pipes?name={pipe_name}&sql={quote(sql, safe='')}", method="POST", data=sql.encode())
@@ -777,8 +770,7 @@ class TinyB:
 
         if len(sql) > TinyB.MAX_GET_LENGTH:
             return self._req(f"/v0/sql?{urlencode(params)}", data=sql, method="POST")
-        else:
-            return self._req(f"/v0/sql?q={quote(sql, safe='')}&{urlencode(params)}")
+        return self._req(f"/v0/sql?q={quote(sql, safe='')}&{urlencode(params)}")
 
     def jobs(
         self, status: Optional[Tuple[str, ...]] = None, kind: Optional[Tuple[str, ...]] = None
@@ -1006,7 +998,7 @@ class TinyB:
 
     def add_workspaces_to_organization(self, organization_id: str, workspace_ids: List[str]):
         if not workspace_ids:
-            return
+            return None
         return self._req(
             f"/v0/organizations/{organization_id}/workspaces",
             method="PUT",
@@ -1344,8 +1336,7 @@ class TinyB:
         return next((connector for connector in result["connectors"] if connector_equals(connector, kwargs)), None)
 
     def regions(self):
-        regions = self._req("/v0/regions")
-        return regions
+        return self._req("/v0/regions")
 
     def datasource_query_copy(self, datasource_name: str, sql_query: str):
         params = {"copy_to": datasource_name}

{tinybird-4.6.19.dev0 → tinybird-4.6.20.dev0}/tinybird/tb/modules/cicd.py

@@ -182,6 +182,7 @@ class CICDGeneratorBase:
                 return FeedbackManager.warning_for_cicd_file(
                     file_name=cicd_file.file_name, warning_message=cicd_file.warning_message.format(**params)
                 )
+        return None
 
     def is_already_generated(self, path: str) -> bool:
         for cicd_file in self.cicd_files:

{tinybird-4.6.19.dev0 → tinybird-4.6.20.dev0}/tinybird/tb/modules/cli.py

@@ -25,7 +25,6 @@ from tinybird.iterating.data_branch_modes import DataBranchMode
 from tinybird.tb import __cli__
 from tinybird.tb.check_pypi import CheckPypi
 from tinybird.tb.client import (
-    AuthException,
     AuthNoTokenException,
     TinyB,
 )
@@ -734,12 +733,15 @@ def cli(
     # Keep config path pointing to the user project root even when using a virtual SDK project.
     config["path"] = folder if sdk_virtual_project else str(project.path)
     # If they have passed a token or host as parameter and it's different that record in .tinyb, refresh the workspace id
+    # Best-effort only: e.g. a still-Classic workspace makes this v1 (Forward-only)
+    # call fail with a non-auth error, and that must not block the CLI from
+    # starting up (commands like `migrate-to-forward` are meant to run on it).
     if token or host:
         try:
             workspace = client.workspace_info(version="v1")
             config["id"] = workspace.get("id", "")
             config["name"] = workspace.get("name", "")
-        except (AuthNoTokenException, AuthException):
+        except Exception:
             pass
 
     ctx.ensure_object(dict)["config"] = config

{tinybird-4.6.19.dev0 → tinybird-4.6.20.dev0}/tinybird/tb/modules/common.py

@@ -223,6 +223,7 @@ class AliasedGroup(click.Group):
         cm = click.Group.get_command(self, ctx, cmd_name)
         if cm is not None:
             return cm
+        return None
 
     def resolve_command(self, ctx, args):
         # always return the command's name, not the alias
@@ -449,7 +450,7 @@ def analyze_file(filename: str, client: TinyB, format: str):
     meta, data = _analyze(filename, client, format)
     schema = meta["analysis"]["schema"]
     schema = schema.replace(", ", ",\n    ")
-    content = f"""DESCRIPTION >
+    return f"""DESCRIPTION >
     Generated from {filename}
 
 SCHEMA >
@@ -459,7 +460,6 @@ ENGINE "MergeTree"
 # ENGINE_SORTING_KEY "user_id, timestamp"
 # ENGINE_TTL "timestamp + toIntervalDay(60)"
 # Learn more at https://www.tinybird.co/docs/forward/dev-reference/datafiles/datasource-files"""
-    return content
 
 
 def _generate_datafile(
@@ -516,6 +516,7 @@ def ask_for_region_interactively(regions):
             available_options = ", ".join(map(str, range(1, len(regions) + 1)))
             click.echo(FeedbackManager.error_region_index(host_index=region_index, available_options=available_options))
             region_index = -1
+    return None
 
 
 def get_region_info(ctx, region=None):
@@ -711,10 +712,8 @@ def print_branch_regression_tests_summary(client, job_id, host, response=None):
         if isinstance(metric, float):
             if is_percentage:
                 return f"{round(metric, 3):+} %"
-            else:
-                return f"{round(metric, 3)} seconds"
-        else:
-            return metric
+            return f"{round(metric, 3)} seconds"
+        return metric
 
     failed = False
     response = client.job(job_id) if job_id else response or {"progress": []}
@@ -2087,9 +2086,7 @@ def get_gcs_svc_account_creds() -> str:
         )
 
     assert isinstance(creds, str)
-    creds_without_new_lines = creds.replace("\n", "")
-
-    return creds_without_new_lines
+    return creds.replace("\n", "")
 
 
 class DataConnectorType(str, Enum):
@@ -2478,9 +2475,8 @@ def create_workspace_branch(
             job_response = wait_job(config.get_client(), job_id, job_url, "Environment creation")
             if job_response is None:
                 raise CLIException(f"Empty job API response (job_id: {job_id}, job_url: {job_url})")
-            else:
-                response = job_response.get("result", {})
-                is_summary = "partitions" in response
+            response = job_response.get("result", {})
+            is_summary = "partitions" in response
 
     except Exception as e:
         raise CLIException(FeedbackManager.error_exception(error=str(e)))