tinybird 0.0.1.dev43__py3-none-any.whl → 0.0.1.dev46__py3-none-any.whl

tinybird/tb/modules/pipe.py

@@ -5,128 +5,25 @@
 
 import json
 import re
-from typing import Dict, List, Optional, Tuple
 
 import click
-import humanfriendly
 from click import Context
 
-from tinybird.client import AuthNoTokenException, DoesNotExistException, TinyB
+from tinybird.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import (
     coro,
-    create_tb_client,
     echo_safe_humanfriendly_tables_format_smart_table,
-    wait_job,
 )
-from tinybird.tb.modules.datafile.common import PipeTypes, get_name_version
+from tinybird.tb.modules.datafile.common import get_name_version
 from tinybird.tb.modules.exceptions import CLIPipeException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
-@cli.group(hidden=True)
+@cli.group(hidden=False)
 @click.pass_context
 def pipe(ctx):
-    """Pipes commands"""
-
-
-@pipe.group(name="copy")
-@click.pass_context
-def pipe_copy(ctx: Context) -> None:
-    """Copy Pipe commands"""
-
-
-@pipe.group(name="sink")
-@click.pass_context
-def pipe_sink(ctx: Context) -> None:
-    """Sink Pipe commands"""
-
-
-@pipe.command(name="stats")
-@click.argument("pipes", nargs=-1)
-@click.option(
-    "--format",
-    "format_",
-    type=click.Choice(["json"], case_sensitive=False),
-    default=None,
-    help="Force a type of the output. To parse the output, keep in mind to use `tb --no-version-warning pipe stats`  option.",
-)
-@click.pass_context
-@coro
-async def pipe_stats(ctx: click.Context, pipes: Tuple[str, ...], format_: str):
-    """
-    Print pipe stats for the last 7 days
-    """
-    client: TinyB = ctx.ensure_object(dict)["client"]
-    all_pipes = await client.pipes()
-    pipes_to_get_stats = []
-    pipes_ids: Dict = {}
-
-    if pipes:
-        # We filter by the pipes we want to look for
-        all_pipes = [pipe for pipe in all_pipes if pipe["name"] in pipes]
-
-    for pipe in all_pipes:
-        name_version = get_name_version(pipe["name"])
-        if name_version["name"] in pipe["name"]:
-            pipes_to_get_stats.append(f"'{pipe['id']}'")
-            pipes_ids[pipe["id"]] = name_version
-
-    if not pipes_to_get_stats:
-        if format_ == "json":
-            click.echo(json.dumps({"pipes": []}, indent=2))
-        else:
-            click.echo(FeedbackManager.info_no_pipes_stats())
-        return
-
-    sql = f"""
-        SELECT
-            pipe_id id,
-            sumIf(view_count, date > now() - interval 7 day) requests,
-            sumIf(error_count, date > now() - interval 7 day) errors,
-            avgMergeIf(avg_duration_state, date > now() - interval 7 day) latency
-        FROM tinybird.pipe_stats
-        WHERE pipe_id in ({','.join(pipes_to_get_stats)})
-        GROUP BY pipe_id
-        ORDER BY requests DESC
-        FORMAT JSON
-    """
-
-    res = await client.query(sql)
-
-    if res and "error" in res:
-        raise CLIPipeException(FeedbackManager.error_exception(error=str(res["error"])))
-
-    columns = ["name", "request count", "error count", "avg latency"]
-    table_human_readable: List[Tuple] = []
-    table_machine_readable: List[Dict] = []
-    if res and "data" in res:
-        for x in res["data"]:
-            tk = pipes_ids[x["id"]]
-            table_human_readable.append(
-                (
-                    tk["name"],
-                    x["requests"],
-                    x["errors"],
-                    x["latency"],
-                )
-            )
-            table_machine_readable.append(
-                {
-                    "name": tk["name"],
-                    "requests": x["requests"],
-                    "errors": x["errors"],
-                    "latency": x["latency"],
-                }
-            )
-
-        table_human_readable.sort(key=lambda x: (x[1], x[0]))
-        table_machine_readable.sort(key=lambda x: x["name"])
-
-        if format_ == "json":
-            click.echo(json.dumps({"pipes": table_machine_readable}, indent=2))
-        else:
-            echo_safe_humanfriendly_tables_format_smart_table(table_human_readable, column_names=columns)
+    """Pipe commands"""
 
 
 @pipe.command(name="ls")
