tinybird 0.0.1.dev291__tar.gz → 0.0.1.dev292__tar.gz

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/PKG-INFO

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

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/tinybird/context.py

@@ -3,10 +3,11 @@ from typing import TYPE_CHECKING
 
 # Avoid circular import error
 if TYPE_CHECKING:
-    from tinybird.user import User
+    from hfi.hfi_workspace_data import HfiWorkspaceData
+
 
 workspace_id: ContextVar[str] = ContextVar("workspace_id")
-workspace: ContextVar["User"] = ContextVar("workspace")
+hfi_workspace_data: ContextVar["HfiWorkspaceData"] = ContextVar("hfi_workspace_data")
 table_id: ContextVar[str] = ContextVar("table_id")
 hfi_frequency: ContextVar[float] = ContextVar("hfi_frequency")
 hfi_frequency_gatherer: ContextVar[float] = ContextVar("hfi_frequency_gatherer")

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/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.dev291'
-__revision__ = '87da698'
+__version__ = '0.0.1.dev292'
+__revision__ = '78dba1d'

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/tinybird/tb/modules/agent/agent.py

@@ -34,10 +34,12 @@ from tinybird.tb.modules.agent.mock_agent import MockAgent
 from tinybird.tb.modules.agent.models import create_model
 from tinybird.tb.modules.agent.prompts import (
     agent_system_prompt,
+    fixtures_prompt,
     load_custom_project_rules,
     resources_prompt,
     secrets_prompt,
     service_datasources_prompt,
+    vendor_files_prompt,
 )
 from tinybird.tb.modules.agent.testing_agent import TestingAgent
 from tinybird.tb.modules.agent.tools.analyze import analyze_file, analyze_url
@@ -322,6 +324,14 @@ class TinybirdAgent:
         def get_project_files(ctx: RunContext[TinybirdAgentContext]) -> str:
             return resources_prompt(self.project)
 
+        @self.agent.instructions
+        def get_vendor_files(ctx: RunContext[TinybirdAgentContext]) -> str:
+            return vendor_files_prompt(self.project)
+
+        @self.agent.instructions
+        def get_fixture_files(ctx: RunContext[TinybirdAgentContext]) -> str:
+            return fixtures_prompt(self.project)
+
         @self.agent.instructions
         def get_service_datasources(ctx: RunContext[TinybirdAgentContext]) -> str:
             return service_datasources_prompt()

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/tinybird/tb/modules/agent/explore_agent.py

@@ -12,6 +12,7 @@ from tinybird.tb.modules.agent.prompts import (
     resources_prompt,
     service_datasources_prompt,
     tone_and_style_instructions,
+    vendor_files_prompt,
 )
 from tinybird.tb.modules.agent.tools.diff_resource import diff_resource
 from tinybird.tb.modules.agent.tools.execute_query import execute_query
@@ -76,6 +77,10 @@ Once you finish the task, return a valid response for the task to complete.
         def get_project_files(ctx: RunContext[TinybirdAgentContext]) -> str:
             return resources_prompt(self.project)
 
+        @self.agent.instructions
+        def get_vendor_files(ctx: RunContext[TinybirdAgentContext]) -> str:
+            return vendor_files_prompt(self.project)
+
         @self.agent.instructions
         def get_service_datasources(ctx: RunContext[TinybirdAgentContext]) -> str:
             return service_datasources_prompt()

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/tinybird/tb/modules/agent/mock_agent.py

@@ -6,7 +6,7 @@ from pydantic_ai.usage import Usage
 
 from tinybird.tb.modules.agent.animations import ThinkingAnimation
 from tinybird.tb.modules.agent.models import create_model
-from tinybird.tb.modules.agent.prompts import resources_prompt
+from tinybird.tb.modules.agent.prompts import fixtures_prompt, resources_prompt
 from tinybird.tb.modules.agent.tools.mock import generate_mock_fixture
 from tinybird.tb.modules.agent.utils import TinybirdAgentContext
 from tinybird.tb.modules.project import Project
@@ -194,6 +194,10 @@ Today is {datetime.now().strftime("%Y-%m-%d")}
         def get_project_files(ctx: RunContext[TinybirdAgentContext]) -> str:
             return resources_prompt(self.project)
 
