tinybird 0.0.1.dev7__tar.gz → 0.0.1.dev8__tar.gz

{tinybird-0.0.1.dev7 → tinybird-0.0.1.dev8}/PKG-INFO

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

{tinybird-0.0.1.dev7 → tinybird-0.0.1.dev8}/tinybird/tb/modules/datafile/build.py

@@ -32,6 +32,7 @@ from tinybird.tb.modules.datafile.common import (
     INTERNAL_TABLES,
     ON_DEMAND,
     PREVIEW_CONNECTOR_SERVICES,
+    TB_LOCAL_WORKSPACE_NAME,
     CopyModes,
     CopyParameters,
     DataFileExtensions,
@@ -55,6 +56,9 @@ async def folder_build(
     ignore_sql_errors: bool = False,
     is_internal: bool = False,
     only_pipes: bool = False,
+    is_vendor: bool = False,
+    current_ws: Optional[Dict[str, Any]] = None,
+    workspaces: Optional[List[Dict[str, Any]]] = None,
 ):
     if only_pipes:
         filenames = [f for f in filenames if f.endswith(".pipe")]
@@ -71,9 +75,8 @@ async def folder_build(
     populate_subset = None
     populate_condition = None
     tests_to_run = 0
-    user_token = None
     tests_failfast = True
-    override_datasource = True
+    override_datasource = False
     tests_check_requests_from_branch = False
     skip_confirmation = True
     wait = False
@@ -102,20 +105,44 @@ async def folder_build(
     tests_check_requests_from_branch = False
     git_release = False
     workspace_lib_paths = []
-    workspaces: List[Dict[str, Any]] = (await tb_client.user_workspaces()).get("workspaces", [])
-    current_ws: Dict[str, Any] = next(
-        (workspace for workspace in workspaces if config and workspace.get("id", ".") == config.get("id", "..")), {}
-    )
 
     workspace_lib_paths = list(workspace_lib_paths)
     # include vendor libs without overriding user ones
     existing_workspaces = set(x[1] for x in workspace_lib_paths)
     vendor_path = Path("vendor")
-    if vendor_path.exists():
+    user_token = config.get_user_token()
+    user_client = deepcopy(tb_client)
+
+    if user_token:
+        user_client.token = user_token
+
+    vendor_workspaces = []
+    user_workspaces = await user_client.user_workspaces()
+    if vendor_path.exists() and not is_vendor:
         for x in vendor_path.iterdir():
             if x.is_dir() and x.name not in existing_workspaces:
+                if user_token:
+                    try:
+                        ws_to_delete = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == x.name), None)
+                        if ws_to_delete:
+                            await user_client.delete_workspace(ws_to_delete["id"], hard_delete_confirmation=x.name)
+                    except Exception:
+                        pass
+                    vendor_ws = await user_client.create_workspace(x.name, template=None)
+                    vendor_workspaces.append(vendor_ws)
                 workspace_lib_paths.append((x.name, x))
 
+    workspaces: List[Dict[str, Any]] = (await user_client.user_workspaces()).get("workspaces", [])
+    local_ws = next((ws for ws in workspaces if ws["name"] == TB_LOCAL_WORKSPACE_NAME), {})
+    current_ws: Dict[str, Any] = current_ws or local_ws
+    for vendor_ws in [ws for ws in workspaces if ws["name"] in [ws["name"] for ws in vendor_workspaces]]:
+        ws_client = deepcopy(tb_client)
+        ws_client.token = vendor_ws["token"]
+        shared_ws_path = Path(folder) / "vendor" / vendor_ws["name"]
+
+        if shared_ws_path.exists() and not is_vendor:
+            await folder_build(ws_client, folder=shared_ws_path.as_posix(), is_vendor=True, current_ws=vendor_ws)
+
     datasources: List[Dict[str, Any]] = await tb_client.datasources()
     pipes: List[Dict[str, Any]] = await tb_client.pipes(dependencies=True)
 
@@ -253,10 +280,12 @@ async def folder_build(
                             tests_validate_processed_bytes,
                             tests_check_requests_from_branch,
                             current_ws,
+                            local_ws,
                             fork_downstream,
                             fork,
                             git_release,
                             build,
+                            is_vendor,
                         )
                         if not run_tests:
                             click.echo(
@@ -683,10 +712,12 @@ async def exec_file(
     tests_validate_processed_bytes: bool = False,
     tests_check_requests_from_branch: bool = False,
     current_ws: Optional[Dict[str, Any]] = None,
+    local_ws: Optional[Dict[str, Any]] = None,
     fork_downstream: Optional[bool] = False,
     fork: Optional[bool] = False,
     git_release: Optional[bool] = False,
     build: Optional[bool] = False,
+    is_vendor: Optional[bool] = False,
 ):
     if debug:
         click.echo(FeedbackManager.debug_running_file(file=pp.pformat(r)))
@@ -726,9 +757,11 @@ async def exec_file(
             force,
             skip_confirmation=skip_confirmation,
             current_ws=current_ws,
+            local_ws=local_ws,
             fork_downstream=fork_downstream,
             fork=fork,
             build=build,
+            is_vendor=is_vendor,
         )
         await update_tags_in_resource(r, "datasource", tb_client)
     else:

{tinybird-0.0.1.dev7 → tinybird-0.0.1.dev8}/tinybird/tb/modules/datafile/build_datasource.py

@@ -17,9 +17,11 @@ async def new_ds(
     force: bool = False,
     skip_confirmation: bool = False,
     current_ws=None,
+    local_ws=None,
     fork_downstream: Optional[bool] = False,
     fork: Optional[bool] = False,
     build: Optional[bool] = False,
+    is_vendor: Optional[bool] = False,
 ):
     ds_name = ds["params"]["name"]
 
@@ -93,7 +95,7 @@ async def new_ds(
             if ds.get("tokens"):
                 await manage_tokens()
 
-            if ds.get("shared_with"):
+            if ds.get("shared_with") and not build:
                 if not user_token:
                     click.echo(FeedbackManager.info_skipping_shared_with_entry())
                 else:
@@ -105,6 +107,14 @@ async def new_ds(
                         workspaces_to_share=ds["shared_with"],
                         current_ws=current_ws,
                     )
+            if is_vendor and user_token and local_ws and current_ws:
+                user_client: TinyB = deepcopy(client)
+                user_client.token = user_token
+                await user_client.datasource_share(
+                    datasource_id=datasource.get("id", ""),
+                    current_workspace_id=current_ws.get("id", ""),
+                    destination_workspace_id=local_ws.get("id", ""),
+                )
 
         except Exception as e:
             raise click.ClickException(FeedbackManager.error_creating_datasource(error=str(e)))

{tinybird-0.0.1.dev7 → tinybird-0.0.1.dev8}/tinybird/tb/modules/datafile/common.py

@@ -85,6 +85,7 @@ INTERNAL_TABLES: Tuple[str, ...] = (
 )
 
 PREVIEW_CONNECTOR_SERVICES = ["s3", "s3_iamrole", "gcs"]
+TB_LOCAL_WORKSPACE_NAME = "Tinybird_Local_Testing"
 
 pp = pprint.PrettyPrinter()
 

{tinybird-0.0.1.dev7 → tinybird-0.0.1.dev8}/tinybird/tb/modules/local.py

@@ -120,8 +120,11 @@ def get_tinybird_local_client():
         raise CLIException("Tinybird local environment is not running. Please start it with `tb local start`.")
 
     token = tokens["workspace_admin_token"]
+    user_token = tokens["user_token"]
     config.set_token(token)
     config.set_host(TB_LOCAL_HOST)
+    config.set_user_token(user_token)
+    config.persist_to_file()
     return config.get_client(host=TB_LOCAL_HOST, token=token)
 
 

{tinybird-0.0.1.dev7 → tinybird-0.0.1.dev8}/tinybird.egg-info/PKG-INFO

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