@@ -144,10 +41,10 @@ async def pipe_ls(ctx: Context, match: str, format_: str):
     """List pipes"""
 
     client: TinyB = ctx.ensure_object(dict)["client"]
-    pipes = await client.pipes(dependencies=False, node_attrs="name", attrs="name,updated_at")
+    pipes = await client.pipes(dependencies=False, node_attrs="name", attrs="name,updated_at,type")
     pipes = sorted(pipes, key=lambda p: p["updated_at"])
 
-    columns = ["name", "published date", "nodes"]
+    columns = ["name", "published date", "nodes", "type"]
     table_human_readable = []
     table_machine_readable = []
     pattern = re.compile(match) if match else None
@@ -155,12 +52,13 @@ async def pipe_ls(ctx: Context, match: str, format_: str):
         tk = get_name_version(t["name"])
         if pattern and not pattern.search(tk["name"]):
             continue
-        table_human_readable.append((tk["name"], t["updated_at"][:-7], len(t["nodes"])))
+        table_human_readable.append((tk["name"], t["updated_at"][:-7], len(t["nodes"]), t["type"]))
         table_machine_readable.append(
             {
                 "name": tk["name"],
                 "published date": t["updated_at"][:-7],
                 "nodes": len(t["nodes"]),
+                "type": t["type"],
             }
         )
 
@@ -172,219 +70,3 @@ async def pipe_ls(ctx: Context, match: str, format_: str):
         click.echo(json.dumps({"pipes": table_machine_readable}, indent=2))
     else:
         raise CLIPipeException(FeedbackManager.error_pipe_ls_type())
-
-
-@pipe.command(name="populate")
-@click.argument("pipe_name")
-@click.option("--node", type=str, help="Name of the materialized node.", default=None, required=False)
-@click.option(
-    "--sql-condition",
-    type=str,
-    default=None,
-    help="Populate with a SQL condition to be applied to the trigger Data Source of the Materialized View. For instance, `--sql-condition='date == toYYYYMM(now())'` it'll populate taking all the rows from the trigger Data Source which `date` is the current month. Use it together with --populate. --sql-condition is not taken into account if the --subset param is present. Including in the ``sql_condition`` any column present in the Data Source ``engine_sorting_key`` will make the populate job process less data.",
-)
-@click.option(
-    "--truncate", is_flag=True, default=False, help="Truncates the materialized Data Source before populating it."
-)
-@click.option(
-    "--unlink-on-populate-error",
-    is_flag=True,
-    default=False,
-    help="If the populate job fails the Materialized View is unlinked and new data won't be ingested in the Materialized View. First time a populate job fails, the Materialized View is always unlinked.",
-)
-@click.option(
-    "--wait",
-    is_flag=True,
-    default=False,
-    help="Waits for populate jobs to finish, showing a progress bar. Disabled by default.",
-)
-@click.pass_context
-@coro
-async def pipe_populate(
-    ctx: click.Context,
-    pipe_name: str,
-    node: str,
-    sql_condition: str,
-    truncate: bool,
-    unlink_on_populate_error: bool,
-    wait: bool,
-):
-    """Populate the result of a Materialized Node into the target Materialized View"""
-    cl = create_tb_client(ctx)
-
-    pipe = await cl.pipe(pipe_name)
-
-    if pipe["type"] != PipeTypes.MATERIALIZED:
-        raise CLIPipeException(FeedbackManager.error_pipe_not_materialized(pipe=pipe_name))
-
-    if not node:
-        materialized_ids = [pipe_node["id"] for pipe_node in pipe["nodes"] if pipe_node.get("materialized") is not None]
-
-        if not materialized_ids:
-            raise CLIPipeException(FeedbackManager.error_populate_no_materialized_in_pipe(pipe=pipe_name))
-
-        elif len(materialized_ids) > 1:
-            raise CLIPipeException(FeedbackManager.error_populate_several_materialized_in_pipe(pipe=pipe_name))
-
-        node = materialized_ids[0]
-
-    response = await cl.populate_node(
-        pipe_name,
-        node,
-        populate_condition=sql_condition,
-        truncate=truncate,
-        unlink_on_populate_error=unlink_on_populate_error,
-    )
-    if "job" not in response:
-        raise CLIPipeException(response)
-
-    job_id = response["job"]["id"]
-    job_url = response["job"]["job_url"]
-    if sql_condition:
-        click.echo(FeedbackManager.info_populate_condition_job_url(url=job_url, populate_condition=sql_condition))
-    else:
-        click.echo(FeedbackManager.info_populate_job_url(url=job_url))
-    if wait:
-        await wait_job(cl, job_id, job_url, "Populating")
-
-
-@pipe.command(name="token_read")
-@click.argument("pipe_name")
-@click.pass_context
-@coro
-async def pipe_token_read(ctx: click.Context, pipe_name: str):
-    """Retrieve a token to read a pipe"""
-    client: TinyB = ctx.ensure_object(dict)["client"]
-
-    try:
-        await client.pipe_file(pipe_name)
-    except DoesNotExistException:
-        raise CLIPipeException(FeedbackManager.error_pipe_does_not_exist(pipe=pipe_name))
-
-    tokens = await client.tokens()
-    token = None
-
-    for t in tokens:
-        for scope in t["scopes"]:
-            if scope["type"] == "PIPES:READ" and scope["resource"] == pipe_name:
-                token = t["token"]
-    if token:
-        click.echo(token)
-    else:
-        click.echo(FeedbackManager.warning_token_pipe(pipe=pipe_name))
-
-
-@pipe.command(
-    name="data",
-    context_settings=dict(
-        allow_extra_args=True,
-        ignore_unknown_options=True,
-    ),
-)
-@click.argument("pipe")
-@click.option("--query", default=None, help="Run SQL over pipe results")
-@click.option(
-    "--format", "format_", type=click.Choice(["json", "csv"], case_sensitive=False), help="Return format (CSV, JSON)"
-)
-@click.pass_context
-@coro
-async def print_pipe(ctx: Context, pipe: str, query: str, format_: str):
-    """Print data returned by a pipe
-
-    Syntax: tb pipe data <pipe_name> --param_name value --param2_name value2 ...
-    """
-
-    client: TinyB = ctx.ensure_object(dict)["client"]
-    params = {ctx.args[i][2:]: ctx.args[i + 1] for i in range(0, len(ctx.args), 2)}
-    req_format = "json" if not format_ else format_.lower()
-    try:
-        res = await client.pipe_data(pipe, format=req_format, sql=query, params=params)
-    except AuthNoTokenException:
-        raise
-    except Exception as e:
-        raise CLIPipeException(FeedbackManager.error_exception(error=str(e)))
-
-    if not format_:
-        stats = res["statistics"]
-        seconds = stats["elapsed"]
-        rows_read = humanfriendly.format_number(stats["rows_read"])
-        bytes_read = humanfriendly.format_size(stats["bytes_read"])
-
-        click.echo(FeedbackManager.success_print_pipe(pipe=pipe))
-        click.echo(FeedbackManager.info_query_stats(seconds=seconds, rows=rows_read, bytes=bytes_read))
-
-        if not res["data"]:
-            click.echo(FeedbackManager.info_no_rows())
-        else:
-            echo_safe_humanfriendly_tables_format_smart_table(
-                data=[d.values() for d in res["data"]], column_names=res["data"][0].keys()
-            )
-        click.echo("\n")
-    elif req_format == "json":
-        click.echo(json.dumps(res))
-    else:
-        click.echo(res)
-
-
-@pipe_sink.command(name="run", short_help="Run an on-demand sink job")
-@click.argument("pipe_name_or_id")
-@click.option("--wait", is_flag=True, default=False, help="Wait for the sink job to finish")
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
-@click.option("--dry-run", is_flag=True, default=False, help="Run the command without executing the sink job")
-@click.option(
-    "--param",
-    nargs=1,
-    type=str,
-    multiple=True,
-    default=None,
-    help="Key and value of the params you want the Sink pipe to be called with. For example: tb pipe sink run <my_sink_pipe> --param foo=bar",
-)
-@click.pass_context
-@coro
-async def pipe_sink_run(
-    ctx: click.Context, pipe_name_or_id: str, wait: bool, yes: bool, dry_run: bool, param: Optional[Tuple[str]]
-):
-    """Run an on-demand sink job"""
-
-    params = dict(key_value.split("=") for key_value in param) if param else {}
-
-    if dry_run or yes or click.confirm(FeedbackManager.warning_confirm_sink_job(pipe=pipe_name_or_id)):
-        click.echo(FeedbackManager.info_sink_job_running(pipe=pipe_name_or_id))
-        client: TinyB = ctx.ensure_object(dict)["client"]
-
-        try:
-            pipe = await client.pipe(pipe_name_or_id)
-            connections = await client.get_connections()
-
-            if (pipe.get("type", None) != "sink") or (not pipe.get("sink_node", None)):
-                error_message = f"Pipe {pipe_name_or_id} is not published as a Sink pipe"
-                raise Exception(FeedbackManager.error_running_on_demand_sink_job(error=error_message))
-
-            current_sink = None
-            for connection in connections:
-                for sink in connection.get("sinks", []):
-                    if sink.get("resource_id") == pipe["id"]:
-                        current_sink = sink
-                        break
-
-            if not current_sink:
-                click.echo(FeedbackManager.warning_sink_no_connection(pipe_name=pipe.get("name", "")))
-
-            if dry_run:
-                click.echo(FeedbackManager.info_dry_sink_run())
-                return
-
-            bucket_path = (current_sink or {}).get("settings", {}).get("bucket_path", "")
-            response = await client.pipe_run_sink(pipe_name_or_id, params)
-            job_id = response["job"]["id"]
-            job_url = response["job"]["job_url"]
-            click.echo(FeedbackManager.success_sink_job_created(bucket_path=bucket_path, job_url=job_url))
-
-            if wait:
-                await wait_job(client, job_id, job_url, "** Sinking data")
-                click.echo(FeedbackManager.success_sink_job_finished(bucket_path=bucket_path))
-
-        except AuthNoTokenException:
-            raise
-        except Exception as e:
-            raise CLIPipeException(FeedbackManager.error_creating_sink_job(error=str(e)))

