tinybird 0.0.1.dev181__py3-none-any.whl → 0.0.1.dev183__py3-none-any.whl

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev181'
-__revision__ = '0bfd0e2'
+__version__ = '0.0.1.dev183'
+__revision__ = '1e2d149'

tinybird/tb/client.py

@@ -4,7 +4,7 @@ import logging
 import os
 import ssl
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Mapping, Optional, Set, Union
+from typing import Any, Callable, Dict, List, Mapping, Optional, Set, Tuple, Union
 from urllib.parse import quote, urlencode
 
 import aiofiles
@@ -696,12 +696,30 @@ class TinyB:
         else:
             return await self._req(f"/v0/sql?q={quote(sql, safe='')}&{urlencode(params)}")
 
-    async def jobs(self, status=None):
-        jobs = (await self._req("/v0/jobs"))["jobs"]
-        if status:
-            status = [status] if isinstance(status, str) else status
-            jobs = [j for j in jobs if j["status"] in status]
-        return jobs
+    async def jobs(
+        self, status: Optional[Tuple[str, ...]] = None, kind: Optional[Tuple[str, ...]] = None
+    ) -> List[Dict[str, Any]]:
+        async def fetch_jobs(params: Dict[str, str]) -> List[Dict[str, Any]]:
+            query_string = urlencode(params) if params else ""
+            endpoint = f"/v0/jobs?{query_string}" if query_string else "/v0/jobs"
+            response = await self._req(endpoint)
+            return response["jobs"]
+
+        if not status and not kind:
+            return await fetch_jobs({})
+        result: List[Dict[str, Any]] = []
+        if status and kind:
+            for s in status:
+                for k in kind:
+                    result.extend(await fetch_jobs({"status": s, "kind": k}))
+        elif status:
+            for s in status:
+                result.extend(await fetch_jobs({"status": s}))
+        elif kind:
+            for k in kind:
+                result.extend(await fetch_jobs({"kind": k}))
+
+        return result
 
     async def job(self, job_id: str):
         return await self._req(f"/v0/jobs/{job_id}")

tinybird/tb/modules/datafile/build_datasource.py

@@ -87,7 +87,7 @@ async def new_ds(
             if datasource.get("service") == "dynamodb":
                 job_id = datasource_response.get("import_id", None)
                 if job_id:
-                    jobs = await client.jobs(status=["waiting", "working"])
+                    jobs = await client.jobs(status=("waiting", "working"))
                     job_url = next((job["job_url"] for job in jobs if job["id"] == job_id), None)
                     if job_url:
                         click.echo(FeedbackManager.success_dynamodb_initial_load(job_url=job_url))

tinybird/tb/modules/datafile/fixture.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Optional, Union
 
 from tinybird.tb.modules.common import format_data_to_ndjson
 
@@ -17,10 +17,16 @@ def persist_fixture_sql(fixture_name: str, sql: str, folder: str) -> Path:
     return fixture_file
 
 
-def persist_fixture(fixture_name: str, data: Union[List[Dict[str, Any]], str], folder: str, format: str) -> Path:
-    fixture_dir = get_fixture_dir(folder)
-    fixture_file = fixture_dir / f"{fixture_name}.{format}"
-    extension = f".{format}"
+def persist_fixture(
+    fixture_name: str, data: Union[List[Dict[str, Any]], str], folder: str, format: str, target: Optional[str] = None
+) -> Path:
+    if target:
+        fixture_file = Path(target)
+        extension = fixture_file.suffix
+    else:
+        fixture_dir = get_fixture_dir(folder)
+        fixture_file = fixture_dir / f"{fixture_name}.{format}"
+        extension = f".{format}"
     if extension == FixtureExtension.NDJSON:
         fixture_file.write_text(data if isinstance(data, str) else format_data_to_ndjson(data))
     elif extension == FixtureExtension.CSV:

tinybird/tb/modules/datasource.py

@@ -423,19 +423,15 @@ async def datasource_export(
     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
+    - Export to specific file: tb datasource export my_datasource --target ./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}"))
+    click.echo(FeedbackManager.highlight(message=f"\n» Exporting {datasource}"))
 
     try:
         if format_ == "csv":
@@ -445,11 +441,13 @@ async def datasource_export(
 
         res = await client.query(query)
 
-        fixture_path = persist_fixture(datasource, res, project.folder, format=format_)
-        file_size = os.path.getsize(fixture_path)
+        target_path = persist_fixture(datasource, res, project.folder, format=format_, target=target)
+        file_size = os.path.getsize(target_path)
 
         click.echo(
-            FeedbackManager.success(message=f"✓ Exported data to {target} ({humanfriendly.format_size(file_size)})")
+            FeedbackManager.success(
+                message=f"✓ Exported data to {str(target_path).replace(project.folder, '')} ({humanfriendly.format_size(file_size)})"
+            )
         )
 
     except Exception as e:

tinybird/tb/modules/job.py

@@ -3,6 +3,8 @@
 # - If it makes sense and only when strictly necessary, you can create utility functions in this file.
 # - But please, **do not** interleave utility functions and command definitions.
 
+from typing import Tuple
+
 import click
 from click import Context
 
@@ -24,16 +26,23 @@ def job(ctx: Context) -> None:
     "-s",
     "--status",
     help="Show only jobs with this status",
-    type=click.Choice(["waiting", "working", "done", "error"], case_sensitive=False),
+    type=click.Choice(["waiting", "working", "done", "error", "cancelling", "cancelled"], case_sensitive=False),
+    multiple=True,
+    default=None,
+)
+@click.option(
+    "-k",
+    "--kind",
+    help="Show only jobs of this kind",
     multiple=True,
     default=None,
 )
 @click.pass_context
 @coro
-async def jobs_ls(ctx: Context, status: str) -> None:
-    """List jobs, up to 100 in the last 48h"""
+async def jobs_ls(ctx: Context, status: Tuple[str, ...], kind: Tuple[str, ...]) -> None:
+    """List jobs, up to 100"""
     client: TinyB = ctx.ensure_object(dict)["client"]
-    jobs = await client.jobs(status=status)
+    jobs = await client.jobs(status=status, kind=kind)
     columns = ["id", "kind", "status", "created at", "updated at", "job url"]
     click.echo(FeedbackManager.info_jobs())
     table = []

{tinybird-0.0.1.dev181.dist-info → tinybird-0.0.1.dev183.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev181
+Version: 0.0.1.dev183
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev181.dist-info → tinybird-0.0.1.dev183.dist-info}/RECORD

@@ -12,10 +12,10 @@ 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=X4tE9OrfaUy6kO9cqVEzyI9cDcmOF3IAssRRzsTsfEQ,40781
-tinybird/tb/__cli__.py,sha256=8iTlE27daJeiOAX4_hsaWWMEON1KBeHGMIVXpVUdIBQ,247
+tinybird/tb/__cli__.py,sha256=I3YL2OnI6jdHeZZqhxx8ydlJp5zrUKANN9Bqmzf28WY,247
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=u3eGOhX0MHkuT6tiwaZ0_3twqLmqKXDAOxF7yV_Nn9Q,1075
-tinybird/tb/client.py,sha256=QOGhsppeY5J5t0_buigAZ1U8Lmg9Hp-cVg6_wtOyjVI,55844
+tinybird/tb/client.py,sha256=59GH0IoYSV_KUG0eEbDDYHSWH4OlkVnSRFXE3mYAM0s,56571
 tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
 tinybird/tb/modules/build.py,sha256=rRL5XKBdadMc9uVDEUt0GXm0h09Y6XXw199rdmRI1qo,19127
 tinybird/tb/modules/cicd.py,sha256=MnShTTJzKBYeajswF2jg7p7ZzupaeCgSriAN05MeEdg,7330
@@ -25,7 +25,7 @@ tinybird/tb/modules/config.py,sha256=ziqW_t_mRVvWOd85VoB4vKyvgMkEfpXDf9H4v38p2xc
 tinybird/tb/modules/connection.py,sha256=7oOR7x4PhBcm1ETFFCH2YJ_3oeGXjAbmx1cnZX9_L70,9014
 tinybird/tb/modules/copy.py,sha256=2Mm4FWKehOG7CoOhiF1m9UZJgJn0W1_cMolqju8ONYg,5805
 tinybird/tb/modules/create.py,sha256=jz5jswVntvsnNN-IbCXoKw9pUKySx_IubpP0rxi7Iy0,17528
-tinybird/tb/modules/datasource.py,sha256=mZ9N9LxbNA9QoKSMbxcMiQkdaQkfFqLeFB9_88e3_68,17843
+tinybird/tb/modules/datasource.py,sha256=0_6Cn07p5GoNBBGdu88pSeLvTWojln1-k23FsS8jTDs,17801
 tinybird/tb/modules/deployment.py,sha256=t6DDLJ1YdY3SJiTPbEG7CRblSLkbuqwzauQ9y65FWtY,27147
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
 tinybird/tb/modules/dev_server.py,sha256=57FCKuWpErwYUYgHspYDkLWEm9F4pbvVOtMrFXX1fVU,10129
@@ -34,7 +34,7 @@ tinybird/tb/modules/exceptions.py,sha256=5jK91w1LPmtqIUfDpHe_Op5OxGz8-p1BPgtLREM
 tinybird/tb/modules/feedback_manager.py,sha256=c0ZOpG7IHFq3doodezctX64cTcTquIOhO38w9uPuU8Q,76798
 tinybird/tb/modules/info.py,sha256=iKeFbFkos7vYaBU7Vr5SI-fa1x7AbuUHB748jsGsaA4,5944
 tinybird/tb/modules/infra.py,sha256=fve30Gj3mG9zbquGxS2e4ipcOYOxviWQCpNFfEzJN_Q,33195
-tinybird/tb/modules/job.py,sha256=n4dSSBgnA8NqD7srGahf2xRj6wxkmX9Vl0J-QJ_a2w0,2966
+tinybird/tb/modules/job.py,sha256=AsUCRNzy7HG5oJ4fyk9NpIm5NtNJgBZSy8MtJdXBe5A,3167
 tinybird/tb/modules/llm.py,sha256=KfsCYmKeW1VQz0iDZhGKCRkQv_Y3kTHh6JuxvofOguE,1076
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=SUaGWH9TLDFFF9uCw4y7UW4NsKgnXG8uxTcxz1dbkCM,14230
@@ -58,12 +58,12 @@ tinybird/tb/modules/workspace.py,sha256=-XUvL2PB5GcviJ8m30h-ZDc5kwJcm1wy1dreYa2l
 tinybird/tb/modules/workspace_members.py,sha256=RYLpyPM1ECCasHRg3uvpckzXplX0_KgNFsSPZn_i6qk,8744
 tinybird/tb/modules/datafile/build.py,sha256=d_h3pRFDPFrDKGhpFx2iejY25GuB2k8yfNouj6s8caw,50973
 tinybird/tb/modules/datafile/build_common.py,sha256=LU24kAQmxDJIyoIapDaYG-SU3P4FrMG9UBf8m9PgVSI,4565
-tinybird/tb/modules/datafile/build_datasource.py,sha256=nXEQ0qHdq2ai7jJTv8H2d7eeDPBYzLn8VY7zMtOYb8M,17382
+tinybird/tb/modules/datafile/build_datasource.py,sha256=y4WVe_d2h9zqs7jAzPsUOOCqBaMAvmRQX5oHPJfTV4Y,17382
 tinybird/tb/modules/datafile/build_pipe.py,sha256=6Cwjf3BKEF3-oQ9PipsQfK-Z43nSwtA4qJAUoysI7Uc,11385
 tinybird/tb/modules/datafile/common.py,sha256=9mZqagXTjw6XXdNBvTWv_jQDaLIwNBmKAd6VxhxRuVo,91721
 tinybird/tb/modules/datafile/diff.py,sha256=MTmj53RYjER4neLgWVjabn-FKVFgh8h8uYiBo55lFQg,6757
 tinybird/tb/modules/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1wnI,556
-tinybird/tb/modules/datafile/fixture.py,sha256=DrRWivcvo_1rn7LlVUnHcXccdgx9yVj63mzBkUwCzk8,1420
+tinybird/tb/modules/datafile/fixture.py,sha256=gftYWeweeQDFK3cHgUmSOfltNjZVOuMt8v7WTMLhGBw,1579
 tinybird/tb/modules/datafile/format_common.py,sha256=1V1ZQuphp8EH2hT-IfZQEgz_0b9QqY177nwX8aMUte4,1962
 tinybird/tb/modules/datafile/format_datasource.py,sha256=iWbeXruxC7OBmjNgurWt6ymcJlYzxfKwkGnhpcoSKEo,6190
 tinybird/tb/modules/datafile/format_pipe.py,sha256=DUGdmlzI146YDqTwW-7kSIOXocz4AH-md_LFGUm9hrc,7436
@@ -80,8 +80,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.dev181.dist-info/METADATA,sha256=O18GXI84iGtB6bfQS-DeCKWRwrteeTp8JI_t-UOST4k,1608
-tinybird-0.0.1.dev181.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev181.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev181.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev181.dist-info/RECORD,,
+tinybird-0.0.1.dev183.dist-info/METADATA,sha256=PHYeXR2ipg3vhMXXloKq0_uhArBd_xQyvQ9Wg_O64QE,1608
+tinybird-0.0.1.dev183.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev183.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev183.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev183.dist-info/RECORD,,