tinybird 0.0.1.dev96__tar.gz → 0.0.1.dev98__tar.gz

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/PKG-INFO

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

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/client.py

@@ -714,8 +714,8 @@ class TinyB:
     async def job_cancel(self, job_id: str):
         return await self._req(f"/v0/jobs/{job_id}/cancel", method="POST", data=b"")
 
-    async def user_workspaces(self):
-        data = await self._req("/v0/user/workspaces/?with_environments=false")
+    async def user_workspaces(self, version: str = "v0"):
+        data = await self._req(f"/{version}/user/workspaces/?with_environments=false")
         # TODO: this is repeated in local_common.py but I'm avoiding circular imports
         local_port = int(os.getenv("TB_LOCAL_PORT", 80))
         local_host = f"http://localhost:{local_port}"
@@ -725,16 +725,16 @@ class TinyB:
         local_workspaces = [x for x in data["workspaces"] if not x["name"].startswith("Tinybird_Local_")]
         return {**data, "workspaces": local_workspaces}
 
-    async def user_workspaces_and_branches(self):
-        return await self._req("/v0/user/workspaces/?with_environments=true")
+    async def user_workspaces_and_branches(self, version: str = "v0"):
+        return await self._req(f"/{version}/user/workspaces/?with_environments=true")
 
-    async def user_workspaces_with_organization(self):
+    async def user_workspaces_with_organization(self, version: str = "v0"):
         return await self._req(
-            "/v0/user/workspaces/?with_environments=false&with_organization=true&with_members_and_owner=false"
+            f"/{version}/user/workspaces/?with_environments=false&with_organization=true&with_members_and_owner=false"
         )
 
-    async def user_workspace_branches(self):
-        return await self._req("/v0/user/workspaces/?with_environments=true&only_environments=true")
+    async def user_workspace_branches(self, version: str = "v0"):
+        return await self._req(f"/{version}/user/workspaces/?with_environments=true&only_environments=true")
 
     async def branches(self):
         return await self._req("/v0/environments")
@@ -747,8 +747,9 @@ class TinyB:
         name: str,
         template: Optional[str],
         assign_to_organization_id: Optional[str] = None,
+        version: str = "v0",
     ):
-        url = f"/v0/workspaces?name={name}"
+        url = f"/{version}/workspaces?name={name}"
         if template:
             url += f"&starter_kit={template}"
         if assign_to_organization_id:
@@ -884,8 +885,8 @@ class TinyB:
         params = {"with_token": "true" if with_token else "false"}
         return await self._req(f"/v0/workspaces/{workspace_id}?{urlencode(params)}")
 
-    async def workspace_info(self) -> Dict[str, Any]:
-        return await self._req("/v0/workspace")
+    async def workspace_info(self, version: str = "v0") -> Dict[str, Any]:
+        return await self._req(f"/{version}/workspace")
 
     async def organization(self, organization_id: str):
         return await self._req(f"/v0/organizations/{organization_id}")
@@ -906,6 +907,21 @@ class TinyB:
             data=json.dumps({"workspace_ids": ",".join(workspace_ids)}),
         )
 
