tinybird 0.0.1.dev291__py3-none-any.whl → 1.0.5__py3-none-any.whl

tinybird/tb/modules/deployment.py

@@ -382,6 +382,7 @@ def create_deployment_cmd(
     template: Optional[str] = None,
     verbose: bool = False,
 ) -> None:
+    output = ctx.ensure_object(dict)["output"]
     project: Project = ctx.ensure_object(dict)["project"]
     if template:
         if project.get_project_files():
@@ -416,6 +417,7 @@ def create_deployment_cmd(
         check,
         allow_destructive_operations,
         ingest_hint=not is_web_analytics_starter_kit,
+        output=output,
     )
     show_web_analytics_starter_kit_hints(client, is_web_analytics_starter_kit)
 

tinybird/tb/modules/deployment_common.py

@@ -10,11 +10,13 @@ import requests
 
 from tinybird.tb.client import TinyB
 from tinybird.tb.modules.common import (
+    echo_json,
     echo_safe_humanfriendly_tables_format_smart_table,
     get_display_cloud_host,
     sys_exit,
 )
 from tinybird.tb.modules.feedback_manager import FeedbackManager, bcolors
+from tinybird.tb.modules.job_common import echo_job_url
 from tinybird.tb.modules.project import Project
 
 
@@ -59,9 +61,14 @@ def api_post(
     params: Optional[dict] = None,
 ) -> dict:
     r = requests.post(url, headers=headers, files=files, params=params)
-    if r.status_code < 300:
-        logging.debug(json.dumps(r.json(), indent=2))
-        return r.json()
+    try:
+        if r.status_code < 300:
+            logging.debug(json.dumps(r.json(), indent=2))
+            return r.json()
+    except json.JSONDecodeError:
+        message = "Error parsing response from API"
+        click.echo(FeedbackManager.error(message=message))
+        sys_exit("deployment_error", message)
 
     # Try to parse and print the error from the response
     try:
@@ -152,8 +159,6 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool, ingest_hi
         )
 
 
-# TODO(eclbg): This logic should be in the server, and there should be a dedicated endpoint for discarding a
-# deployment
 def discard_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
     result = api_fetch(TINYBIRD_API_URL, headers=headers)
@@ -164,29 +169,25 @@ def discard_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
         return
 
     if len(deployments) < 2:
-        click.echo(FeedbackManager.error(message="Only one deployment found"))
+        click.echo(FeedbackManager.error(message="Only one deployment found. Cannot discard the only deployment."))
         return
 
-    previous_deployment, current_deployment = deployments[0], deployments[1]
+    current_deployment, deployment_to_discard = deployments[0], deployments[1]
 
-    if previous_deployment.get("status") != "data_ready":
+    # NOTE(eclbg): we never get here. We wrote this code when we though we'd enable promoting back and forth between
+    # staging and live, but the current CLI commands don't allow getting in that state
+    if current_deployment.get("status") != "data_ready":
         click.echo(FeedbackManager.error(message="Previous deployment is not ready"))
-        deploy_errors = previous_deployment.get("errors", [])
+        deploy_errors = current_deployment.get("errors", [])
         for deploy_error in deploy_errors:
             click.echo(FeedbackManager.error(message=f"* {deploy_error}"))
         return
 
-    if previous_deployment.get("live"):
-        click.echo(FeedbackManager.error(message="Previous deployment is already live"))
-    else:
-        click.echo(FeedbackManager.success(message="Promoting previous deployment"))
-
-        TINYBIRD_API_URL = f"{host}/v1/deployments/{previous_deployment.get('id')}/set-live"
-        result = api_post(TINYBIRD_API_URL, headers=headers)
-
-    click.echo(FeedbackManager.success(message="Removing current deployment"))
+    to_discard_status = deployment_to_discard.get("status")
+    verb = "Canceling" if to_discard_status in {"calculating", "creating_schema", "schema_ready"} else "Removing"
+    click.echo(FeedbackManager.success(message=f"{verb} deployment {deployment_to_discard['id']}"))
 
