tinybird 4.3.2.dev0__tar.gz → 4.3.3.dev0__tar.gz

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.3.2.dev0
+Version: 4.3.3.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.3.2
+*******
+
+- `Changed` CLI API requests now set the `from` parameter dynamically from the detected project type (`python-sdk`, `ts-sdk`, or `cli`) instead of using a hardcoded source.
+
 4.3.1
 *******
 

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/syncasync.py

@@ -681,29 +681,3 @@ def sync_to_async(
         thread_sensitive=thread_sensitive,
         executor=executor,
     )
-
-
-def run_function_in_event_loop(func_def: Callable[..., Any], *args: Any, **kwargs: Any) -> Any:
-    """Run an async function, handling the case where an event loop may already be running."""
-    try:
-        asyncio.get_running_loop()
-        # If we're already in an event loop, we need to run the coroutine in a thread
-        # to avoid blocking the current event loop
-        import concurrent.futures
-
-        def run_in_new_loop() -> Any:
-            # Create a new event loop for this thread
-            new_loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(new_loop)
-            try:
-                return new_loop.run_until_complete(func_def(*args, **kwargs))
-            finally:
-                new_loop.close()
-
-        # Run in a separate thread to avoid blocking the current event loop
-        with concurrent.futures.ThreadPoolExecutor() as executor:
-            future = executor.submit(run_in_new_loop)
-            return future.result()
-    except RuntimeError:
-        # No event loop running, use asyncio.run()
-        return asyncio.run(func_def(*args, **kwargs))

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/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__ = '4.3.2.dev0'
-__revision__ = '7f221c6'
+__version__ = '4.3.3.dev0'
+__revision__ = '894a8b6'

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/client.py

@@ -5,7 +5,7 @@ import ssl
 import time
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Mapping, Optional, Set, Tuple, Union
-from urllib.parse import quote, urlencode
+from urllib.parse import parse_qsl, quote, urlencode, urlsplit
 
 import requests
 import requests.adapters
@@ -89,6 +89,7 @@ class TinyB:
         semver: Optional[str] = None,
         env: Optional[str] = "production",
         staging: bool = False,
+        request_from: Optional[str] = None,
     ):
         ctx = ssl.create_default_context()
         ctx.check_hostname = False
@@ -102,6 +103,12 @@ class TinyB:
         self.semver = semver
         self.env = env
         self.staging = staging
+        self.request_from = request_from
+
+    @staticmethod
+    def _has_query_param(url: str, param_name: str) -> bool:
+        query_params = parse_qsl(urlsplit(url).query, keep_blank_values=True)
+        return any(key == param_name for key, _ in query_params)
 
     def _req_raw(
         self,
@@ -124,6 +131,8 @@ class TinyB:
             url += ("&" if "?" in url else "?") + "__tb__semver=" + self.semver
         if self.staging:
             url += ("&" if "?" in url else "?") + "__tb__deployment=staging"
+        if self.request_from and not self._has_query_param(url, "from"):
+            url += ("&" if "?" in url else "?") + "from=" + quote(self.request_from, safe="")
 
         verify_ssl = not self.disable_ssl_checks
         try:

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/modules/build_common.py

@@ -209,6 +209,7 @@ def build_project(
     TINYBIRD_API_URL = urljoin(tb_client.host, build_url)
     logging.debug(TINYBIRD_API_URL)
     TINYBIRD_API_KEY = tb_client.token
+    request_from = getattr(tb_client, "request_from", None)
     error: Optional[str] = None
 
     try:
@@ -235,8 +236,8 @@ def build_project(
 
                 files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, content, content_type)))
         HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
-
-        r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS)
+        params = {"from": request_from} if request_from else None
+        r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS, params=params)
         try:
             result = r.json()
         except Exception as e:

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/modules/cli.py

@@ -64,8 +64,8 @@ DEV_MODE_ROUTED_COMMANDS = {"build", "deploy"}
 SDK_PROJECT_ROUTED_COMMANDS = {"build", "deploy", "preview"}
 TS_PROJECT_ROUTED_COMMANDS = SDK_PROJECT_ROUTED_COMMANDS
 COMMANDS_ALWAYS_CLOUD = {"infra", "branch", "environment", "workspace", "preview"}
-PROJECT_TYPE_TYPESCRIPT = "typescript"
-PROJECT_TYPE_PYTHON = "python"
+PROJECT_TYPE_TYPESCRIPT = "ts-sdk"
+PROJECT_TYPE_PYTHON = "python-sdk"
 PROJECT_TYPE_CLI = "cli"
 PROJECT_TYPES = {PROJECT_TYPE_TYPESCRIPT, PROJECT_TYPE_PYTHON, PROJECT_TYPE_CLI}
 CLI_PROJECT_MARKERS = (
@@ -613,7 +613,9 @@ def cli(
         user_token = os.environ.get("TB_USER_TOKEN", "")
 
     config = get_config(host, token, user_token=user_token, config_file=config_temp._path)
-    client = _get_tb_client(config.get("token", ""), config["host"])
+    project_type = get_project_type_from_tinybird_config(os.getcwd()) or PROJECT_TYPE_CLI
+    ctx.ensure_object(dict)["project_type"] = project_type
+    client = _get_tb_client(config.get("token", ""), config["host"], request_from=project_type)
 
     tinybird_dev_mode = get_dev_mode_from_tinybird_config(os.getcwd())
     if tinybird_dev_mode:
@@ -632,8 +634,6 @@ def cli(
 
     project = Project(folder=folder, workspace_name=config.get("name", ""), max_depth=max_depth)
 
-    project_type = get_project_type_from_tinybird_config(os.getcwd())
-
     sdk_virtual_project: Optional[Union[PythonVirtualProject, TypescriptVirtualProject]] = None
     if ctx.invoked_subcommand in SDK_PROJECT_ROUTED_COMMANDS:
         try:
@@ -724,6 +724,7 @@ def cli(
         effective_cloud,
         staging,
         project=project,
+        project_type=project_type,
         show_warnings=version_warning,
         branch=effective_branch,
         create_branch_if_missing=(
@@ -1013,6 +1014,7 @@ def create_ctx_client(
     cloud: bool,
     staging: bool,
     project: Project,
+    project_type: str = PROJECT_TYPE_CLI,
     show_warnings: bool = True,
     branch: Optional[str] = None,
     create_branch_if_missing: bool = False,
@@ -1066,6 +1068,7 @@ def create_ctx_client(
             staging=staging,
             branch=branch,
             create_branch_if_missing=create_branch_if_missing,
+            request_from=project_type,
         )
     test = command in command_always_test
     if show_warnings and command:

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/modules/common.py

@@ -360,7 +360,9 @@ def _get_tb_client(
     staging: bool = False,
     branch: Optional[str] = None,
     create_branch_if_missing: bool = False,
+    request_from: Optional[str] = None,
 ) -> TinyB:
+    resolved_request_from = request_from
     disable_ssl: bool = getenv_bool("TB_DISABLE_SSL_CHECKS", False)
     cloud_client = TinyB(
         token,
@@ -369,6 +371,7 @@ def _get_tb_client(
         disable_ssl_checks=disable_ssl,
         send_telemetry=True,
         staging=staging,
+        request_from=resolved_request_from,
     )
 
     if not branch:
@@ -402,13 +405,16 @@ def _get_tb_client(
         disable_ssl_checks=disable_ssl,
         send_telemetry=True,
         staging=staging,
+        request_from=resolved_request_from,
     )
 
 
 def create_tb_client(ctx: Context) -> TinyB:
-    token = ctx.ensure_object(dict)["config"].get("token", "")
-    host = ctx.ensure_object(dict)["config"].get("host", DEFAULT_API_HOST)
-    return _get_tb_client(token, host)
+    obj = ctx.ensure_object(dict)
+    token = obj["config"].get("token", "")
+    host = obj["config"].get("host", DEFAULT_API_HOST)
+    request_from = obj.get("project_type")
+    return _get_tb_client(token, host, request_from=request_from)
 
 
 def _analyze(filename: str, client: TinyB, format: str):
@@ -1668,6 +1674,7 @@ def run_aws_iamrole_connection_flow(
                 token=config.get("token", ""),
                 host=config.get("host", ""),
                 staging=False,
+                request_from=getattr(client, "request_from", None),
             )
         except Exception as e:
             click.echo(FeedbackManager.warning(message=f"Failed to initialize cloud client: {e}"))

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/modules/connection.py

@@ -222,6 +222,7 @@ def connection_create_gcs(ctx: Context) -> None:
             token=token,
             host=host,
             staging=False,
+            request_from=getattr(client, "request_from", None),
         )
         creds_json = get_gcs_svc_account_creds()
         secret_name = f"gcs_svc_account_creds_{connection_name}_{unique_suffix}"

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/modules/connection_kafka.py

@@ -190,6 +190,7 @@ def connection_create_kafka(
             token=token,
             host=host,
             staging=False,
+            request_from=getattr(obj.get("client"), "request_from", None),
         )
         if tb_secret_bootstrap_servers:
             prod_client.create_secret(name=tb_secret_bootstrap_servers, value=bootstrap_servers)

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/modules/datasource.py

@@ -298,9 +298,14 @@ def datasource_append(
 
     if events:
         click.echo(FeedbackManager.highlight(message=f"\n» Sending events to {datasource_name}"))
+        events_params = {"name": datasource_name}
+        request_from = getattr(client, "request_from", None)
+        if request_from:
+            events_params["from"] = request_from
         response = requests.post(
-            f"{client.host}/v0/events?name={datasource_name}",
+            f"{client.host}/v0/events",
             headers={"Authorization": f"Bearer {client.token}"},
+            params=events_params,
             data=events,
         )
 

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/modules/deployment.py

@@ -131,8 +131,9 @@ def download_github_template(url: str) -> Optional[Path]:
 
 
 # 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)
+def api_fetch(url: str, headers: dict, request_from: Optional[str] = None) -> dict:
+    request_params = {"from": request_from} if request_from and "from=" not in url else None
+    r = requests.get(url, headers=headers, params=request_params)
     if r.status_code == 200:
         logging.debug(json.dumps(r.json(), indent=2))
         return r.json()
@@ -232,7 +233,7 @@ def deployment_ls(ctx: click.Context, include_deleted: bool) -> None:
     if include_deleted:
         url += "?include_deleted=true"
 
-    result = api_fetch(url, HEADERS)
+    result = api_fetch(url, HEADERS, request_from=getattr(client, "request_from", None))
     status_map = {
         "calculating": "Creating - Calculating steps",
         "creating_schema": "Creating - Creating schemas",
@@ -297,7 +298,7 @@ def deployment_promote(ctx: click.Context, wait: bool) -> None:
     TINYBIRD_API_KEY = client.token
     HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
-    promote_deployment(client.host, HEADERS, wait=wait)
+    promote_deployment(client.host, HEADERS, wait=wait, request_from=getattr(client, "request_from", None))
 
 
 @deployment_group.command(name="discard")
@@ -317,7 +318,7 @@ def deployment_discard(ctx: click.Context, wait: bool) -> None:
     TINYBIRD_API_KEY = client.token
     HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
-    discard_deployment(client.host, HEADERS, wait=wait)
+    discard_deployment(client.host, HEADERS, wait=wait, request_from=getattr(client, "request_from", None))
 
 
 @cli.command(name="deploy")

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird/tb/modules/deployment_common.py

@@ -21,11 +21,18 @@ 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, max_retries: int = 3, backoff_factor: float = 0.5) -> dict:
+def api_fetch(
+    url: str,
+    headers: dict,
+    max_retries: int = 3,
+    backoff_factor: float = 0.5,
+    request_from: Optional[str] = None,
+) -> dict:
+    request_params = {"from": request_from} if request_from and "from=" not in url else None
     retries = 0
     while retries <= max_retries:
         try:
-            r = requests.get(url, headers=headers)
+            r = requests.get(url, headers=headers, params=request_params)
             if r.status_code == 200:
                 logging.debug(json.dumps(r.json(), indent=2))
                 return r.json()
@@ -59,8 +66,13 @@ def api_post(
     headers: dict,
     files: Optional[list] = None,
     params: Optional[dict] = None,
+    request_from: Optional[str] = None,
 ) -> dict:
-    r = requests.post(url, headers=headers, files=files, params=params)
+    request_params = dict(params or {})
+    if request_from and "from=" not in url:
+        request_params.setdefault("from", request_from)
+
+    r = requests.post(url, headers=headers, files=files, params=request_params)
     try:
         if r.status_code < 300:
             logging.debug(json.dumps(r.json(), indent=2))
@@ -124,9 +136,15 @@ def _get_deployment_job(client: TinyB, deployment_id: Optional[Union[str, int]])
 
 # 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, ingest_hint: Optional[bool] = True) -> None:
+def promote_deployment(
+    host: Optional[str],
+    headers: dict,
+    wait: bool,
+    ingest_hint: Optional[bool] = True,
+    request_from: Optional[str] = None,
+) -> None:
     TINYBIRD_API_DEPLOYMENTS_BASE_URL = f"{host}/v1/deployments"
-    result = api_fetch(TINYBIRD_API_DEPLOYMENTS_BASE_URL, headers)
+    result = api_fetch(TINYBIRD_API_DEPLOYMENTS_BASE_URL, headers, request_from=request_from)
 
     deployments = result.get("deployments")
     if not deployments:
@@ -156,12 +174,13 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool, ingest_hi
     else:
         tb_api_set_live_url = f"{TINYBIRD_API_DEPLOYMENTS_BASE_URL}/{candidate_deployment.get('id')}/set-live"
         click.echo(FeedbackManager.highlight(message="» Waiting for deployment to be promoted..."))
-        result = api_post(tb_api_set_live_url, headers=headers)
+        result = api_post(tb_api_set_live_url, headers=headers, request_from=request_from)
         click.echo(FeedbackManager.info(message="✓ Deployment promoted"))
 
     last_deployment_id = last_deployment.get("id")
     tb_api_last_deployment_url = f"{TINYBIRD_API_DEPLOYMENTS_BASE_URL}/{last_deployment_id}"
-    r = requests.delete(tb_api_last_deployment_url, headers=headers)
+    request_params = {"from": request_from} if request_from and "from=" not in tb_api_last_deployment_url else None
+    r = requests.delete(tb_api_last_deployment_url, headers=headers, params=request_params)
 
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
@@ -181,7 +200,7 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool, ingest_hi
 
     if wait:
         while True:
-            result = api_fetch(tb_api_last_deployment_url, headers=headers)
+            result = api_fetch(tb_api_last_deployment_url, headers=headers, request_from=request_from)
 
             last_deployment = result.get("deployment")
             if not last_deployment:
@@ -204,9 +223,9 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool, ingest_hi
         )
 
 
-def discard_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
+def discard_deployment(host: Optional[str], headers: dict, wait: bool, request_from: Optional[str] = None) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
-    result = api_fetch(TINYBIRD_API_URL, headers=headers)
+    result = api_fetch(TINYBIRD_API_URL, headers=headers, request_from=request_from)
 
     deployments = result.get("deployments")
     if not deployments:
@@ -233,7 +252,8 @@ def discard_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     click.echo(FeedbackManager.success(message=f"{verb} deployment {deployment_to_discard['id']}"))
 
     TINYBIRD_API_URL = f"{host}/v1/deployments/{deployment_to_discard.get('id')}"
-    r = requests.delete(TINYBIRD_API_URL, headers=headers)
+    request_params = {"from": request_from} if request_from and "from=" not in TINYBIRD_API_URL else None
+    r = requests.delete(TINYBIRD_API_URL, headers=headers, params=request_params)
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
     if result.get("error"):
@@ -246,7 +266,7 @@ def discard_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     if wait:
         while True:
             TINYBIRD_API_URL = f"{host}/v1/deployments/{deployment_to_discard.get('id')}"
-            result = api_fetch(TINYBIRD_API_URL, headers)
+            result = api_fetch(TINYBIRD_API_URL, headers, request_from=request_from)
 
             deployment_to_discard = result.get("deployment")
             if deployment_to_discard and deployment_to_discard.get("status") == "deleted":
@@ -311,8 +331,9 @@ def create_deployment(
     deployment_job: Optional[Dict[str, Any]] = None
     deployment_request_sent = False
     deployment = {}
+    HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
+    request_from = getattr(client, "request_from", None)
     try:
-        HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
         params = {}
         if check:
             click.echo(FeedbackManager.highlight(message="\n» Validating deployment...\n"))
@@ -323,7 +344,9 @@ def create_deployment(
             params["allow_destructive_operations"] = "true"
 
         deployment_request_sent = True
-        result = api_post(TINYBIRD_API_DEPLOY_ENDPOINT_URL, headers=HEADERS, files=files, params=params)
+        result = api_post(
+            TINYBIRD_API_DEPLOY_ENDPOINT_URL, headers=HEADERS, files=files, params=params, request_from=request_from
+        )
 
         print_changes(result, project, output)
 
@@ -440,7 +463,7 @@ def create_deployment(
     try:
         while True:
             url = f"{client.host}/v1/deployments/{deployment.get('id')}"
-            res = api_fetch(url, HEADERS)
+            res = api_fetch(url, HEADERS, request_from=request_from)
             deployment = res.get("deployment", {})
             if not deployment:
                 click.echo(FeedbackManager.error(message="Error parsing deployment from response"))

{tinybird-4.3.2.dev0 → tinybird-4.3.3.dev0}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.3.2.dev0
+Version: 4.3.3.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -52,6 +52,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.3.2
+*******
+
+- `Changed` CLI API requests now set the `from` parameter dynamically from the detected project type (`python-sdk`, `ts-sdk`, or `cli`) instead of using a hardcoded source.
+
 4.3.1
 *******