+    async def infra_create(self, organization_id: str, name: str, host: str) -> Dict[str, Any]:
+        params = {
+            "organization_id": organization_id,
+            "name": name,
+            "host": host,
+        }
+        return await self._req(f"/v1/infra?{urlencode(params)}", method="POST")
+
+    async def infra_list(self, organization_id: str) -> List[Dict[str, Any]]:
+        data = await self._req(f"/v1/infra?organization_id={organization_id}")
+        return data.get("infras", [])
+
+    async def infra_delete(self, infra_id: str, organization_id: str) -> Dict[str, Any]:
+        return await self._req(f"/v1/infra/{infra_id}?organization_id={organization_id}", method="DELETE")
+
     async def wait_for_job(
         self,
         job_id: str,

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/__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__ = '0.0.1.dev96'
-__revision__ = 'f1cd799'
+__version__ = '0.0.1.dev98'
+__revision__ = 'f7b04b3'

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/modules/cicd.py

@@ -32,8 +32,8 @@ on:
 concurrency: ${{! github.workflow }}-${{! github.event.pull_request.number }}
 
 env:
-  TINYBIRD_HOST: ${{ secrets.TINYBIRD_HOST }}
-  TINYBIRD_TOKEN: ${{ secrets.TINYBIRD_TOKEN }}
+  TINYBIRD_HOST: ${{! secrets.TINYBIRD_HOST }}
+  TINYBIRD_TOKEN: ${{! secrets.TINYBIRD_TOKEN }}
 
 jobs:
   ci:
@@ -55,7 +55,7 @@ jobs:
       - name: Test project
         run: tb test run
       - name: Deployment check
-        run: tb --cloud --host ${{ TINYBIRD_HOST }} --token ${{ TINYBIRD_TOKEN }} deploy --check
+        run: tb --cloud --host ${{! TINYBIRD_HOST }} --token ${{! TINYBIRD_TOKEN }} deploy --check
 """
 
 
@@ -88,7 +88,7 @@ tinybird_ci_workflow:
     - cd $CI_PROJECT_DIR/{{ data_project_dir }}
     - tb build
     - tb test run
-    - tb --cloud --host ${{ TINYBIRD_HOST }} --token ${{ TINYBIRD_TOKEN }} deploy --check
+    - tb --cloud --host ${{! TINYBIRD_HOST }} --token ${{! TINYBIRD_TOKEN }} deploy --check
   services:
     - name: tinybirdco/tinybird-local:beta
       alias: tinybird-local

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/modules/cli.py

@@ -121,7 +121,7 @@ async def cli(
     # If they have passed a token or host as parameter and it's different that record in .tinyb, refresh the workspace id
     if token or host:
         try:
-            workspace = await client.workspace_info()
+            workspace = await client.workspace_info(version="v1")
             config["id"] = workspace.get("id", "")
             config["name"] = workspace.get("name", "")
         # If we can not get this info, we continue with the id on the file
@@ -236,7 +236,7 @@ async def diff(
     else:
         config = CLIConfig.get_project_config()
 
-        response = await client.user_workspaces_and_branches()
+        response = await client.user_workspaces_and_branches(version="v1")
         ws_client = None
         for workspace in response["workspaces"]:
             if config["id"] == workspace["id"]:

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/modules/common.py

@@ -198,7 +198,7 @@ def generate_datafile(
 
 async def get_current_workspace(config: CLIConfig) -> Optional[Dict[str, Any]]:
     client = config.get_client()
-    workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches()).get("workspaces", [])
+    workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches(version="v1")).get("workspaces", [])
     return _get_current_workspace_common(workspaces, config["id"])
 
 
@@ -213,7 +213,7 @@ def _get_current_workspace_common(
 
 
 async def get_current_environment(client, config):
-    workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches()).get("workspaces", [])
+    workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches(version="v1")).get("workspaces", [])
     return next((workspace for workspace in workspaces if workspace["id"] == config["id"]), None)
 
 
@@ -700,7 +700,9 @@ async def create_workspace_non_interactive(
         user_client: TinyB = deepcopy(client)
         user_client.token = user_token
 
-        created_workspace = await user_client.create_workspace(workspace_name, starterkit, organization_id)
+        created_workspace = await user_client.create_workspace(
+            workspace_name, starterkit, organization_id, version="v1"
+        )
         if organization_id and organization_name:
             click.echo(
                 FeedbackManager.success_workspace_created_with_organization(
@@ -1210,7 +1212,7 @@ def _get_setting_value(connection, setting, sensitive_settings):
 
 async def switch_workspace(config: CLIConfig, workspace_name_or_id: str) -> None:
     try:
-        response = await config.get_client().user_workspaces()
+        response = await config.get_client().user_workspaces(version="v1")
         workspaces = response["workspaces"]
 
         workspace = next(
@@ -1436,7 +1438,7 @@ async def try_update_config_with_remote(
         return True
 
     try:
-        response = await config.get_client().workspace_info()
+        response = await config.get_client().workspace_info(version="v1")
     except AuthException:
         if raise_on_errors:
             raise CLIAuthException(FeedbackManager.error_invalid_token_for_host(host=config.get_host()))
@@ -1606,7 +1608,7 @@ async def wait_job_no_ui(
 
 
 async def get_current_main_workspace(config: CLIConfig) -> Optional[Dict[str, Any]]:
-    current_workspace = await config.get_client().user_workspaces_and_branches()
+    current_workspace = await config.get_client().user_workspaces_and_branches(version="v1")
     return _get_current_main_workspace_common(current_workspace, config.get("id", current_workspace["id"]))
 
 
@@ -1988,7 +1990,7 @@ async def get_organizations_by_user(config: CLIConfig, user_token: str) -> List[
 
     try:
         user_client = config.get_client(token=user_token)
-        user_workspaces = await user_client.user_workspaces_with_organization()
+        user_workspaces = await user_client.user_workspaces_with_organization(version="v1")
         admin_org_id = user_workspaces.get("organization_id")
         seen_org_ids = set()
 
@@ -2105,7 +2107,7 @@ async def create_organization_and_add_workspaces(
         raise CLIWorkspaceException(FeedbackManager.error_organization_creation(error=str(e)))
 
     # Add existing orphan workspaces to the organization - this is only needed for backwards compatibility
-    user_workspaces = await client.user_workspaces_with_organization()
+    user_workspaces = await client.user_workspaces_with_organization(version="v1")
     workspaces_to_migrate = []
     for workspace in user_workspaces["workspaces"]:
         if workspace.get("organization") is None and workspace.get("role") == "admin":

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/modules/config.py

@@ -279,7 +279,7 @@ class CLIConfig:
 
         client: tbc.TinyB = self.get_client(token=self.get_user_token(), host=host)
 
-        info: Dict[str, Any] = await client.user_workspaces_and_branches()
+        info: Dict[str, Any] = await client.user_workspaces_and_branches(version="v1")
         workspaces: List[Dict[str, Any]] = info["workspaces"]
 
         result: Optional[str] = next(

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/modules/datafile/build.py

@@ -1015,7 +1015,7 @@ async def process_file(
                     period: int = DEFAULT_CRON_PERIOD
 
                     if current_ws is not None:
-                        workspaces = (await tb_client.user_workspaces()).get("workspaces", [])
+                        workspaces = (await tb_client.user_workspaces(version="v1")).get("workspaces", [])
                         workspace_rate_limits: Dict[str, Dict[str, int]] = next(
                             (w.get("rate_limits", {}) for w in workspaces if w["id"] == current_ws["id"]), {}
                         )

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/modules/datafile/build_datasource.py

@@ -346,9 +346,9 @@ async def share_and_unshare_datasource(
     if current_ws:
         # Force to get all the workspaces the user can access
         workspace = current_ws
-        workspaces = (await client.user_workspaces()).get("workspaces", [])
+        workspaces = (await client.user_workspaces(version="v1")).get("workspaces", [])
     else:
-        workspace = await client.user_workspace_branches()
+        workspace = await client.user_workspace_branches(version="v1")
         workspaces = workspace.get("workspaces", [])
 
     if workspace.get("is_branch", False):

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/modules/datafile/build_pipe.py

@@ -166,10 +166,10 @@ async def new_pipe(
 
 async def get_token_from_main_branch(branch_tb_client: TinyB) -> Optional[str]:
     token_from_main_branch = None
-    current_workspace = await branch_tb_client.workspace_info()
+    current_workspace = await branch_tb_client.workspace_info(version="v1")
     # current workspace is a branch
     if current_workspace.get("main"):
-        response = await branch_tb_client.user_workspaces()
+        response = await branch_tb_client.user_workspaces(version="v1")
         workspaces = response["workspaces"]
         prod_workspace = next(
             (workspace for workspace in workspaces if workspace["id"] == current_workspace["main"]), None

{tinybird-0.0.1.dev96 → tinybird-0.0.1.dev98}/tinybird/tb/modules/datafile/playground.py

@@ -1172,7 +1172,7 @@ async def process_file(
                     period: int = DEFAULT_CRON_PERIOD
 
                     if current_ws is not None:
-                        workspaces = (await tb_client.user_workspaces()).get("workspaces", [])
+                        workspaces = (await tb_client.user_workspaces(version="v1")).get("workspaces", [])
                         workspace_rate_limits: Dict[str, Dict[str, int]] = next(
                             (w.get("rate_limits", {}) for w in workspaces if w["id"] == current_ws["id"]), {}
                         )