tinybird 0.0.1.dev181__tar.gz → 0.0.1.dev183__tar.gz

{tinybird-0.0.1.dev181 → tinybird-0.0.1.dev183}/PKG-INFO

@@ -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 → tinybird-0.0.1.dev183}/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-0.0.1.dev181 → tinybird-0.0.1.dev183}/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-0.0.1.dev181 → tinybird-0.0.1.dev183}/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-0.0.1.dev181 → tinybird-0.0.1.dev183}/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-0.0.1.dev181 → tinybird-0.0.1.dev183}/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-0.0.1.dev181 → tinybird-0.0.1.dev183}/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 → tinybird-0.0.1.dev183}/tinybird.egg-info/PKG-INFO

@@ -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