tinybird 0.0.1.dev16__py3-none-any.whl → 0.0.1.dev18__py3-none-any.whl

tinybird/tb/modules/cli.py

@@ -36,7 +36,6 @@ from tinybird.tb.modules.common import (
     coro,
     create_tb_client,
     echo_safe_format_table,
-    folder_init,
     get_current_main_workspace,
     getenv_bool,
     is_major_semver,
@@ -81,7 +80,6 @@ DEFAULT_PATTERNS: List[Tuple[str, Union[str, Callable[[str], str]]]] = [
 )
 @click.option("--token", help="Use auth token, defaults to TB_TOKEN envvar, then to the .tinyb file")
 @click.option("--host", help="Use custom host, defaults to TB_HOST envvar, then to https://api.tinybird.co")
-@click.option("--semver", help="Semver of a Release to run the command. Example: 1.0.0", hidden=True)
 @click.option("--gcp-project-id", help="The Google Cloud project ID", hidden=True)
 @click.option(
     "--gcs-bucket", help="The Google Cloud Storage bucket to write temp files when using the connectors", hidden=True
@@ -118,7 +116,6 @@ async def cli(
     debug: bool,
     token: str,
     host: str,
-    semver: str,
     gcp_project_id: str,
     gcs_bucket: str,
     google_application_credentials: str,
@@ -140,7 +137,7 @@ async def cli(
     """
 
     # We need to unpatch for our tests not to break
-    if show_tokens:
+    if show_tokens or local or ctx.invoked_subcommand == "build":
         __unpatch_click_output()
     else:
         __patch_click_output()
@@ -156,9 +153,7 @@ async def cli(
         config_temp.set_token(token)
     if host:
         config_temp.set_host(host)
-    if semver:
-        config_temp.set_semver(semver)
-    if token or host or semver:
+    if token or host:
         await try_update_config_with_remote(config_temp, auto_persist=False, raise_on_errors=False)
 
     # Overwrite token and host with env vars manually, without resorting to click.
@@ -170,10 +165,8 @@ async def cli(
         token = os.environ.get("TB_TOKEN", "")
     if not host and "TB_HOST" in os.environ:
         host = os.environ.get("TB_HOST", "")
-    if not semver and "TB_SEMVER" in os.environ:
-        semver = os.environ.get("TB_SEMVER", "")
 
-    config = await get_config(host, token, semver)
+    config = await get_config(host, token)
     client = _get_tb_client(config.get("token", None), config["host"])
 
     # If they have passed a token or host as paramter and it's different that record in .tinyb, refresh the workspace id
@@ -232,88 +225,13 @@ async def cli(
     logging.debug("debug enabled")
 
     ctx.ensure_object(dict)["client"] = (
-        await get_tinybird_local_client()
-        if local
-        else _get_tb_client(config.get("token", None), config["host"], semver)
+        await get_tinybird_local_client() if local else _get_tb_client(config.get("token", None), config["host"])
     )
 
     for connector in SUPPORTED_CONNECTORS:
         load_connector_config(ctx, connector, debug, check_uninstalled=True)
 
 
-@cli.command()
-@click.option(
-    "--generate-datasources",
-    is_flag=True,
-    default=False,
-    help="Generate datasources based on CSV, NDJSON and Parquet files in this folder",
-)
-@click.option(
-    "--folder",
-    default=None,
-    type=click.Path(exists=True, file_okay=False),
-    help="Folder where datafiles will be placed",
-)
-@click.option("-f", "--force", is_flag=True, default=False, help="Overrides existing files")
-@click.option(
-    "-ir",
-    "--ignore-remote",
-    is_flag=True,
-    default=False,
-    help="Ignores remote files not present in the local data project on git init",
-)
-@click.option(
-    "--git",
-    is_flag=True,
-    default=False,
-    help="Init workspace with git releases. Generates CI/CD files for your git provider",
-)
-@click.option(
-    "--override-commit",
-    default=None,
-    help="Use this option to manually override the reference commit of your workspace. This is useful if a commit is not recognized in your git log, such as after a force push (git push -f).",
-)
-@click.option(
-    "--cicd", is_flag=True, default=False, help="Generates only CI/CD files for your git provider", hidden=True
-)
-@click.pass_context
-@coro
-async def init(
-    ctx: Context,
-    generate_datasources: bool,
-    folder: Optional[str],
-    force: bool,
-    ignore_remote: bool,
-    git: bool,
-    override_commit: Optional[str],
-    cicd: Optional[bool],
-) -> None:
-    """Initialize folder layout."""
-    client: TinyB = ctx.ensure_object(dict)["client"]
-    config = CLIConfig.get_project_config()
-    if config.get("token") is None:
-        raise AuthNoTokenException
-    folder = folder if folder else getcwd()
-
-    workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches()).get("workspaces", [])
-    current_ws: Dict[str, Any] = next(
-        (workspace for workspace in workspaces if config and workspace.get("id", ".") == config.get("id", "..")), {}
-    )
-
-    if current_ws.get("is_branch"):
-        raise CLIException(FeedbackManager.error_not_allowed_in_branch())
-
-    await folder_init(client, folder, generate_datasources, generate_releases=True, force=force)
-
-    error = False
-    final_response = None
-
-    if final_response:
-        if error:
-            raise CLIException(final_response)
-        click.echo(final_response)
-
-
 @cli.command()
 @click.argument("filenames", type=click.Path(exists=True), nargs=-1, default=None)
 @click.option("--debug", is_flag=True, default=False, help="Print internal representation")
@@ -1347,9 +1265,6 @@ async def deploy(
             check_backfill_required = getenv_bool("TB_CHECK_BACKFILL_REQUIRED", True)
         try:
             tb_client = create_tb_client(ctx)
-            if dry_run:
-                config.set_semver(None)
-                tb_client.semver = None
             await folder_push(
                 tb_client=tb_client,
                 dry_run=dry_run,

tinybird/tb/modules/common.py

@@ -17,7 +17,7 @@ from contextlib import closing
 from copy import deepcopy
 from enum import Enum
 from functools import wraps
-from os import chmod, environ, getcwd, getenv
+from os import environ, getcwd, getenv
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union
 from urllib.parse import urlparse
@@ -61,9 +61,7 @@ if TYPE_CHECKING:
     from tinybird.connectors import Connector
 
 from tinybird.feedback_manager import FeedbackManager, warning_message
-from tinybird.git_settings import DEFAULT_TINYENV_FILE
 from tinybird.syncasync import async_to_sync, sync_to_async
-from tinybird.tb.modules.cicd import APPEND_FIXTURES_SH, DEFAULT_REQUIREMENTS_FILE, EXEC_TEST_SH
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import (
     CLIAuthException,
@@ -218,19 +216,6 @@ async def get_current_environment(client, config):
     return next((workspace for workspace in workspaces if workspace["id"] == config["id"]), None)
 
 
-async def get_current_workspace_branches(config: CLIConfig) -> List[Dict[str, Any]]:
-    current_main_workspace: Optional[Dict[str, Any]] = await get_current_main_workspace(config)
-    if not current_main_workspace:
-        raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
-
-    client = config.get_client()
-    user_branches: List[Dict[str, Any]] = (await client.user_workspace_branches()).get("workspaces", [])
-    all_branches: List[Dict[str, Any]] = (await client.branches()).get("environments", [])
-    branches = user_branches + [branch for branch in all_branches if branch not in user_branches]
-
-    return [branch for branch in branches if branch.get("main") == current_main_workspace["id"]]
-
-
 class AliasedGroup(click.Group):
     def get_command(self, ctx, cmd_name):
         # Step one: built-in commands as normal
@@ -320,16 +305,15 @@ def getenv_bool(key: str, default: bool) -> bool:
     return v.lower() == "true" or v == "1"
 
 
-def _get_tb_client(token: str, host: str, semver: Optional[str] = None) -> TinyB:
+def _get_tb_client(token: str, host: str) -> TinyB:
     disable_ssl: bool = getenv_bool("TB_DISABLE_SSL_CHECKS", False)
-    return TinyB(token, host, version=VERSION, disable_ssl_checks=disable_ssl, send_telemetry=True, semver=semver)
+    return TinyB(token, host, version=VERSION, disable_ssl_checks=disable_ssl, send_telemetry=True)
 
 
 def create_tb_client(ctx: Context) -> TinyB:
     token = ctx.ensure_object(dict)["config"].get("token", "")
     host = ctx.ensure_object(dict)["config"].get("host", DEFAULT_API_HOST)
-    semver = ctx.ensure_object(dict)["config"].get("semver", "")
-    return _get_tb_client(token, host, semver=semver)
+    return _get_tb_client(token, host)
 
 
 async def _analyze(filename: str, client: TinyB, format: str, connector: Optional["Connector"] = None):
@@ -385,111 +369,6 @@ async def folder_init(
             for path in Path(folder).glob(f"*.{format}"):
                 await _generate_datafile(str(path), client, format=format, force=force)
 
-    if generate_releases:
-        base = Path(".")
-        f = base / (".tinyenv")
-        if not f.exists() or force:
-            async with aiofiles.open(".tinyenv", "w") as file:
-                await file.write(DEFAULT_TINYENV_FILE)
-                click.echo(FeedbackManager.info_file_created(file=".tinyenv"))
-        else:
-            click.echo(FeedbackManager.info_dottinyenv_already_exists())
-
-        base = Path(".")
-        f = base / ("requirements.txt")
-        if not f.exists() or force:
-            async with aiofiles.open("requirements.txt", "w") as file:
-                await file.write(DEFAULT_REQUIREMENTS_FILE)
-                click.echo(FeedbackManager.info_file_created(file="requirements.txt"))
-
-        base = Path("scripts")
-        if not base.exists():
-            base = Path()
-        f = base / ("exec_test.sh")
-        if not f.exists() or force:
-            async with aiofiles.open(f"{f}", "w") as t_file:
-                await t_file.write(EXEC_TEST_SH)
-            click.echo(FeedbackManager.info_file_created(file="scripts/exec_test.sh"))
-        chmod(f, 0o755)
-
-        f = base / ("append_fixtures.sh")
-        if not f.exists() or force:
-            async with aiofiles.open(f"{f}", "w") as t_file:
-                await t_file.write(APPEND_FIXTURES_SH)
-            click.echo(FeedbackManager.info_file_created(file="scripts/append_fixtures.sh"))
-        chmod(f, 0o755)
-
-        base = Path("tests")
-        if not base.exists():
-            base = Path()
-        f = base / ("example.yml")
-        if not base.exists() or force:
-            async with aiofiles.open(f"{f}", "w") as t_file:
-                await t_file.write(
-                    """
-##############################################################################################################################
-###   Visit https://www.tinybird.co/docs/production/implementing-test-strategies.html#data-quality-tests              ###
-###   for more details on Data Quality tests                                                                               ###
-##############################################################################################################################
-
-- example_no_negative_numbers:
-    max_bytes_read: null
-    max_time: null
-    sql: |
-        SELECT
-            number
-        FROM numbers(10)
-        WHERE
-            number < 0
-
-#    - example_top_products_params_no_empty_top_10_on_2023:
-#       max_bytes_read: null
-#       max_time: null
-#       sql: |
-#          SELECT *
-#          FROM top_products_params
-#          WHERE empty(top_10)
-#       pipe:
-#          name: top_products_params
-#          params:
-#             start: '2023-01-01'
-#             end: '2023-12-31'
-
-"""
-                )
-
-        f = base / ("regression.yaml")
-        if not base.exists() or force:
-            async with aiofiles.open(f"{f}", "w") as t_file:
-                await t_file.write(
-                    """
-############################################################################################################################
-###   Visit https://www.tinybird.co/docs/production/implementing-test-strategies.html#regression-tests              ###
-###   for more details on Regression tests                                                                               ###
-############################################################################################################################
-
-###
-### New pipes are covered by this rule, rules below this one supersede this setting
-###
-- pipe: '.*'
-  tests:
-    - coverage:
-
-
-
-###
-### These are rules to customize regression testing by pipe using regular expressions
-### For instance skip regression tests for the pipes matching `endpoint_name.*`
-###
-- pipe: 'endpoint_name.*'
-  tests:
-    - coverage:
-        config:
-          skip: True
-
-"""
-                )
-
 
 async def configure_connector(connector):
     if connector not in SUPPORTED_CONNECTORS:
@@ -776,77 +655,6 @@ async def create_workspace_interactive(
     await create_workspace_non_interactive(ctx, workspace_name, starterkit, user_token, fork)  # type: ignore
 
 
-async def create_workspace_branch(
-    branch_name: Optional[str],
-    last_partition: bool,
-    all: bool,
-    ignore_datasources: Optional[List[str]],
-    wait: Optional[bool],
-) -> None:
-    """
-    Creates a workspace branch
-    """
-    config = CLIConfig.get_project_config()
-    _ = await try_update_config_with_remote(config)
-
-    try:
-        workspace = await get_current_workspace(config)
-        if not workspace:
-            raise CLIWorkspaceException(FeedbackManager.error_workspace())
-
-        if not branch_name:
-            click.echo(FeedbackManager.info_workspace_branch_create_greeting())
-            default_name = f"{workspace['name']}_{uuid.uuid4().hex[0:4]}"
-            branch_name = click.prompt("\Branch name", default=default_name, err=True, type=str)
-        assert isinstance(branch_name, str)
-
-        response = await config.get_client().create_workspace_branch(
-            branch_name,
-            last_partition,
-            all,
-            ignore_datasources,
-        )
-        assert isinstance(response, dict)
-
-        is_job: bool = "job" in response
-        is_summary: bool = "partitions" in response
-
-        if not is_job and not is_summary:
-            raise CLIException(str(response))
-
-        if all and not is_job:
-            raise CLIException(str(response))
-
-        click.echo(
-            FeedbackManager.success_workspace_branch_created(workspace_name=workspace["name"], branch_name=branch_name)
-        )
-
-        job_id: Optional[str] = None
-
-        if is_job:
-            job_id = response["job"]["job_id"]
-            job_url = response["job"]["job_url"]
-            click.echo(FeedbackManager.info_data_branch_job_url(url=job_url))
-
-        if wait and is_job:
-            assert isinstance(job_id, str)
-
-            # Await the job to finish and get the result dict
-            job_response = await wait_job(config.get_client(), job_id, job_url, "Branch creation")
-            if job_response is None:
-                raise CLIException(f"Empty job API response (job_id: {job_id}, job_url: {job_url})")
-            else:
-                response = job_response.get("result", {})
-                is_summary = "partitions" in response
-
-        await switch_workspace(config, branch_name, only_environments=True)
-        if is_summary and (bool(last_partition) or bool(all)):
-            await print_data_branch_summary(config.get_client(), None, response)
-
-    except Exception as e:
-        raise CLIException(FeedbackManager.error_exception(error=str(e)))
-
-
 async def print_data_branch_summary(client, job_id, response=None):
     response = await client.job(job_id) if job_id else response or {"partitions": []}
     columns = ["Data Source", "Partition", "Status", "Error"]
@@ -1327,13 +1135,10 @@ def _get_setting_value(connection, setting, sensitive_settings):
     return connection.get(setting, "")
 
 
-async def switch_workspace(config: CLIConfig, workspace_name_or_id: str, only_environments: bool = False) -> None:
+async def switch_workspace(config: CLIConfig, workspace_name_or_id: str) -> None:
     try:
-        if only_environments:
-            workspaces = await get_current_workspace_branches(config)
-        else:
-            response = await config.get_client().user_workspaces()
-            workspaces = response["workspaces"]
+        response = await config.get_client().user_workspaces()
+        workspaces = response["workspaces"]
 
         workspace = next(
             (
@@ -1345,10 +1150,7 @@ async def switch_workspace(config: CLIConfig, workspace_name_or_id: str, only_en
         )
 
         if not workspace:
-            if only_environments:
-                raise CLIException(FeedbackManager.error_branch(branch=workspace_name_or_id))
-            else:
-                raise CLIException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
+            raise CLIException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
 
         config.set_token(workspace["token"])
         config.set_token_for_host(workspace["token"], config.get_host())

tinybird/tb/modules/config.py

@@ -72,7 +72,6 @@ class CLIConfig:
         "token": "TB_TOKEN",
         "user_token": "TB_USER_TOKEN",
         "host": "TB_HOST",
-        "semver": "TB_SEMVER",
     }
 
     DEFAULTS: Dict[str, str] = {"host": DEFAULT_API_HOST if not FeatureFlags.is_localhost() else DEFAULT_LOCALHOST}
@@ -178,15 +177,6 @@ class CLIConfig:
         except KeyError:
             return None
 
-    def set_semver(self, semver: Optional[str]) -> None:
-        self["semver"] = semver
-
-    def get_semver(self) -> Optional[str]:
-        try:
-            return self["semver"]
-        except KeyError:
-            return None
-
     def set_token_for_host(self, token: Optional[str], host: Optional[str]) -> None:
         """Sets the token for the specified host.