tinybird 0.0.1.dev291__py3-none-any.whl → 1.0.5__py3-none-any.whl

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
 
@@ -1209,7 +1200,7 @@ def process_file(
             #
             # Note: any unknown import_ parameter is leaved as is.
             for key in ImportReplacements.get_datafile_parameter_keys():
-                replacement, default_value = ImportReplacements.get_api_param_for_datafile_param(service, key)
+                replacement, default_value = ImportReplacements.get_api_param_for_datafile_param(key)
                 if not replacement:
                     continue  # We should not reach this never, but just in case...
 

tinybird/tb/modules/datafile/pull.py

@@ -74,9 +74,8 @@ def folder_pull(
                         if resource_to_write:
                             fd.write(resource_to_write)
                             return f
-                else:
-                    if verbose:
-                        click.echo(FeedbackManager.info_skip_already_exists())
+                elif verbose:
+                    click.echo(FeedbackManager.info_skip_already_exists())
                 return None
             except Exception as e:
                 raise click.ClickException(FeedbackManager.error_exception(error=e))