tinybird 0.0.1.dev88__tar.gz → 0.0.1.dev89__tar.gz

{tinybird-0.0.1.dev88 → tinybird-0.0.1.dev89}/PKG-INFO

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

{tinybird-0.0.1.dev88 → tinybird-0.0.1.dev89}/tinybird/ch_utils/engine.py

@@ -761,6 +761,16 @@ def engine_local_to_replicated(engine: str, database: str, name: str) -> str:
     return re.sub(r"(.*)MergeTree(\(([^\)]*)\))*(.*)", _replace, engine.strip())
 
 
+def ttl_from_engine(engine: str) -> Optional[str]:
+    ttl_array = engine.split(" TTL ")
+    if len(ttl_array) <= 1:
+        return None
+    settings_array = engine.split(" SETTINGS ")
+    settings = " SETTINGS " + settings_array[1] if len(settings_array) > 1 else None
+    ttl = ttl_array[1][: -(len(settings))] if settings else ttl_array[1]
+    return ttl
+
+
 def ttl_condition_from_engine_full(engine_full: Optional[str]) -> Optional[str]:
     """
     >>> ttl_condition_from_engine_full(None)
@@ -808,13 +818,9 @@ def ttl_condition_from_engine_full(engine_full: Optional[str]) -> Optional[str]:
         return None
 
     try:
-        ttl_array = engine_full.split(" TTL ")
-        if len(ttl_array) <= 1:
+        ttl = ttl_from_engine(engine_full)
+        if not ttl:
             return None
-        settings_array = engine_full.split(" SETTINGS ")
-        settings = " SETTINGS " + settings_array[1] if len(settings_array) > 1 else None
-        ttl = ttl_array[1][: -(len(settings))] if settings else ttl_array[1]
-
         groups = SIMPLE_TTL_DEFINITION.search(ttl)
         if not groups:
             return None

{tinybird-0.0.1.dev88 → tinybird-0.0.1.dev89}/tinybird/config.py

@@ -30,6 +30,7 @@ LEGACY_HOSTS = {
     "https://api.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/us-west-2",
     "https://api.eu-central-1.aws.tinybird.co": "https://app.tinybird.co/aws/eu-central-1",
     "https://api.eu-west-1.aws.tinybird.co": "https://app.tinybird.co/aws/eu-west-1",
+    "https://api.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
     "https://api.ap-east.aws.tinybird.co": "https://app.tinybird.co/aws/ap-east",
     "https://api.wadus1.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus1",
     "https://api.wadus2.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus2",
@@ -48,6 +49,7 @@ LEGACY_HOSTS = {
     "https://ui.us-east.aws.tinybird.co": "https://app.tinybird.co/aws/us-east-1",
     "https://ui.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/us-west-2",
     "https://ui.eu-central-1.aws.tinybird.co": "https://app.tinybird.co/aws/eu-central-1",
+    "https://ui.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
     "https://ui.ap-east.aws.tinybird.co": "https://app.tinybird.co/aws/ap-east",
     "https://ui.split.tinybird.co": "https://app.tinybird.co/aws/split-us-east",
     "https://ui.split.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/split-us-west-2",

{tinybird-0.0.1.dev88 → tinybird-0.0.1.dev89}/tinybird/context.py

@@ -7,7 +7,7 @@ if TYPE_CHECKING:
 
 workspace_id: ContextVar[str] = ContextVar("workspace_id")
 workspace: ContextVar["User"] = ContextVar("workspace")
-datasource_id: ContextVar[str] = ContextVar("datasource_id")
+table_id: ContextVar[str] = ContextVar("table_id")
 hfi_frequency: ContextVar[float] = ContextVar("hfi_frequency")
 hfi_frequency_gatherer: ContextVar[float] = ContextVar("hfi_frequency_gatherer")
 use_gatherer: ContextVar[bool] = ContextVar("use_gatherer")

{tinybird-0.0.1.dev88 → tinybird-0.0.1.dev89}/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.dev88'
-__revision__ = 'fd53f21'
+__version__ = '0.0.1.dev89'
+__revision__ = '6153af6'

{tinybird-0.0.1.dev88 → tinybird-0.0.1.dev89}/tinybird/tb/modules/deployment.py

@@ -191,17 +191,19 @@ def deployment_group() -> None:
     help="Validate the deployment before creating it. Disabled by default.",
 )
 @click.option(
-    "--allow-remove-datasources/--no-allow-remove-datasources",
+    "--allow-destructive-operations/--no-allow-destructive-operations",
     is_flag=True,
     default=False,
     help="Allow removing datasources. Disabled by default.",
 )
 @click.pass_context
-def deployment_create(ctx: click.Context, wait: bool, auto: bool, check: bool, allow_remove_datasources: bool) -> None:
+def deployment_create(
+    ctx: click.Context, wait: bool, auto: bool, check: bool, allow_destructive_operations: bool
+) -> None:
     """
     Validate and deploy the project server side.
     """
-    create_deployment(ctx, wait, auto, check, allow_remove_datasources)
+    create_deployment(ctx, wait, auto, check, allow_destructive_operations)
 
 
 @deployment_group.command(name="ls")
@@ -298,17 +300,17 @@ def deployment_rollback(ctx: click.Context, wait: bool) -> None:
     help="Validate the deployment before creating it. Disabled by default.",
 )
 @click.option(
-    "--allow-remove-datasources/--no-allow-remove-datasources",
+    "--allow-destructive-operations/--no-allow-destructive-operations",
     is_flag=True,
     default=False,
     help="Allow removing datasources. Disabled by default.",
 )
 @click.pass_context
-def deploy(ctx: click.Context, wait: bool, auto: bool, check: bool, allow_remove_datasources: bool) -> None:
+def deploy(ctx: click.Context, wait: bool, auto: bool, check: bool, allow_destructive_operations: bool) -> None:
     """
     Deploy the project.
     """
-    create_deployment(ctx, wait, auto, check, allow_remove_datasources)
+    create_deployment(ctx, wait, auto, check, allow_destructive_operations)
 
 
 def create_deployment(
@@ -316,7 +318,7 @@ def create_deployment(
     wait: bool,
     auto: bool,
     check: Optional[bool] = None,
-    allow_remove_datasources: Optional[bool] = None,
+    allow_destructive_operations: Optional[bool] = None,
 ) -> None:
     # TODO: This code is duplicated in build_server.py
     # Should be refactored to be shared
@@ -350,8 +352,8 @@ def create_deployment(
         if check:
             click.echo(FeedbackManager.highlight(message="\n» Validating deployment...\n"))
             params["check"] = "true"
-        if allow_remove_datasources:
-            params["allow_remove_datasources"] = "true"
+        if allow_destructive_operations:
+            params["allow_destructive_operations"] = "true"
         r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS, params=params)
         result = r.json()
         logging.debug(json.dumps(result, indent=2))

{tinybird-0.0.1.dev88 → tinybird-0.0.1.dev89}/tinybird.egg-info/PKG-INFO

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