+        @self.agent.instructions
+        def get_fixture_files(ctx: RunContext[TinybirdAgentContext]) -> str:
+            return fixtures_prompt(self.project)
+
     def run(self, task: str, deps: TinybirdAgentContext, usage: Usage):
         result = self.agent.run_sync(
             task,

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/tinybird/tb/modules/agent/prompts.py

@@ -35,8 +35,10 @@ available_commands = [
     "`tb sink ls`: List all sinks",
     "`tb workspace current`: Show the current workspace",
     "`tb workspace clear --yes`: Delete all resources in the workspace (Only available in Tinybird Local)",
+    "`tb workspace ls`: List all workspaces",
     "`tb local start --skip-new-version`: Start Tinybird Local container in non-interactive mode",
     "`tb local restart --skip-new-version --yes`: Restart Tinybird Local container in non-interactive mode",
+    "`tb pull --only-vendored`: Pull only the vendored datasources from other workspaces",
 ]
 
 plan_instructions = """
@@ -166,7 +168,6 @@ SQL >
 
 def resources_prompt(project: Project) -> str:
     files = project.get_project_files()
-    fixture_files = project.get_fixture_files()
 
     resources_content = "# Existing resources in the project:\n"
     if files:
@@ -184,7 +185,36 @@ def resources_prompt(project: Project) -> str:
     else:
         resources_content += "No resources found"
 
+    return resources_content
+
+
+def vendor_files_prompt(project: Project) -> str:
+    files = project.get_vendored_files()
+    content = "# Datasources shared from other workspaces:\n"
+    if files:
+        resources: list[dict[str, Any]] = []
+        for filename in files:
+            file_path = Path(filename)
+            workspace_name = file_path.parent.parent.name
+            resource = {
+                "path": str(file_path.relative_to(project.folder)),
+                "type": get_resource_type(file_path),
+                "name": f"{workspace_name}.{file_path.stem}",
+                "content": file_path.read_text(),
+                "origin_workspace": workspace_name,
+            }
+            resources.append(resource)
+        content += format_as_xml(resources, root_tag="resources", item_tag="resource")
+    else:
+        content += "No datasources shared from other workspaces"
+
+    return content
+
+
+def fixtures_prompt(project: Project) -> str:
+    fixture_files = project.get_fixture_files()
     fixture_content = "# Fixture files in the project:\n"
+
     if fixture_files:
         fixtures: list[dict[str, Any]] = []
         for filename in fixture_files:
@@ -199,7 +229,7 @@ def resources_prompt(project: Project) -> str:
     else:
         fixture_content += "No fixture files found"
 
-    return resources_content + "\n" + fixture_content
+    return fixture_content
 
 
 def service_datasources_prompt() -> str:
@@ -954,6 +984,23 @@ After changes have been deployed and promoted, if you want to deploy other chang
 If after running a deployment, the error contains a recommended forward query, use it to update the .datasource file.
 </dev_notes>
 
+## Sharing datasources with other workspaces
+To share a Data Source, in the .datasource file you want to share, add the destination workspace(s). For example:
+
+```
+SHARED_WITH >
+    destination_workspace,
+    other_destination_workspace
+```
+
+## Working with shared datasources:
+
+The following limitations apply to shared datasources:
+- Shared datasources are read-only.
+- You can't share a shared datasource, only the original.
+- You can't check the quarantine of a shared datasource.
+- You can't create a Materialized View from a shared datasource.
+
 # Working with any type of pipe file:
 {pipe_instructions}
 {pipe_example}

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/tinybird/tb/modules/agent/tools/run_command.py

@@ -3,6 +3,7 @@ import subprocess
 import click
 from pydantic_ai import RunContext
 
+from tinybird.tb.modules.agent.prompts import available_commands
 from tinybird.tb.modules.agent.utils import (
     AgentRunCancelled,
     SubAgentRunCancelled,
@@ -20,6 +21,14 @@ def run_command(ctx: RunContext[TinybirdAgentContext], command: str):
         command (str): The command to run. Required. Examples: `tb --local sql "select 1"`, `tb --cloud datasource ls`, `tb --help`
     """
     try:
+        clean_commands = [cmd.split(":")[0].replace("`", "").split("[")[0] for cmd in available_commands]
+        available_commands_to_cloud = [f"tb --cloud {command.replace('tb ', '')}" for command in clean_commands]
+        available_commands_to_local = [f"tb --local {command.replace('tb ', '')}" for command in clean_commands]
+        all_commands = clean_commands + available_commands_to_cloud + available_commands_to_local
+
+        if not any(cmd.startswith(command) for cmd in all_commands):
+            raise SubAgentRunCancelled(f"Command {command} not found in the list of available commands")
+
         ctx.deps.thinking_animation.stop()
         force_confirmation = " deploy" in command.lower() or " truncate" in command.lower()
         confirmation = show_confirmation(

{tinybird-0.0.1.dev291 → tinybird-0.0.1.dev292}/tinybird.egg-info/PKG-INFO

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