tinybird 0.0.1.dev183__tar.gz → 0.0.1.dev185__tar.gz

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

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

{tinybird-0.0.1.dev183 → tinybird-0.0.1.dev185}/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.dev183'
-__revision__ = '1e2d149'
+__version__ = '0.0.1.dev185'
+__revision__ = 'b79d3c1'

{tinybird-0.0.1.dev183 → tinybird-0.0.1.dev185}/tinybird/tb/modules/common.py

@@ -174,8 +174,12 @@ def generate_datafile(
         base = Path(folder) / base
     datasource_name = normalize_datasource_name(p.stem)
     if not base.exists():
-        base = Path()
+        if folder:
+            base = Path(folder)
+        else:
+            base = Path()
     f = base / (datasource_name + ".datasource")
+
     if not f.exists() or force:
         with open(f"{f}", "w") as ds_file:
             ds_file.write(datafile)
@@ -421,13 +425,18 @@ async def _analyze(filename: str, client: TinyB, format: str, connector: Optiona
 
 
 async def _generate_datafile(
-    filename: str, client: TinyB, format: str, connector: Optional["Connector"] = None, force: Optional[bool] = False
+    filename: str,
+    client: TinyB,
+    format: str,
+    connector: Optional["Connector"] = None,
+    force: Optional[bool] = False,
+    folder: Optional[str] = None,
 ):
     meta, data = await _analyze(filename, client, format, connector=connector)
     schema = meta["analysis"]["schema"]
     schema = schema.replace(", ", ",\n    ")
     datafile = f"""DESCRIPTION >\n    Generated from {filename}\n\nSCHEMA >\n    {schema}"""
-    return generate_datafile(datafile, filename, data, force, _format=format)
+    return generate_datafile(datafile, filename, data, force, _format=format, folder=folder)
 
 
 async def configure_connector(connector):

{tinybird-0.0.1.dev183 → tinybird-0.0.1.dev185}/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.",
 )
@@ -54,9 +56,6 @@ async def create(
         config.persist_to_file()
         project.folder = folder
 
-    if cwd := config.get("cwd"):
-        click.echo(FeedbackManager.gray(message=f"Using '{cwd.replace(os.getcwd(), '')}' as target folder"))
-
     root_folder = os.getcwd()
     if config._path:
         root_folder = os.path.dirname(config._path)
@@ -76,7 +75,7 @@ async def create(
             if not user_token:
                 raise Exception("This action requires authentication. Run 'tb login' first.")
 
-        if not validate_project_structure(folder):
+        if not validate_project_structure(project):
             click.echo(FeedbackManager.highlight(message="\n» Creating new project structure..."))
             create_project_structure(folder)
             click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
@@ -87,7 +86,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 +136,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:
@@ -175,14 +185,13 @@ async def create(
 PROJECT_PATHS = ("datasources", "endpoints", "materializations", "copies", "pipes", "fixtures", "tests", "connections")
 
 
-def validate_project_structure(folder: str) -> bool:
-    some_folder_created = any((Path(folder) / path).exists() for path in PROJECT_PATHS)
+def validate_project_structure(project: Project) -> bool:
+    some_folder_created = any((Path(project.folder) / path).exists() for path in PROJECT_PATHS)
     if some_folder_created:
         return True
 
-    folder_path = Path(folder)
-    datasources = list(folder_path.glob("**/*.datasource"))
-    pipes = list(folder_path.glob("**/*.pipe"))
+    datasources = project.get_datasource_files()
+    pipes = project.get_pipe_files()
 
     return len(datasources) > 0 or len(pipes) > 0
 
@@ -452,12 +461,37 @@ 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
+    if not path.exists():
+        path = Path(data)
     result: List[Path] = []
     format = path.suffix.lstrip(".")
-    ds_file = await _generate_datafile(str(path), local_client, format=format, force=True)
+    ds_file = await _generate_datafile(str(path), local_client, format=format, force=True, folder=project.folder)
+    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
+            """,
+            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, folder=project.folder)
     result.append(ds_file)
     name = ds_file.stem
     no_pipes = len(project.get_pipe_files()) == 0
@@ -465,10 +499,10 @@ 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
+TYPE ENDPOINT
             """,
             project.folder,
         )

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

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