tinybird-cli 3.0.2.dev1__tar.gz → 3.0.2.dev2__tar.gz

{tinybird-cli-3.0.2.dev1 → tinybird-cli-3.0.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.0.2.dev1
+Version: 3.0.2.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,11 @@ Changelog
 
 ---------
 
+3.0.2.dev2
+************
+
+- `Changed` Internal changes to allow parametrize fmt
+
 3.0.1
 ************
 
@@ -2486,4 +2491,4 @@ env=test tb push file.datasource
 *******************
 - Limited the amount of rows fetched when running ``tb sql`` to 100. Added ``--row-limit``.
 - Fixed warning when pipes use internal tables like ``datasources_ops_log``
-- Raise an error when ``INSERT`` sql statement is used
+- Raise an error when ``INSERT`` sql statement is used.

{tinybird-cli-3.0.2.dev1 → tinybird-cli-3.0.2.dev2}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '3.0.2.dev1'
-__revision__ = '0d49134'
+__version__ = '3.0.2.dev2'
+__revision__ = 'bd19d6e'

{tinybird-cli-3.0.2.dev1 → tinybird-cli-3.0.2.dev2}/tinybird/git_settings.py

@@ -99,6 +99,7 @@ DEFAULT_INIT_FILES = {
     "pipes/.gitkeep": "",
     "endpoints/.gitkeep": "",
     "deploy/.gitkeep": "",
+    "tests/.gitkeep": "",
 }
 
 GITHUB_CI_YML_PATH = ".github/workflows/tinybird_ci.yml"

{tinybird-cli-3.0.2.dev1 → tinybird-cli-3.0.2.dev2}/tinybird/sql_template_fmt.py

@@ -4,7 +4,7 @@ from types import MethodType
 from typing import Any, Dict, List, Optional
 
 from sqlfmt import actions, api
-from sqlfmt.analyzer import Rule, group
+from sqlfmt.analyzer import Analyzer, Rule, group
 from sqlfmt.comment import Comment
 from sqlfmt.dialect import ClickHouse
 from sqlfmt.jinjafmt import JinjaFormatter, JinjaTag
@@ -63,25 +63,6 @@ def from_nodes(
     return line
 
 
-def standardize_value(cls, token: Token) -> str:
-    """
-    Tinybird => Monkey patched to not lower keywords
-    https://github.com/tconbeer/sqlfmt/blob/c11775b92d8a45f0e91d871b81a88a894d620bec/src/sqlfmt/node_manager.py#L215
-    """
-    if token.type in (
-        TokenType.UNTERM_KEYWORD,
-        TokenType.STATEMENT_START,
-        TokenType.STATEMENT_END,
-        TokenType.WORD_OPERATOR,
-        TokenType.ON,
-        TokenType.BOOLEAN_OPERATOR,
-        TokenType.SET_OPERATOR,
-    ):
-        return " ".join(token.token.split())
-    else:
-        return token.token
-
-
 def _format_jinja_node(self, node: Node, max_length: int) -> bool:
     """
     Format a single jinja tag. No-ops for nodes that
@@ -127,10 +108,36 @@ def _format_jinja_node(self, node: Node, max_length: int) -> bool:
 
 # Some monkey patching
 Line.from_nodes = MethodType(from_nodes, Line)
-NodeManager.standardize_value = MethodType(standardize_value, NodeManager)
 JinjaFormatter._format_jinja_node = MethodType(_format_jinja_node, JinjaFormatter)
 
 
+class TinybirdNodeManager(NodeManager):
+    def __init__(self, case_sensitive_names: bool, lower_keywords: bool) -> None:
+        super().__init__(case_sensitive_names)
+        self.lower_keywords = lower_keywords
+
+    def standardize_value(self, token: Token) -> str:
+        """
+        Tinybird => Patched to not lower keywords
+        https://github.com/tconbeer/sqlfmt/blob/c11775b92d8a45f0e91d871b81a88a894d620bec/src/sqlfmt/node_manager.py#L215
+        """
+        if self.lower_keywords:
+            return super().standardize_value(token)
+
+        if token.type in (
+            TokenType.UNTERM_KEYWORD,
+            TokenType.STATEMENT_START,
+            TokenType.STATEMENT_END,
+            TokenType.WORD_OPERATOR,
+            TokenType.ON,
+            TokenType.BOOLEAN_OPERATOR,
+            TokenType.SET_OPERATOR,
+        ):
+            return " ".join(token.token.split())
+        else:
+            return token.token
+
+
 class TinybirdDialect(ClickHouse):
     """
     This is an extension of the base rules.
@@ -142,8 +149,9 @@ class TinybirdDialect(ClickHouse):
     https://github.com/tconbeer/sqlfmt/blob/c11775b92d8a45f0e91d871b81a88a894d620bec/src/sqlfmt/dialect.py#L55
     """
 
-    def __init__(self) -> None:
+    def __init__(self, lower_keywords: bool = False) -> None:
         super().__init__()
+        self.lower_keywords = lower_keywords
 
         override_rules = {
             "main": [],
@@ -171,14 +179,29 @@ class TinybirdDialect(ClickHouse):
                         self.RULES[section].append(rule)
                         break
 
+    def initialize_analyzer(self, line_length: int) -> Analyzer:
+        """
+        Creates and returns an analyzer that uses the Dialect's rules for lexing
+        Custom NodeManager for Tinybird
+        """
+        analyzer = Analyzer(
+            line_length=line_length,
+            rules=self.get_rules(),
+            node_manager=TinybirdNodeManager(self.case_sensitive_names, self.lower_keywords),
+        )
+        return analyzer
+
 
+@dataclass
 class TBMode(Mode):
+    lower_keywords: bool = False
+
     def __post_init__(self) -> None:
         """
         Tinybird => Overriden to use `TinybirdDialect`
         https://github.com/tconbeer/sqlfmt/blob/c11775b92d8a45f0e91d871b81a88a894d620bec/src/sqlfmt/mode.py#L31
         """
-        self.dialect = TinybirdDialect()
+        self.dialect = TinybirdDialect(self.lower_keywords)
 
 
 def _calc_str(self) -> str:
@@ -194,10 +217,10 @@ def _calc_str(self) -> str:
 Comment._calc_str = property(_calc_str)
 
 
-def format_sql_template(sql: str, line_length: Optional[int] = None) -> str:
+def format_sql_template(sql: str, line_length: Optional[int] = None, lower_keywords: bool = False) -> str:
     try:
         # https://github.com/tconbeer/sqlfmt/blob/c11775b92d8a45f0e91d871b81a88a894d620bec/src/sqlfmt/mode.py#L16-L29
-        config: Dict[str, Any] = {"line_length": line_length or 80}
+        config: Dict[str, Any] = {"line_length": line_length or 80, "lower_keywords": lower_keywords}
 
         mode = TBMode(**config)
         sql = sql.strip()

{tinybird-cli-3.0.2.dev1 → tinybird-cli-3.0.2.dev2}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.0.2.dev1
+Version: 3.0.2.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,11 @@ Changelog
 
 ---------
 
+3.0.2.dev2
+************
+
+- `Changed` Internal changes to allow parametrize fmt
+
 3.0.1
 ************
 
@@ -2486,4 +2491,4 @@ env=test tb push file.datasource
 *******************
 - Limited the amount of rows fetched when running ``tb sql`` to 100. Added ``--row-limit``.
 - Fixed warning when pipes use internal tables like ``datasources_ops_log``
-- Raise an error when ``INSERT`` sql statement is used
+- Raise an error when ``INSERT`` sql statement is used.