tinybird 0.0.1.dev79__tar.gz → 0.0.1.dev81__tar.gz

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/PKG-INFO

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

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/tinybird/client.py

@@ -924,11 +924,12 @@ class TinyB:
         kafka_auto_offset_reset=None,
         kafka_schema_registry_url=None,
         kafka_sasl_mechanism="PLAIN",
+        kafka_security_protocol="SASL_SSL",
         kafka_ssl_ca_pem=None,
     ):
         params = {
             "service": "kafka",
-            "kafka_security_protocol": "SASL_SSL",
+            "kafka_security_protocol": kafka_security_protocol,
             "kafka_sasl_mechanism": kafka_sasl_mechanism,
             "kafka_bootstrap_servers": kafka_bootstrap_servers,
             "kafka_sasl_plain_username": kafka_key,

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/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.dev79'
-__revision__ = 'f126631'
+__version__ = '0.0.1.dev81'
+__revision__ = 'd577324'

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/tinybird/tb/modules/cli.py

@@ -88,7 +88,6 @@ async def cli(
         logging.basicConfig(level=logging.DEBUG)
 
     config_temp = CLIConfig.get_project_config()
-    project = Project(folder=config_temp.cwd)
 
     if token:
         config_temp.set_token(token)
@@ -132,6 +131,7 @@ async def cli(
     if client:
         ctx.ensure_object(dict)["client"] = client
 
+    project = Project(folder=config.get("cwd", os.getcwd()))
     ctx.ensure_object(dict)["project"] = project
     ctx.ensure_object(dict)["env"] = get_target_env(cloud, build)
 

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/tinybird/tb/modules/config.py

@@ -146,9 +146,6 @@ class CLIConfig:
                 values: Dict[str, Any] = json.loads(file.read())
                 for k, v in values.items():
                     self[k] = v
-                if "cwd" in values:
-                    self.set_cwd(values["cwd"])
-
             return True
         except OSError:
             return False
@@ -212,7 +209,7 @@ class CLIConfig:
         self["host"] = f"{scheme}://{netloc}"
 
     def set_cwd(self, cwd: str) -> None:
-        self.cwd = os.path.join(os.path.dirname(self._path) if self._path else os.getcwd(), cwd)
+        self["cwd"] = cwd
 
     def get_host(self, use_defaults_if_needed: bool = False) -> Optional[str]:
         result: Optional[str] = self.get("host", None)

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/tinybird/tb/modules/create.py

@@ -1,7 +1,7 @@
 import os
 import re
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Tuple
 
 import click
 
@@ -64,7 +64,7 @@ async def create(
     try:
         tb_client = config.get_client()
         user_token: Optional[str] = None
-        created = False
+        created_something = False
         if prompt:
             try:
                 user_token = config.get_user_token()
@@ -83,11 +83,13 @@ async def create(
             click.echo(FeedbackManager.highlight(message="\n» Creating new project structure..."))
             create_project_structure(folder)
             click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
-            created = True
+            created_something = True
         result = ""
         if data or prompt:
             click.echo(FeedbackManager.highlight(message="\n» Creating resources..."))
-            result = await create_resources(local_client, tb_client, user_token, data, prompt, folder)
+            result, created_something = await create_resources(
+                local_client, tb_client, user_token, data, prompt, folder
+            )
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
 
         if not already_has_cicd(root_folder):
@@ -95,12 +97,14 @@ async def create(
             init_git(root_folder)
             await init_cicd(root_folder, data_project_dir=os.path.relpath(folder))
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
+            created_something = True
 
         if not already_has_cursor_rules(root_folder):
             click.echo(FeedbackManager.highlight(message="\n» Creating .cursorrules..."))
             create_rules(root_folder, "tb", agent)
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
-            created = True
+            created_something = True
+
         if should_generate_fixtures(result):
             click.echo(FeedbackManager.highlight(message="\n» Generating fixtures..."))
 
@@ -110,7 +114,7 @@ async def create(
                 datasource_path = Path(folder) / "datasources" / f"{ds_name}.datasource"
                 click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
                 persist_fixture(ds_name, data_content, folder)
-                created = True
+                created_something = True
             elif prompt and user_token:
                 datasource_files = [f for f in os.listdir(Path(folder) / "datasources") if f.endswith(".datasource")]
                 for datasource_file in datasource_files:
@@ -129,8 +133,9 @@ async def create(
                         if data:
                             persist_fixture(datasource_name, data, folder)
                             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
-                            created = True
-        if not created:
+                            created_something = True
+
+        if not created_something:
             click.echo(FeedbackManager.warning(message="△ No resources created\n"))
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"Error: {str(e)}"))
@@ -185,8 +190,9 @@ async def create_resources(
     data: Optional[str],
     prompt: Optional[str],
     folder: str,
-):
+) -> Tuple[str, bool]:
     result = ""
+    created_any_resource = False
     folder_path = Path(folder)
     if data:
         path = folder_path / data
@@ -206,6 +212,7 @@ TYPE ENDPOINT
         result = (
             f"<response><resource><type>datasource</type><name>{name}</name><content></content></resource></response>"
         )
+        created_any_resource = True
 
     elif prompt and user_token:
         datasource_paths = [
@@ -262,12 +269,14 @@ TYPE ENDPOINT
                 force=True,
                 folder=folder,
             )
+            created_any_resource = True
 
         for pipe in pipes:
             content = pipe["content"].replace("```", "")
             generate_pipe_file(pipe["name"], content, folder)
+            created_any_resource = True
 
-        return result
+    return result, created_any_resource
 
 
 def init_git(folder: str):

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/tinybird/tb/modules/deployment.py

@@ -15,6 +15,23 @@ from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 
 
+# TODO(eclbg): This should eventually end up in client.py, but we're not using it here yet.
+def api_fetch(url: str, headers: dict) -> dict:
+    r = requests.get(url, headers=headers)
+    if r.status_code == 200:
+        return r.json()
+    # Try to parse and print the error from the response
+    try:
+        result = r.json()
+        error = result.get("error")
+        logging.debug(json.dumps(result, indent=2))
+        click.echo(FeedbackManager.error(message=f"Error: {error}"))
+        sys.exit(1)
+    except Exception:
+        click.echo(FeedbackManager.error(message="Error parsing response from API"))
+        sys.exit(1)
+
+
 # TODO(eclbg): This logic should be in the server, and there should be a dedicated endpoint for promoting a deployment
 # potato
 def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
@@ -197,16 +214,15 @@ def deployment_ls(ctx: click.Context) -> None:
 
     TINYBIRD_API_KEY = client.token
     HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
-    TINYBIRD_API_URL = f"{client.host}/v1/deployments"
+    url = f"{client.host}/v1/deployments"
 
-    r = requests.get(TINYBIRD_API_URL, headers=HEADERS)
-    result = r.json()
+    result = api_fetch(url, HEADERS)
     logging.debug(json.dumps(result, indent=2))
 
     status_map = {"data_ready": "Ready", "failed": "Failed"}
     columns = ["ID", "Status", "Created at", "Live"]
     table = []
-    for deployment in result.get("deployments"):
+    for deployment in result.get("deployments", []):
         if deployment.get("id") == "0":
             continue
 
@@ -402,12 +418,12 @@ def create_deployment(
 
     if deployment and wait and not check:
         while True:
-            TINYBIRD_API_URL = f"{client.host}/v1/deployments/{deployment.get('id')}"
-            r = requests.get(TINYBIRD_API_URL, headers=HEADERS)
-            result = r.json()
-            logging.debug(json.dumps(result, indent=2))
-
-            deployment = result.get("deployment")
+            url = f"{client.host}/v1/deployments/{deployment.get('id')}"
+            res = api_fetch(url, HEADERS)
+            deployment = res.get("deployment")
+            if not deployment:
+                click.echo(FeedbackManager.error(message="Error parsing deployment from response"))
+                sys.exit(1)
             if deployment.get("status") == "failed":
                 click.echo(FeedbackManager.error(message="Deployment failed"))
                 deploy_errors = deployment.get("errors")

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/tinybird/tb_cli_modules/connection.py

@@ -135,6 +135,11 @@ def connection_create(ctx: Context) -> None:
     default="PLAIN",
     help="Authentication method for connection-based protocols. Defaults to 'PLAIN'",
 )
+@click.option(
+    "--security-protocol",
+    default="SASL_SSL",
+    help="Security protocol for connection-based protocols. Defaults to 'SASL_SSL'",
+)
 @click.option("--ssl-ca-pem", default=None, help="Path or content of the CA Certificate file in PEM format")
 @click.pass_context
 @coro
@@ -147,6 +152,7 @@ async def connection_create_kafka(
     auto_offset_reset: Optional[str],
     schema_registry_url: Optional[str],
     sasl_mechanism: Optional[str],
+    security_protocol: Optional[str],
     ssl_ca_pem: Optional[str],
 ) -> None:
     """
@@ -165,10 +171,10 @@ async def connection_create_kafka(
     if not bootstrap_servers:
         bootstrap_servers = click.prompt("Kafka Bootstrap Server")
         validate_kafka_bootstrap_servers(bootstrap_servers)
-    if not key:
+    if key is None:
         key = click.prompt("Key")
         validate_kafka_key(key)
-    if not secret:
+    if secret is None:
         secret = click.prompt("Secret", hide_input=True)
         validate_kafka_secret(secret)
     if not connection_name:
@@ -187,6 +193,7 @@ async def connection_create_kafka(
         auto_offset_reset,
         schema_registry_url,
         sasl_mechanism,
+        security_protocol,
         get_ca_pem_content(ssl_ca_pem),
     )
 

{tinybird-0.0.1.dev79 → tinybird-0.0.1.dev81}/tinybird.egg-info/PKG-INFO

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