tinybird 0.0.1.dev126__py3-none-any.whl → 0.0.1.dev128__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.dev126'
-__revision__ = '7860cec'
+__version__ = '0.0.1.dev128'
+__revision__ = '1631c37'

tinybird/tb/cli.py

@@ -14,7 +14,6 @@ import tinybird.tb.modules.create
 import tinybird.tb.modules.datasource
 import tinybird.tb.modules.deployment
 import tinybird.tb.modules.endpoint
-import tinybird.tb.modules.fmt
 import tinybird.tb.modules.infra
 import tinybird.tb.modules.job
 import tinybird.tb.modules.local

tinybird/tb/modules/build.py

@@ -63,7 +63,7 @@ def dev(ctx: click.Context, data_origin: str) -> None:
     run_watch(project=project, tb_client=tb_client, process=partial(process, project=project, tb_client=tb_client))
 
 
-def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str] = None) -> None:
+def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str] = None, silent: bool = False) -> None:
     MULTIPART_BOUNDARY_DATA_PROJECT = "data_project://"
     DATAFILE_TYPE_TO_CONTENT_TYPE = {
         ".datasource": "text/plain",
@@ -112,7 +112,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
             pipes = build.get("new_pipe_names", [])
             connections = build.get("new_data_connector_names", [])
 
-            if not file_changed:
+            if not file_changed and not silent:
                 for ds in datasources:
                     ds_path_str: Optional[str] = next(
                         (p for p in project_files if p.endswith(ds + ".datasource")), None
@@ -261,7 +261,12 @@ def show_data(tb_client: TinyB, filename: str, diff: Optional[str] = None):
 
 
 def process(
-    project: Project, tb_client: TinyB, watch: bool, file_changed: Optional[str] = None, diff: Optional[str] = None
+    project: Project,
+    tb_client: TinyB,
+    watch: bool,
+    file_changed: Optional[str] = None,
+    diff: Optional[str] = None,
+    silent: bool = False,
 ) -> None:
     time_start = time.time()
     build_failed = False
@@ -271,7 +276,7 @@ def process(
         rebuild_fixture_sql(project, tb_client, file_changed)
     else:
         try:
-            build_project(project, tb_client, file_changed)
+            build_project(project, tb_client, file_changed, silent)
         except click.ClickException as e:
             click.echo(FeedbackManager.error(message=e))
             build_failed = True
@@ -291,7 +296,8 @@ def process(
         if not watch:
             sys.exit(1)
     else:
-        click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
+        if not silent:
+            click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
 
 
 def run_watch(

tinybird/tb/modules/test.py

@@ -17,6 +17,7 @@ from requests import Response
 
 from tinybird.prompts import test_create_prompt
 from tinybird.tb.client import TinyB
+from tinybird.tb.modules.build import process
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.config import CLIConfig
@@ -79,6 +80,7 @@ async def test_create(ctx: click.Context, name_or_filename: str, prompt: str) ->
     config = CLIConfig.get_project_config()
     root_path = project.path
     folder = project.folder
+
     try:
         if ".pipe" in name_or_filename:
             pipe_path = Path(name_or_filename)
@@ -211,9 +213,13 @@ async def test_update(ctx: click.Context, pipe: str) -> None:
 @click.pass_context
 @coro
 async def run_tests(ctx: click.Context, name: Tuple[str, ...]) -> None:
-    click.echo(FeedbackManager.highlight(message="\n» Running tests"))
     client: TinyB = ctx.ensure_object(dict)["client"]
     project: Project = ctx.ensure_object(dict)["project"]
+    click.echo(FeedbackManager.highlight(message="\n» Building project"))
+    process(project=project, tb_client=client, watch=False, silent=True)
+    click.echo(FeedbackManager.info(message="✓ Done!"))
+
+    click.echo(FeedbackManager.highlight(message="\n» Running tests"))
     paths = [Path(n) for n in name]
     endpoints = [f"{project.path}/tests/{p.stem}.yaml" for p in paths]
     test_files: List[str] = (
@@ -222,7 +228,7 @@ async def run_tests(ctx: click.Context, name: Tuple[str, ...]) -> None:
 
     async def run_test(test_file):
         test_file_path = Path(test_file)
-        click.echo(FeedbackManager.info(message=f"\n* {test_file_path.stem}{test_file_path.suffix}"))
+        click.echo(FeedbackManager.info(message=f"* {test_file_path.stem}{test_file_path.suffix}"))
         test_file_content = yaml.safe_load(test_file_path.read_text())
 
         for test in test_file_content:

tinybird/tb/modules/watch.py

@@ -164,9 +164,7 @@ class FileChangeHandler(FileSystemEventHandler):
             is_vendor = "vendor/" in path
             if is_vendor:
                 return False
-            return any(
-                path.endswith(ext) for ext in [".datasource", ".pipe", FixtureExtension.NDJSON, FixtureExtension.CSV]
-            )
+            return any(path.endswith(ext) for ext in [".pipe"])
 
         if should_process_path(event.src_path):
             return event.src_path

{tinybird-0.0.1.dev126.dist-info → tinybird-0.0.1.dev128.dist-info}/METADATA

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

{tinybird-0.0.1.dev126.dist-info → tinybird-0.0.1.dev128.dist-info}/RECORD

@@ -12,12 +12,12 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=BZuPM7MFS7vaEKK5tOMR2bwSAgJudPrJt27uVEwZmTY,40512
-tinybird/tb/__cli__.py,sha256=R_56U8k8apqKnW-xs-fk-jaby1hlI4th1HnLHIpF8bc,252
-tinybird/tb/cli.py,sha256=uDLwcbwSJfVFw-pceijZJqaq26z5jNsey0QaUGFjt7w,1097
+tinybird/tb/__cli__.py,sha256=AD638EDKr26bDWUR_Lb4JdbCkcF0rHLln23P0QeUWCo,252
+tinybird/tb/cli.py,sha256=Xw5EhwCQu6Xx55DzoJsZJODdi7tkA391mii-xgGnpEU,1066
 tinybird/tb/client.py,sha256=oa0pR46WvzDoqpyaDU-lRu33I0cZhtZVDqDQz2RHMWQ,56085
 tinybird/tb/config.py,sha256=iIia7F67UI9p51Ja4jALonyttIi4eH7PwOn3HvcvOb8,4008
 tinybird/tb/modules/auth.py,sha256=_OeYnmTH83lnqCgQEdS6K0bx1KBUeRmZk2M7JnRmWpk,9037
-tinybird/tb/modules/build.py,sha256=b1fjWrurDWLwNdWjcNaEaSJh6Iko98uSExw4k_CRoTc,17244
+tinybird/tb/modules/build.py,sha256=KqXMJJW8JEuTlH3KyV1ylCLUob_oFhwDTM7bYLgrK9s,17359
 tinybird/tb/modules/cicd.py,sha256=A7zJZF9HkJ6NPokplgNjmefMrpUlRbFxBbjMZhq5OTI,7110
 tinybird/tb/modules/cli.py,sha256=Y_5hu9xwyTIZw4bQoe0MYLnRIzmR7hUjql_oZBxd4Qg,13407
 tinybird/tb/modules/common.py,sha256=bdKNjHtQKcsZFyZIsLY8vEoTD0Xf-1UNBnh1pAyWPZU,83456
@@ -30,7 +30,6 @@ tinybird/tb/modules/deployment.py,sha256=4Zt7jPbqt18fB5kPx7DbO91Bh6xzBBTEUFY7O89
 tinybird/tb/modules/endpoint.py,sha256=XySDt3pk66vxOZ0egUfz4bY8bEk3BjOXkv-L0OIJ3sc,12083
 tinybird/tb/modules/exceptions.py,sha256=4A2sSjCEqKUMqpP3WI00zouCWW4uLaghXXLZBSw04mY,3363
 tinybird/tb/modules/feedback_manager.py,sha256=8I6n5JFPS4xP-Pfb9iu7hqx5VX773uGDXH2E5QeANeg,74179
-tinybird/tb/modules/fmt.py,sha256=qpf9APqKTKL2uphNgdbj4OMVyLkAxZn6dn4eHF99L5g,3553
 tinybird/tb/modules/infra.py,sha256=eX0StUipaXaxIhMxO82cnAnFKTCa7EPOt-e8pWoSLX0,33206
 tinybird/tb/modules/job.py,sha256=n4dSSBgnA8NqD7srGahf2xRj6wxkmX9Vl0J-QJ_a2w0,2966
 tinybird/tb/modules/llm.py,sha256=KfsCYmKeW1VQz0iDZhGKCRkQv_Y3kTHh6JuxvofOguE,1076
@@ -50,9 +49,9 @@ tinybird/tb/modules/shell.py,sha256=cvT0EKpnSRHfuo3avykBRMsCwLBqmzSR7sNUdbQ6lXA,
 tinybird/tb/modules/table.py,sha256=4XrtjM-N0zfNtxVkbvLDQQazno1EPXnxTyo7llivfXk,11035
 tinybird/tb/modules/tag.py,sha256=anPmMUBc-TbFovlpFi8GPkKA18y7Y0GczMsMms5TZsU,3502
 tinybird/tb/modules/telemetry.py,sha256=FcFw_70-0SyC_2BdToF_sjVpXpMD7i00fCm2SO4cHx8,11397
-tinybird/tb/modules/test.py,sha256=HxkSpdLOW8brGUNsqdBoSW8RixxyC7OCDmYwEZsIpfs,11459
+tinybird/tb/modules/test.py,sha256=qO0_sMaAwqtYBqFRVG5X3XkRTroIa-a_FEzh36nDn1E,11711
 tinybird/tb/modules/token.py,sha256=2fmKwu10_M0pqs6YmJVeILR9ZQB0ejRAET86agASbKM,13488
-tinybird/tb/modules/watch.py,sha256=-2DGSShUGAPDYpLVkiDiONC-RqGdZbTiXOCsDtU5udw,8990
+tinybird/tb/modules/watch.py,sha256=_92co0BjTikQuy7MbHr4TDu9A75QdHsrAO8v7DlYLg4,8898
 tinybird/tb/modules/workspace.py,sha256=SlK08psp0tu5t_URHyIczm696buW6KD6FPs9Lg1aNRE,6614
 tinybird/tb/modules/workspace_members.py,sha256=RYLpyPM1ECCasHRg3uvpckzXplX0_KgNFsSPZn_i6qk,8744
 tinybird/tb/modules/datafile/build.py,sha256=d_h3pRFDPFrDKGhpFx2iejY25GuB2k8yfNouj6s8caw,50973
@@ -79,8 +78,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 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=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev126.dist-info/METADATA,sha256=PNr5bUR9Fhz3S1GSg0aY6BCFGdTnfwz-eCBSRfJMFAg,1612
-tinybird-0.0.1.dev126.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev126.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev126.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev126.dist-info/RECORD,,
+tinybird-0.0.1.dev128.dist-info/METADATA,sha256=1rm0QBnLwJtL4e--PnGpcwbM-MJejj23ZjD0jFinX_Y,1612
+tinybird-0.0.1.dev128.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev128.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev128.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev128.dist-info/RECORD,,

tinybird/tb/modules/fmt.py

@@ -1,94 +0,0 @@
-import difflib
-import sys
-from pathlib import Path
-from typing import List, Optional
-
-import aiofiles
-import click
-from click import Context
-
-from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import coro
-from tinybird.tb.modules.datafile.common import is_file_a_datasource
-from tinybird.tb.modules.datafile.diff import color_diff, peek
-from tinybird.tb.modules.datafile.format_datasource import format_datasource
-from tinybird.tb.modules.datafile.format_pipe import format_pipe
-from tinybird.tb.modules.feedback_manager import FeedbackManager
-
-
-@cli.command()
-@click.argument("filenames", type=click.Path(exists=True), nargs=-1, required=True)
-@click.option(
-    "--line-length",
-    is_flag=False,
-    default=100,
-    help="A number indicating the maximum characters per line in the node SQL, lines will be splitted based on the SQL syntax and the number of characters passed as a parameter",
-)
-@click.option("--dry-run", is_flag=True, default=False, help="Don't ask to override the local file")
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation to overwrite the local file")
-@click.option(
-    "--diff",
-    is_flag=True,
-    default=False,
-    help="Formats local file, prints the diff and exits 1 if different, 0 if equal",
-)
-@click.pass_context
-@coro
-async def fmt(
-    ctx: Context, filenames: List[str], line_length: int, dry_run: bool, yes: bool, diff: bool
-) -> Optional[str]:
-    """
-    Formats a .datasource, .pipe or .incl file.
-
-    This command removes comments starting with # from the file, use DESCRIPTION instead.
-
-    The format command tries to parse the datafile so syntax errors might rise.
-
-    .incl files must contain a NODE definition.
-    """
-
-    result = ""
-    failed = []
-    for filename in filenames:
-        if not diff:
-            click.echo(filename)
-        extensions = Path(filename).suffixes
-        if is_file_a_datasource(filename):
-            result = await format_datasource(filename, skip_eval=True)
-        elif (".pipe" in extensions) or (".incl" in extensions):
-            result = await format_pipe(filename, line_length, skip_eval=True)
-        else:
-            click.echo("Unsupported file type. Supported files types are: .pipe and .datasource")
-            return None
-
-        if diff:
-            result = result.rstrip("\n")
-            lines_fmt = [f"{line}\n" for line in result.split("\n")]
-            async with aiofiles.open(filename, "r") as file:
-                lines_file = await file.readlines()
-            diff_result = difflib.unified_diff(
-                lines_file, lines_fmt, fromfile=f"{Path(filename).name} local", tofile="fmt datafile"
-            )
-            diff_result = color_diff(diff_result)
-            not_empty, diff_lines = peek(diff_result)
-            if not_empty:
-                sys.stdout.writelines(diff_lines)
-                failed.append(filename)
-                click.echo("")
-        else:
-            click.echo(result)
-            if dry_run:
-                return None
-
-            if yes or click.confirm(FeedbackManager.prompt_override_local_file(name=filename)):
-                async with aiofiles.open(f"{filename}", "w") as file:
-                    await file.write(result)
-
-                click.echo(FeedbackManager.success_generated_local_file(file=filename))
-
-    if len(failed):
-        click.echo(FeedbackManager.error_failed_to_format_files(number=len(failed)))
-        for f in failed:
-            click.echo(f"tb fmt {f} --yes")
-        sys.exit(1)
-    return result