tinybird 0.0.1.dev278__tar.gz → 0.0.1.dev279__tar.gz

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev278
+Version: 0.0.1.dev279
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev278'
-__revision__ = '422553e'
+__version__ = '0.0.1.dev279'
+__revision__ = '9848d86'

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/agent/agent.py

@@ -64,7 +64,6 @@ from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.login_common import login
 from tinybird.tb.modules.mock_common import append_mock_data, create_mock_data
 from tinybird.tb.modules.project import Project
-from tinybird.tb.modules.secret_common import load_secrets
 from tinybird.tb.modules.test_common import run_tests as run_tests_common
 
 
@@ -206,7 +205,6 @@ class TinybirdAgent:
                 str: The summary of the result.
             """
             result = self.explore_agent.run(task, deps=ctx.deps, usage=ctx.usage)
-            self.explore_agent.clear_messages()
             return result.output or "No result returned"
 
         @self.agent.instructions
@@ -297,7 +295,6 @@ class TinybirdAgent:
             local_host=local_client.host,
             local_token=local_client.token,
             run_id=run_id,
-            load_secrets_local=partial(load_secrets, project=project, client=local_client),
         )
 
     def run(self, user_prompt: str, config: dict[str, Any]) -> None:

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/agent/tools/secret.py

@@ -84,7 +84,6 @@ def create_or_update_secrets(ctx: RunContext[TinybirdAgentContext], secrets: dic
         action = "Updating" if env_file_path.exists() and updated_keys else "Creating"
         click.echo(FeedbackManager.highlight(message=f"» {action} secrets in .env.local..."))
         env_file_path.write_text(new_content)
-        ctx.deps.load_secrets_local()
         ctx.deps.build_project(test=False, silent=True, load_fixtures=False)
 
         # Generate success message

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/agent/utils.py

@@ -61,7 +61,6 @@ class TinybirdAgentContext(BaseModel):
     get_connection_datafile_cloud: Callable[..., str]
     get_connection_datafile_local: Callable[..., str]
     run_tests: Callable[..., Optional[str]]
-    load_secrets_local: Callable[..., None]
     dangerously_skip_permissions: bool
     token: str
     user_token: str

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/build.py

@@ -20,7 +20,6 @@ from tinybird.tb.modules.datafile.playground import folder_playground
 from tinybird.tb.modules.dev_server import BuildStatus, start_server
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
-from tinybird.tb.modules.secret_common import load_secrets
 from tinybird.tb.modules.shell import Shell, print_table_formatted
 from tinybird.tb.modules.watch import watch_files, watch_project
 
@@ -47,7 +46,6 @@ def build(ctx: click.Context, watch: bool) -> None:
             )
         )
 
-    load_secrets(project, tb_client)
     click.echo(FeedbackManager.highlight_building_project())
     process(project=project, tb_client=tb_client, watch=False)
     if watch:
@@ -76,7 +74,6 @@ def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
         # Wait for the server to start
         time.sleep(0.5)
 
-    load_secrets(project, tb_client)
     click.echo(FeedbackManager.highlight_building_project())
     process(project=project, tb_client=tb_client, watch=True, build_status=build_status)
     run_watch(

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/build_common.py

@@ -14,7 +14,6 @@ from tinybird.tb.modules.datafile.fixture import FixtureExtension, get_fixture_d
 from tinybird.tb.modules.dev_server import BuildStatus
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
-from tinybird.tb.modules.secret_common import load_secrets
 from tinybird.tb.modules.shell import print_table_formatted
 
 
@@ -49,7 +48,6 @@ def process(
             build_status.building = False
             build_status.error = None
     elif file_changed and (file_changed.endswith(".env.local") or file_changed.endswith(".env")):
-        load_secrets(project, tb_client)
         if build_status:
             build_status.building = False
             build_status.error = None

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/cli.py

@@ -195,12 +195,12 @@ def cli(
     if "--help" in sys.argv or "-h" in sys.argv:
         return
 
-    client = create_ctx_client(ctx, config, cloud, staging, show_warnings=version_warning)
+    ctx.ensure_object(dict)["project"] = project
+    client = create_ctx_client(ctx, config, cloud, staging, project=project, show_warnings=version_warning)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
 
-    ctx.ensure_object(dict)["project"] = project
     ctx.ensure_object(dict)["env"] = get_target_env(cloud)
     ctx.ensure_object(dict)["output"] = output
 
@@ -368,7 +368,9 @@ def __hide_click_output() -> None:
     click.secho = silent_secho  # type: ignore
 
 
-def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, staging: bool, show_warnings: bool = True):
+def create_ctx_client(
+    ctx: Context, config: Dict[str, Any], cloud: bool, staging: bool, project: Project, show_warnings: bool = True
+):
     commands_without_ctx_client = [
         "auth",
         "check",

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/exceptions.py

@@ -139,3 +139,10 @@ class CLILocalException(CLIException):
 
     def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
         super().__init__(message, "local_error", **kw_telemetry_event_data)
+
+
+class CLISecretException(CLIException):
+    """Exceptions generated by the secret commands"""
+
+    def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
+        super().__init__(message, "secret_error", **kw_telemetry_event_data)

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/local_common.py

@@ -18,6 +18,7 @@ from tinybird.tb.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLILocalException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.secret_common import load_secrets
 from tinybird.tb.modules.telemetry import add_telemetry_event
 
 TB_IMAGE_NAME = "tinybirdco/tinybird-local:latest"
@@ -34,7 +35,9 @@ def get_tinybird_local_client(
     """Get a Tinybird client connected to the local environment."""
 
     config = get_tinybird_local_config(config_obj, test=test, silent=silent)
-    return config.get_client(host=TB_LOCAL_ADDRESS, staging=staging)
+    client = config.get_client(host=TB_LOCAL_ADDRESS, staging=staging)
+    load_secrets(config_obj.get("path", ""), client)
+    return client
 
 
 def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False, silent: bool = False) -> CLIConfig:

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/secret_common.py

@@ -1,20 +1,19 @@
+from pathlib import Path
 from typing import Dict
 
-import click
 from dotenv import dotenv_values
 
 from tinybird.tb.client import TinyB
-from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.project import Project
+from tinybird.tb.modules.exceptions import CLISecretException
 
 
-def load_secrets(project: Project, client: TinyB):
+def load_secrets(project_folder: str, client: TinyB):
     try:
         env_vars: Dict[str, str] = {}
 
         # Load secrets from .env file
         env_file = ".env"
-        env_path = project.path / env_file
+        env_path = Path(project_folder) / env_file
 
         if env_path.exists():
             env_values = dotenv_values(env_path)
@@ -23,7 +22,7 @@ def load_secrets(project: Project, client: TinyB):
 
         # Load secrets from .env.local file
         env_file = ".env.local"
-        env_path = project.path / env_file
+        env_path = Path(project_folder) / env_file
 
         if env_path.exists():
             env_values = dotenv_values(env_path)
@@ -33,8 +32,6 @@ def load_secrets(project: Project, client: TinyB):
         if len(env_vars.keys()) == 0:
             return
 
-        click.echo(FeedbackManager.highlight(message="\n» Loading secrets from .env files..."))
-
         for name, value in env_vars.items():
             if not value:
                 continue
@@ -49,8 +46,7 @@ def load_secrets(project: Project, client: TinyB):
                 else:
                     client.create_secret(name, value)
             except Exception as e:
-                click.echo(FeedbackManager.error(message=f"✗ Error setting secret '{name}': {e}"))
+                raise Exception(f"Error setting secret '{name}': {e}")
 
-        click.echo(FeedbackManager.success(message="✓ Secrets loaded!"))
     except Exception as e:
-        click.echo(FeedbackManager.error(message=f"✗ Error: {e}"))
+        raise CLISecretException(str(e))

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird/tb/modules/test_common.py

@@ -25,7 +25,6 @@ from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
 from tinybird.tb.modules.local_common import get_local_tokens, get_test_workspace_name
 from tinybird.tb.modules.project import Project
-from tinybird.tb.modules.secret_common import load_secrets
 
 yaml.SafeDumper.org_represent_str = yaml.SafeDumper.represent_str  # type: ignore[attr-defined]
 
@@ -64,9 +63,10 @@ def create_test(
     tests: List[Dict[str, Any]] = []
 
     try:
-        load_secrets(project=project, client=client)
         click.echo(FeedbackManager.highlight(message="\n» Building test environment"))
-        build_project(project=project, tb_client=client, watch=False, silent=True)
+        build_error = build_project(project=project, tb_client=client, watch=False, silent=True, exit_on_error=False)
+        if build_error:
+            raise Exception(build_error)
         click.echo(FeedbackManager.info(message="✓ Done!\n"))
         config = CLIConfig.get_project_config()
         folder = project.folder
@@ -145,9 +145,11 @@ def dump_tests(tests: List[Dict[str, Any]]) -> str:
 def update_test(pipe: str, project: Project, client: TinyB) -> None:
     try:
         folder = project.folder
-        load_secrets(project=project, client=client)
         click.echo(FeedbackManager.highlight(message="\n» Building test environment"))
-        build_project(project=project, tb_client=client, watch=False, silent=True)
+        build_error = build_project(project=project, tb_client=client, watch=False, silent=True, exit_on_error=False)
+        if build_error:
+            raise Exception(build_error)
+
         click.echo(FeedbackManager.info(message="✓ Done!"))
         pipe_tests_path = get_pipe_path(pipe, folder)
         pipe_name = pipe_tests_path.stem
@@ -191,9 +193,10 @@ def update_test(pipe: str, project: Project, client: TinyB) -> None:
 def run_tests(name: Tuple[str, ...], project: Project, client: TinyB) -> Optional[str]:
     full_error = ""
     try:
-        load_secrets(project=project, client=client)
         click.echo(FeedbackManager.highlight(message="\n» Building test environment"))
-        build_project(project=project, tb_client=client, watch=False, silent=True)
+        build_error = build_project(project=project, tb_client=client, watch=False, silent=True, exit_on_error=False)
+        if build_error:
+            raise Exception(build_error)
         click.echo(FeedbackManager.info(message="✓ Done!"))
 
         click.echo(FeedbackManager.highlight(message="\n» Running tests"))

{tinybird-0.0.1.dev278 → tinybird-0.0.1.dev279}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev278
+Version: 0.0.1.dev279
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird