tinybird 0.0.1.dev37__tar.gz → 0.0.1.dev39__tar.gz

{tinybird-0.0.1.dev37 → tinybird-0.0.1.dev39}/PKG-INFO

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

{tinybird-0.0.1.dev37 → tinybird-0.0.1.dev39}/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.dev37'
-__revision__ = '255b7f6'
+__version__ = '0.0.1.dev39'
+__revision__ = 'b1233f1'

{tinybird-0.0.1.dev37 → tinybird-0.0.1.dev39}/tinybird/tb/modules/build.py

@@ -16,7 +16,7 @@ from tinybird.tb.modules.datafile.fixture import build_fixture_name, get_fixture
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
-from tinybird.tb.modules.shell import Shell
+from tinybird.tb.modules.shell import Shell, print_table_formatted
 from tinybird.tb.modules.watch import watch_project
 
 
@@ -39,15 +39,20 @@ def build(ctx: click.Context, watch: bool) -> None:
             rebuild_fixture(project, tb_client, file_changed)
         else:
             build_project(project, tb_client)
+            new_tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
+            try:
+                if file_changed:
+                    build_and_print_resource(new_tb_client, file_changed)
+            except Exception:
+                pass
 
     process()
-
     time_end = time.time()
     elapsed_time = time_end - time_start
     click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
 
     if watch:
-        shell = Shell(project=project, client=tb_client)
+        shell = Shell(project=project)
         click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
         watcher_thread = threading.Thread(
             target=watch_project,
@@ -83,7 +88,7 @@ def build_project(project: Project, tb_client: TinyB) -> None:
             files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type)))
         HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
-        r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS)
+        r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS, data={"folder": str(project_path)})
         try:
             result = r.json()
         except Exception as e:
@@ -109,19 +114,23 @@ def build_project(project: Project, tb_client: TinyB) -> None:
                     pipe_path = pipe_path.replace(f"{project.folder}/", "")
                     click.echo(FeedbackManager.info(message=f"✓ {pipe_path} created"))
 
-            for filename in project_files:
-                if filename.endswith(".datasource"):
-                    ds_path = Path(filename)
-                    ds_name = ds_path.stem
-                    name = build_fixture_name(filename, ds_name, ds_path.read_text())
-                    fixture_folder = get_fixture_dir(project.folder)
-                    fixture_path = fixture_folder / f"{name}.ndjson"
+            try:
+                new_tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
+                for filename in project_files:
+                    if filename.endswith(".datasource"):
+                        ds_path = Path(filename)
+                        ds_name = ds_path.stem
+                        name = build_fixture_name(filename, ds_name, ds_path.read_text())
+                        fixture_folder = get_fixture_dir(project.folder)
+                        fixture_path = fixture_folder / f"{name}.ndjson"
 
-                    if not fixture_path.exists():
-                        fixture_path = fixture_folder / f"{ds_name}.ndjson"
+                        if not fixture_path.exists():
+                            fixture_path = fixture_folder / f"{ds_name}.ndjson"
 
-                    if fixture_path.exists():
-                        append_fixture(tb_client, ds_name, str(fixture_path))
+                        if fixture_path.exists():
+                            append_fixture(new_tb_client, ds_name, str(fixture_path))
+            except Exception:
+                pass
 
         elif build_result == "failed":
             click.echo(FeedbackManager.error(message="Build failed"))
@@ -158,8 +167,8 @@ def append_fixture(
     )
 
 
-def rebuild_fixture(project: Project, tb_client: TinyB, fixture_path: str) -> None:
-    fixture_path = Path(fixture_path)
+def rebuild_fixture(project: Project, tb_client: TinyB, fixture: str) -> None:
+    fixture_path = Path(fixture)
     datasources_path = Path(project.folder) / "datasources"
     ds_name = fixture_path.stem
 
@@ -173,3 +182,11 @@ def rebuild_fixture(project: Project, tb_client: TinyB, fixture_path: str) -> No
 
     if ds_path.exists():
         append_fixture(tb_client, ds_name, str(fixture_path))
+
+
+def build_and_print_resource(tb_client: TinyB, filename: str):
+    resource_path = Path(filename)
+    name = resource_path.stem
+    pipeline = name if filename.endswith(".pipe") else None
+    res = asyncio.run(tb_client.query(f"SELECT * FROM {name} FORMAT JSON", pipeline=pipeline))
+    print_table_formatted(res, name)

{tinybird-0.0.1.dev37 → tinybird-0.0.1.dev39}/tinybird/tb/modules/local_common.py

