tinybird 0.0.1.dev49__tar.gz → 0.0.1.dev51__tar.gz

{tinybird-0.0.1.dev49 → tinybird-0.0.1.dev51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird
-Version: 0.0.1.dev49
+Version: 0.0.1.dev51
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev49 → tinybird-0.0.1.dev51}/tinybird/prompts.py

@@ -779,7 +779,7 @@ You have commands at your disposal to develop a tinybird project:
 - {base_command} --build token ls: to list all the tokens
 There are other commands that you can use, but these are the most common ones. Run `{base_command} -h` to see all the commands if needed.
 When you need to work with resources or data in the Tinybird environment that you updated with the build command, add always the --build flag before the command. Example: {base_command} --build datasource ls
-When you need to work with resources or data in production, add always the --prod flag before the command. Example: {base_command} --prod datasource ls
+When you need to work with resources or data in cloud, add always the --cloud flag before the command. Example: {base_command} --cloud datasource ls
 </command_calling>
 <development_instructions>
 - When asking to create a tinybird data project, if the needed folders are not already created, use the following structure:
@@ -799,8 +799,9 @@ When you need to work with resources or data in production, add always the --pro
 When asking for ingesting data, adding data or appending data do the following depending on the environment you want to work with:
 <ingest_data_instructions>
 - When building locally, create a .ndjson file with the data you want to ingest and do `{base_command} build` to ingest the data in the build env.
-- When appending data in production, use `{base_command} --prod datasource append <datasource_name> <file_name>`
-- When you have a response that says “there are rows in quarantine”, do `{base_command} --build|--prod datasource data <datasource_name>_quarantine` to understand what is the problem.
+- We call `cloud` the production environment.
+- When appending data in cloud, use `{base_command} --cloud datasource append <datasource_name> <file_name>`
+- When you have a response that says “there are rows in quarantine”, do `{base_command} --build|--cloud datasource data <datasource_name>_quarantine` to understand what is the problem.
 </ingest_data_instructions>
 <datasource_file_instructions>
 Follow these instructions when creating or updating .datasource files:

{tinybird-0.0.1.dev49 → tinybird-0.0.1.dev51}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev49'
-__revision__ = 'a0a2378'
+__version__ = '0.0.1.dev51'
+__revision__ = '0583356'

{tinybird-0.0.1.dev49 → tinybird-0.0.1.dev51}/tinybird/tb/modules/build.py

@@ -103,7 +103,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
         except Exception as e:
             logging.debug(e, exc_info=True)
             click.echo(FeedbackManager.error(message="Couldn't parse response from server"))
-            return
+            sys.exit(1)
 
         logging.debug(json.dumps(result, indent=2))
 
@@ -170,7 +170,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
         for fd in fds:
             fd.close()
         if error:
-            raise click.ClickException(FeedbackManager.error_build_failed())
+            raise click.ClickException(FeedbackManager.error(message="Error: Build failed"))
 
 
 def append_fixture(

{tinybird-0.0.1.dev49 → tinybird-0.0.1.dev51}/tinybird/tb/modules/cli.py

@@ -55,7 +55,7 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 @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("--show-tokens", is_flag=True, default=False, help="Enable the output of tokens")
-@click.option("--prod/--local", is_flag=True, default=False, help="Run against production or local")
+@click.option("--cloud/--local", is_flag=True, default=False, help="Run against cloud or local")
 @click.option("--build", is_flag=True, default=False, help="Run against build mode")
 @click.option("--folder", type=str, help="Folder where files will be placed")
 @click.version_option(version=VERSION)
@@ -67,7 +67,7 @@ async def cli(
     token: str,
     host: str,
     show_tokens: bool,
-    prod: bool,
+    cloud: bool,
     build: bool,
     folder: Optional[str],
 ) -> None:
@@ -76,7 +76,7 @@ async def cli(
     """
     project = Project(folder=folder or os.getcwd())
     # We need to unpatch for our tests not to break
-    if show_tokens or not prod or ctx.invoked_subcommand == "build" or build:
+    if show_tokens or not cloud or ctx.invoked_subcommand == "build" or build:
         __unpatch_click_output()
     else:
         __patch_click_output()
@@ -108,11 +108,13 @@ async def cli(
     config = await get_config(host, token)
     client = _get_tb_client(config.get("token", None), config["host"])
 
+    config["path"] = str(project.path)
     # If they have passed a token or host as paramter and it's different that record in .tinyb, refresh the workspace id
     if token or host:
         try:
             workspace = await client.workspace_info()
             config["id"] = workspace.get("id", "")
+            config["name"] = workspace.get("name", "")
         # If we can not get this info, we continue with the id on the file
         except (AuthNoTokenException, AuthException):
             pass
@@ -121,7 +123,7 @@ async def cli(
 
     logging.debug("debug enabled")
 
-    client = await create_ctx_client(ctx, config, prod, build, project)
+    client = await create_ctx_client(ctx, config, cloud, build, project)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
@@ -129,7 +131,7 @@ async def cli(
     ctx.ensure_object(dict)["project"] = project
 
 
-@cli.command()
+@cli.command(hidden=True)
 @click.option(
     "--folder", default=None, type=click.Path(exists=True, file_okay=False), help="Folder where files will be placed"
 )
@@ -388,23 +390,23 @@ def __unpatch_click_output():
     click.secho = __old_click_secho
 
 
-async def create_ctx_client(ctx: Context, config: Dict[str, Any], prod: bool, build: bool, project: Project):
+async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, build: bool, project: Project):
     commands_without_ctx_client = ["auth", "check", "login", "local"]
     command = ctx.invoked_subcommand
     if command in commands_without_ctx_client:
         return None
 
-    commands_always_prod = ["pull"]
+    commands_always_cloud = ["pull"]
     commands_always_build = ["build", "test"]
     commands_always_local = ["create", "mock"]
     if (
-        (prod or command in commands_always_prod)
+        (cloud or command in commands_always_cloud)
         and command not in commands_always_build
         and command not in commands_always_local
     ):
-        click.echo(FeedbackManager.gray(message=f"Running against {config.get('name') or 'production'}"))
+        click.echo(FeedbackManager.gray(message=f"Running against {config.get('name') or 'cloud'}"))
         return _get_tb_client(config.get("token", None), config["host"])
     build = command in commands_always_build or build
     if not build and command not in commands_always_local and command not in commands_always_build:
         click.echo(FeedbackManager.gray(message="Running against Tinybird local\n"))
-    return await get_tinybird_local_client(str(project.path), build=build)
+    return await get_tinybird_local_client(config, build=build)

{tinybird-0.0.1.dev49 → tinybird-0.0.1.dev51}/tinybird/tb/modules/datafile/common.py

@@ -11,7 +11,7 @@ import shlex
 import string
 import textwrap
 import traceback
-from collections import Counter, namedtuple
+from collections import namedtuple
 from dataclasses import dataclass
 from enum import Enum
 from io import StringIO
@@ -209,13 +209,6 @@ class Datafile:
             #  [x] Only one materialized node
             #  [x] Only one node of any specific type
             #  [ ] ...
-            repeated_node_names = [
-                name for name, count in filter(lambda x: x[1] > 1, Counter(n["name"] for n in self.nodes).items())
-            ]
-            if repeated_node_names:
-                raise DatafileValidationError(
-                    f"Pipe node names must be unique. These names are repeated: {repeated_node_names}"
-                )
             for node in self.nodes:
                 if "sql" not in node:
                     raise DatafileValidationError(f"SQL missing for node {repr(node['name'])}")

{tinybird-0.0.1.dev49 → tinybird-0.0.1.dev51}/tinybird/tb/modules/local_common.py

@@ -1,6 +1,7 @@
 import hashlib
 import logging
 import os
+from typing import Any, Dict
 
 import requests
 
@@ -8,23 +9,24 @@ from tinybird.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLIException
 
-TB_IMAGE_NAME = "registry.gitlab.com/tinybird/analytics/tinybird-local-jammy-3.11:beta"
+TB_IMAGE_NAME = "tinybirdco/tinybird-local:beta"
 TB_CONTAINER_NAME = "tinybird-local"
 TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 80))
 TB_LOCAL_HOST = f"http://localhost:{TB_LOCAL_PORT}"
 
 
-async def get_tinybird_local_client(path: str, build: bool = False) -> TinyB:
+async def get_tinybird_local_client(config_obj: Dict[str, Any], build: bool = False) -> TinyB:
     """Get a Tinybird client connected to the local environment."""
-    config = await get_tinybird_local_config(path, build=build)
+    config = await get_tinybird_local_config(config_obj, build=build)
     return config.get_client(host=TB_LOCAL_HOST)
 
 
-async def get_tinybird_local_config(path: str, build: bool = False) -> CLIConfig:
+async def get_tinybird_local_config(config_obj: Dict[str, Any], build: bool = False) -> CLIConfig:
     """Craft a client config with a workspace name based on the path of the project files
 
     It uses the tokens from tinybird local
     """
+    path = config_obj.get("path")
     config = CLIConfig.get_project_config(path)
 
     try:
@@ -34,26 +36,26 @@ async def get_tinybird_local_config(path: str, build: bool = False) -> CLIConfig
         raise CLIException("Tinybird local is not running. Please run `tb local start` first.")
 
     user_token = tokens["user_token"]
+    admin_token = tokens["admin_token"]
     default_token = tokens["workspace_admin_token"]
     # Create a new workspace if path is provided. This is used to isolate the build in a different workspace.
-    path = path or os.getcwd()
     if path:
         folder_hash = hashlib.sha256(path.encode()).hexdigest()
         user_client = config.get_client(host=TB_LOCAL_HOST, token=user_token)
-        ws_name = f"Tinybird_Local_Build_{folder_hash}" if build else config.get("name")
+        ws_name = f"Tinybird_Local_Build_{folder_hash}" if build else config.get("name") or config_obj.get("name")
         if not ws_name:
             raise AuthNoTokenException()
 
         logging.debug(f"Workspace used for build: {ws_name}")
 
-        user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
+        user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={admin_token}").json()
         local_workspaces = user_workspaces.get("workspaces", [])
 
         ws = next((ws for ws in local_workspaces if ws["name"] == ws_name), None)
 
         if not ws:
             await user_client.create_workspace(ws_name, template=None)
-            user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
+            user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={admin_token}").json()
             ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
             if not ws:
                 raise AuthNoTokenException()

{tinybird-0.0.1.dev49 → tinybird-0.0.1.dev51}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird
-Version: 0.0.1.dev49
+Version: 0.0.1.dev51
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird