tinybird 0.0.1.dev28__tar.gz → 0.0.1.dev29__tar.gz

{tinybird-0.0.1.dev28 → tinybird-0.0.1.dev29}/PKG-INFO

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

{tinybird-0.0.1.dev28 → tinybird-0.0.1.dev29}/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.dev28'
-__revision__ = 'bf7042d'
+__version__ = '0.0.1.dev29'
+__revision__ = '1ff2823'

{tinybird-0.0.1.dev28 → tinybird-0.0.1.dev29}/tinybird/tb/modules/deploy.py

@@ -3,7 +3,7 @@ import json
 import logging
 import time
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
 import click
 import requests
@@ -24,8 +24,8 @@ def project_files(project_path: Path) -> List[str]:
     return project_files
 
 
-def promote_deployment(host: str, headers: dict) -> None:
-    TINYBIRD_API_URL = host + "/v1/deployments"
+def promote_deployment(host: Optional[str], headers: dict) -> None:
+    TINYBIRD_API_URL = f"{host}/v1/deployments"
     r = requests.get(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
@@ -50,14 +50,14 @@ def promote_deployment(host: str, headers: dict) -> None:
     else:
         click.echo(FeedbackManager.success(message="Promoting deployment"))
 
-        TINYBIRD_API_URL = host + f"/v1/deployments/{candidate_deployment.get('id')}/set-live"
+        TINYBIRD_API_URL = f"{host}/v1/deployments/{candidate_deployment.get('id')}/set-live"
         r = requests.post(TINYBIRD_API_URL, headers=headers)
         result = r.json()
         logging.debug(json.dumps(result, indent=2))
 
     click.echo(FeedbackManager.success(message="Removing old deployment"))
 
-    TINYBIRD_API_URL = host + f"/v1/deployments/{last_deployment.get('id')}"
+    TINYBIRD_API_URL = f"{host}/v1/deployments/{last_deployment.get('id')}"
     r = requests.delete(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
@@ -65,8 +65,8 @@ def promote_deployment(host: str, headers: dict) -> None:
     click.echo(FeedbackManager.success(message="Deployment promoted successfully"))
 
 
-def rollback_deployment(host: str, headers: dict) -> None:
-    TINYBIRD_API_URL = host + "/v1/deployments"
+def rollback_deployment(host: Optional[str], headers: dict) -> None:
+    TINYBIRD_API_URL = f"{host}/v1/deployments"
     r = requests.get(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
@@ -91,14 +91,14 @@ def rollback_deployment(host: str, headers: dict) -> None:
     else:
         click.echo(FeedbackManager.success(message="Promoting previous deployment"))
 
-        TINYBIRD_API_URL = host + f"/v1/deployments/{previous_deployment.get('id')}/set-live"
+        TINYBIRD_API_URL = f"{host}/v1/deployments/{previous_deployment.get('id')}/set-live"
         r = requests.post(TINYBIRD_API_URL, headers=headers)
         result = r.json()
         logging.debug(json.dumps(result, indent=2))
 
     click.echo(FeedbackManager.success(message="Removing current deployment"))
 
-    TINYBIRD_API_URL = host + f"/v1/deployments/{current_deployment.get('id')}"
+    TINYBIRD_API_URL = f"{host}/v1/deployments/{current_deployment.get('id')}"
     r = requests.delete(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
@@ -106,7 +106,15 @@ def rollback_deployment(host: str, headers: dict) -> None:
     click.echo(FeedbackManager.success(message="Deployment rolled back successfully"))
 
 
-@cli.command()
+@cli.group(name="deploy")
+def deploy_group() -> None:
+    """
+    Deploy commands.
+    """
+    pass
+
+
+@deploy_group.command(name="create")
 @click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
 @click.option(
     "--wait/--no-wait",
@@ -120,7 +128,7 @@ def rollback_deployment(host: str, headers: dict) -> None:
     default=False,
     help="Auto-promote the deployment. Only works if --wait is enabled. Disabled by default.",
 )
-def deploy(project_path: Path, wait: bool, auto: bool) -> None:
+def create(project_path: Path, wait: bool, auto: bool) -> None:
     """
     Validate and deploy the project server side.
     """
@@ -133,7 +141,7 @@ def deploy(project_path: Path, wait: bool, auto: bool) -> None:
     }
 
     config = CLIConfig.get_project_config(str(project_path))
-    TINYBIRD_API_URL = (config.get_host() or "") + "/v1/deploy"
+    TINYBIRD_API_URL = f"{config.get_host()}/v1/deploy"
     TINYBIRD_API_KEY = config.get_token()
 
     files = [
@@ -178,7 +186,7 @@ def deploy(project_path: Path, wait: bool, auto: bool) -> None:
     if deployment and wait:
         while deployment.get("status") != "data_ready":
             time.sleep(5)
-            TINYBIRD_API_URL = (config.get_host() or "") + f"/v1/deployments/{deployment.get('id')}"
+            TINYBIRD_API_URL = f"{config.get_host()}/v1/deployments/{deployment.get('id')}"
             r = requests.get(TINYBIRD_API_URL, headers=HEADERS)
             result = r.json()
             deployment = result.get("deployment")
@@ -189,28 +197,20 @@ def deploy(project_path: Path, wait: bool, auto: bool) -> None:
         click.echo(FeedbackManager.success(message="Deployment is ready"))
 
         if auto:
-            promote_deployment((config.get_host() or ""), HEADERS)
-
-
-@cli.group(name="releases")
-def releases_group() -> None:
-    """
-    Release commands.
-    """
-    pass
+            promote_deployment(config.get_host(), HEADERS)
 
 
-@releases_group.command(name="list")
+@deploy_group.command(name="list")
 @click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
-def release_list(project_path: Path) -> None:
+def deploy_list(project_path: Path) -> None:
     """
-    List all the releases you have in the project.
+    List all the deployments you have in the project.
     """
     config = CLIConfig.get_project_config(str(project_path))
 
     TINYBIRD_API_KEY = config.get_token()
     HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
-    TINYBIRD_API_URL = (config.get_host() or "") + "/v1/deployments"
+    TINYBIRD_API_URL = f"{config.get_host()}/v1/deployments"
 
     r = requests.get(TINYBIRD_API_URL, headers=HEADERS)
     result = r.json()
@@ -226,9 +226,9 @@ def release_list(project_path: Path) -> None:
     echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
 
 
-@releases_group.command(name="promote")
+@deploy_group.command(name="promote")
 @click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
-def release_promote(project_path: Path) -> None:
+def deploy_promote(project_path: Path) -> None:
     """
     Promote last deploy to ready and remove old one.
     """
@@ -237,18 +237,18 @@ def release_promote(project_path: Path) -> None:
     TINYBIRD_API_KEY = config.get_token()
     HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
-    promote_deployment((config.get_host() or ""), HEADERS)
+    promote_deployment(config.get_host(), HEADERS)
 
 
-@releases_group.command(name="rollback")
+@deploy_group.command(name="rollback")
 @click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
-def release_rollback(project_path: Path) -> None:
+def deploy_rollback(project_path: Path) -> None:
     """
-    Rollback to the previous release.
+    Rollback to the previous deployment.
     """
     config = CLIConfig.get_project_config(str(project_path))
 
     TINYBIRD_API_KEY = config.get_token()
     HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
-    rollback_deployment((config.get_host() or ""), HEADERS)
+    rollback_deployment(config.get_host(), HEADERS)

{tinybird-0.0.1.dev28 → tinybird-0.0.1.dev29}/tinybird.egg-info/PKG-INFO

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