tinybird 0.0.1.dev113__tar.gz → 0.0.1.dev114__tar.gz

{tinybird-0.0.1.dev113 → tinybird-0.0.1.dev114}/PKG-INFO

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

{tinybird-0.0.1.dev113 → tinybird-0.0.1.dev114}/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.dev113'
-__revision__ = '49946d6'
+__version__ = '0.0.1.dev114'
+__revision__ = '9878107'

{tinybird-0.0.1.dev113 → tinybird-0.0.1.dev114}/tinybird/tb/cli.py

@@ -24,7 +24,6 @@ import tinybird.tb.modules.materialization
 import tinybird.tb.modules.mock
 import tinybird.tb.modules.open
 import tinybird.tb.modules.pipe
-import tinybird.tb.modules.playground
 import tinybird.tb.modules.secret
 import tinybird.tb.modules.tag
 import tinybird.tb.modules.test

{tinybird-0.0.1.dev113 → tinybird-0.0.1.dev114}/tinybird/tb/modules/build.py

@@ -4,23 +4,30 @@ import logging
 import sys
 import threading
 import time
+from copy import deepcopy
 from functools import partial
 from pathlib import Path
-from typing import Callable, Optional
+from typing import Callable, List, Optional
 from urllib.parse import urlencode
 
 import click
 import requests
 
+import tinybird.context as context
 from tinybird.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import push_data
+from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.build import folder_build
+from tinybird.tb.modules.datafile.exceptions import ParseException
 from tinybird.tb.modules.datafile.fixture import get_fixture_dir, persist_fixture
+from tinybird.tb.modules.datafile.parse_datasource import parse_datasource
+from tinybird.tb.modules.datafile.parse_pipe import parse_pipe
+from tinybird.tb.modules.datafile.playground import folder_playground
 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
-from tinybird.tb.modules.watch import watch_project
+from tinybird.tb.modules.watch import watch_files, watch_project
 
 
 @cli.command()
@@ -43,8 +50,12 @@ def build(ctx: click.Context, watch: bool) -> None:
 
 
 @cli.command("dev", help="Build the project server side and watch for changes.")
+@click.option("--data-origin", type=str, default="", help="Data origin: local or cloud")
 @click.pass_context
-def dev(ctx: click.Context) -> None:
+def dev(ctx: click.Context, data_origin: str) -> None:
+    if data_origin == "cloud":
+        return dev_cloud(ctx)
+
     project: Project = ctx.ensure_object(dict)["project"]
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
     click.echo(FeedbackManager.highlight_building_project())
@@ -284,3 +295,113 @@ def rebuild_fixture_sql(project: Project, tb_client: TinyB, sql_file: str) -> No
     result = asyncio.run(tb_client.query(f"{sql} FORMAT JSON"))
     data = result.get("data", [])
     persist_fixture(datasource_name, data, project.folder)
