tinybird 0.0.1.dev303__tar.gz → 0.0.1.dev305__tar.gz

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev303
+Version: 0.0.1.dev305
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -39,6 +39,7 @@ Requires-Dist: packaging<24,>=23.1
 Requires-Dist: llm>=0.19
 Requires-Dist: thefuzz==0.22.1
 Requires-Dist: python-dotenv==1.1.0
+Requires-Dist: pyjwt[crypto]==2.9.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/sql_template.py

@@ -384,14 +384,13 @@ def array_type(types):
             if isinstance(x, Placeholder):
                 if default:
                     x = default
-                else:
-                    if _type and _type in types:
-                        if _type == "String":
-                            x = ""
-                        else:
-                            x = ",".join(map(str, [types[_type](x) for _ in range(2)]))
-                    else:
+                elif _type and _type in types:
+                    if _type == "String":
                         x = ""
+                    else:
+                        x = ",".join(map(str, [types[_type](x) for _ in range(2)]))
+                else:
+                    x = ""
             elif x is None:
                 x = default
                 if x is None:
@@ -2386,6 +2385,14 @@ def render_sql_template(
                 documentation="/cli/advanced-templates.html",
             )
         raise SQLTemplateException(str(e), documentation="/cli/advanced-templates.html")
+    except IndexError as e:
+        # This happens when trying to access string indices on empty strings
+        if "string index out of range" in str(e):
+            raise SQLTemplateException(
+                "String index out of range. Check that string parameters have values before accessing specific characters (e.g., param[0]). Provide default values or add length checks in your template.",
+                documentation="/cli/advanced-templates.html",
+            )
+        raise SQLTemplateException(str(e), documentation="/cli/advanced-templates.html")
     except Exception as e:
         # errors might vary here, we need to support as much as possible
         # https://gitlab.com/tinybird/analytics/-/issues/943

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/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__ = '0.0.1.dev303'
-__revision__ = 'ff545f6'
+__version__ = '0.0.1.dev305'
+__revision__ = 'cc453b3'

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/agent/banner.py

@@ -54,20 +54,20 @@ def display_banner():
         """Convert RGB values to ANSI escape code"""
         if use_truecolor:
             return f"\033[38;2;{r};{g};{b}m"
-        else:
-            # Convert to 8-bit color (256 color palette)
-            # Simple approximation: map RGB to 216-color cube + grayscale
-            if r == g == b:
-                # Grayscale
-                gray = int(r / 255 * 23) + 232
-                return f"\033[38;5;{gray}m"
-            else:
-                # Color cube (6x6x6)
-                r_idx = int(r / 255 * 5)
-                g_idx = int(g / 255 * 5)
-                b_idx = int(b / 255 * 5)
-                color_idx = 16 + (36 * r_idx) + (6 * g_idx) + b_idx
-                return f"\033[38;5;{color_idx}m"
+
+        # Convert to 8-bit color (256 color palette)
+        # Simple approximation: map RGB to 216-color cube + grayscale
+        if r == g == b:
+            # Grayscale
+            gray = int(r / 255 * 23) + 232
+            return f"\033[38;5;{gray}m"
+
+        # Color cube (6x6x6)
+        r_idx = int(r / 255 * 5)
+        g_idx = int(g / 255 * 5)
+        b_idx = int(b / 255 * 5)
+        color_idx = 16 + (36 * r_idx) + (6 * g_idx) + b_idx
+        return f"\033[38;5;{color_idx}m"
 
     # Define solid color (corresponding to #27f795)
     solid_color = [39, 247, 149]  # #27f795 in RGB

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/agent/tools/execute_query.py

