tinybird 0.0.1.dev295__tar.gz → 0.0.1.dev296__tar.gz

{tinybird-0.0.1.dev295 → tinybird-0.0.1.dev296}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev295
+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.dev295 → tinybird-0.0.1.dev296}/tinybird/ch_utils/constants.py

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

{tinybird-0.0.1.dev295 → tinybird-0.0.1.dev296}/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.dev295'
-__revision__ = '6b3c823'
+__version__ = '0.0.1.dev296'
+__revision__ = 'b2373b7'

{tinybird-0.0.1.dev295 → tinybird-0.0.1.dev296}/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-0.0.1.dev295 → tinybird-0.0.1.dev296}/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-0.0.1.dev295 → tinybird-0.0.1.dev296}/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-0.0.1.dev295 → tinybird-0.0.1.dev296}/tinybird.egg-info/PKG-INFO

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