tinybird 0.0.1.dev182__tar.gz → 0.0.1.dev184__tar.gz

{tinybird-0.0.1.dev182 → tinybird-0.0.1.dev184}/PKG-INFO

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

{tinybird-0.0.1.dev182 → tinybird-0.0.1.dev184}/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.dev182'
-__revision__ = 'b1eeede'
+__version__ = '0.0.1.dev184'
+__revision__ = '0d5d2de'

{tinybird-0.0.1.dev182 → tinybird-0.0.1.dev184}/tinybird/tb/modules/create.py

@@ -3,8 +3,10 @@ import os
 import re
 from pathlib import Path
 from typing import Any, Dict, List, Optional
+from urllib.parse import urlparse
 
 import click
+import requests
 
 from tinybird.prompts import create_prompt, readme_prompt, rules_prompt
 from tinybird.tb.client import TinyB
@@ -25,7 +27,7 @@ from tinybird.tb.modules.project import Project
 @cli.command()
 @click.option(
     "--data",
-    type=click.Path(exists=True),
+    type=str,
     default=None,
     help="Initial data to be used to create the project. Tinybird Local and authentication are required.",
 )
@@ -87,7 +89,10 @@ async def create(
 
         data_result: List[Path] = []
         if data:
-            data_result = await create_resources_from_data(data, project, ctx_config)
+            if urlparse(data).scheme in ("http", "https"):
+                data_result = await create_resources_from_url(data, project, ctx_config)
+            else:
+                data_result = await create_resources_from_data(data, project, ctx_config)
             result.extend(data_result)
 
         prompt_result: List[Path] = []
@@ -134,14 +139,22 @@ async def create(
 
             if data:
                 for ds_path in [ds for ds in data_result if ds.suffix == ".datasource"]:
-                    data_path = Path(data)
-                    data_content = data_path.read_text()
+                    parsed_url = urlparse(data)
+                    if parsed_url.scheme in ("http", "https"):
+                        response = requests.get(data)  # noqa: ASYNC210
+                        data_content = response.text
+                        data_format = parsed_url.path.split(".")[-1]
+                    else:
+                        data_path = Path(data)
+                        data_content = data_path.read_text()
+                        data_format = data_path.suffix.lstrip(".")
+
                     ds_name = ds_path.stem
-                    data_format = data_path.suffix.lstrip(".")
                     datasource_path = Path(folder) / "datasources" / f"{ds_name}.datasource"
-                    click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
+                    click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}.{data_format}"))
                     persist_fixture(ds_name, data_content, folder, format=data_format)
                     created_something = True
+
             elif prompt and prompt_result:
                 ds_results = [path for path in prompt_result if path.suffix == ".datasource"]
                 for datasource_path in ds_results:
@@ -452,8 +465,8 @@ async def create_resources_from_data(
     project: Project,
     config: Dict[str, Any],
 ) -> List[Path]:
-    folder_path = project.path
     local_client = await get_tinybird_local_client(config)
+    folder_path = project.path
     path = folder_path / data
     result: List[Path] = []
     format = path.suffix.lstrip(".")
@@ -465,10 +478,33 @@ async def create_resources_from_data(
         pipe_file = generate_pipe_file(
             f"{name}_endpoint",
             f"""
-    NODE endpoint
-    SQL >
+NODE endpoint
+SQL >
+    SELECT * from {name}
+TYPE ENDPOINT
+            """,
+            project.folder,
+        )
+        result.append(pipe_file)
+    return result
+
+
+async def create_resources_from_url(url: str, project: Project, config: Dict[str, Any]) -> List[Path]:
+    result: List[Path] = []
+    local_client = await get_tinybird_local_client(config)
+    format = url.split(".")[-1]
+    ds_file = await _generate_datafile(url, local_client, format=format, force=True)
+    result.append(ds_file)
+    name = ds_file.stem
+    no_pipes = len(project.get_pipe_files()) == 0
+    if no_pipes:
+        pipe_file = generate_pipe_file(
+            f"{name}_endpoint",
+            f"""
+NODE endpoint
+SQL >
     SELECT * from {name}
-    TYPE ENDPOINT
+TYPE ENDPOINT
             """,
             project.folder,
         )

{tinybird-0.0.1.dev182 → tinybird-0.0.1.dev184}/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.dev182 → tinybird-0.0.1.dev184}/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.dev182 → tinybird-0.0.1.dev184}/tinybird/tb_cli_modules/auth.py

