tinybird 0.0.1.dev294__py3-none-any.whl → 0.0.1.dev296__py3-none-any.whl

tinybird/ch_utils/constants.py

@@ -259,4 +259,8 @@ VALID_QUERY_FORMATS = (
     "TabSeparated",
     "JSONCompactEachRowWithNamesAndTypes",
     "TabSeparatedWithNamesAndTypes",
+    "JSONCompactEachRow",
+    "JSONCompact",
+    "JSONStringsEachRowWithProgress",
+    "ODBCDriver2",
 )

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev294'
-__revision__ = 'b3b73ff'
+__version__ = '0.0.1.dev296'
+__revision__ = 'b2373b7'

tinybird/tb/modules/build.py

@@ -53,6 +53,7 @@ def build(ctx: click.Context, watch: bool) -> None:
         run_watch(
             project=project,
             tb_client=tb_client,
+            config=config,
             process=partial(process, project=project, tb_client=tb_client, watch=True, config=config),
         )
 
@@ -81,16 +82,17 @@ def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
     run_watch(
         project=project,
         tb_client=tb_client,
-        process=partial(process, project=project, tb_client=tb_client, build_status=build_status),
+        config=config,
+        process=partial(process, project=project, tb_client=tb_client, build_status=build_status, config=config),
     )
 
 
-def run_watch(project: Project, tb_client: TinyB, process: Callable) -> None:
+def run_watch(project: Project, tb_client: TinyB, process: Callable, config: dict[str, Any]) -> None:
     shell = Shell(project=project, tb_client=tb_client, playground=False)
     click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
     watcher_thread = threading.Thread(
         target=watch_project,
-        args=(shell, process, project),
+        args=(shell, process, project, config),
         daemon=True,
     )
     watcher_thread.start()

tinybird/tb/modules/build_common.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import re
 import time
 from copy import deepcopy
 from pathlib import Path
@@ -31,11 +32,14 @@ def process(
     build_status: Optional[BuildStatus] = None,
     exit_on_error: bool = True,
     load_fixtures: bool = True,
+    project_with_vendors: Optional[Project] = None,
 ) -> Optional[str]:
     time_start = time.time()
 
     # Build vendored workspaces before build
-    build_vendored_workspaces(project=project, tb_client=tb_client, config=config)
+    if not project_with_vendors:
+        build_vendored_workspaces(project=project, tb_client=tb_client, config=config)
+
     # Ensure SHARED_WITH workspaces exist before build
     build_shared_with_workspaces(project=project, tb_client=tb_client, config=config)
 
@@ -63,7 +67,13 @@ def process(
             build_status.error = None
     else:
         try:
-            build_result = build_project(project, tb_client, silent, load_fixtures)
+            build_result = build_project(
+                project,
+                tb_client,
+                silent,
+                load_fixtures,
+                project_with_vendors=project_with_vendors,
+            )
             if build_status:
                 build_status.building = False
                 build_status.error = None
@@ -192,7 +202,11 @@ def show_data(tb_client: TinyB, filename: str, diff: Optional[str] = None):
 
 
 def build_project(
-    project: Project, tb_client: TinyB, silent: bool = False, load_fixtures: bool = True
+    project: Project,
+    tb_client: TinyB,
+    silent: bool = False,
+    load_fixtures: bool = True,
+    project_with_vendors: Optional[Project] = None,
 ) -> Optional[bool]:
     MULTIPART_BOUNDARY_DATA_PROJECT = "data_project://"
     DATAFILE_TYPE_TO_CONTENT_TYPE = {
@@ -204,6 +218,7 @@ def build_project(
     logging.debug(TINYBIRD_API_URL)
     TINYBIRD_API_KEY = tb_client.token
     error: Optional[str] = None
+
     try:
         files = [
             ("context://", ("cli-version", "1.0.0", "text/plain")),
@@ -218,9 +233,15 @@ def build_project(
             relative_path = Path(file_path).relative_to(project_path).as_posix()
             with open(file_path, "rb") as fd:
                 content_type = DATAFILE_TYPE_TO_CONTENT_TYPE.get(Path(file_path).suffix, "application/unknown")
-                files.append(
-                    (MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type))
-                )
+                content = fd.read().decode("utf-8")
+                if project_with_vendors:
+                    # Replace 'SHARED_WITH' and everything that comes after, including new lines, with 'SHARED_WITH Tinybird_Local_Test_'
+                    content = replace_shared_with(
+                        content,
+                        [project_with_vendors.workspace_name],
+                    )
+
+                files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, content, content_type)))
         HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
         r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS)
