tinybird 0.0.1.dev71__tar.gz → 0.0.1.dev72__tar.gz

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/PKG-INFO

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

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/client.py

@@ -93,7 +93,7 @@ class TinyB:
         send_telemetry: bool = False,
         semver: Optional[str] = None,
         env: Optional[str] = "production",
-        preview: bool = False,
+        staging: bool = False,
     ):
         ctx = ssl.create_default_context()
         ctx.check_hostname = False
@@ -106,7 +106,7 @@ class TinyB:
         self.send_telemetry = send_telemetry
         self.semver = semver
         self.env = env
-        self.preview = preview
+        self.staging = staging
 
     async def _req_raw(
         self,
@@ -127,8 +127,8 @@ class TinyB:
             url += ("&" if "?" in url else "?") + "cli_version=" + quote(self.version)
         if self.semver:
             url += ("&" if "?" in url else "?") + "__tb__semver=" + self.semver
-        if self.preview:
-            url += ("&" if "?" in url else "?") + "__tb__deployment=preview"
+        if self.staging:
+            url += ("&" if "?" in url else "?") + "__tb__deployment=staging"
 
         verify_ssl = not self.disable_ssl_checks
         try:

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/feedback_manager.py

@@ -458,7 +458,7 @@ class FeedbackManager:
     info_releases_detected = info_message("** Live Release: {current_semver} => New Release: {semver}")
     info_dry_releases_detected = info_message("** [DRY RUN] Live Release: {current_semver} => New Release: {semver}")
     info_pre_prompt_auth_login_user_token = info_message(
-        "ℹ️ In order to log into Tinybird, you need your user token. Please, go to {host}/tokens/ and paste your User Token here."
+        "ℹ️ In order to log into Tinybird, you need your user token. Please, go to {host}/tokens/ and paste your User Token here."  # noqa: RUF001
     )
     prompt_auth_login_user_token = prompt_message("❓ User token:")
 
@@ -609,7 +609,7 @@ Ready? """
     )
     warning_datasource_sync = warning_message("** Warning: Do you want to sync the Data Source {datasource}?")
     warning_datasource_sync_bucket = warning_message(
-        "** Warning: Do you want to ingest all the selected files (new and previous) from the {datasource} bucket? Be aware that data might be duplicated if you have previously ingested those files.\n"
+        "** Warning: Do you want to ingest all the selected files (new and previous) from the {datasource} bucket? Be aware that data might be duplicated if you have previously ingested those files.\n"
     )
     warning_users_dont_exist = warning_message(
         "** Warning: The following users do not exist in the workspace {workspace}: {users}"

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/prompts.py

@@ -790,10 +790,10 @@ When you need to work with resources or data in cloud, add always the --cloud fl
 ├── materializations
 ├── pipes
 └── tests
-- The local development server will be available at http://localhost:80. Even if some response uses another base url, use always http://localhost:80.
+- The local development server will be available at http://localhost:7181. Even if some response uses another base url, use always http://localhost:7181.
 - After every change in your .datasource, .pipe or .ndjson files, run `{base_command} build` to build the project locally.
 - When you need to ingest data locally in a datasource, create a .ndjson file with the same name of the datasource and the data you want and run `{base_command} build` so the data is ingested.
-- The format of the generated api endpoint urls is: http://localhost:80/v0/pipe/<pipe_name>.json?token=<token>
+- The format of the generated api endpoint urls is: http://localhost:7181/v0/pipe/<pipe_name>.json?token=<token>
 - Before running the tests, remember to have the project built with `{base_command} build` with the latest changes.
 </development_instructions>
 When asking for ingesting data, adding data or appending data do the following depending on the environment you want to work with:

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/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.dev71'
-__revision__ = '4feda71'
+__version__ = '0.0.1.dev72'
+__revision__ = 'f2d1d8b'

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/tb/modules/cicd.py

@@ -41,7 +41,7 @@ jobs:
       tinybird:
         image: tinybirdco/tinybird-local:beta
         ports:
-          - 80:80
+          - 7181:7181
     steps:
       - uses: actions/checkout@v3
       - name: Install Tinybird CLI

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/tb/modules/cli.py

@@ -57,7 +57,7 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 @click.option("--show-tokens", is_flag=True, default=False, help="Enable the output of tokens")
 @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("--preview", is_flag=True, default=False, help="Run against new deployment")
+@click.option("--staging", is_flag=True, default=False, help="Run against a staging deployment.")
 @click.version_option(version=VERSION)
 @click.pass_context
 @coro
@@ -69,7 +69,7 @@ async def cli(
     show_tokens: bool,
     cloud: bool,
     build: bool,
-    preview: bool,
+    staging: bool,
 ) -> None:
     """
     Use `OBFUSCATE_REGEX_PATTERN` and `OBFUSCATE_PATTERN_SEPARATOR` environment variables to define a regex pattern and a separator (in case of a single string with multiple regex) to obfuscate secrets in the CLI output.
@@ -123,7 +123,7 @@ async def cli(
 
     logging.debug("debug enabled")
 
-    client = await create_ctx_client(ctx, config, cloud, build, preview)
+    client = await create_ctx_client(ctx, config, cloud, build, staging)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
@@ -388,7 +388,7 @@ def __unpatch_click_output():
     click.secho = __old_click_secho
 
 
-async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, build: bool, preview: bool):
+async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, build: bool, staging: bool):
     commands_without_ctx_client = ["auth", "check", "login", "local", "upgrade"]
     command = ctx.invoked_subcommand
     if command in commands_without_ctx_client:
@@ -405,11 +405,11 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
         click.echo(
             FeedbackManager.gray(message=f"Running against Tinybird Cloud: Workspace {config.get('name', 'default')}")
         )
-        return _get_tb_client(config.get("token", None), config["host"], preview=preview)
+        return _get_tb_client(config.get("token", None), config["host"], staging=staging)
     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(config, build=build, preview=preview)
+    return await get_tinybird_local_client(config, build=build, staging=staging)
 
 
 def get_target_env(cloud: bool, build: bool) -> str:

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/tb/modules/common.py

@@ -375,9 +375,9 @@ def getenv_bool(key: str, default: bool) -> bool:
     return v.lower() == "true" or v == "1"
 
 
-def _get_tb_client(token: str, host: str, preview: bool = False) -> TinyB:
+def _get_tb_client(token: str, host: str, staging: bool = False) -> 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, preview=preview)
+    return TinyB(token, host, version=VERSION, disable_ssl_checks=disable_ssl, send_telemetry=True, staging=staging)
 
 
 def create_tb_client(ctx: Context) -> TinyB:

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/tb/modules/config.py

@@ -219,7 +219,7 @@ class CLIConfig:
             return CLIConfig.DEFAULTS["host"]
         return None
 
-    def get_client(self, token: Optional[str] = None, host: Optional[str] = None, preview: bool = False) -> tbc.TinyB:
+    def get_client(self, token: Optional[str] = None, host: Optional[str] = None, staging: bool = False) -> tbc.TinyB:
         """Returns a new TinyB client configured with:
 
         - token:
@@ -242,7 +242,7 @@ class CLIConfig:
             version=CURRENT_VERSION,
             disable_ssl_checks=FeatureFlags.ignore_ssl_errors(),
             send_telemetry=FeatureFlags.send_telemetry(),
-            preview=preview,
+            staging=staging,
         )
 
     def get_user_client(self, host: Optional[str] = None) -> tbc.TinyB:

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/tb/modules/deployment.py

@@ -352,7 +352,16 @@ def create_deployment(
                 click.echo(FeedbackManager.success(message="\n✓ Deployment is valid"))
             else:
                 click.echo(FeedbackManager.error(message="\n✗ Deployment is not valid"))
-
+                deploy_errors = result.get("errors")
+                for deploy_error in deploy_errors:
+                    if deploy_error.get("filename", None):
+                        click.echo(
+                            FeedbackManager.error(
+                                message=f"{deploy_error.get('filename')}\n\n{deploy_error.get('error')}"
+                            )
+                        )
+                    else:
+                        click.echo(FeedbackManager.error(message=f"{deploy_error.get('error')}"))
             return
 
         deploy_result = result.get("result")

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/tb/modules/endpoint.py

@@ -56,7 +56,7 @@ async def endpoint_ls(ctx: Context, match: str, format_: str):
         if pattern and not pattern.search(tk["name"]):
             continue
         token = get_endpoint_token(tokens, tk["name"]) or client.token
-        endpoint_url = build_endpoint_url(client, tk["name"], token)
+        endpoint_url = build_endpoint_url(client, tk["name"], token, client.staging)
         table_human_readable.append((tk["name"], t["updated_at"][:-7], len(t["nodes"]), endpoint_url))
         table_machine_readable.append(
             {
@@ -166,7 +166,7 @@ async def endpoint_url(ctx: Context, pipe: str, language: str):
     client: TinyB = ctx.ensure_object(dict)["client"]
     tokens = await client.tokens()
     token = get_endpoint_token(tokens, pipe) or client.token
-    click.echo(build_endpoint_snippet(client, pipe, token, language))
+    click.echo(build_endpoint_snippet(client, pipe, token, language, client.staging))
     if language != "http":
         click.echo(FeedbackManager.success(message="\n✓ Code snippet copied to clipboard!\n"))
 
@@ -269,8 +269,10 @@ async def endpoint_stats(ctx: click.Context, pipes: Tuple[str, ...], format_: st
             echo_safe_humanfriendly_tables_format_smart_table(table_human_readable, column_names=columns)
 
 
-def build_endpoint_snippet(tb_client: TinyB, pipe_name: str, token: str, language: str) -> Optional[str]:
-    endpoint_url = build_endpoint_url(tb_client, pipe_name, token)
+def build_endpoint_snippet(
+    tb_client: TinyB, pipe_name: str, token: str, language: str, staging: bool = False
+) -> Optional[str]:
+    endpoint_url = build_endpoint_url(tb_client, pipe_name, token, staging)
     if language == "http":
         return endpoint_url
 
@@ -293,13 +295,15 @@ def build_endpoint_snippet(tb_client: TinyB, pipe_name: str, token: str, languag
     return snippet
 
 
-def build_endpoint_url(tb_client: TinyB, pipe_name: str, token: str) -> str:
+def build_endpoint_url(tb_client: TinyB, pipe_name: str, token: str, staging: bool = False) -> str:
     example_params = {
         "format": "json",
         "pipe": pipe_name,
         "q": "",
         "token": token,
     }
+    if staging:
+        example_params["__tb__deployment"] = "staging"
     response = requests.get(f"{tb_client.host}/examples/query.http?{urlencode(example_params)}")
     return response.text.replace("http://localhost:8001", tb_client.host)
 

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/tb/modules/feedback_manager.py

@@ -466,7 +466,7 @@ class FeedbackManager:
     info_releases_detected = info_message("** Live Release: {current_semver} => New Release: {semver}")
     info_dry_releases_detected = info_message("** [DRY RUN] Live Release: {current_semver} => New Release: {semver}")
     info_pre_prompt_auth_login_user_token = info_message(
-        "ℹ️ In order to log into Tinybird, you need your user token. Please, go to {host}/tokens/ and paste your User Token here."
+        "ℹ️ In order to log into Tinybird, you need your user token. Please, go to {host}/tokens/ and paste your User Token here."  # noqa: RUF001
     )
     prompt_auth_login_user_token = prompt_message("❓ User token:")
 
@@ -617,7 +617,7 @@ Ready? """
     )
     warning_datasource_sync = warning_message("** Warning: Do you want to sync the Data Source {datasource}?")
     warning_datasource_sync_bucket = warning_message(
-        "** Warning: Do you want to ingest all the selected files (new and previous) from the {datasource} bucket? Be aware that data might be duplicated if you have previously ingested those files.\n"
+        "** Warning: Do you want to ingest all the selected files (new and previous) from the {datasource} bucket? Be aware that data might be duplicated if you have previously ingested those files.\n"
     )
     warning_users_dont_exist = warning_message(
         "** Warning: The following users do not exist in the workspace {workspace}: {users}"

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird/tb/modules/local_common.py

@@ -11,14 +11,14 @@ from tinybird.tb.modules.exceptions import CLIException
 
 TB_IMAGE_NAME = "tinybirdco/tinybird-local:beta"
 TB_CONTAINER_NAME = "tinybird-local"
-TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 80))
+TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 7181))
 TB_LOCAL_HOST = f"http://localhost:{TB_LOCAL_PORT}"
 
 
-async def get_tinybird_local_client(config_obj: Dict[str, Any], build: bool = False, preview: bool = False) -> TinyB:
+async def get_tinybird_local_client(config_obj: Dict[str, Any], build: bool = False, staging: bool = False) -> TinyB:
     """Get a Tinybird client connected to the local environment."""
     config = await get_tinybird_local_config(config_obj, build=build)
-    return config.get_client(host=TB_LOCAL_HOST, preview=preview)
+    return config.get_client(host=TB_LOCAL_HOST, staging=staging)
 
 
 async def get_tinybird_local_config(config_obj: Dict[str, Any], build: bool = False) -> CLIConfig:

{tinybird-0.0.1.dev71 → tinybird-0.0.1.dev72}/tinybird.egg-info/PKG-INFO

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