+
+
+def is_vendor(f: Path) -> bool:
+    return f.parts[0] == "vendor"
+
+
+def get_vendor_workspace(f: Path) -> str:
+    return f.parts[1]
+
+
+def is_endpoint(f: Path) -> bool:
+    return f.suffix == ".pipe" and not is_vendor(f) and f.parts[0] == "endpoints"
+
+
+def is_pipe(f: Path) -> bool:
+    return f.suffix == ".pipe" and not is_vendor(f)
+
+
+def check_filenames(filenames: List[str]):
+    parser_matrix = {".pipe": parse_pipe, ".datasource": parse_datasource}
+    incl_suffix = ".incl"
+
+    for filename in filenames:
+        file_suffix = Path(filename).suffix
+        if file_suffix == incl_suffix:
+            continue
+
+        parser = parser_matrix.get(file_suffix)
+        if not parser:
+            raise ParseException(FeedbackManager.error_unsupported_datafile(extension=file_suffix))
+
+        parser(filename)
+
+
+def dev_cloud(
+    ctx: click.Context,
+) -> None:
+    project: Project = ctx.ensure_object(dict)["project"]
+    config = CLIConfig.get_project_config()
+    tb_client: TinyB = config.get_client()
+    context.disable_template_security_validation.set(True)
+
+    async def process(filenames: List[str], watch: bool = False):
+        datafiles = [f for f in filenames if f.endswith(".datasource") or f.endswith(".pipe")]
+        if len(datafiles) > 0:
+            check_filenames(filenames=datafiles)
+            await folder_playground(
+                project, config, tb_client, filenames=datafiles, is_internal=False, current_ws=None, local_ws=None
+            )
+        if len(filenames) > 0 and watch:
+            filename = filenames[0]
+            await build_and_print_resource(config, tb_client, filename)
+
+    datafiles = project.get_project_files()
+    filenames = datafiles
+
+    async def build_once(filenames: List[str]):
+        ok = False
+        try:
+            click.echo(FeedbackManager.highlight(message="» Building project...\n"))
+            time_start = time.time()
+            await process(filenames=filenames, watch=False)
+            time_end = time.time()
+            elapsed_time = time_end - time_start
+
+            click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
+            ok = True
+        except Exception as e:
+            error_path = Path(".tb_error.txt")
+            if error_path.exists():
+                content = error_path.read_text()
+                content += f"\n\n{str(e)}"
+                error_path.write_text(content)
+            else:
+                error_path.write_text(str(e))
+            click.echo(FeedbackManager.error_exception(error=e))
+            ok = False
+        return ok
+
+    build_ok = asyncio.run(build_once(filenames))
+
+    shell = Shell(project=project, tb_client=tb_client, playground=True)
+    click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
+    watcher_thread = threading.Thread(
+        target=watch_files, args=(filenames, process, shell, project, build_ok), daemon=True
+    )
+    watcher_thread.start()
+    shell.run()
+
+
+async def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename: str):
+    resource_path = Path(filename)
+    name = resource_path.stem
+    playground_name = name if filename.endswith(".pipe") else None
+    user_client = deepcopy(tb_client)
+    user_client.token = config.get_user_token() or ""
+    cli_params = {}
+    cli_params["workspace_id"] = config.get("id", None)
+    data = await user_client._req(f"/v0/playgrounds?{urlencode(cli_params)}")
+    playgrounds = data["playgrounds"]
+    playground = next((p for p in playgrounds if p["name"] == (f"{playground_name}" + "__tb__playground")), None)
+    if not playground:
+        return
+    playground_id = playground["id"]
+    last_node = playground["nodes"][-1]
+    if not last_node:
+        return
+    node_sql = last_node["sql"]
+    res = await tb_client.query(f"{node_sql} FORMAT JSON", playground=playground_id)
+    print_table_formatted(res, name)

{tinybird-0.0.1.dev113 → tinybird-0.0.1.dev114}/tinybird/tb/modules/cli.py

@@ -372,7 +372,7 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
     if command in commands_without_ctx_client:
         return None
 