@@ -125,23 +125,20 @@ def execute_query(
 
         if not result["data"]:
             click.echo(FeedbackManager.info_no_rows())
+        elif script:
+            try:
+                # Execute the LLM-generated plotext script
+                chart_output = _execute_plotext_script(script, result["data"], result["meta"])
+                click.echo(chart_output)
+            except Exception as script_error:
+                click.echo(FeedbackManager.error(message=f"There was an error rendering the chart.\n{script_error}"))
+                ctx.deps.thinking_animation.start()
+                return f"After executing the query: {query}, there was an error rendering the chart: {script_error}. Fix the script and render the chart again."
         else:
-            if script:
-                try:
-                    # Execute the LLM-generated plotext script
-                    chart_output = _execute_plotext_script(script, result["data"], result["meta"])
-                    click.echo(chart_output)
-                except Exception as script_error:
-                    click.echo(
-                        FeedbackManager.error(message=f"There was an error rendering the chart.\n{script_error}")
-                    )
-                    ctx.deps.thinking_animation.start()
-                    return f"After executing the query: {query}, there was an error rendering the chart: {script_error}. Fix the script and render the chart again."
-            else:
-                echo_safe_humanfriendly_tables_format_pretty_table(
-                    data=[d.values() for d in result["data"]], column_names=result["data"][0].keys()
-                )
-                click.echo("Showing first 10 results\n")
+            echo_safe_humanfriendly_tables_format_pretty_table(
+                data=[d.values() for d in result["data"]], column_names=result["data"][0].keys()
+            )
+            click.echo("Showing first 10 results\n")
 
         ctx.deps.thinking_animation.start()
         display_format = "chart" if script else "table"

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/agent/utils.py

@@ -580,59 +580,50 @@ def create_terminal_box(content: str, new_content: Optional[str] = None, title:
             else:
                 line_num_str = f"{line_num:>4}"
 
-            if diff_marker:
-                if COLORAMA_AVAILABLE:
-                    if diff_marker == "-":
-                        # Fill the entire content area with red background
-                        content_with_bg = f"{Back.RED}{diff_marker}   {content}{Style.RESET_ALL}"
-                        # Calculate padding needed for the content area
-                        content_area_width = available_width - 9  # 9 is reduced prefix length
-                        content_padding = content_area_width - len(f"{diff_marker}   {content}")
-                        if content_padding > 0:
-                            content_with_bg = (
-                                f"{Back.RED}{diff_marker}   {content}{' ' * content_padding}{Style.RESET_ALL}"
-                            )
-                        line = f"{vertical} {line_num_str} {content_with_bg}"
-                    elif diff_marker == "+":
-                        # Fill the entire content area with green background
-                        content_with_bg = f"{Back.GREEN}{diff_marker}   {content}{Style.RESET_ALL}"
-                        # Calculate padding needed for the content area
-                        content_area_width = available_width - 9  # 9 is reduced prefix length
-                        content_padding = content_area_width - len(f"{diff_marker}   {content}")
-                        if content_padding > 0:
-                            content_with_bg = (
-                                f"{Back.GREEN}{diff_marker}   {content}{' ' * content_padding}{Style.RESET_ALL}"
-                            )
-                        line = f"{vertical} {line_num_str} {content_with_bg}"
-                else:
-                    line = f"{vertical} {line_num:>4} {diff_marker}   {content}"
-            else:
-                line = f"{vertical} {line_num_str}     {content}"
-        else:
-            # Continuation line without number - fill background starting from where symbol would be
-            if diff_marker and COLORAMA_AVAILABLE:
+        if diff_marker:
+            if COLORAMA_AVAILABLE:
                 if diff_marker == "-":
-                    # Calculate how much space we need to fill with background
+                    # Fill the entire content area with red background
+                    content_with_bg = f"{Back.RED}{diff_marker}   {content}{Style.RESET_ALL}"
+                    # Calculate padding needed for the content area
                     content_area_width = available_width - 9  # 9 is reduced prefix length
-                    content_padding = content_area_width - len(
-                        content
-                    )  # Don't subtract spaces, they're in the background
+                    content_padding = content_area_width - len(f"{diff_marker}   {content}")
                     if content_padding > 0:
-                        line = f"{vertical}      {Back.RED}    {content}{' ' * content_padding}{Style.RESET_ALL}"
-                    else:
-                        line = f"{vertical}      {Back.RED}    {content}{Style.RESET_ALL}"
+                        content_with_bg = f"{Back.RED}{diff_marker}   {content}{' ' * content_padding}{Style.RESET_ALL}"
+                    line = f"{vertical} {line_num_str} {content_with_bg}"
                 elif diff_marker == "+":
-                    # Calculate how much space we need to fill with background
+                    # Fill the entire content area with green background
+                    content_with_bg = f"{Back.GREEN}{diff_marker}   {content}{Style.RESET_ALL}"
+                    # Calculate padding needed for the content area
                     content_area_width = available_width - 9  # 9 is reduced prefix length
-                    content_padding = content_area_width - len(
-                        content
-                    )  # Don't subtract spaces, they're in the background
+                    content_padding = content_area_width - len(f"{diff_marker}   {content}")
                     if content_padding > 0:
-                        line = f"{vertical}      {Back.GREEN}    {content}{' ' * content_padding}{Style.RESET_ALL}"
-                    else:
-                        line = f"{vertical}      {Back.GREEN}    {content}{Style.RESET_ALL}"
+                        content_with_bg = (
+                            f"{Back.GREEN}{diff_marker}   {content}{' ' * content_padding}{Style.RESET_ALL}"
+                        )
+                    line = f"{vertical} {line_num_str} {content_with_bg}"
             else:
-                line = f"{vertical}          {content}"
+                line = f"{vertical} {line_num:>4} {diff_marker}   {content}"
+        elif diff_marker and COLORAMA_AVAILABLE:
+            # Continuation line without number - fill background starting from where symbol would be
+            if diff_marker == "-":
+                # Calculate how much space we need to fill with background
+                content_area_width = available_width - 9  # 9 is reduced prefix length
+                content_padding = content_area_width - len(content)  # Don't subtract spaces, they're in the background
+                if content_padding > 0:
+                    line = f"{vertical}      {Back.RED}    {content}{' ' * content_padding}{Style.RESET_ALL}"
+                else:
+                    line = f"{vertical}      {Back.RED}    {content}{Style.RESET_ALL}"
+            elif diff_marker == "+":
+                # Calculate how much space we need to fill with background
+                content_area_width = available_width - 9  # 9 is reduced prefix length
+                content_padding = content_area_width - len(content)  # Don't subtract spaces, they're in the background
+                if content_padding > 0:
+                    line = f"{vertical}      {Back.GREEN}    {content}{' ' * content_padding}{Style.RESET_ALL}"
+                else:
+                    line = f"{vertical}      {Back.GREEN}    {content}{Style.RESET_ALL}"
+        else:
+            line = f"{vertical}          {content}"
 
         # Pad to terminal width
         # Need to account for ANSI escape sequences not taking visual space

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/build_common.py

@@ -102,12 +102,12 @@ def process(
             build_status.error = build_error
             build_status.building = False
         return build_error
-    else:
-        if not silent:
-            if build_result == False:  # noqa: E712
-                click.echo(FeedbackManager.info(message="No changes. Build skipped."))
-            else:
-                click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
+
+    if not silent:
+        if build_result == False:  # noqa: E712
+            click.echo(FeedbackManager.info(message="No changes. Build skipped."))
+        else:
+            click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
 
     return None
 
@@ -280,17 +280,16 @@ def build_project(
             )
             if no_changes:
                 return False
-            else:
-                if not silent:
-                    echo_changes(project, new_datasources, ".datasource", "created")
-                    echo_changes(project, changed_datasources, ".datasource", "changed")
-                    echo_changes(project, deleted_datasources, ".datasource", "deleted")
-                    echo_changes(project, new_pipes, ".pipe", "created")
-                    echo_changes(project, changed_pipes, ".pipe", "changed")
-                    echo_changes(project, deleted_pipes, ".pipe", "deleted")
-                    echo_changes(project, new_connections, ".connection", "created")
-                    echo_changes(project, changed_connections, ".connection", "changed")
-                    echo_changes(project, deleted_connections, ".connection", "deleted")
+            if not silent:
+                echo_changes(project, new_datasources, ".datasource", "created")
+                echo_changes(project, changed_datasources, ".datasource", "changed")
+                echo_changes(project, deleted_datasources, ".datasource", "deleted")
+                echo_changes(project, new_pipes, ".pipe", "created")
+                echo_changes(project, changed_pipes, ".pipe", "changed")
+                echo_changes(project, deleted_pipes, ".pipe", "deleted")
+                echo_changes(project, new_connections, ".connection", "created")
+                echo_changes(project, changed_connections, ".connection", "changed")
+                echo_changes(project, deleted_connections, ".connection", "deleted")
             if load_fixtures:
                 try:
                     for filename in project_files:

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/cli.py

@@ -116,11 +116,10 @@ def cli(
     # We need to unpatch for our tests not to break
     if output != "human":
         __hide_click_output()
+    elif show_tokens or not cloud or ctx.invoked_subcommand == "build":
+        __unpatch_click_output()
     else:
-        if show_tokens or not cloud or ctx.invoked_subcommand == "build":
-            __unpatch_click_output()
-        else:
-            __patch_click_output()
+        __patch_click_output()
 
     if getenv_bool("TB_DISABLE_SSL_CHECKS", False):
         click.echo(FeedbackManager.warning_disabled_ssl_checks())

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/common.py

@@ -2197,18 +2197,17 @@ def ask_for_organization(
         user_token = get_user_token(config, user_token)
         organization = create_organization_and_add_workspaces(config, organization_name, user_token)
         organization_id = organization.get("id")
+    elif len(organizations) == 1:
+        organization_name = organizations[0]["name"]
+        organization_id = organizations[0]["id"]
     else:
-        if len(organizations) == 1:
-            organization_name = organizations[0]["name"]
-            organization_id = organizations[0]["id"]
+        sorted_organizations = sort_organizations_by_user(organizations, user_email=user_email)
+        current_organization = ask_for_organization_interactively(sorted_organizations)
+        if current_organization:
+            organization_id = current_organization.get("id")
+            organization_name = current_organization.get("name")
         else:
-            sorted_organizations = sort_organizations_by_user(organizations, user_email=user_email)
-            current_organization = ask_for_organization_interactively(sorted_organizations)
-            if current_organization:
-                organization_id = current_organization.get("id")
-                organization_name = current_organization.get("name")
-            else:
-                return None, None
+            return None, None
     return organization_id, organization_name
 
 

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/datafile/build.py

@@ -128,41 +128,33 @@ def folder_build(
                     filename = to_run[name]["filename"]
                     filename = filename.replace(f"{folder}/", "")
                     click.echo(FeedbackManager.info(message=f"✓ {filename}"))
-                else:
-                    if raise_on_exists:
-                        raise AlreadyExistsException(
-                            FeedbackManager.warning_name_already_exists(
-                                name=name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}"
-                            )
+                elif raise_on_exists:
+                    raise AlreadyExistsException(
+                        FeedbackManager.warning_name_already_exists(
+                            name=name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}"
                         )
+                    )
+                elif name_matches_existing_resource(resource, name, tb_client):
+                    if resource == "pipes":
+                        click.echo(FeedbackManager.error_pipe_cannot_be_pushed(name=name))
                     else:
-                        if name_matches_existing_resource(resource, name, tb_client):
-                            if resource == "pipes":
-                                click.echo(FeedbackManager.error_pipe_cannot_be_pushed(name=name))
-                            else:
-                                click.echo(FeedbackManager.error_datasource_cannot_be_pushed(name=name))
-                        else:
-                            click.echo(
-                                FeedbackManager.warning_name_already_exists(
-                                    name=(
-                                        name
-                                        if to_run[name]["version"] is None
-                                        else f"{name}__v{to_run[name]['version']}"
-                                    )
-                                )
-                            )
-            else:
-                if should_push_file(name, remote_resource_names, force, run_tests):
-                    extension = "pipe" if resource == "pipes" else "datasource"
-                    click.echo(FeedbackManager.info_building_resource(name=f"{name}.{extension}", version=""))
+                        click.echo(FeedbackManager.error_datasource_cannot_be_pushed(name=name))
                 else:
-                    if name_matches_existing_resource(resource, name, tb_client):
-                        if resource == "pipes":
-                            click.echo(FeedbackManager.warning_pipe_cannot_be_pushed(name=name))
-                        else:
-                            click.echo(FeedbackManager.warning_datasource_cannot_be_pushed(name=name))
-                    else:
-                        click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
+                    click.echo(
+                        FeedbackManager.warning_name_already_exists(
+                            name=(name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}")
+                        )
+                    )
+            elif should_push_file(name, remote_resource_names, force, run_tests):
+                extension = "pipe" if resource == "pipes" else "datasource"
+                click.echo(FeedbackManager.info_building_resource(name=f"{name}.{extension}", version=""))
+            elif name_matches_existing_resource(resource, name, tb_client):
+                if resource == "pipes":
+                    click.echo(FeedbackManager.warning_pipe_cannot_be_pushed(name=name))
+                else:
+                    click.echo(FeedbackManager.warning_datasource_cannot_be_pushed(name=name))
+            else:
+                click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
 
     def push_files(
         dependency_graph: GraphDependencies,
@@ -932,11 +924,8 @@ def process_file(
                 raise click.ClickException(FeedbackManager.error_missing_table_arn(datasource=datasource["name"]))
             if not params.get("import_export_bucket", None):
                 raise click.ClickException(FeedbackManager.error_missing_export_bucket(datasource=datasource["name"]))
-        else:
-            if not params.get("import_external_datasource", None):
-                raise click.ClickException(
-                    FeedbackManager.error_missing_external_datasource(datasource=datasource["name"])
-                )
+        elif not params.get("import_external_datasource", None):
+            raise click.ClickException(FeedbackManager.error_missing_external_datasource(datasource=datasource["name"]))
 
         return params
 

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/datafile/build_datasource.py

@@ -301,32 +301,28 @@ def new_ds(
     if alter_response and make_changes:
         # alter operation finished
         pass
+    elif (
+        os.getenv("TB_I_KNOW_WHAT_I_AM_DOING")
+        and click.prompt(FeedbackManager.info_ask_for_datasource_confirmation()) == ds_name
+    ):  # TODO move to CLI
+        try:
+            client.datasource_delete(ds_name)
+            click.echo(FeedbackManager.success_delete_datasource(datasource=ds_name))
+        except Exception:
+            raise click.ClickException(FeedbackManager.error_removing_datasource(datasource=ds_name))
+        return
+    elif alter_error_message:
+        raise click.ClickException(
+            FeedbackManager.error_datasource_already_exists_and_alter_failed(
+                datasource=ds_name, alter_error_message=alter_error_message
+            )
+        )
+    elif promote_error_message:
+        raise click.ClickException(
+            FeedbackManager.error_promoting_datasource(datasource=ds_name, error=promote_error_message)
+        )
     else:
-        # removed replacing by default. When a datasource is removed data is
-        # removed and all the references needs to be updated
-        if (
-            os.getenv("TB_I_KNOW_WHAT_I_AM_DOING")
-            and click.prompt(FeedbackManager.info_ask_for_datasource_confirmation()) == ds_name
-        ):  # TODO move to CLI
-            try:
-                client.datasource_delete(ds_name)
-                click.echo(FeedbackManager.success_delete_datasource(datasource=ds_name))
-            except Exception:
-                raise click.ClickException(FeedbackManager.error_removing_datasource(datasource=ds_name))
-            return
-        else:
-            if alter_error_message:
-                raise click.ClickException(
-                    FeedbackManager.error_datasource_already_exists_and_alter_failed(
-                        datasource=ds_name, alter_error_message=alter_error_message
-                    )
-                )
-            if promote_error_message:
-                raise click.ClickException(
-                    FeedbackManager.error_promoting_datasource(datasource=ds_name, error=promote_error_message)
-                )
-            else:
-                click.echo(FeedbackManager.warning_datasource_already_exists(datasource=ds_name))
+        click.echo(FeedbackManager.warning_datasource_already_exists(datasource=ds_name))
 
 
 def share_and_unshare_datasource(

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/datafile/format_pipe.py

@@ -162,7 +162,7 @@ def format_pipe(
                 if "." in include_file
                 else eval_var(include_file)
             )
-            included_pipe = parse_pipe(include_file, skip_eval=skip_eval).datafile
+            included_pipe = parse_pipe(str(include_file), skip_eval=skip_eval).datafile
             pipe_nodes = doc.nodes.copy()
             for included_node in included_pipe.nodes.copy():
                 unrolled_included_node = next(

{tinybird-0.0.1.dev303 → tinybird-0.0.1.dev305}/tinybird/tb/modules/datafile/playground.py

@@ -214,41 +214,34 @@ def folder_playground(
                             error=e,
                         )
                         raise click.ClickException(exception)
-                else:
-                    if raise_on_exists:
-                        raise AlreadyExistsException(
-                            FeedbackManager.warning_name_already_exists(
-                                name=name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}"
-                            )
+                elif raise_on_exists:
+                    raise AlreadyExistsException(
+                        FeedbackManager.warning_name_already_exists(
+                            name=name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}"
                         )
+                    )
+                elif name_matches_existing_resource(resource, name, tb_client):
+                    if resource == "pipes":
+                        click.echo(FeedbackManager.error_pipe_cannot_be_pushed(name=name))
                     else:
-                        if name_matches_existing_resource(resource, name, tb_client):
-                            if resource == "pipes":
-                                click.echo(FeedbackManager.error_pipe_cannot_be_pushed(name=name))
-                            else:
-                                click.echo(FeedbackManager.error_datasource_cannot_be_pushed(name=name))
-                        else:
-                            click.echo(
-                                FeedbackManager.warning_name_already_exists(
-                                    name=(
-                                        name
-                                        if to_run[name]["version"] is None
-                                        else f"{name}__v{to_run[name]['version']}"
-                                    )
-                                )
-                            )
-            else:
+                        click.echo(FeedbackManager.error_datasource_cannot_be_pushed(name=name))
+                else:
+                    click.echo(
+                        FeedbackManager.warning_name_already_exists(
+                            name=(name if to_run[name]["version"] is None else f"{name}__v{to_run[name]['version']}")
+                        )
+                    )
+            if dry_run:
                 if should_push_file(name, remote_resource_names, force, run_tests):
                     extension = "pipe" if resource == "pipes" else "datasource"
                     click.echo(FeedbackManager.info_building_resource(name=f"{name}.{extension}", version=""))
-                else:
-                    if name_matches_existing_resource(resource, name, tb_client):
-                        if resource == "pipes":
-                            click.echo(FeedbackManager.warning_pipe_cannot_be_pushed(name=name))
-                        else:
-                            click.echo(FeedbackManager.warning_datasource_cannot_be_pushed(name=name))
+                elif name_matches_existing_resource(resource, name, tb_client):
+                    if resource == "pipes":
+                        click.echo(FeedbackManager.warning_pipe_cannot_be_pushed(name=name))
                     else:
-                        click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
+                        click.echo(FeedbackManager.warning_datasource_cannot_be_pushed(name=name))
+                else:
+                    click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
 
     def push_files(
         dependency_graph: GraphDependencies,
@@ -793,44 +786,45 @@ def get_processed(
                 dir_path=dir_path,
                 embedded_datasources=embedded_ds,
             )
-        else:
-            if verbose:
-                click.echo(FeedbackManager.info_processing_file(filename=filename))
+            continue
 
-            if ".incl" in filename:
-                click.echo(FeedbackManager.warning_skipping_include_file(file=filename))
+        if verbose:
+            click.echo(FeedbackManager.info_processing_file(filename=filename))
 
-            if tb_client is None:
-                raise ValueError("tb_client cannot be None")
+        if ".incl" in filename:
+            click.echo(FeedbackManager.warning_skipping_include_file(file=filename))
 
-            name, warnings = process(
-                filename=filename,
-                tb_client=tb_client,
-                deps=deps_list,
-                dep_map=dep_map_dict,
-                to_run=to_run_dict,
-                vendor_paths=vendor_paths,
-                skip_connectors=skip_connectors,
-                current_ws=current_ws,
-                changed=changed,
-                fork_downstream=fork_downstream,
-                is_internal=is_internal,
-                dir_path=dir_path,
-                verbose=verbose,
-                embedded_datasources=embedded_ds,
-            )
-            processed_set.add(name)
+        if tb_client is None:
+            raise ValueError("tb_client cannot be None")
 
-            if verbose:
-                if len(warnings) == 1:
-                    click.echo(FeedbackManager.warning_pipe_restricted_param(word=warnings[0]))
-                elif len(warnings) > 1:
-                    click.echo(
-                        FeedbackManager.warning_pipe_restricted_params(
-                            words=", ".join(["'{}'".format(param) for param in warnings[:-1]]),
-                            last_word=warnings[-1],
-                        )
+        name, warnings = process(
+            filename=filename,
+            tb_client=tb_client,
+            deps=deps_list,
+            dep_map=dep_map_dict,
+            to_run=to_run_dict,
+            vendor_paths=vendor_paths,
+            skip_connectors=skip_connectors,
+            current_ws=current_ws,
+            changed=changed,
+            fork_downstream=fork_downstream,
+            is_internal=is_internal,
+            dir_path=dir_path,
+            verbose=verbose,
+            embedded_datasources=embedded_ds,
+        )
+        processed_set.add(name)
+
+        if verbose:
+            if len(warnings) == 1:
+                click.echo(FeedbackManager.warning_pipe_restricted_param(word=warnings[0]))
+            elif len(warnings) > 1:
+                click.echo(
+                    FeedbackManager.warning_pipe_restricted_params(
+                        words=", ".join(["'{}'".format(param) for param in warnings[:-1]]),
+                        last_word=warnings[-1],
                     )
+                )
 
 
 def build_graph(
@@ -1082,11 +1076,8 @@ def process_file(
                 raise click.ClickException(FeedbackManager.error_missing_table_arn(datasource=datasource["name"]))
             if not params.get("import_export_bucket", None):
                 raise click.ClickException(FeedbackManager.error_missing_export_bucket(datasource=datasource["name"]))
-        else:
-            if not params.get("import_external_datasource", None):
-                raise click.ClickException(
-                    FeedbackManager.error_missing_external_datasource(datasource=datasource["name"])
-                )
+        elif not params.get("import_external_datasource", None):
+            raise click.ClickException(FeedbackManager.error_missing_external_datasource(datasource=datasource["name"]))
 
         return params