-    TINYBIRD_API_URL = f"{host}/v1/deployments/{current_deployment.get('id')}"
+    TINYBIRD_API_URL = f"{host}/v1/deployments/{deployment_to_discard.get('id')}"
     r = requests.delete(TINYBIRD_API_URL, headers=headers)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
@@ -194,15 +195,16 @@ def discard_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
         click.echo(FeedbackManager.error(message=result.get("error")))
         sys_exit("deployment_error", result.get("error", "Unknown error"))
 
+    deployment_to_discard = deployments[1]
     click.echo(FeedbackManager.success(message="Discard process successfully started"))
 
     if wait:
         while True:
-            TINYBIRD_API_URL = f"{host}/v1/deployments/{current_deployment.get('id')}"
+            TINYBIRD_API_URL = f"{host}/v1/deployments/{deployment_to_discard.get('id')}"
             result = api_fetch(TINYBIRD_API_URL, headers)
 
-            current_deployment = result.get("deployment")
-            if current_deployment.get("status") == "deleted":
+            deployment_to_discard = result.get("deployment")
+            if deployment_to_discard and deployment_to_discard.get("status") == "deleted":
                 click.echo(FeedbackManager.success(message="Discard process successfully completed"))
                 break
             time.sleep(5)
@@ -218,6 +220,8 @@ def create_deployment(
     check: Optional[bool] = None,
     allow_destructive_operations: Optional[bool] = None,
     ingest_hint: Optional[bool] = True,
+    output: Optional[str] = "human",
+    env: Optional[str] = "cloud",
 ) -> None:
     # TODO: This code is duplicated in build_server.py
     # Should be refactored to be shared
