tinybird 0.0.1.dev74__py3-none-any.whl → 0.0.1.dev75__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of tinybird might be problematic. Click here for more details.

tinybird/tb/__cli__.py CHANGED
@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
4
4
  __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
5
5
  __author__ = 'Tinybird'
6
6
  __author_email__ = 'support@tinybird.co'
7
- __version__ = '0.0.1.dev74'
8
- __revision__ = '68ada75'
7
+ __version__ = '0.0.1.dev75'
8
+ __revision__ = '0985575'
@@ -1,5 +1,4 @@
1
1
  import json
2
- import logging
3
2
  from copy import deepcopy
4
3
  from typing import Any, Dict, List, Optional, Set
5
4
  from urllib.parse import urlencode
@@ -9,7 +8,7 @@ import requests
9
8
  from croniter import croniter
10
9
 
11
10
  from tinybird.client import DoesNotExistException, TinyB
12
- from tinybird.tb.modules.common import requests_delete, requests_get, wait_job
11
+ from tinybird.tb.modules.common import requests_delete, requests_get
13
12
  from tinybird.tb.modules.config import CLIConfig
14
13
  from tinybird.tb.modules.datafile.common import ON_DEMAND, CopyModes, CopyParameters, PipeNodeTypes, PipeTypes
15
14
  from tinybird.tb.modules.exceptions import CLIPipeException
@@ -66,50 +65,10 @@ async def new_pipe(
66
65
  current_pipe = next((play for play in playgrounds if play["name"] == p["name"] + "__tb__playground"), None)
67
66
  pipe_exists = current_pipe is not None
68
67
 
69
- is_materialized = any([node.get("params", {}).get("type", None) == "materialized" for node in p["nodes"]])
70
- copy_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "copy"), None)
71
- sink_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "sink"), None)
72
- stream_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "stream"), None)
73
-
74
68
  for node in p["nodes"]:
75
69
  if node["params"]["name"] == p["name"]:
76
70
  raise click.ClickException(FeedbackManager.error_pipe_node_same_name(name=p["name"]))
77
71
 
78
- if pipe_exists:
79
- if force or run_tests:
80
- # TODO: this should create a different node and rename it to the final one on success
81
- if check and not populate:
82
- if not is_materialized and not copy_node and not sink_node and not stream_node:
83
- pass
84
- else:
85
- if is_materialized:
86
- await check_materialized(
87
- p,
88
- host,
89
- token,
90
- tb_client,
91
- override_datasource=override_datasource,
92
- current_pipe=current_pipe,
93
- )
94
- if copy_node:
95
- await check_copy_pipe(pipe=current_pipe, copy_node=copy_node, tb_client=tb_client)
96
- if sink_node:
97
- await check_sink_pipe(pipe=current_pipe, sink_node=sink_node, tb_client=tb_client)
98
- if stream_node:
99
- await check_stream_pipe(pipe=current_pipe, stream_node=stream_node, tb_client=tb_client)
100
- if run_tests:
101
- logging.info(f"skipping force override of {p['name']}")
102
- return
103
- else:
104
- raise click.ClickException(FeedbackManager.error_pipe_already_exists(pipe=p["name"]))
105
- elif not pipe_exists and check:
106
- if is_materialized:
107
- await check_materialized(
108
- p, host, token, tb_client, override_datasource=override_datasource, current_pipe=current_pipe
109
- )
110
- if copy_node:
111
- await check_copy_pipe(pipe=current_pipe, copy_node=copy_node, tb_client=tb_client)
112
-
113
72
  params = {}
114
73
  params.update(cli_params)
115
74
  if force:
@@ -136,17 +95,6 @@ async def new_pipe(
136
95
  if p["nodes"]:
137
96
  body["nodes"] = [parse_node(n) for n in p["nodes"]]
138
97
 
139
- if copy_node:
140
- body["target_datasource"] = copy_node.get("target_datasource", None)
141
- # We will update the schedule cron later
142
- body["schedule_cron"] = None
143
-
144
- if sink_node:
145
- body.update(sink_node.get("export_params", {}))
146
-
147
- if stream_node:
148
- body.update(stream_node.get("export_params", {}))
149
-
150
98
  post_headers = {"Content-Type": "application/json"}
151
99
 
152
100
  post_headers.update(headers)
@@ -176,71 +124,6 @@ async def new_pipe(
176
124
  except Exception as e:
177
125
  raise click.ClickException(FeedbackManager.error_pushing_pipe(pipe=p["name"], error=str(e)))
178
126
 
179
- datasource = data.get("datasource", None)
180
-
181
- if datasource and populate and not copy_node:
182
- job_url = data.get("job", {}).get("job_url", None)
183
- job_id = data.get("job", {}).get("job_id", None)
184
- if populate_subset:
185
- click.echo(FeedbackManager.info_populate_subset_job_url(url=job_url, subset=populate_subset))
186
- elif populate_condition:
187
- click.echo(
188
- FeedbackManager.info_populate_condition_job_url(url=job_url, populate_condition=populate_condition)
189
- )
190
- else:
191
- click.echo(FeedbackManager.info_populate_job_url(url=job_url))
192
-
193
- if wait_populate:
194
- result = await wait_job(tb_client, job_id, job_url, "Populating")
195
- click.echo(FeedbackManager.info_populate_job_result(result=result))
196
- else:
197
- if data.get("type") == "default" and not skip_tokens and not as_standard and not copy_node and not sink_node:
198
- # FIXME: set option to add last node as endpoint in the API
199
- endpoint_node = next(
200
- (node for node in data.get("nodes", []) if node.get("type") == "endpoint"), data.get("nodes", [])[-1]
201
- )
202
- try:
203
- data = await tb_client._req(
204
- f"/v0/pipes/{p['name']}/nodes/{endpoint_node.get('id')}/endpoint?{urlencode(cli_params)}",
205
- method="POST",
206
- headers=headers,
207
- )
208
- except Exception as e:
209
- raise Exception(
210
- FeedbackManager.error_creating_endpoint(
211
- node=endpoint_node.get("name"), pipe=p["name"], error=str(e)
212
- )
213
- )
214
-
215
- if copy_node:
216
- pipe_id = data["id"]
217
- node = next((node for node in data["nodes"] if node["node_type"] == "copy"), None)
218
- if node:
219
- copy_params = {"pipe_name_or_id": pipe_id, "node_id": node["id"]}
220
- try:
221
- target_datasource = copy_node.get(CopyParameters.TARGET_DATASOURCE, None)
222
- schedule_cron = copy_node.get(CopyParameters.COPY_SCHEDULE, None)
223
- mode = copy_node.get("mode", CopyModes.APPEND)
224
- schedule_cron = None if schedule_cron == ON_DEMAND else schedule_cron
225
- current_target_datasource_id = data["copy_target_datasource"]
226
- target_datasource_response = await tb_client.get_datasource(target_datasource)
227
- target_datasource_to_send = (
228
- target_datasource
229
- if target_datasource_response.get("id", target_datasource) != current_target_datasource_id
230
- else None
231
- )
232
- copy_params[CopyParameters.TARGET_DATASOURCE] = target_datasource_to_send
233
- current_schedule = data.get("schedule", {})
234
- current_schedule_cron = current_schedule.get("cron", None) if current_schedule else None
235
- schedule_cron_should_be_removed = current_schedule_cron and not schedule_cron
236
- copy_params["schedule_cron"] = "None" if schedule_cron_should_be_removed else schedule_cron
237
- copy_params["mode"] = mode
238
- await tb_client.pipe_update_copy(**copy_params)
239
- except Exception as e:
240
- raise Exception(
241
- FeedbackManager.error_setting_copy_node(node=copy_node.get("name"), pipe=p["name"], error=str(e))
242
- )
243
-
244
127
  if p["tokens"] and not skip_tokens and not as_standard and data.get("type") in ["endpoint", "copy"]:
245
128
  # search for token with specified name and adds it if not found or adds permissions to it
246
129
  t = None
@@ -1151,21 +1151,6 @@ def parse(
1151
1151
 
1152
1152
  return raise_deprecation_error
1153
1153
 
1154
- def not_supported_yet(extra_message: str = "") -> Callable[..., Any]:
1155
- def inner(func: Callable[..., Any]) -> Callable[..., Any]:
1156
- @functools.wraps(func)
1157
- def raise_not_supported_yet_error(*args: Any, **kwargs: Any) -> Any:
1158
- extra_message_bit = f". {extra_message}" if extra_message else ""
1159
- raise DatafileSyntaxError(
1160
- f"{kwargs['cmd']} is not supported yet{extra_message_bit}",
1161
- lineno=kwargs["lineno"],
1162
- pos=1,
1163
- )
1164
-
1165
- return raise_not_supported_yet_error
1166
-
1167
- return inner
1168
-
1169
1154
  def assign(attr):
1170
1155
  @multiline_not_supported
1171
1156
  def _fn(x, **kwargs):
@@ -1270,7 +1255,6 @@ def parse(
1270
1255
 
1271
1256
  return _f
1272
1257
 
1273
- @not_supported_yet(extra_message="You can manage tokens with `tb token` in the meantime.")
1274
1258
  @multiline_not_supported
1275
1259
  def add_token(*args: str, **kwargs: Any) -> None: # token_name, permissions):
1276
1260
  # lineno = kwargs["lineno"]
@@ -1284,7 +1268,6 @@ def parse(
1284
1268
  # APPEND for datasources
1285
1269
  doc.tokens.append({"token_name": _unquote(args[0]), "permissions": args[1]})
1286
1270
 
1287
- @not_supported_yet()
1288
1271
  def include(*args: str, **kwargs: Any) -> None:
1289
1272
  f = _unquote(args[0])
1290
1273
  f = eval_var(f)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: tinybird
3
- Version: 0.0.1.dev74
3
+ Version: 0.0.1.dev75
4
4
  Summary: Tinybird Command Line Tool
5
5
  Home-page: https://www.tinybird.co/docs/cli/introduction.html
6
6
  Author: Tinybird
@@ -15,7 +15,7 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
15
15
  tinybird/tornado_template.py,sha256=KmW_VD7y-NVqrc8YZKwIaxoJB0XpCcB2izdmxmtmApM,41944
16
16
  tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
17
17
  tinybird/ch_utils/engine.py,sha256=AUAww-KjGOZg9h0IBlKA3FeacJYB4rOtqcTGJhFM-g8,40392
18
- tinybird/tb/__cli__.py,sha256=sa2SLi9xyvB-stMjO_bz2sJude-pMt2cBgZYff5bXh8,251
18
+ tinybird/tb/__cli__.py,sha256=LaZ0t3yKRxZPnxqu6aulgUkaZqP4XBsgCCpRHBVb650,251
19
19
  tinybird/tb/cli.py,sha256=KpJ_-V6xVEzcdPRPnHhEdh2EgRPCyhZnfJVqeqMsftI,964
20
20
  tinybird/tb/modules/auth.py,sha256=vBA-KsrjAp77kFunGSM-4o7AFdfO7ac4dnrHKrx0alI,9020
21
21
  tinybird/tb/modules/build.py,sha256=LBLyO5bVzqOegop459-V2QM1s48yMJu2GBSWBSio_u0,10323
@@ -55,8 +55,8 @@ tinybird/tb/modules/workspace_members.py,sha256=Vb5XEaKmkfONyfg2MS5EcpwolMvv7GLw
55
55
  tinybird/tb/modules/datafile/build.py,sha256=seGFSvmgyRrAM1-icsKBkuog3WccfGUYFTPT-xoA5W8,50940
56
56
  tinybird/tb/modules/datafile/build_common.py,sha256=rT7VJ5mnQ68R_8US91DAtkusfvjWuG_NObOzNgtN_ko,4562
57
57
  tinybird/tb/modules/datafile/build_datasource.py,sha256=VjxaKKLZhPYt3XHOyMmfoqEAWAPI5D78T-8FOaN77MY,17355
58
- tinybird/tb/modules/datafile/build_pipe.py,sha256=-22_657DiZodJ7shSu7KvwE_m6bHesNITdUgCMniuBI,22202
59
- tinybird/tb/modules/datafile/common.py,sha256=dEGwdfJf90XQNh2FOLbAy-Y04X3RpfpafT8wzVU13aA,80088
58
+ tinybird/tb/modules/datafile/build_pipe.py,sha256=KSlLAXsli0k3W-LTFMmaWNRCpgchHltJBjN2_ZkX7As,16223
59
+ tinybird/tb/modules/datafile/common.py,sha256=1sKkQnyKOaFARQzORncpL6cRVpV9GDOD4oC36daX-Hk,79343
60
60
  tinybird/tb/modules/datafile/diff.py,sha256=-0J7PsBO64T7LOZSkZ4ZFHHCPvT7cKItnJkbz2PkndU,6754
61
61
  tinybird/tb/modules/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1wnI,556
62
62
  tinybird/tb/modules/datafile/fixture.py,sha256=si-9LB-LdKQSWDtVW82xDrHtFfko5bgBG1cvjqqrcPU,1064
@@ -76,8 +76,8 @@ tinybird/tb_cli_modules/config.py,sha256=6u6B5QCdiQLbJkCkwtnKGs9H3nP-KXXhC75mF7B
76
76
  tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
77
77
  tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
78
78
  tinybird/tb_cli_modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
79
- tinybird-0.0.1.dev74.dist-info/METADATA,sha256=1BtfBdQkgTyFzBZ6W4eL38o3T_02rjevCVjj7I6CCVE,2585
80
- tinybird-0.0.1.dev74.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
81
- tinybird-0.0.1.dev74.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
82
- tinybird-0.0.1.dev74.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
83
- tinybird-0.0.1.dev74.dist-info/RECORD,,
79
+ tinybird-0.0.1.dev75.dist-info/METADATA,sha256=COmCCDyvvYeoOKvdYYmo8KPcoRZWtr6rqYcvZEcLLSY,2585
80
+ tinybird-0.0.1.dev75.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
81
+ tinybird-0.0.1.dev75.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
82
+ tinybird-0.0.1.dev75.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
83
+ tinybird-0.0.1.dev75.dist-info/RECORD,,