-    commands_always_cloud = ["pull", "playground", "infra"]
+    commands_always_cloud = ["pull", "infra"]
     commands_always_build = ["build", "test", "dev", "create"]
     commands_always_local: List[str] = []
     if (

{tinybird-0.0.1.dev113 → tinybird-0.0.1.dev114}/tinybird.egg-info/PKG-INFO

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

{tinybird-0.0.1.dev113 → tinybird-0.0.1.dev114}/tinybird.egg-info/SOURCES.txt

@@ -53,7 +53,6 @@ tinybird/tb/modules/materialization.py
 tinybird/tb/modules/mock.py
 tinybird/tb/modules/open.py
 tinybird/tb/modules/pipe.py
-tinybird/tb/modules/playground.py
 tinybird/tb/modules/project.py
 tinybird/tb/modules/regions.py
 tinybird/tb/modules/secret.py

tinybird-0.0.1.dev113/tinybird/tb/modules/playground.py

@@ -1,135 +0,0 @@
-import asyncio
-import threading
-import time
-from copy import deepcopy
-from pathlib import Path
-from typing import List
-from urllib.parse import urlencode
-
-import click
-
-import tinybird.context as context
-from tinybird.client import TinyB
-from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.config import CLIConfig
-from tinybird.tb.modules.datafile.exceptions import ParseException
-from tinybird.tb.modules.datafile.parse_datasource import parse_datasource
-from tinybird.tb.modules.datafile.parse_pipe import parse_pipe
-from tinybird.tb.modules.datafile.playground import folder_playground
-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
-from tinybird.tb.modules.watch import watch_files
-
-
-def is_vendor(f: Path) -> bool:
-    return f.parts[0] == "vendor"
-
-
-def get_vendor_workspace(f: Path) -> str:
-    return f.parts[1]
-
-
-def is_endpoint(f: Path) -> bool:
-    return f.suffix == ".pipe" and not is_vendor(f) and f.parts[0] == "endpoints"
-
-
-def is_pipe(f: Path) -> bool:
-    return f.suffix == ".pipe" and not is_vendor(f)
-
-
-def check_filenames(filenames: List[str]):
-    parser_matrix = {".pipe": parse_pipe, ".datasource": parse_datasource}
-    incl_suffix = ".incl"
-
-    for filename in filenames:
-        file_suffix = Path(filename).suffix
-        if file_suffix == incl_suffix:
-            continue
-
-        parser = parser_matrix.get(file_suffix)
-        if not parser:
-            raise ParseException(FeedbackManager.error_unsupported_datafile(extension=file_suffix))
-
-        parser(filename)
-
-
-@cli.command()
-@click.pass_context
-def playground(
-    ctx: click.Context,
-) -> None:
-    """Build the project in Tinybird Local."""
-    project: Project = ctx.ensure_object(dict)["project"]
-    tb_client: TinyB = ctx.ensure_object(dict)["client"]
-    config = CLIConfig.get_project_config()
-    context.disable_template_security_validation.set(True)
-
-    async def process(filenames: List[str], watch: bool = False):
-        datafiles = [f for f in filenames if f.endswith(".datasource") or f.endswith(".pipe")]
-        if len(datafiles) > 0:
-            check_filenames(filenames=datafiles)
-            await folder_playground(
-                project, config, tb_client, filenames=datafiles, is_internal=False, current_ws=None, local_ws=None
-            )
-        if len(filenames) > 0 and watch:
-            filename = filenames[0]
-            await build_and_print_resource(config, tb_client, filename)
-
-    datafiles = project.get_project_files()
-    filenames = datafiles
-
-    async def build_once(filenames: List[str]):
-        ok = False
-        try:
-            click.echo(FeedbackManager.highlight(message="» Building project...\n"))
-            time_start = time.time()
-            await process(filenames=filenames, watch=False)
-            time_end = time.time()
-            elapsed_time = time_end - time_start
-
-            click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
-            ok = True
-        except Exception as e:
-            error_path = Path(".tb_error.txt")
-            if error_path.exists():
-                content = error_path.read_text()
-                content += f"\n\n{str(e)}"
-                error_path.write_text(content)
-            else:
-                error_path.write_text(str(e))
-            click.echo(FeedbackManager.error_exception(error=e))
-            ok = False
-        return ok
-
-    build_ok = asyncio.run(build_once(filenames))
-
-    shell = Shell(project=project, tb_client=tb_client, playground=True)
-    click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
-    watcher_thread = threading.Thread(
-        target=watch_files, args=(filenames, process, shell, project, build_ok), daemon=True
-    )
-    watcher_thread.start()
-    shell.run()
-
-
-async def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename: str):
-    resource_path = Path(filename)
-    name = resource_path.stem
-    playground_name = name if filename.endswith(".pipe") else None
-    user_client = deepcopy(tb_client)
-    user_client.token = config.get_user_token() or ""
-    cli_params = {}
-    cli_params["workspace_id"] = config.get("id", None)
-    data = await user_client._req(f"/v0/playgrounds?{urlencode(cli_params)}")
-    playgrounds = data["playgrounds"]
-    playground = next((p for p in playgrounds if p["name"] == (f"{playground_name}" + "__tb__playground")), None)
-    if not playground:
-        return
-    playground_id = playground["id"]
-    last_node = playground["nodes"][-1]
-    if not last_node:
-        return
-    node_sql = last_node["sql"]
-    res = await tb_client.query(f"{node_sql} FORMAT JSON", playground=playground_id)
-    print_table_formatted(res, name)