tinybird 0.0.1.dev21__py3-none-any.whl → 0.0.1.dev22__py3-none-any.whl

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev21'
-__revision__ = '523adc6'
+__version__ = '0.0.1.dev22'
+__revision__ = 'fad51ec'

tinybird/tb/modules/datafile/build.py

@@ -689,6 +689,148 @@ class GraphDependencies:
     all_resources: Dict[str, Dict[str, Any]]
 
 
+async def process(
+    filename: str,
+    tb_client: TinyB,
+    deps: List[str],
+    dep_map: Dict[str, Any],
+    to_run: Dict[str, Any],
+    vendor_paths: Optional[List[Tuple[str, str]]] = None,
+    skip_connectors: bool = False,
+    current_ws: Optional[Dict[str, Any]] = None,
+    changed: Optional[Dict[str, Any]] = None,
+    fork_downstream: Optional[bool] = False,
+    is_internal: Optional[bool] = False,
+    dir_path: Optional[str] = None,
+    verbose: bool = False,
+    embedded_datasources: Optional[Dict[str, Any]] = None,
+):
+    name, kind = filename.rsplit(".", 1)
+    warnings = []
+
+    try:
+        res = await process_file(
+            filename,
+            tb_client,
+            skip_connectors=skip_connectors,
+            current_ws=current_ws,
+        )
+    except click.ClickException as e:
+        raise e
+    except IncludeFileNotFoundException as e:
+        raise click.ClickException(FeedbackManager.error_deleted_include(include_file=str(e), filename=filename))
+    except Exception as e:
+        raise click.ClickException(str(e))
+
+    for r in res:
+        resource_name = r["resource_name"]
+        warnings = r.get("warnings", [])
+        if (
+            changed
+            and resource_name in changed
+            and (not changed[resource_name] or changed[resource_name] in ["shared", "remote"])
+        ):
+            continue
+
+        if (
+            fork_downstream
+            and r.get("resource", "") == "pipes"
+            and any(["engine" in x.get("params", {}) for x in r.get("nodes", [])])
+        ):
+            raise click.ClickException(FeedbackManager.error_forkdownstream_pipes_with_engine(pipe=resource_name))
+
+        to_run[resource_name] = r
+        file_deps = r.get("deps", [])
+        deps += file_deps
+        # calculate and look for deps
+        dep_list = []
+        for x in file_deps:
+            if x not in INTERNAL_TABLES or is_internal:
+                f, ds = find_file_by_name(dir_path, x, verbose, vendor_paths=vendor_paths, resource=r)
+                if f:
+                    dep_list.append(f.rsplit(".", 1)[0])
+                if ds:
+                    ds_fn = ds["resource_name"]
+                    prev = to_run.get(ds_fn, {})
+                    to_run[ds_fn] = deepcopy(r)
+                    try:
+                        to_run[ds_fn]["deps"] = list(
+                            set(to_run[ds_fn].get("deps", []) + prev.get("deps", []) + [resource_name])
+                        )
+                    except ValueError:
+                        pass
+                    embedded_datasources[x] = to_run[ds_fn]
+                else:
+                    e_ds = embedded_datasources.get(x, None)
+                    if e_ds:
+                        dep_list.append(e_ds["resource_name"])
+
+        dep_map[resource_name] = set(dep_list)
+    return os.path.basename(name), warnings
+
+
+async def get_processed(
+    filenames: Iterable[str],
+    changed: Optional[Dict[str, Any]] = None,
+    verbose: bool = False,
+    deps: List[str] = [],
+    dep_map: Dict[str, Any] = {},
+    to_run: Dict[str, Any] = {},
+    vendor_paths: Optional[List[Tuple[str, str]]] = None,
+    processed: Set[str] = set(),
+    tb_client: TinyB = None,
+    skip_connectors: bool = False,
+    current_ws: Optional[Dict[str, Any]] = None,
+    fork_downstream: Optional[bool] = False,
+    is_internal: Optional[bool] = False,
+    dir_path: Optional[str] = None,
+    embedded_datasources: Optional[Dict[str, Any]] = None,
+):
+    for filename in filenames:
+        # just process changed filenames (tb deploy and --only-changes)
+        if changed:
+            resource = Path(filename).resolve().stem
+            if resource in changed and (not changed[resource] or changed[resource] in ["shared", "remote"]):
+                continue
+        if os.path.isdir(filename):
+            await get_processed(filenames=get_project_filenames(filename))
+        else:
+            if verbose:
+                click.echo(FeedbackManager.info_processing_file(filename=filename))
+
+            if ".incl" in filename:
+                click.echo(FeedbackManager.warning_skipping_include_file(file=filename))
+
+            name, warnings = await process(
+                filename=filename,
+                tb_client=tb_client,
+                deps=deps,
+                dep_map=dep_map,
+                to_run=to_run,
+                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_datasources,
+            )
+            processed.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],
+                        )
+                    )
+
+
 async def build_graph(
     filenames: Iterable[str],
     tb_client: TinyB,
@@ -740,109 +882,24 @@ async def build_graph(
         all_dep_map = all_dependencies_graph.dep_map
         all_resources = all_dependencies_graph.to_run
 
-    async def process(
-        filename: str,
-        deps: List[str],
-        dep_map: Dict[str, Any],
-        to_run: Dict[str, Any],
-        vendor_paths: Optional[List[Tuple[str, str]]],
-    ):
-        name, kind = filename.rsplit(".", 1)
-        warnings = []
-
-        try:
-            res = await process_file(
-                filename,
-                tb_client,
-                skip_connectors=skip_connectors,
-                current_ws=current_ws,
-            )
-        except click.ClickException as e:
-            raise e
-        except IncludeFileNotFoundException as e:
-            raise click.ClickException(FeedbackManager.error_deleted_include(include_file=str(e), filename=filename))
-        except Exception as e:
-            raise click.ClickException(str(e))
-
-        for r in res:
-            resource_name = r["resource_name"]
-            warnings = r.get("warnings", [])
-            if (
-                changed
-                and resource_name in changed
-                and (not changed[resource_name] or changed[resource_name] in ["shared", "remote"])
-            ):
-                continue
-
-            if (
-                fork_downstream
-                and r.get("resource", "") == "pipes"
-                and any(["engine" in x.get("params", {}) for x in r.get("nodes", [])])
-            ):
-                raise click.ClickException(FeedbackManager.error_forkdownstream_pipes_with_engine(pipe=resource_name))
-
-            to_run[resource_name] = r
-            file_deps = r.get("deps", [])
-            deps += file_deps
-            # calculate and look for deps
-            dep_list = []
-            for x in file_deps:
-                if x not in INTERNAL_TABLES or is_internal:
-                    f, ds = find_file_by_name(dir_path, x, verbose, vendor_paths=vendor_paths, resource=r)
-                    if f:
-                        dep_list.append(f.rsplit(".", 1)[0])
-                    if ds:
-                        ds_fn = ds["resource_name"]
-                        prev = to_run.get(ds_fn, {})
-                        to_run[ds_fn] = deepcopy(r)
-                        try:
-                            to_run[ds_fn]["deps"] = list(
-                                set(to_run[ds_fn].get("deps", []) + prev.get("deps", []) + [resource_name])
-                            )
-                        except ValueError:
-                            pass
-                        embedded_datasources[x] = to_run[ds_fn]
-                    else:
-                        e_ds = embedded_datasources.get(x, None)
-                        if e_ds:
-                            dep_list.append(e_ds["resource_name"])
-
-            dep_map[resource_name] = set(dep_list)
-        return os.path.basename(name), warnings
-
     processed = set()
 
-    async def get_processed(filenames: Iterable[str]):
-        for filename in filenames:
-            # just process changed filenames (tb deploy and --only-changes)
-            if changed:
-                resource = Path(filename).resolve().stem
-                if resource in changed and (not changed[resource] or changed[resource] in ["shared", "remote"]):
-                    continue
-            if os.path.isdir(filename):
-                await get_processed(filenames=get_project_filenames(filename))
-            else:
-                if verbose:
-                    click.echo(FeedbackManager.info_processing_file(filename=filename))
-
-                if ".incl" in filename:
-                    click.echo(FeedbackManager.warning_skipping_include_file(file=filename))
-
-                name, warnings = await process(filename, deps, dep_map, to_run, vendor_paths)
-                processed.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],
-                            )
-                        )
-
-    await get_processed(filenames=filenames)
+    await get_processed(
+        filenames=filenames,
+        tb_client=tb_client,
+        changed=changed,
+        deps=deps,
+        dep_map=dep_map,
+        to_run=to_run,
+        vendor_paths=vendor_paths,
+        processed=processed,
+        skip_connectors=skip_connectors,
+        current_ws=current_ws,
+        fork_downstream=fork_downstream,
+        is_internal=is_internal,
+        dir_path=dir_path,
+        embedded_datasources=embedded_datasources,
+    )
 
     if process_dependencies:
         if only_changes:
@@ -878,7 +935,21 @@ async def build_graph(
                                 click.echo(FeedbackManager.info_skipping_resource(resource=processed_filename))
                                 continue
                             click.echo(FeedbackManager.info_processing_file(filename=processed_filename))
-                        await process(str(f), deps, dep_map, to_run, vendor_paths)
+                        await process(
+                            filename=str(f),
+                            tb_client=tb_client,
+                            deps=deps,
+                            dep_map=dep_map,
+                            to_run=to_run,
+                            vendor_paths=vendor_paths,
+                            skip_connectors=skip_connectors,
+                            current_ws=current_ws,
+                            fork_downstream=fork_downstream,
+                            is_internal=is_internal,
+                            dir_path=dir_path,
+                            verbose=verbose,
+                            embedded_datasources=embedded_datasources,
+                        )
 
     return GraphDependencies(dep_map, to_run, all_dep_map, all_resources)
 

tinybird/tb/modules/local.py

@@ -60,6 +60,7 @@ def start_tinybird_local(
 
     click.echo(FeedbackManager.info(message="* Waiting for Tinybird Local to be ready..."))
     while True:
+        container.reload()  # Refresh container attributes
         health = container.attrs.get("State", {}).get("Health", {}).get("Status")
         if health == "healthy":
             break

{tinybird-0.0.1.dev21.dist-info → tinybird-0.0.1.dev22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird
-Version: 0.0.1.dev21
+Version: 0.0.1.dev22
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev21.dist-info → tinybird-0.0.1.dev22.dist-info}/RECORD

@@ -15,7 +15,7 @@ tinybird/syncasync.py,sha256=fAvq0qkRgqXqXMKwbY2iJNYqLT_r6mDsh1MRpGKrdRU,27763
 tinybird/tornado_template.py,sha256=o2HguxrL1Evnt8o3IvrsI8Zm6JtRQ3zhLJKf1XyR3SQ,41965
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=OXkBhlzGjZotjD0vaT-rFIbSGV4tpiHxE8qO_ip0SyQ,40454
-tinybird/tb/__cli__.py,sha256=1VxxptKXBoOejwGSsyZYVR5OdTVsLgpfAiAB6C5DI3c,251
+tinybird/tb/__cli__.py,sha256=X2PDOP_pElDefrfQdab_-Df296RDkCK0nKLzdihDVJk,251
 tinybird/tb/cli.py,sha256=onCxcKvTV4RuokC5V3t82OXWAIwgU6pMWs8rpWOUi_o,815
 tinybird/tb/modules/auth.py,sha256=EzRWFmwRkXNhUmRaruEVFLdkbUg8xMSix0cAWl5D4Jg,9029
 tinybird/tb/modules/build.py,sha256=qJsmJCphanQitSnv86dqeoThM7mOg9Yg9JJLQjQ56ws,7074
@@ -31,7 +31,7 @@ tinybird/tb/modules/feedback_manager.py,sha256=a76KSrIdtNT5cs56jMYUfpqoXMwEPq_SE
 tinybird/tb/modules/fmt.py,sha256=poh6_cwVGSf-sBu6LKWuO2TANL_J8Sgm25sPpwxa3Aw,3558
 tinybird/tb/modules/job.py,sha256=956Pj8BEEsiD2GZsV9RKKVM3I_CveOLgS82lykO5ukk,2963
 tinybird/tb/modules/llm.py,sha256=9oJzI213eFv68Ttcfl3XNgEetaxfr6m56s2-IyBhNZ8,2713
-tinybird/tb/modules/local.py,sha256=xWUVQzGw2bdWrezJd2Qa3YmXnpg4VdGtQduJpPfKMck,5194
+tinybird/tb/modules/local.py,sha256=n8L1tH0LlCwGEM7K_1jHeCRdqjtW9BbpCIibI4IgeaM,5253
 tinybird/tb/modules/local_common.py,sha256=oemeKBCdEkNHXuGv1p6I9vhjkSXvqDsV5kT-rPN3mvk,2145
 tinybird/tb/modules/login.py,sha256=KYGpM35fsjIVkp04Xm1kHvlEOXysRSvLfBUNTxNx26A,6044
 tinybird/tb/modules/mock.py,sha256=BbDe60Qdlxg5-WewxFYRPETNBExj1qqBn5Ngz5T8G2Q,3231
@@ -46,7 +46,7 @@ tinybird/tb/modules/token.py,sha256=AePr-QMv_vtWwZDWQ92Zp0kPrCjze61i4npiPhoLMZg,
 tinybird/tb/modules/watch.py,sha256=xCIUvqTgeb2s63CYw26czgUGV3zzJpdmuyHGH2TLp1E,2349
 tinybird/tb/modules/workspace.py,sha256=6icAgnTvfL3d1kx4L1Z1cGXCD_2Yx0fNRjbZHNxRbYc,10927
 tinybird/tb/modules/workspace_members.py,sha256=Ai6iCOzXX1zQ8q9iXIFSFHsBJlT-8Q28DaG5Ie-UweY,8726
-tinybird/tb/modules/datafile/build.py,sha256=ICr9FvWQfW99aKnygbUOZPvivD6qaR31ZsQ7nNI2GLg,54309
+tinybird/tb/modules/datafile/build.py,sha256=i8UTYzB1_vWOJrmule_655FLEBj6sZzyiffQg-HsPJ4,56459
 tinybird/tb/modules/datafile/build_common.py,sha256=IXl-Z51zUi1dypV7meNenX0iu2UmowNeqgG6WHyMHlk,4562
 tinybird/tb/modules/datafile/build_datasource.py,sha256=4aP8_DYCRGghXntZSeWDNJxjps1QRVa7WHoYCzQwQts,17355
 tinybird/tb/modules/datafile/build_pipe.py,sha256=iu6_1eNEI5f2wm7AfDhLyMCwsqBtrAwkP_1yL4XTHOs,27659
@@ -69,8 +69,8 @@ tinybird/tb_cli_modules/config.py,sha256=6NTgIdwf0X132A1j6G_YrdPep87ymZ9b5pABabK
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=iEGnMuCuNhvF6ln__j6X9MSTwL_0Hm-GgFHHHvhfknk,10466
-tinybird-0.0.1.dev21.dist-info/METADATA,sha256=FMzNtUcWW-VbxL1Fvu5zVrBsEJb0mDEowNSDKibTL0U,2446
-tinybird-0.0.1.dev21.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tinybird-0.0.1.dev21.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev21.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
-tinybird-0.0.1.dev21.dist-info/RECORD,,
+tinybird-0.0.1.dev22.dist-info/METADATA,sha256=tjKF0zgTPtEhfgPlmDM3dJcqpe5R8j55aoeXgjZfxNM,2446
+tinybird-0.0.1.dev22.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tinybird-0.0.1.dev22.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev22.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
+tinybird-0.0.1.dev22.dist-info/RECORD,,