tinybird 0.0.1.dev70__tar.gz → 0.0.1.dev71__tar.gz

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

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

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

@@ -93,6 +93,7 @@ class TinyB:
         send_telemetry: bool = False,
         semver: Optional[str] = None,
         env: Optional[str] = "production",
+        preview: bool = False,
     ):
         ctx = ssl.create_default_context()
         ctx.check_hostname = False
@@ -105,6 +106,7 @@ class TinyB:
         self.send_telemetry = send_telemetry
         self.semver = semver
         self.env = env
+        self.preview = preview
 
     async def _req_raw(
         self,
@@ -125,6 +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"
 
         verify_ssl = not self.disable_ssl_checks
         try:
@@ -197,7 +201,7 @@ class TinyB:
             if not token_to_use:
                 raise AuthNoTokenException(f"Forbidden: {error}")
             raise AuthException(f"Forbidden: {error}")
-        if response.status_code == 204 or response.status_code == 205:
+        if response.status_code in (204, 205):
             return None
         if response.status_code == 404:
             error = parse_error_response(response)

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/tinybird/sql_template.py

@@ -385,9 +385,12 @@ def array_type(types):
                     x = default
                 else:
                     if _type and _type in types:
-                        x = ",".join(map(str, [types[_type](x) for _ in range(2)]))
+                        if _type == "String":
+                            x = ""
+                        else:
+                            x = ",".join(map(str, [types[_type](x) for _ in range(2)]))
                     else:
-                        x = ",".join([f"__no_value__{i}" for i in range(2)])
+                        x = ""
             elif x is None:
                 x = default
                 if x is None:
@@ -405,7 +408,7 @@ def array_type(types):
                         values.append(expression_wrapper(types[_type](t), str(t)))
                     else:
                         raise SQLTemplateException(
-                            f"Error validating {x}[{i}]({t}) to type {_type}",
+                            f"Error validating [{x}][{i}] ({'empty string' if t == '' else t}) to type {_type}",
                             documentation="/cli/advanced-templates.html",
                         )
                 else:
@@ -2056,7 +2059,11 @@ def render_sql_template(
     >>> render_sql_template("SELECT {{ Array(embedding, 'Float32') }}", {'token':'testing', 'embedding': '1,2,3,4, null'})
     Traceback (most recent call last):
     ...
-    tinybird.sql_template.SQLTemplateException: Template Syntax Error: Error validating 1,2,3,4, null[4]( null) to type Float32
+    tinybird.sql_template.SQLTemplateException: Template Syntax Error: Error validating [1,2,3,4, null][4] ( null) to type Float32
+    >>> render_sql_template("SELECT {{ Array(embedding, 'Int32', '') }}", {'token':'testing', 'embedding': ''})
+    Traceback (most recent call last):
+    ...
+    tinybird.sql_template.SQLTemplateException: Template Syntax Error: Error validating [][0] (empty string) to type Int32
     >>> render_sql_template('{% if test %}SELECT 1{% else %} select 2 {% end %}')
     (' select 2 ', {}, [])
     >>> render_sql_template('{% if Int32(test, 1) %}SELECT 1{% else %} select 2 {% end %}')
@@ -2096,7 +2103,7 @@ def render_sql_template(
     >>> render_sql_template("SELECT {{Array(foo, 'Int32')}}", test_mode=True)
     ('SELECT [0,0]', {}, [])
     >>> render_sql_template("SELECT {{Array(foo)}}", test_mode=True)
-    ("SELECT ['__no_value__0','__no_value__1']", {}, [])
+    ("SELECT ['']", {}, [])
     >>> render_sql_template("{{max_threads(2)}} SELECT 1")
     ('-- max_threads 2\\n SELECT 1', {'max_threads': 2}, [])
     >>> render_sql_template("SELECT {{String(foo)}}", test_mode=True)
@@ -2183,6 +2190,14 @@ def render_sql_template(
     ("% SELECT ['pre','pro']", {}, [])
     >>> render_sql_template("% SELECT {{Array(click_selector, 'String', 'pre,pro')}}", {'click_selector': 'hi,hello'})
     ("% SELECT ['hi','hello']", {}, [])
+    >>> render_sql_template("% SELECT {{Array(click_selector, 'String', '')}}")
+    ("% SELECT ['']", {}, [])
+    >>> render_sql_template("SELECT {{ Array(embedding, 'Int32', '') }}")
+    Traceback (most recent call last):
+    ...
+    tinybird.sql_template.SQLTemplateException: Template Syntax Error: Error validating [][0] (empty string) to type Int32
+    >>> render_sql_template("% SELECT {{Array(click_selector, 'String', '')}}", test_mode=True)
+    ("% SELECT ['']", {}, [])
     >>> render_sql_template("% SELECT now() > {{DateTime64(variable, '2020-09-09 10:10:10.000')}}", {})
     ("% SELECT now() > '2020-09-09 10:10:10.000'", {}, [])
     >>> render_sql_template("% SELECT {% if defined(x) %} x, 1", {})
@@ -2241,6 +2256,16 @@ def render_sql_template(
     Traceback (most recent call last):
     ...
     tinybird.sql_template.SQLTemplateException: Template Syntax Error: Required parameter is not defined. Check the parameters test. Please provide a value or set a default value in the pipe code.
+    >>> render_sql_template("SELECT * FROM test WHERE {% for item in JSON(filters, '[{}]') %} {{item.get('operand')}} {% end %}")
+    Traceback (most recent call last):
+        ...
+    tinybird.sql_template.SQLTemplateException: Template Syntax Error: expression "item.get('operand')" evaluated to null
+    >>> render_sql_template("SELECT * FROM test WHERE {% for item in JSON(filters, '[{\\\"operand\\\":\\\"test\\\"}]') %} {{item.get('operand')}} {% end %}")
+    ("SELECT * FROM test WHERE  'test' ", {}, [])
+    >>> render_sql_template("SELECT * FROM test WHERE {% for item in JSON(filters, '[\\\"test\\\"]') %} {{item.get('operator')}} {% end %}")
+    Traceback (most recent call last):
+        ...
+    tinybird.sql_template.SQLTemplateException: Template Syntax Error: 'str' object has no attribute 'get'. Make sure you're using an object/dictionary where trying to use .get()
     """
     escape_split_to_array = ff_split_to_array_escape.get(False)
 
@@ -2308,6 +2333,14 @@ def render_sql_template(
     except SQLTemplateException as e:
         format_SQLTemplateException_message(e, vars_and_types=template_variables_with_types)
         raise
+    except AttributeError as e:
+        # This happens when trying to use `get` on a string or when the object is None
+        if "'str' object has no attribute 'get'" in str(e):
+            raise SQLTemplateException(
+                "'str' object has no attribute 'get'. Make sure you're using an object/dictionary where trying to use .get()",
+                documentation="/cli/advanced-templates.html",
+            )
+        raise SQLTemplateException(str(e), documentation="/cli/advanced-templates.html")
     except Exception as e:
         # errors might vary here, we need to support as much as possible
         # https://gitlab.com/tinybird/analytics/-/issues/943

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

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

@@ -57,6 +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.version_option(version=VERSION)
 @click.pass_context
 @coro
@@ -68,6 +69,7 @@ async def cli(
     show_tokens: bool,
     cloud: bool,
     build: bool,
+    preview: 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.
@@ -121,7 +123,7 @@ async def cli(
 
     logging.debug("debug enabled")
 
-    client = await create_ctx_client(ctx, config, cloud, build)
+    client = await create_ctx_client(ctx, config, cloud, build, preview)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
@@ -386,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):
+async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, build: bool, preview: bool):
     commands_without_ctx_client = ["auth", "check", "login", "local", "upgrade"]
     command = ctx.invoked_subcommand
     if command in commands_without_ctx_client:
@@ -403,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"])
+        return _get_tb_client(config.get("token", None), config["host"], preview=preview)
     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)
+    return await get_tinybird_local_client(config, build=build, preview=preview)
 
 
 def get_target_env(cloud: bool, build: bool) -> str:

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/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) -> TinyB:
+def _get_tb_client(token: str, host: str, preview: 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)
+    return TinyB(token, host, version=VERSION, disable_ssl_checks=disable_ssl, send_telemetry=True, preview=preview)
 
 
 def create_tb_client(ctx: Context) -> TinyB:
@@ -554,7 +554,7 @@ def format_host(host: str, subdomain: Optional[str] = None) -> str:
     if subdomain and not is_localhost:
         url_info = urlparse(host)
         current_subdomain = url_info.netloc.split(".")[0]
-        if current_subdomain == "api" or current_subdomain == "ui":
+        if current_subdomain in ("api", "ui"):
             host = host.replace(current_subdomain, subdomain)
     if "localhost" in host or is_localhost:
         host = f"http://{host}" if "http" not in host else host

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/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) -> tbc.TinyB:
+    def get_client(self, token: Optional[str] = None, host: Optional[str] = None, preview: bool = False) -> tbc.TinyB:
         """Returns a new TinyB client configured with:
 
         - token:
@@ -242,6 +242,7 @@ class CLIConfig:
             version=CURRENT_VERSION,
             disable_ssl_checks=FeatureFlags.ignore_ssl_errors(),
             send_telemetry=FeatureFlags.send_telemetry(),
+            preview=preview,
         )
 
     def get_user_client(self, host: Optional[str] = None) -> tbc.TinyB:

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

@@ -15,10 +15,10 @@ 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(config_obj: Dict[str, Any], build: bool = False) -> TinyB:
+async def get_tinybird_local_client(config_obj: Dict[str, Any], build: bool = False, preview: 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)
+    return config.get_client(host=TB_LOCAL_HOST, preview=preview)
 
 
 async def get_tinybird_local_config(config_obj: Dict[str, Any], build: bool = False) -> CLIConfig:

{tinybird-0.0.1.dev70/tinybird/tb_cli_modules → tinybird-0.0.1.dev71/tinybird/tb/modules}/telemetry.py

@@ -206,7 +206,7 @@ class TelemetryHelper:
 
             self.log(f"Received status {r.status_code}: {r.text}")
 
-            if r.status_code == 200 or r.status_code == 202:
+            if r.status_code in (200, 202):
                 self.log(f"Successfully sent {len(events)} events to {self.tb_host}")
                 self.events.clear()
                 return

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/tinybird/tb/modules/test.py

@@ -5,6 +5,7 @@
 
 import difflib
 import glob
+import sys
 import urllib.parse
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
@@ -265,7 +266,7 @@ async def run_tests(ctx: click.Context, name: Tuple[str, ...]) -> None:
 
     if failed_tests_count:
         click.echo(FeedbackManager.error(message=f"\n✗ {test_count - failed_tests_count}/{test_count} passed"))
-        exit(1)
+        sys.exit(1)
     else:
         click.echo(FeedbackManager.success(message=f"\n✓ {test_count}/{test_count} passed"))
 

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/tinybird/tb/modules/tinyunit/tinyunit.py

@@ -190,8 +190,6 @@ def generate_file(file: str, overwrite: bool = False) -> None:
     else:
         raise CLIException(FeedbackManager.error_file_already_exists(file=p))
 
-    return
-
 
 async def run_test_file(tb_client: TinyB, file: str) -> List[TestResult]:
     results: List[TestResult] = []

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/tinybird/tb_cli_modules/cli.py

@@ -676,7 +676,6 @@ async def push(
         user_token=user_token,
         is_internal=is_internal,
     )
-    return
 
 
 @cli.command()

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/tinybird/tb_cli_modules/common.py

@@ -600,7 +600,7 @@ def format_host(host: str, subdomain: Optional[str] = None) -> str:
     if subdomain and not is_localhost:
         url_info = urlparse(host)
         current_subdomain = url_info.netloc.split(".")[0]
-        if current_subdomain == "api" or current_subdomain == "ui":
+        if current_subdomain in ("api", "ui"):
             host = host.replace(current_subdomain, subdomain)
     if "localhost" in host or is_localhost:
         host = f"http://{host}" if "http" not in host else host

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/tinybird/tb_cli_modules/pipe.py

@@ -701,7 +701,6 @@ async def regression_test(
         tests_validate_processed_bytes=validate_processed_bytes,
         tests_check_requests_from_branch=check_requests_from_main,
     )
-    return
 
 
 @pipe_copy.command(name="run", short_help="Run an on-demand copy job")

{tinybird-0.0.1.dev70/tinybird/tb/modules → tinybird-0.0.1.dev71/tinybird/tb_cli_modules}/telemetry.py

@@ -206,7 +206,7 @@ class TelemetryHelper:
 
             self.log(f"Received status {r.status_code}: {r.text}")
 
-            if r.status_code == 200 or r.status_code == 202:
+            if r.status_code in (200, 202):
                 self.log(f"Successfully sent {len(events)} events to {self.tb_host}")
                 self.events.clear()
                 return

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/tinybird/tb_cli_modules/tinyunit/tinyunit.py

@@ -190,8 +190,6 @@ def generate_file(file: str, overwrite: bool = False) -> None:
     else:
         raise CLIException(FeedbackManager.error_file_already_exists(file=p))
 
-    return
-
 
 async def run_test_file(tb_client: TinyB, file: str) -> List[TestResult]:
     results: List[TestResult] = []

{tinybird-0.0.1.dev70 → tinybird-0.0.1.dev71}/tinybird/tornado_template.py

@@ -1144,7 +1144,7 @@ def check_valid_expr(expr):
             return
         if isinstance(expr.value, str):
             return
-        if isinstance(expr.value, type(None)):
+        if expr.value is None:
             return
         raise SecurityException(f"Invalid Constant: {ast.dump(expr)}")
     elif isinstance(expr, ast.Name):

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

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