tinybird/tb/modules/project.py

@@ -46,11 +46,17 @@ class Project:
     def pipes(self) -> List[str]:
         return [Path(f).stem for f in glob.glob(f"{self.path}/**/*.pipe", recursive=True)]
 
-    def get_pipe_datafile(self, filename: str) -> Datafile:
-        return parse_pipe(filename)
+    def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
+        try:
+            return parse_pipe(filename)
+        except Exception:
+            return None
 
-    def get_datasource_datafile(self, filename: str) -> Datafile:
-        return parse_datasource(filename)
+    def get_datasource_datafile(self, filename: str) -> Optional[Datafile]:
+        try:
+            return parse_datasource(filename)
+        except Exception:
+            return None
 
     def get_datafile(self, filename: str) -> Optional[Datafile]:
         if filename.endswith(".pipe"):

tinybird/tb/modules/shell.py

@@ -245,7 +245,7 @@ class Shell:
         click.echo(FeedbackManager.error(message=f"'tb {arg}' command is not available in watch mode"))
 
     def handle_mock(self, arg):
-        subprocess.run(f"tb --folder {self.project.folder} mock {arg}", shell=True, text=True)
+        subprocess.run(f"tb --build --folder {self.project.folder} mock {arg}", shell=True, text=True)
 
     def handle_tb(self, arg):
         click.echo("")
@@ -259,7 +259,7 @@ class Shell:
         elif arg.startswith("mock"):
             self.handle_mock(arg)
         else:
-            subprocess.run(f"tb --folder {self.project.folder} {arg}", shell=True, text=True)
+            subprocess.run(f"tb --build --folder {self.project.folder} {arg}", shell=True, text=True)
 
     def default(self, argline):
         click.echo("")
@@ -271,7 +271,7 @@ class Shell:
         elif len(arg.split()) == 1 and arg in self.project.pipes + self.project.datasources:
             self.run_sql(f"select * from {arg}")
         else:
-            subprocess.run(f"tb --folder {self.project.folder} {arg}", shell=True, text=True)
+            subprocess.run(f"tb --build --folder {self.project.folder} {arg}", shell=True, text=True)
 
     def run_sql(self, query, rows_limit=20):
         try:

tinybird/tb/modules/test.py

@@ -37,7 +37,7 @@ def repr_str(dumper, data):
 yaml.add_representer(str, repr_str, Dumper=yaml.SafeDumper)
 
 
-def generate_test_file(pipe_name: str, tests: List[Dict[str, Any]], folder: Optional[str], mode: str = "w"):
+def generate_test_file(pipe_name: str, tests: List[Dict[str, Any]], folder: Optional[str], mode: str = "w") -> Path:
     base = Path("tests")
     if folder:
         base = Path(folder) / base
@@ -50,6 +50,7 @@ def generate_test_file(pipe_name: str, tests: List[Dict[str, Any]], folder: Opti
     path = base / f"{pipe_name}.yaml"
     with open(path, mode) as f:
         f.write(formatted_yaml)
+    return path
 
 
 @cli.group()
@@ -66,9 +67,14 @@ def test(ctx: click.Context) -> None:
 @click.option(
     "--prompt", type=str, default="Create a test for the selected pipe", help="Prompt to be used to create the test"
 )
+@click.option(
+    "--skip",
+    is_flag=True,
+    help="Skip the test creation process and only generate the test file",
+)
 @click.pass_context
 @coro
-async def test_create(ctx: click.Context, name_or_filename: str, prompt: str) -> None:
+async def test_create(ctx: click.Context, name_or_filename: str, prompt: str, skip: bool) -> None:
     """
     Create a test for an existing pipe
     """
@@ -96,7 +102,7 @@ async def test_create(ctx: click.Context, name_or_filename: str, prompt: str) ->
         pipe_path = root_path / pipe_path
         pipe_content = pipe_path.read_text()
 
-        client = await get_tinybird_local_client(folder)
+        client = await get_tinybird_local_client(folder, build=True)
         pipe = await client._req(f"/v0/pipes/{pipe_name}")
         parameters = set([param["name"] for node in pipe["nodes"] for param in node["params"]])
 
@@ -111,43 +117,72 @@ async def test_create(ctx: click.Context, name_or_filename: str, prompt: str) ->
             raise CLIException(FeedbackManager.error(message="No user token found"))
         llm = LLM(user_token=user_token, host=config.get_client().host)
 
-        response_llm = llm.ask(system_prompt=system_prompt, prompt=prompt)
-        response_xml = extract_xml(response_llm, "response")
-        tests_content = parse_xml(response_xml, "test")
-
-        tests: List[Dict[str, Any]] = []
-        for test_content in tests_content:
-            test: Dict[str, Any] = {}
-            test["name"] = extract_xml(test_content, "name")
-            test["description"] = extract_xml(test_content, "description")
-            parameters_api = extract_xml(test_content, "parameters")
-            test["parameters"] = parameters_api.split("?")[1] if "?" in parameters_api else parameters_api
-            test["expected_result"] = ""
-
-            response = None
-            try:
-                response = await get_pipe_data(client, pipe_name=pipe_name, test_params=test["parameters"])
-            except Exception:
-                pass
+        iterations = 0
+        history = ""
+        test_path: Optional[Path] = None
 
-            if response:
-                if response.status_code >= 400:
-                    test["expected_http_status"] = response.status_code
-                    test["expected_result"] = response.json()["error"]
+        while iterations < 10:
+            feedback = ""
+            if iterations > 0:
+                feedback = click.prompt("\nFollow-up instructions or continue", default="continue")
+            if iterations > 0 and (not feedback or feedback in ("continue", "ok", "exit", "quit", "q")):
+                break
+            else:
+                if iterations > 0 and test_path:
+                    test_path.unlink()
+                    test_path = None
+                    click.echo(FeedbackManager.highlight(message=f"\n» Creating test for {pipe_name} endpoint..."))
+
+                response_llm = llm.ask(system_prompt=system_prompt, prompt=prompt)
+                response_xml = extract_xml(response_llm, "response")
+                tests_content = parse_xml(response_xml, "test")
+
+                tests: List[Dict[str, Any]] = []
+
+                for test_content in tests_content:
+                    test: Dict[str, Any] = {}
+                    test["name"] = extract_xml(test_content, "name")
+                    test["description"] = extract_xml(test_content, "description")
+                    parameters_api = extract_xml(test_content, "parameters")
+                    test["parameters"] = parameters_api.split("?")[1] if "?" in parameters_api else parameters_api
+                    test["expected_result"] = ""
+
+                    response = None
+                    try:
+                        response = await get_pipe_data(client, pipe_name=pipe_name, test_params=test["parameters"])
+                    except Exception:
+                        pass
+
+                    if response:
+                        if response.status_code >= 400:
+                            test["expected_http_status"] = response.status_code
+                            test["expected_result"] = response.json()["error"]
+                        else:
+                            if "expected_http_status" in test:
+                                del test["expected_http_status"]
+                            test["expected_result"] = response.text or ""
+
+                    tests.append(test)
+
+                if len(tests) > 0:
+                    test_path = generate_test_file(pipe_name, tests, folder, mode="a")
+                    for test in tests:
+                        test_name = test["name"]
+                        click.echo(FeedbackManager.info(message=f"✓ {test_name} created"))
+
+                    history = (
+                        history
+                        + f"""
+                    <result_iteration_{iterations}>
+                        {response_xml}
+                    </result_iteration_{iterations}>
+                    """
+                    )
+                    if skip:
+                        break
+                    iterations += 1
                 else:
-                    if "expected_http_status" in test:
-                        del test["expected_http_status"]
-                    test["expected_result"] = response.text or ""
-
-            tests.append(test)
-
-        if len(tests) > 0:
-            generate_test_file(pipe_name, tests, folder, mode="a")
-            for test in tests:
-                test_name = test["name"]
-                click.echo(FeedbackManager.info(message=f"✓ {test_name} created"))
-        else:
-            click.echo(FeedbackManager.info(message="* No tests created"))
+                    click.echo(FeedbackManager.info(message="* No tests created"))
 
         click.echo(FeedbackManager.success(message="✓ Done!\n"))
     except Exception as e:

tinybird/tb/modules/tinyunit/tinyunit.py

@@ -155,7 +155,7 @@ def parse_file(file: str) -> Iterable[TestCase]:
                 )
         except Exception as e:
             raise CLIException(
-                f"""Error: {FeedbackManager.error_exception(error=e)} reading file, check "{file}"->"{definition.get('name')}" """
+                f"""Error: {FeedbackManager.error_exception(error=e)} reading file, check "{file}"->"{definition.get("name")}" """
             )
 
 

tinybird/tb/modules/update.py

@@ -19,7 +19,7 @@ from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
 from tinybird.tb.modules.local_common import get_tinybird_local_client
 
 
-@cli.command()
+@cli.command(hidden=True)
 @click.argument("prompt")
 @click.option(
     "--folder",

tinybird/tb/modules/workspace.py

@@ -8,6 +8,7 @@ from typing import Optional
 import click
 from click import Context
 
+from tinybird.client import TinyB
 from tinybird.config import get_display_host
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import (
@@ -41,7 +42,7 @@ async def workspace_ls(ctx: Context) -> None:
     """List all the workspaces you have access to in the account you're currently authenticated into."""
 
     config = CLIConfig.get_project_config()
-    client = config.get_client()
+    client: TinyB = ctx.ensure_object(dict)["client"]
 
     response = await client.user_workspaces()
 

{tinybird-0.0.1.dev43.dist-info → tinybird-0.0.1.dev46.dist-info}/METADATA

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