@@ -408,7 +429,8 @@ def build_vendored_workspaces(project: Project, tb_client: TinyB, config: dict[s
             vendor_client = deepcopy(tb_client)
             vendor_client.token = ws_token
             vendor_project = Project(folder=str(ws_dir), workspace_name=workspace_name, max_depth=project.max_depth)
-
+            workspace_info = tb_client.workspace_info(version="v1")
+            project.workspace_name = workspace_info.get("name", "")
             # Do not exit on error to allow main project to continue
             process(
                 project=vendor_project,
@@ -418,6 +440,7 @@ def build_vendored_workspaces(project: Project, tb_client: TinyB, config: dict[s
                 exit_on_error=True,
                 load_fixtures=True,
                 config=config,
+                project_with_vendors=project,
             )
     except Exception as e:
         # Never break the main build due to vendored build errors
@@ -459,3 +482,24 @@ def build_shared_with_workspaces(project: Project, tb_client: TinyB, config: dic
             find_workspace_or_create(user_client, ws_name)
     except Exception as e:
         click.echo(FeedbackManager.error_exception(error=e))
+
+
+def replace_shared_with(text: str, new_workspaces: list[str]) -> str:
+    replacement = ", ".join(new_workspaces)
+
+    # 1) Formato multilinea:
+    # SHARED_WITH >
+    #     workspace1, workspace2
+    #
+    # Solo sustituimos la LÍNEA de workspaces (grupo 3), no usamos DOTALL.
+    pat_multiline = re.compile(r"(?m)^(SHARED_WITH\s*>\s*)\n([ \t]*)([^\n]*)$")
+    if pat_multiline.search(text):
+        return pat_multiline.sub(lambda m: f"{m.group(1)}\n{m.group(2)}{replacement}", text)
+
+    # 2) Formato inline:
+    # SHARED_WITH workspace1, workspace2
+    pat_inline = re.compile(r"(?m)^(SHARED_WITH\s+)([^\n]*)$")
+    if pat_inline.search(text):
+        return pat_inline.sub(lambda m: f"{m.group(1)}{replacement}", text)
+
+    return text

tinybird/tb/modules/local_common.py

@@ -63,7 +63,8 @@ def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False, si
             ).json()
             local_workspaces = user_workspaces.get("workspaces", [])
             for ws in local_workspaces:
-                if ws["name"].startswith("Tinybird_Local_Test_"):
+                is_test_workspace = ws["name"].startswith("Tinybird_Local_Test_")
+                if is_test_workspace:
                     requests.delete(
                         f"{TB_LOCAL_ADDRESS}/v1/workspaces/{ws['id']}?token={user_token}&hard_delete_confirmation=yes"
                     )

tinybird/tb/modules/test_common.py

@@ -64,7 +64,13 @@ def create_test(
     try:
         click.echo(FeedbackManager.highlight(message="\n» Building test environment"))
         build_error = build_project(
-            project=project, tb_client=client, watch=False, silent=True, exit_on_error=False, config=config
+            project=project,
+            tb_client=client,
+            watch=False,
+            silent=True,
+            exit_on_error=False,
+            config=config,
+            load_fixtures=True,
         )
         if build_error:
             raise Exception(build_error)

tinybird/tb/modules/watch.py

@@ -33,9 +33,10 @@ class WatchProjectHandler(PatternMatchingEventHandler):
         ".env.local",
     ]
 
-    def __init__(self, shell: Shell, project: Project, process: Callable):
+    def __init__(self, shell: Shell, project: Project, config: dict[str, Any], process: Callable):
         self.shell = shell
         self.project = project
+        self.config = config
         self.process = process
         self.datafiles = project.get_project_datafiles()
         patterns = [f"**/*{ext}" for ext in self.valid_extensions]
@@ -58,7 +59,7 @@ class WatchProjectHandler(PatternMatchingEventHandler):
 
     def _process(self, path: Optional[str] = None) -> None:
         click.echo(FeedbackManager.highlight(message="» Rebuilding project..."))
-        self.process(watch=True, file_changed=path, diff=self.diff(path))
+        self.process(watch=True, file_changed=path, diff=self.diff(path), config=self.config)
         self.shell.reprint_prompt()
 
     def diff(self, path: Optional[str] = None) -> Optional[str]:
@@ -137,8 +138,9 @@ def watch_project(
     shell: Shell,
     process: Callable[[bool, Optional[str], Optional[str]], None],
     project: Project,
+    config: dict[str, Any],
 ) -> None:
-    event_handler = WatchProjectHandler(shell=shell, project=project, process=process)
+    event_handler = WatchProjectHandler(shell=shell, project=project, process=process, config=config)
     observer = Observer()
     observer.schedule(event_handler, path=str(project.path), recursive=True)
     observer.start()

{tinybird-0.0.1.dev294.dist-info → tinybird-0.0.1.dev296.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev294
+Version: 0.0.1.dev296
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev294.dist-info → tinybird-0.0.1.dev296.dist-info}/RECORD

@@ -11,20 +11,20 @@ tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,
 tinybird/sql_toolset.py,sha256=Y2_fQrbk5GSNoRncAmRS_snpV61XQbiOy4uYkeF6pr4,19767
 tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
-tinybird/ch_utils/constants.py,sha256=eQhAxN1vBBzFCP0-UGbBjkuCp4jrFzZRUkfVcKQ2osg,4231
+tinybird/ch_utils/constants.py,sha256=yTNizMzgYNBzUc2EV3moBfdrDIggOe9hiuAgWF7sv2c,4333
 tinybird/ch_utils/engine.py,sha256=4X1B-iuhdW_mxKnX_m3iCsxgP9RPVgR75g7yH1vsJ6A,40851
 tinybird/datafile/common.py,sha256=hr9Qv4Xot21l2dW6xKPa5_JUu8pnGuDNnVpDf8pgthc,105659
 tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1wnI,556
 tinybird/datafile/parse_connection.py,sha256=tRyn2Rpr1TeWet5BXmMoQgaotbGdYep1qiTak_OqC5E,1825
 tinybird/datafile/parse_datasource.py,sha256=ssW8QeFSgglVFi3sDZj_HgkJiTJ2069v2JgqnH3CkDE,1825
 tinybird/datafile/parse_pipe.py,sha256=8e9LMecSQVWHC4AXf8cdxoQ1nxUR4fTObYxTctO_EXQ,3816
-tinybird/tb/__cli__.py,sha256=WOliD3wiTxHrfZ79e4-jU5sf1wFngafUTW5PChhWgY4,247
+tinybird/tb/__cli__.py,sha256=P2Ti-wEFHoOSwUBJ94hsFL-3YXmkiScFvoAVUOKFdZw,247
 tinybird/tb/check_pypi.py,sha256=Gp0HkHHDFMSDL6nxKlOY51z7z1Uv-2LRexNTZSHHGmM,552
 tinybird/tb/cli.py,sha256=FdDFEIayjmsZEVsVSSvRiVYn_FHOVg_zWQzchnzfWho,1008
 tinybird/tb/client.py,sha256=IQRaInDjOwr9Fzaz3_xXc3aUGqh94tM2lew7IZbB9eM,53733
 tinybird/tb/config.py,sha256=mhMTGnMB5KcxGoh3dewIr2Jjsa6pHE183gCPAQWyp6o,3973
-tinybird/tb/modules/build.py,sha256=-aKn1fkoMoCnh0a6iQr-9EQuApVDeRYUrwcH3BosU-w,7828
-tinybird/tb/modules/build_common.py,sha256=O9WXbZHRjBUwczCr2CGlXIkLQOiwAEJGL9TiY-0eEh8,18627
+tinybird/tb/modules/build.py,sha256=vyhQyyDGLUHrJGdKoRy0gCc62vzZrRjtyzdXAJttYE4,7925
+tinybird/tb/modules/build_common.py,sha256=w6UUXfr73EKjTCBqKgZxciMoL8HVwpg37gL4GXYKycw,20201
 tinybird/tb/modules/cicd.py,sha256=0KLKccha9IP749QvlXBmzdWv1On3mFwMY4DUcJlBxiE,7326
 tinybird/tb/modules/cli.py,sha256=-hkwg2ZIWPtldkLkgdY7RYWacOJtkMx58eqqYzMoMfw,17793
 tinybird/tb/modules/common.py,sha256=zY0PFDQVWjhu2MivBtUmcXtAlv7imgO-RG_PUK37XvI,83659
@@ -46,7 +46,7 @@ tinybird/tb/modules/job.py,sha256=wBsnu8UPTOha2rkLvucgmw4xYv73ubmui3eeSIF68ZM,31
 tinybird/tb/modules/llm.py,sha256=fPBBCmM3KlCksLlgJkg4joDn6y3H5QjDzE-Pm4YNf7E,1782
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=kW3IHwJPvhBsa1eMh_xzow9Az3yYpHthkzsLSHeP5HE,6512
-tinybird/tb/modules/local_common.py,sha256=Otvx7R8FjqEpI_5FS8BaraINChpF9XNuw5LW_WTL2XA,18474
+tinybird/tb/modules/local_common.py,sha256=vHgFIH7cLNX6085iCls_grj_Dud_yRegr9Zia5Fgtgw,18528
 tinybird/tb/modules/login.py,sha256=zerXZqIv15pbFk5XRt746xGcVnp01YmL_403byBf4jQ,1245
 tinybird/tb/modules/login_common.py,sha256=CKXD_BjivhGUmBtNbLTJwzQDr6885C72XPZjo0GLLvI,12010
 tinybird/tb/modules/logout.py,sha256=sniI4JNxpTrVeRCp0oGJuQ3yRerG4hH5uz6oBmjv724,1009
@@ -64,9 +64,9 @@ tinybird/tb/modules/sink.py,sha256=dK2s__my0ePIUYrqBzhPSgdWN9rbpvP1G4dT7DJzz80,3
 tinybird/tb/modules/table.py,sha256=4XrtjM-N0zfNtxVkbvLDQQazno1EPXnxTyo7llivfXk,11035
 tinybird/tb/modules/telemetry.py,sha256=T9gtsQffWqG_4hRBaUJPzOfMkPwz7mH-R6Bn1XRYViA,11482
 tinybird/tb/modules/test.py,sha256=gi7fH6zavFp1jDs3SoRWdf9uBiKjp1hdOPAEleg7H-Y,2145
-tinybird/tb/modules/test_common.py,sha256=pvHVXZb9xGosh4h_updz13qsIg3pyAtroFnjjrxaoPU,14673
+tinybird/tb/modules/test_common.py,sha256=501Fo6oDI-ZzJv8bqcLz7-6ulS8-FGViwi1tHq_A5h0,14766
 tinybird/tb/modules/token.py,sha256=ZhW_o7XCr90wJRhMN6816vyo_TVfnzPXyIhrhzQ7oZ0,13807
-tinybird/tb/modules/watch.py,sha256=No0bK1M1_3CYuMaIgylxf7vYFJ72lTJe3brz6xQ-mJo,8819
+tinybird/tb/modules/watch.py,sha256=R0wERRyL-PrwxKOLSk-T-EvkIczHpeoGirrl3JZxXa8,8935
 tinybird/tb/modules/workspace.py,sha256=tCP1zZMwBhLRGm22TGfpSd4cHvQLAS1o_azIXv_r6uw,11172
 tinybird/tb/modules/workspace_members.py,sha256=5JdkJgfuEwbq-t6vxkBhYwgsiTDxF790wsa6Xfif9nk,8608
 tinybird/tb/modules/agent/__init__.py,sha256=i3oe3vDIWWPaicdCM0zs7D7BJ1W0k7th93ooskHAV00,54
@@ -121,8 +121,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev294.dist-info/METADATA,sha256=xt6XB_652KuU-2KoOStFfaIviXpS1Luml6EySb92MHU,1845
-tinybird-0.0.1.dev294.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev294.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev294.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev294.dist-info/RECORD,,
+tinybird-0.0.1.dev296.dist-info/METADATA,sha256=QzTIE7fRrhXS5qTEMjtIHQHsbVBXOcPk8BwDp7NFZzA,1845
+tinybird-0.0.1.dev296.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev296.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev296.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev296.dist-info/RECORD,,