tinybird 0.0.1.dev69__tar.gz → 0.0.1.dev70__tar.gz

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/PKG-INFO

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

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/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.dev69'
-__revision__ = 'f90d907'
+__version__ = '0.0.1.dev70'
+__revision__ = 'f8064d4'

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/tinybird/tb/modules/build.py

@@ -15,7 +15,7 @@ from tinybird.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import push_data
 from tinybird.tb.modules.datafile.build import folder_build
-from tinybird.tb.modules.datafile.fixture import get_fixture_dir
+from tinybird.tb.modules.datafile.fixture import get_fixture_dir, persist_fixture
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.shell import Shell, print_table_formatted
@@ -210,6 +210,8 @@ def process(
     build_failed = False
     if file_changed and file_changed.endswith(".ndjson"):
         rebuild_fixture(project, tb_client, file_changed)
+    elif file_changed and file_changed.endswith(".sql"):
+        rebuild_fixture_sql(project, tb_client, file_changed)
     else:
         try:
             build_project(project, tb_client, file_changed)
@@ -247,3 +249,12 @@ def run_watch(
     )
     watcher_thread.start()
     shell.run()
+
+
+def rebuild_fixture_sql(project: Project, tb_client: TinyB, sql_file: str) -> None:
+    sql_path = Path(sql_file)
+    datasource_name = sql_path.stem
+    sql = sql_path.read_text()
+    result = asyncio.run(tb_client.query(f"{sql} FORMAT JSON"))
+    data = result.get("data", [])
+    persist_fixture(datasource_name, data, project.folder)

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/tinybird/tb/modules/cli.py

@@ -127,6 +127,7 @@ async def cli(
         ctx.ensure_object(dict)["client"] = client
 
     ctx.ensure_object(dict)["project"] = project
+    ctx.ensure_object(dict)["env"] = get_target_env(cloud, build)
 
 
 @cli.command(hidden=True)
@@ -393,7 +394,7 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
 
     commands_always_cloud = ["pull"]
     commands_always_build = ["build", "test", "dev"]
-    commands_always_local = ["create", "mock"]
+    commands_always_local = ["create"]
     if (
         (cloud or command in commands_always_cloud)
         and command not in commands_always_build
@@ -407,3 +408,11 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
     if not build and command not in commands_always_local and command not in commands_always_build:
         click.echo(FeedbackManager.gray(message="Running against Tinybird Local\n"))
     return await get_tinybird_local_client(config, build=build)
+
+
+def get_target_env(cloud: bool, build: bool) -> str:
+    if cloud:
+        return "cloud"
+    if build:
+        return "build"
+    return "local"

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/tinybird/tb/modules/datafile/fixture.py

@@ -8,6 +8,13 @@ def get_fixture_dir(folder: str) -> Path:
     return Path(folder) / "fixtures"
 
 
+def persist_fixture_sql(fixture_name: str, sql: str, folder: str) -> Path:
+    fixture_dir = get_fixture_dir(folder)
+    fixture_file = fixture_dir / f"{fixture_name}.sql"
+    fixture_file.write_text(sql)
+    return fixture_file
+
+
 def persist_fixture(fixture_name: str, data: Union[List[Dict[str, Any]], str], folder: str, format="ndjson") -> Path:
     fixture_dir = get_fixture_dir(folder)
     fixture_file = fixture_dir / f"{fixture_name}.{format}"

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/tinybird/tb/modules/datasource.py

@@ -5,6 +5,7 @@
 
 import asyncio
 import json
+import os
 import re
 from typing import Optional
 
@@ -23,8 +24,10 @@ from tinybird.tb.modules.common import (
     push_data,
 )
 from tinybird.tb.modules.datafile.common import get_name_version
+from tinybird.tb.modules.datafile.fixture import persist_fixture
 from tinybird.tb.modules.exceptions import CLIDatasourceException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.project import Project
 
 
 @cli.group()
@@ -391,3 +394,63 @@ async def datasource_data(ctx: Context, datasource: str, limit: int):
         echo_safe_humanfriendly_tables_format_smart_table(
             data=[d.values() for d in res["data"]], column_names=res["data"][0].keys()
         )
+
+
+@datasource.command(name="export")
+@click.argument("datasource")
+@click.option(
+    "--format",
+    "format_",
+    type=click.Choice(["csv", "ndjson"], case_sensitive=False),
+    default="ndjson",
+    help="Output format (csv or ndjson)",
+)
+@click.option("--rows", type=int, default=100, help="Number of rows to export (default: 100)")
+@click.option("--where", type=str, default=None, help="Condition to filter data")
+@click.option("--target", type=str, help="Target file path (default: datasource_name.{format})")
+@click.pass_context
+@coro
+async def datasource_export(
+    ctx: Context,
+    datasource: str,
+    format_: str,
+    rows: int,
+    where: Optional[str],
+    target: Optional[str],
+):
+    """Export data from a datasource to a file in CSV or NDJSON format
+
+    Example usage:
+    - Export all rows as CSV: tb datasource export my_datasource
+    - Export 1000 rows as NDJSON: tb datasource export my_datasource --format ndjson --rows 1000
+    - Export to specific file: tb datasource export my_datasource --output ./data/export.csv
+    """
+    client: TinyB = ctx.ensure_object(dict)["client"]
+    project: Project = ctx.ensure_object(dict)["project"]
+
+    # Determine output filename if not provided
+    if not target:
+        target = f"{datasource}.{format_}"
+
+    # Build query with optional row limit
+    query = f"SELECT * FROM {datasource} WHERE {where or 1} LIMIT {rows}"
+
+    click.echo(FeedbackManager.highlight(message=f"\n» Exporting {datasource} to {target}"))
+
+    try:
+        if format_ == "csv":
+            query += " FORMAT CSVWithNames"
+        else:
+            query += " FORMAT JSONEachRow"
+
+        res = await client.query(query)
+
+        fixture_path = persist_fixture(datasource, res, project.folder)
+        file_size = os.path.getsize(fixture_path)
+
+        click.echo(
+            FeedbackManager.success(message=f"✓ Exported data to {target} ({humanfriendly.format_size(file_size)})")
+        )
+
+    except Exception as e:
+        raise CLIDatasourceException(FeedbackManager.error(message=str(e)))

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/tinybird/tb/modules/deployment.py

@@ -266,13 +266,13 @@ def deployment_rollback(ctx: click.Context, wait: bool) -> None:
 @click.option(
     "--wait/--no-wait",
     is_flag=True,
-    default=False,
+    default=True,
     help="Wait for deploy to finish. Disabled by default.",
 )
 @click.option(
     "--auto/--no-auto",
     is_flag=True,
-    default=False,
+    default=True,
     help="Auto-promote the deployment. Only works if --wait is enabled. Disabled by default.",
 )
 @click.option(
@@ -311,6 +311,7 @@ def create_deployment(
     }
     project: Project = ctx.ensure_object(dict)["project"]
     client = ctx.ensure_object(dict)["client"]
+    config = ctx.ensure_object(dict)["config"]
     TINYBIRD_API_URL = f"{client.host}/v1/deploy"
     TINYBIRD_API_KEY = client.token
 
@@ -357,8 +358,21 @@ def create_deployment(
         deploy_result = result.get("result")
         if deploy_result == "success":
             print_changes(result, project)
-            click.echo(FeedbackManager.success(message="Deployment submitted successfully"))
-            deployment = result.get("deployment")
+            deployment = result.get("deployment", {})
+            # We show the url in the case of region is public
+            if client.host == "https://api.europe-west2.gcp.tinybird.co":
+                click.echo(
+                    FeedbackManager.gray(message="Deployment URL: ")
+                    + FeedbackManager.info(
+                        message=f"https://cloud.tinybird.co/gcp/europe-west2/{config.get('name')}/deployments/{deployment.get('id')}"
+                    )
+                )
+
+            if wait:
+                click.echo(FeedbackManager.info(message="\n✓ Deployment submitted successfully"))
+            else:
+                click.echo(FeedbackManager.success(message="\n✓ Deployment submitted successfully"))
+
             feedback = deployment.get("feedback", [])
             for f in feedback:
                 click.echo(

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/tinybird/tb/modules/mock.py

@@ -1,6 +1,4 @@
 import glob
-import logging
-import os
 from pathlib import Path
 
 import click
@@ -8,9 +6,9 @@ import click
 from tinybird.client import TinyB
 from tinybird.prompts import mock_prompt
 from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import CLIException, check_user_token_with_client, coro
+from tinybird.tb.modules.common import CLIException, check_user_token_with_client, coro, push_data
 from tinybird.tb.modules.config import CLIConfig
-from tinybird.tb.modules.datafile.fixture import persist_fixture
+from tinybird.tb.modules.datafile.fixture import persist_fixture, persist_fixture_sql
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml
@@ -41,11 +39,11 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str) -> N
     try:
         tb_client: TinyB = ctx.ensure_object(dict)["client"]
         project: Project = ctx.ensure_object(dict)["project"]
+        env = ctx.ensure_object(dict)["env"]
         datasource_path = Path(datasource)
         datasource_name = datasource
         folder = project.folder
         click.echo(FeedbackManager.highlight(message=f"\n» Creating fixture for {datasource_name}..."))
-
         if datasource_path.suffix == ".datasource":
             datasource_name = datasource_path.stem
         else:
@@ -56,14 +54,6 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str) -> N
         if not datasource_path.exists():
             raise CLIException(f"Datasource '{datasource_path.stem}' not found")
 
-        prompt_path = Path(folder) / "fixtures" / f"{datasource_name}.prompt"
-        if not prompt or prompt == "Use the datasource schema to generate sample data":
-            # load the prompt from the fixture.prompt file if it exists
-            if prompt_path.exists():
-                prompt = prompt_path.read_text()
-        else:
-            prompt_path.write_text(prompt)
-
         datasource_content = datasource_path.read_text()
         config = CLIConfig.get_project_config()
         user_client = config.get_client()
@@ -76,21 +66,39 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str) -> N
         except Exception:
             click.echo(FeedbackManager.error(message="This action requires authentication. Run 'tb login' first."))
             return
+
         llm = LLM(user_token=user_token, host=user_client.host)
         prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
         sql = ""
-
         response = llm.ask(system_prompt=mock_prompt(rows), prompt=prompt)
         sql = extract_xml(response, "sql")
         result = await tb_client.query(f"{sql} FORMAT JSON")
         data = result.get("data", [])[:rows]
-        persist_fixture(datasource_name, data, folder)
-        click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}.ndjson created"))
+        if env == "build":
+            persist_fixture_sql(datasource_name, sql, folder)
+
+        fixture_path = persist_fixture(datasource_name, data, folder)
 
-        if os.environ.get("TB_DEBUG", "") != "":
-            logging.debug(sql)
+        click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}.ndjson created"))
+        if env == "cloud":
+            await append_fixture(tb_client, datasource_name, str(fixture_path))
 
         click.echo(FeedbackManager.success(message=f"✓ Sample data for {datasource_name} created with {rows} rows"))
 
     except Exception as e:
         click.echo(FeedbackManager.error_exception(error=f"Error: {e}"))
+
+
+async def append_fixture(
+    tb_client: TinyB,
+    datasource_name: str,
+    url: str,
+):
+    await push_data(
+        tb_client,
+        datasource_name,
+        url,
+        mode="append",
+        concurrency=1,
+        silent=True,
+    )

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/tinybird/tb/modules/watch.py

@@ -29,7 +29,7 @@ class WatchProjectHandler(FileSystemEventHandler):
         if event.is_directory:
             return None
 
-        valid_extensions = [".datasource", ".pipe", ".ndjson"]
+        valid_extensions = [".datasource", ".pipe", ".ndjson", ".sql"]
 
         if not any(event.src_path.endswith(ext) for ext in valid_extensions):
             return None

{tinybird-0.0.1.dev69 → tinybird-0.0.1.dev70}/tinybird.egg-info/PKG-INFO

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