@@ -27,6 +27,7 @@ async def get_tinybird_local_config(path: Optional[str] = None) -> CLIConfig:
     It uses the tokens from tinybird local
     """
     config = CLIConfig.get_project_config(path)
+
     try:
         # ruff: noqa: ASYNC210
         tokens = requests.get(f"{TB_LOCAL_HOST}/tokens").json()
@@ -40,15 +41,20 @@ async def get_tinybird_local_config(path: Optional[str] = None) -> CLIConfig:
     if path:
         folder_hash = hashlib.sha256(path.encode()).hexdigest()
         user_client = config.get_client(host=TB_LOCAL_HOST, token=user_token)
-
         ws_name = f"Tinybird_Local_Build_{folder_hash}"
         logging.debug(f"Workspace used for build: {ws_name}")
 
-        user_workspaces = await user_client.user_workspaces()
-        ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
+        user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
+        local_workspaces = [ws for ws in user_workspaces["workspaces"] if ws["name"].startswith(ws_name)]
+        local_workspaces = sorted(local_workspaces, key=lambda x: x["name"])
+
+        ws = None
+        if len(local_workspaces) > 0:
+            ws = local_workspaces[-1]
+
         if not ws:
             await user_client.create_workspace(ws_name, template=None)
-            user_workspaces = await user_client.user_workspaces()
+            user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
             ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
             if not ws:
                 raise CLIException(f"Workspace {ws_name} not found after creation")

{tinybird-0.0.1.dev37 → tinybird-0.0.1.dev39}/tinybird/tb/modules/shell.py

@@ -14,9 +14,9 @@ from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.shortcuts import CompleteStyle
 from prompt_toolkit.styles import Style
 
-from tinybird.client import TinyB
 from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager, bcolors
+from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.table import format_table
 
@@ -174,10 +174,9 @@ def _(event):
 
 
 class Shell:
-    def __init__(self, project: Project, client: TinyB):
+    def __init__(self, project: Project):
         self.history = self.get_history()
         self.project = project
-        self.client = client
         self.prompt_message = "\ntb > "
         self.commands = ["create", "mock", "test", "tb", "select"]
         self.session: PromptSession = PromptSession(
@@ -286,8 +285,9 @@ class Shell:
                 loop = asyncio.new_event_loop()
                 asyncio.set_event_loop(loop)
                 try:
+                    tb_client = asyncio.run(get_tinybird_local_client(str(self.project.path)))
                     return loop.run_until_complete(
-                        self.client.query(f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT JSON")
+                        tb_client.query(f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT JSON")
                     )
                 finally:
                     loop.close()

{tinybird-0.0.1.dev37 → tinybird-0.0.1.dev39}/tinybird/tb/modules/test.py

@@ -23,6 +23,7 @@ from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
 from tinybird.tb.modules.local_common import get_tinybird_local_client
+from tinybird.tb.modules.project import Project
 
 yaml.SafeDumper.org_represent_str = yaml.SafeDumper.represent_str  # type: ignore[attr-defined]
 
@@ -62,21 +63,18 @@ def test(ctx: click.Context) -> None:
     help="Create a test for an existing pipe",
 )
 @click.argument("name_or_filename", type=str)
-@click.option(
-    "--folder",
-    default=".",
-    type=click.Path(exists=True, file_okay=False),
-    help="Folder where datafiles will be placed",
-)
 @click.option(
     "--prompt", type=str, default="Create a test for the selected pipe", help="Prompt to be used to create the test"
 )
+@click.pass_context
 @coro
-async def test_create(name_or_filename: str, prompt: str, folder: str) -> None:
+async def test_create(ctx: click.Context, name_or_filename: str, prompt: str) -> None:
     """
     Create a test for an existing pipe
     """
-    root_path = Path(folder)
+    project: Project = ctx.ensure_object(dict)["project"]
+    root_path = Path(project.folder)
+    folder = project.folder
     try:
         if ".pipe" in name_or_filename:
             pipe_path = Path(name_or_filename)
@@ -98,7 +96,7 @@ async def test_create(name_or_filename: str, prompt: str, folder: str) -> None:
         pipe_path = root_path / pipe_path
         pipe_content = pipe_path.read_text()
 
-        client = await get_tinybird_local_client(os.path.abspath(folder))
+        client = await get_tinybird_local_client(folder)
         pipe = await client._req(f"/v0/pipes/{pipe_name}")
         parameters = set([param["name"] for node in pipe["nodes"] for param in node["params"]])
 

{tinybird-0.0.1.dev37 → tinybird-0.0.1.dev39}/tinybird.egg-info/PKG-INFO

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