tinybird-cli 3.8.1.dev1__tar.gz → 3.8.2.dev1__tar.gz

{tinybird-cli-3.8.1.dev1 → tinybird-cli-3.8.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.8.1.dev1
+Version: 3.8.2.dev1
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -19,6 +19,12 @@ Changelog
 
 ---------
 
+3.8.1
+************
+
+- `Fixed` Avoid system vars evaluation when doing `tb fmt`
+- `Fixed` environment variables substitution for Data Source engine parameters.
+
 3.8.0
 ************
 

{tinybird-cli-3.8.1.dev1 → tinybird-cli-3.8.2.dev1}/tinybird/__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__ = '3.8.1.dev1'
-__revision__ = 'ee21c5f'
+__version__ = '3.8.2.dev1'
+__revision__ = 'f993ee3'

{tinybird-cli-3.8.1.dev1 → tinybird-cli-3.8.2.dev1}/tinybird/datafile.py

@@ -727,7 +727,9 @@ class Datafile:
         return True
 
 
-def parse_datasource(filename: str, replace_includes: bool = True, content: Optional[str] = None) -> Datafile:
+def parse_datasource(
+    filename: str, replace_includes: bool = True, content: Optional[str] = None, skip_eval: bool = False
+) -> Datafile:
     basepath = ""
     if not content:
         with open(filename) as file:
@@ -737,7 +739,7 @@ def parse_datasource(filename: str, replace_includes: bool = True, content: Opti
         s = content
 
     try:
-        doc = parse(s, "default", basepath, replace_includes=replace_includes)
+        doc = parse(s, "default", basepath, replace_includes=replace_includes, skip_eval=skip_eval)
     except ParseException as e:
         raise click.ClickException(
             FeedbackManager.error_parsing_file(filename=filename, lineno=e.lineno, error=e)
@@ -749,7 +751,9 @@ def parse_datasource(filename: str, replace_includes: bool = True, content: Opti
     return doc
 
 
-def parse_pipe(filename: str, replace_includes: bool = True, content: Optional[str] = None) -> Datafile:
+def parse_pipe(
+    filename: str, replace_includes: bool = True, content: Optional[str] = None, skip_eval: bool = False
+) -> Datafile:
     basepath = ""
     if not content:
         with open(filename) as file:
@@ -760,7 +764,7 @@ def parse_pipe(filename: str, replace_includes: bool = True, content: Optional[s
 
     try:
         sql = ""
-        doc = parse(s, basepath=basepath, replace_includes=replace_includes)
+        doc = parse(s, basepath=basepath, replace_includes=replace_includes, skip_eval=skip_eval)
         for node in doc.nodes:
             sql = node.get("sql", "")
             if sql.strip()[0] == "%":
@@ -795,7 +799,9 @@ def parse_pipe(filename: str, replace_includes: bool = True, content: Optional[s
     return doc
 
 
-def parse_token(filename: str, replace_includes: bool = True, content: Optional[str] = None) -> Datafile:
+def parse_token(
+    filename: str, replace_includes: bool = True, content: Optional[str] = None, skip_eval: bool = False
+) -> Datafile:
     if not content:
         with open(filename) as file:
             s = file.read()
@@ -805,7 +811,7 @@ def parse_token(filename: str, replace_includes: bool = True, content: Optional[
 
     try:
         sql = ""
-        doc = parse(s, basepath=basepath, replace_includes=replace_includes)
+        doc = parse(s, basepath=basepath, replace_includes=replace_includes, skip_eval=skip_eval)
     except ParseException as e:
         raise click.ClickException(
             FeedbackManager.error_parsing_file(
@@ -835,14 +841,20 @@ def _unquote(x: str):
     return x
 
 
-def eval_var(s: str) -> str:
+def eval_var(s: str, skip: bool = False) -> str:
+    if skip:
+        return s
     # replace ENV variables
     # it's probably a bad idea to allow to get any env var
     return Template(s).safe_substitute(os.environ)
 
 
 def parse(
-    s: str, default_node: Optional[str] = None, basepath: str = ".", replace_includes: bool = True
+    s: str,
+    default_node: Optional[str] = None,
+    basepath: str = ".",
+    replace_includes: bool = True,
+    skip_eval: bool = False,
 ) -> Datafile:  # noqa: C901
     """
     Parses `s` string into a document
@@ -898,7 +910,7 @@ def parse(
     def assign_var(v: str) -> Callable[[VarArg(str), KwArg(Any)], None]:
         def _f(*args: str, **kwargs: Any):
             s = _unquote((" ".join(args)).strip())
-            parser_state.current_node[v.lower()] = eval_var(s)
+            parser_state.current_node[v.lower()] = eval_var(s, skip=skip_eval)
 
         return _f
 
@@ -1029,12 +1041,12 @@ def parse(
     def set_engine(*args: str, **kwargs: Any) -> None:
         __init_engine("ENGINE")
         engine_type = _unquote((" ".join(args)).strip())
-        parser_state.current_node["engine"]["type"] = engine_type
+        parser_state.current_node["engine"]["type"] = eval_var(engine_type, skip=skip_eval)
 
     def add_engine_var(v: str) -> Callable[[VarArg(str), KwArg(Any)], None]:
         def _f(*args: str, **kwargs: Any):
             __init_engine(f"ENGINE_{v}".upper())
-            engine_arg = _unquote((" ".join(args)).strip())
+            engine_arg = eval_var(_unquote((" ".join(args)).strip()), skip=skip_eval)
             parser_state.current_node["engine"]["args"].append((v, engine_arg))
 
         return _f
@@ -4470,11 +4482,12 @@ async def format_datasource(
     replace_includes: bool = False,
     datafile: Optional[Datafile] = None,
     for_deploy_diff: bool = False,
+    skip_eval: bool = False,
 ) -> str:
     if datafile:
         doc = datafile
     else:
-        doc = parse_datasource(filename, replace_includes=replace_includes)
+        doc = parse_datasource(filename, replace_includes=replace_includes, skip_eval=skip_eval)
 
     file_parts: List[str] = []
     if for_diff:
@@ -4707,11 +4720,12 @@ async def format_pipe(
     replace_includes: bool = False,
     datafile: Optional[Datafile] = None,
     for_deploy_diff: bool = False,
+    skip_eval: bool = False,
 ) -> str:
     if datafile:
         doc = datafile
     else:
-        doc = parse_pipe(filename, replace_includes=replace_includes)
+        doc = parse_pipe(filename, replace_includes=replace_includes, skip_eval=skip_eval)
 
     file_parts: List[str] = []
     format_sources(file_parts, doc)
@@ -4738,7 +4752,7 @@ async def format_pipe(
                 if "." in include_file
                 else eval_var(include_file)
             )
-            included_pipe = parse_pipe(include_file)
+            included_pipe = parse_pipe(include_file, skip_eval=skip_eval)
             pipe_nodes = doc.nodes.copy()
             for included_node in included_pipe.nodes.copy():
                 unrolled_included_node = next(

{tinybird-cli-3.8.1.dev1 → tinybird-cli-3.8.2.dev1}/tinybird/tb_cli_modules/cli.py

@@ -797,9 +797,9 @@ async def fmt(
             click.echo(filename)
         extensions = Path(filename).suffixes
         if is_file_a_datasource(filename):
-            result = await format_datasource(filename)
+            result = await format_datasource(filename, skip_eval=True)
         elif (".pipe" in extensions) or (".incl" in extensions):
-            result = await format_pipe(filename, line_length)
+            result = await format_pipe(filename, line_length, skip_eval=True)
         else:
             click.echo("Unsupported file type. Supported files types are: .pipe, .incl and .datasource")
             return None

{tinybird-cli-3.8.1.dev1 → tinybird-cli-3.8.2.dev1}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.8.1.dev1
+Version: 3.8.2.dev1
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -19,6 +19,12 @@ Changelog
 
 ---------
 
+3.8.1
+************
+
+- `Fixed` Avoid system vars evaluation when doing `tb fmt`
+- `Fixed` environment variables substitution for Data Source engine parameters.
+
 3.8.0
 ************