@@ -269,7 +273,10 @@ def create_deployment(
 
         result = api_post(TINYBIRD_API_URL, headers=HEADERS, files=files, params=params)
 
-        print_changes(result, project)
+        print_changes(result, project, output)
+
+        if output == "json" and check:
+            echo_json(result.get("deployment", {}), 8)
 
         deployment = result.get("deployment", {})
         feedback = deployment.get("feedback", [])
@@ -315,13 +322,30 @@ def create_deployment(
             )
 
         status = result.get("result")
-        if status == "success":
-            host = get_display_cloud_host(client.host)
+        host = get_display_cloud_host(client.host)
+        if status in ["success", "failed"]:
             click.echo(
-                FeedbackManager.info(message="Deployment URL: ")
+                FeedbackManager.gray(message="Deployment URL: ")
                 + f"{bcolors.UNDERLINE}{host}/{config.get('name')}/deployments/{deployment.get('id')}{bcolors.ENDC}"
             )
+            jobs = client.jobs()
+            deployment_job = next(
+                (
+                    job
+                    for job in jobs
+                    if job.get("kind") == "deployment" and job.get("deployment_id") == deployment.get("id")
+                ),
+                None,
+            )
+            if deployment_job:
+                echo_job_url(
+                    token=client.token,
+                    host=client.host,
+                    workspace_name=config.get("name") or "",
+                    job_url=deployment_job.get("job_url") or "",
+                )
 
+        if status == "success":
             if wait:
                 click.echo(FeedbackManager.info(message="\n* Deployment submitted"))
             else:
@@ -352,26 +376,33 @@ def create_deployment(
             if not deployment:
                 click.echo(FeedbackManager.error(message="Error parsing deployment from response"))
                 sys_exit("deployment_error", "Error parsing deployment from response")
-            if deployment.get("status") == "failed":
-                click.echo(FeedbackManager.error(message="Deployment failed"))
-                deploy_errors = deployment.get("errors")
-                for deploy_error in deploy_errors:
-                    click.echo(FeedbackManager.error(message=f"* {deploy_error}"))
-
-                if auto:
-                    click.echo(FeedbackManager.error(message="Rolling back deployment"))
-                    discard_deployment(client.host, HEADERS, wait=wait)
-                sys_exit(
-                    "deployment_error",
-                    f"Deployment failed. Errors: {str(deployment.get('errors') + deployment.get('feedback', []))}",
-                )
+                return
 
-            if deployment.get("status") == "data_ready":
+            status = deployment.get("status")
+            errors = deployment.get("errors")
+            feedback = deployment.get("feedback")
+
+            if status == "failed":
+                # Just wait until we poll again and see deleting or deleted to report errors
+                pass
+
+            if status == "data_ready":
                 break
 
-            if deployment.get("status") in ["deleting", "deleted"]:
-                click.echo(FeedbackManager.error(message="Deployment was deleted by another process"))
-                sys_exit("deployment_error", "Deployment was deleted by another process")
+            if status in ["deleting", "deleted"]:
+                errors = deployment.get("errors")
+                if errors:
+                    verb = "is being" if status == "deleting" else "was"
+                    click.echo(
+                        FeedbackManager.error(
+                            message=f"Deployment failed and {verb} deleted automatically. Deployment errors:"
+                        )
+                    )
+                    for error in errors:
+                        click.echo(FeedbackManager.error(message=f"* {error}"))
+                sys_exit(
+                    "deployment_error", f"Deployment deleted after failure. Errors: {str(errors + (feedback or []))}"
+                )
 
             time.sleep(5)
 
@@ -379,6 +410,15 @@ def create_deployment(
 
         if auto:
             promote_deployment(client.host, HEADERS, wait=wait, ingest_hint=ingest_hint)
+            # Fetch the final deployment state after promotion for JSON output
+            if output == "json":
+                url = f"{client.host}/v1/deployments/{deployment.get('id')}"
+                res = api_fetch(url, HEADERS)
+                deployment = res.get("deployment")
+
+    # Output JSON at the appropriate time based on the execution path
+    if output == "json" and deployment:
+        echo_json(deployment, 8)
 
 
 def _build_data_movement_message(kind: str, source_mv_name: Optional[str]) -> str:
@@ -390,7 +430,7 @@ def _build_data_movement_message(kind: str, source_mv_name: Optional[str]) -> st
         return ""
 
 
-def print_changes(result: dict, project: Project) -> None:
+def print_changes(result: dict, project: Project, output: Optional[str] = "human") -> None:
     deployment = result.get("deployment", {})
     resources_columns = ["status", "name", "type", "path"]
     resources: list[list[Union[str, None]]] = []

tinybird/tb/modules/deprecations.py

@@ -29,20 +29,20 @@ def auth(args) -> None:
 
 
 @cli.command(
-    name="branch",
+    name="environment",
     context_settings=dict(
         ignore_unknown_options=True,
     ),
     hidden=True,
 )
 @click.argument("args", nargs=-1, type=click.UNPROCESSED)
-def branch(args) -> None:
+def environment(args) -> None:
     """
-    `tb branch` is deprecated. You should rely on your version control system to manage branches.
+    `tb environment` has been renamed to `tb branch`.
     """
     click.echo(
         FeedbackManager.warning(
-            message="This command is deprecated. You should rely on your version control system to manage branches."
+            message=f"`tb environment` has been renamed to `tb branch`. Please use `tb branch {args[0]}` instead."
         )
     )
     click.echo(

tinybird/tb/modules/dev_server.py

@@ -6,8 +6,10 @@ from pathlib import Path
 from typing import Callable, Optional
 
 import click
+import requests
 
 from tinybird.tb.client import TinyB
+from tinybird.tb.config import get_display_cloud_host
 from tinybird.tb.modules.common import sys_exit
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import TB_LOCAL_PORT
@@ -33,6 +35,7 @@ class DevServer(http.server.HTTPServer):
         project: Project,
         build_status: BuildStatus,
         tb_client: TinyB,
+        branch: Optional[str] = None,
     ):
         port = 49161
         self.project = project
@@ -40,19 +43,32 @@ class DevServer(http.server.HTTPServer):
         self.process = process
         self.build_status = build_status
         self.port = port
+        base_ui_url = get_display_cloud_host(tb_client.host)
+        if branch:
+            ui_url = f"{base_ui_url}/{project.workspace_name}~{branch}/project"
+        else:
+            ui_url = f"{base_ui_url}/{project.workspace_name}/project"
 
         try:
             super().__init__(("", port), DevHandler)
-            click.echo(FeedbackManager.success(message=f"✓ Dev server running on http://localhost:{port}"))
-            click.echo(
-                FeedbackManager.info(
-                    message=f"* Access your project at https://cloud.tinybird.co/local/{TB_LOCAL_PORT}/{project.workspace_name}/project"
-                )
-            )
+            click.echo(FeedbackManager.info(message=f"✓ Access your project at {ui_url}\n"))
         except OSError as e:
             if e.errno == 48:  # Address already in use
-                click.echo(FeedbackManager.error(message=f"Port {port} is already in use. Try a different port."))
-                sys_exit("port_in_use", f"Port {port} is already in use")
+                dev_server_already_running = False
+                try:
+                    response = requests.get(f"http://localhost:{port}")
+                    if response.status_code == 200 and "Tinybird Dev Server" in response.text:
+                        dev_server_already_running = True
+                except Exception:
+                    pass
+                if dev_server_already_running:
+                    message = f"Dev server is already running on http://localhost:{port}. Skipping..."
+                    click.echo(FeedbackManager.warning(message=message))
+                    sys_exit("dev_server_already_running", message)
+                else:
+                    message = f"Port {port} is already in use. Check if another instance of the server is running or release the port."
+                    click.echo(FeedbackManager.error(message=message))
+                    sys_exit("port_in_use", message)
             else:
                 click.echo(FeedbackManager.error_exception(error=e))
                 sys_exit("server_error", str(e))
@@ -137,7 +153,10 @@ class DevHandler(http.server.SimpleHTTPRequestHandler):
                 self.wfile.write(
                     json.dumps(
                         {
-                            "files": [f.replace(f"{project.folder}/", "") for f in project_files],
+                            "files": [
+                                {"path": f.replace(f"{project.folder}/", ""), "content": Path(f).read_text()}
+                                for f in project_files
+                            ],
                             "root": project.folder,
                             "workspace_name": project.workspace_name,
                         }
@@ -232,7 +251,9 @@ class DevHandler(http.server.SimpleHTTPRequestHandler):
         pass
 
 
-def start_server(project: Project, tb_client: TinyB, process: Callable, build_status: BuildStatus):
+def start_server(
+    project: Project, tb_client: TinyB, process: Callable, build_status: BuildStatus, branch: Optional[str] = None
+):
     """Start a development server for the project.
 
     Args:
@@ -240,10 +261,10 @@ def start_server(project: Project, tb_client: TinyB, process: Callable, build_st
     """
 
     try:
-        click.echo(FeedbackManager.highlight(message="\n» Starting Tinybird dev server...\n"))
+        click.echo(FeedbackManager.highlight(message="» Exposing your project to Tinybird UI..."))
 
         # Create and start the server
-        server = DevServer(process, project, build_status, tb_client)
+        server = DevServer(process, project, build_status, tb_client, branch)
         server.serve_forever()
 
         # Run the server in the main thread

tinybird/tb/modules/exceptions.py

@@ -127,6 +127,13 @@ class CLIMockException(CLIException):
         super().__init__(message, "mock_error", **kw_telemetry_event_data)
 
 
+class CLIAgentException(CLIException):
+    """Exceptions generated by the agent commands"""
+
+    def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
+        super().__init__(message, "agent_error", **kw_telemetry_event_data)
+
+
 class CLILoginException(CLIException):
     """Exceptions generated by the login commands"""
 
@@ -146,3 +153,10 @@ class CLISecretException(CLIException):
 
     def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
         super().__init__(message, "secret_error", **kw_telemetry_event_data)
+
+
+class CLIChException(CLIException):
+    """Exceptions generated by the ch commands"""
+
+    def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
+        super().__init__(message, "ch_error", **kw_telemetry_event_data)

tinybird/tb/modules/feedback_manager.py

@@ -1209,7 +1209,7 @@ STEP 3: ADD KEY TO SERVICE ACCOUNT
 
     debug_running_file = print_message("** Running {file}", bcolors.CGREY)
 
-    highlight_building_project = info_highlight_message("\n» Building project...")
+    highlight_building_project = info_highlight_message("» Building project...")
 
     success = success_message("{message}")
     info = info_message("{message}")

tinybird/tb/modules/info.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple
 import click
 
 from tinybird.tb.client import TinyB
-from tinybird.tb.config import get_display_cloud_host
+from tinybird.tb.config import get_clickhouse_host, get_display_cloud_host
 from tinybird.tb.modules.cli import CLIConfig, cli
 from tinybird.tb.modules.common import echo_json, force_echo, format_robust_table
 from tinybird.tb.modules.exceptions import CLILocalException
@@ -14,8 +14,9 @@ from tinybird.tb.modules.project import Project
 
 
 @cli.command(name="info")
+@click.option("--skip-local", is_flag=True, default=False, help="Skip local info")
 @click.pass_context
-def info(ctx: click.Context) -> None:
+def info(ctx: click.Context, skip_local: bool) -> None:
     """Get information about the project that is currently being used"""
     ctx_config = ctx.ensure_object(dict)["config"]
     project: Project = ctx.ensure_object(dict)["project"]
@@ -27,23 +28,41 @@ def info(ctx: click.Context) -> None:
 
     click.echo(FeedbackManager.highlight(message="» Tinybird Cloud:"))
     cloud_table, cloud_columns = get_cloud_info(ctx_config)
-    click.echo(FeedbackManager.highlight(message="\n» Tinybird Local:"))
-    local_table, local_columns = get_local_info(ctx_config)
+
+    if not skip_local:
+        click.echo(FeedbackManager.highlight(message="\n» Tinybird Local:"))
+        local_table, local_columns = get_local_info(ctx_config)
+
     click.echo(FeedbackManager.highlight(message="\n» Project:"))
     project_table, project_columns = get_project_info(project.folder)
+
     if output == "json":
+        response: dict[str, Any] = {}
+
         cloud_data = {}
         if cloud_columns and cloud_table and isinstance(cloud_table, list) and len(cloud_table) > 0:
             cloud_data = {column: cloud_table[0][i] for i, column in enumerate(cloud_columns)}
+        response["cloud"] = cloud_data
 
-        local_data = {}
-        if local_columns and local_table and isinstance(local_table, list) and len(local_table) > 0:
-            local_data = {column: local_table[0][i] for i, column in enumerate(local_columns)}
+        if not skip_local:
+            local_data = {}
+            if local_columns and local_table and isinstance(local_table, list) and len(local_table) > 0:
+                local_data = {column: local_table[0][i] for i, column in enumerate(local_columns)}
+            response["local"] = local_data
 
         project_data = {}
         if project_columns and project_table and isinstance(project_table, list) and len(project_table) > 0:
             project_data = {column: project_table[0][i] for i, column in enumerate(project_columns)}
-        echo_json({"cloud": cloud_data, "local": local_data, "project": project_data})
+        response["project"] = project_data
+
+        branches = get_branches(ctx_config)
+        if branches:
+            branch_data: dict[str, dict[str, str]] = {}
+            for branch in branches:
+                branch_data[branch["name"]] = get_branch_info(branch)
+            response["branches"] = branch_data
+
+        echo_json(response)
 
 
 def get_cloud_info(ctx_config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]]:
@@ -54,9 +73,10 @@ def get_cloud_info(ctx_config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]
         token = config.get_token() or "No workspace token found"
         api_host = config.get("host") or "No API host found"
         ui_host = get_display_cloud_host(api_host)
+        ch_host = get_clickhouse_host(api_host)
         user_email = config.get("user_email") or "No user email found"
         user_token = config.get_user_token() or "No user token found"
-        return get_env_info(client, ctx_config, user_email, token, user_token, api_host, ui_host)
+        return get_env_info(client, ctx_config, user_email, token, user_token, api_host, ui_host, ch_host)
     except Exception:
         click.echo(
             FeedbackManager.warning(
@@ -66,6 +86,20 @@ def get_cloud_info(ctx_config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]
         return [], []
 
 
+def get_branch_info(branch: Dict[str, Any]) -> Dict[str, Any]:
+    try:
+        token = branch.get("token") or "No token found"
+
+        return {
+            "token": token,
+        }
+
+    except Exception:
+        return {
+            "token": "No token found",
+        }
+
+
 def get_local_info(config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]]:
     try:
         local_config = get_tinybird_local_config(config, test=False, silent=False)
@@ -75,7 +109,10 @@ def get_local_info(config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]]:
         user_token = local_config.get_user_token() or "No user token found"
         api_host = TB_LOCAL_ADDRESS
         ui_host = get_display_cloud_host(api_host)
-        return get_env_info(local_client, config, user_email, token, user_token, api_host, ui_host, is_local=True)
+        ch_host = get_clickhouse_host(api_host)
+        return get_env_info(
+            local_client, config, user_email, token, user_token, api_host, ui_host, ch_host, is_local=True
+        )
     except CLILocalException as e:
         raise e
     except Exception as e:
@@ -95,6 +132,7 @@ def get_env_info(
     user_token: str,
     api_host: str,
     ui_host: str,
+    ch_host: str,
     is_local=False,
 ) -> Tuple[List[Any], List[str]]:
     user_workspaces = client.user_workspaces(version="v1")
@@ -115,11 +153,20 @@ def get_env_info(
 
     assert isinstance(current_main_workspace, dict)
 
-    columns = ["user", "workspace_name", "workspace_id", "token", "user_token", "api", "ui"]
+    columns = ["user", "workspace_name", "workspace_id", "token", "user_token", "api", "ui", "clickhouse"]
     if current_main_workspace["name"]:
         ui_host += f"/{current_main_workspace['name']}"
     table = [
-        (user_email, current_main_workspace["name"], current_main_workspace["id"], token, user_token, api_host, ui_host)
+        (
+            user_email,
+            current_main_workspace["name"],
+            current_main_workspace["id"],
+            token,
+            user_token,
+            api_host,
+            ui_host,
+            ch_host,
+        )
     ]
 
     if is_local and (
@@ -155,3 +202,13 @@ def get_project_info(project_path: Optional[str] = None) -> Tuple[Iterable[Any],
     table: Iterable[Any] = [(current_path, tinyb_path, project_path)]
     click.echo(format_robust_table(table, column_names=columns))
     return table, columns
+
+
+def get_branches(ctx_config: Dict[str, Any]) -> List[Dict[str, Any]]:
+    try:
+        config = CLIConfig.get_project_config()
+        client = config.get_client()
+        response = client.branches()
+        return response["environments"]
+    except Exception:
+        return []

tinybird/tb/modules/infra.py

@@ -626,12 +626,11 @@ def infra_init(
                 else:
                     click.echo("Failed to get diff for Kubernetes configuration:")
                     click.echo(diff_result.stderr)
+            elif diff_result.stdout:
+                click.echo("\nChanges that will be applied:")
+                click.echo(diff_result.stdout)
             else:
-                if diff_result.stdout:
-                    click.echo("\nChanges that will be applied:")
-                    click.echo(diff_result.stdout)
-                else:
-                    click.echo("\nNo changes detected or resources don't exist yet.")
+                click.echo("\nNo changes detected or resources don't exist yet.")
 
             # Now apply the configuration
             command = f"kubectl --context {selected_context} apply -f {str(yaml_path)}"

tinybird/tb/modules/job_common.py

@@ -0,0 +1,15 @@
+import click
+
+from tinybird.tb.config import get_display_cloud_host
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.local_common import TB_LOCAL_ADDRESS
+
+
+def echo_job_url(token: str, host: str, workspace_name: str, job_url: str):
+    if "localhost" in host:
+        job_url = f"{job_url.replace('http://localhost:8001', TB_LOCAL_ADDRESS)}?token={token}"
+    click.echo(FeedbackManager.gray(message="Job API URL: ") + FeedbackManager.info(message=f"{job_url}"))
+    ui_host = get_display_cloud_host(host)
+    click.echo(
+        FeedbackManager.gray(message="Jobs URL: ") + FeedbackManager.info(message=f"{ui_host}/{workspace_name}/jobs")
+    )