@@ -74,9 +74,8 @@ async def auth(ctx: click.Context, token: str, host: str, region: str, connector
     # do a clean auth
     if not token and not ctx.parent.params.get("token") and not env_token:
         config.set_token(None)
-    else:
-        if env_token and not token:
-            click.echo(FeedbackManager.info_reading_from_env(value="token", envvar="TB_TOKEN"))
+    elif env_token and not token:
+        click.echo(FeedbackManager.info_reading_from_env(value="token", envvar="TB_TOKEN"))
 
     regions: Optional[List[Region]] = None
     try_all_regions = True

{tinybird-0.0.1.dev182 → tinybird-0.0.1.dev184}/tinybird/tb_cli_modules/branch.py

@@ -597,9 +597,8 @@ async def regression_tests(
                 await print_branch_regression_tests_summary(client, job_id, config["host"])
         except Exception as e:
             raise CLIBranchException(FeedbackManager.error_exception(error=str(e)))
-    else:
-        if not ctx.invoked_subcommand:
-            await _run_regression(type="coverage", wait=wait, run_in_main=main)
+    elif not ctx.invoked_subcommand:
+        await _run_regression(type="coverage", wait=wait, run_in_main=main)
 
 
 async def _run_regression(

{tinybird-0.0.1.dev182 → tinybird-0.0.1.dev184}/tinybird/tb_cli_modules/cli.py

@@ -431,10 +431,9 @@ async def init(
                 error = True
             else:
                 click.echo(FeedbackManager.info_cicd_already_exists(provider=cicd_provider.name))
-        else:
-            if cicd:
-                data_project_dir = os.path.relpath(folder, cli_git_release.working_dir())
-                await init_cicd(client, path=cli_git_release.working_dir(), data_project_dir=data_project_dir)
+        elif cicd:
+            data_project_dir = os.path.relpath(folder, cli_git_release.working_dir())
+            await init_cicd(client, path=cli_git_release.working_dir(), data_project_dir=data_project_dir)
 
     if final_response:
         if error:
@@ -1463,12 +1462,11 @@ async def deploy(
                             )
                         else:
                             click.echo(FeedbackManager.info_minor_patch_release_with_autopromote(version=new_version))
-                else:
-                    if show_feedback:
-                        if dry_run:
-                            click.echo(FeedbackManager.info_dry_minor_patch_release_no_autopromote(version=new_version))
-                        else:
-                            click.echo(FeedbackManager.info_minor_patch_release_no_autopromote(version=new_version))
+                elif show_feedback:
+                    if dry_run:
+                        click.echo(FeedbackManager.info_dry_minor_patch_release_no_autopromote(version=new_version))
+                    else:
+                        click.echo(FeedbackManager.info_minor_patch_release_no_autopromote(version=new_version))
                 new_release = True
 
         if new_release:

{tinybird-0.0.1.dev182 → tinybird-0.0.1.dev184}/tinybird/tb_cli_modules/workspace.py

@@ -234,20 +234,19 @@ async def create_workspace(
         if not organization:
             raise CLIWorkspaceException(FeedbackManager.error_organization_not_found(organization_id=organization_id))
         organization_name = organization.get("name")
+    elif len(organizations) == 0:
+        click.echo(FeedbackManager.warning_none_organization(ui_host=ui_host))
+    elif len(organizations) == 1:
+        organization_id = organizations[0].get("id")
+        organization_name = organizations[0].get("name")
     else:
-        if len(organizations) == 0:
-            click.echo(FeedbackManager.warning_none_organization(ui_host=ui_host))
-        elif len(organizations) == 1:
-            organization_id = organizations[0].get("id")
-            organization_name = organizations[0].get("name")
+        sorted_organizations = sort_organizations_by_user(organizations, user_email=config.get_user_email())
+        current_organization = await ask_for_organization_interactively(sorted_organizations)
+        if current_organization:
+            organization_id = current_organization.get("id")
+            organization_name = current_organization.get("name")
         else:
-            sorted_organizations = sort_organizations_by_user(organizations, user_email=config.get_user_email())
-            current_organization = await ask_for_organization_interactively(sorted_organizations)
-            if current_organization:
-                organization_id = current_organization.get("id")
-                organization_name = current_organization.get("name")
-            else:
-                return
+            return
 
     # If we have at least workspace_name, we start the non interactive
     # process, creating an empty workspace

{tinybird-0.0.1.dev182 → tinybird-0.0.1.dev184}/tinybird.egg-info/PKG-INFO

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