metaflow 2.15.6__py2.py3-none-any.whl → 2.15.7__py2.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.
- metaflow/plugins/argo/argo_workflows.py +34 -11
- metaflow/plugins/argo/argo_workflows_deployer_objects.py +7 -6
- metaflow/version.py +1 -1
- {metaflow-2.15.6.data → metaflow-2.15.7.data}/data/share/metaflow/devtools/Makefile +2 -2
- {metaflow-2.15.6.dist-info → metaflow-2.15.7.dist-info}/METADATA +4 -3
- {metaflow-2.15.6.dist-info → metaflow-2.15.7.dist-info}/RECORD +12 -12
- {metaflow-2.15.6.dist-info → metaflow-2.15.7.dist-info}/WHEEL +1 -1
- {metaflow-2.15.6.data → metaflow-2.15.7.data}/data/share/metaflow/devtools/Tiltfile +0 -0
- {metaflow-2.15.6.data → metaflow-2.15.7.data}/data/share/metaflow/devtools/pick_services.sh +0 -0
- {metaflow-2.15.6.dist-info → metaflow-2.15.7.dist-info}/entry_points.txt +0 -0
- {metaflow-2.15.6.dist-info → metaflow-2.15.7.dist-info/licenses}/LICENSE +0 -0
- {metaflow-2.15.6.dist-info → metaflow-2.15.7.dist-info}/top_level.txt +0 -0
|
@@ -524,6 +524,7 @@ class ArgoWorkflows(object):
|
|
|
524
524
|
default_value = json.dumps(default_value)
|
|
525
525
|
|
|
526
526
|
parameters[param.name] = dict(
|
|
527
|
+
python_var_name=var,
|
|
527
528
|
name=param.name,
|
|
528
529
|
value=default_value,
|
|
529
530
|
type=param_type,
|
|
@@ -838,7 +839,11 @@ class ArgoWorkflows(object):
|
|
|
838
839
|
Arguments().parameters(
|
|
839
840
|
[
|
|
840
841
|
Parameter(parameter["name"])
|
|
841
|
-
.value(
|
|
842
|
+
.value(
|
|
843
|
+
"'%s'" % parameter["value"]
|
|
844
|
+
if parameter["type"] == "JSON"
|
|
845
|
+
else parameter["value"]
|
|
846
|
+
)
|
|
842
847
|
.description(parameter.get("description"))
|
|
843
848
|
# TODO: Better handle IncludeFile in Argo Workflows UI.
|
|
844
849
|
for parameter in self.parameters.values()
|
|
@@ -1594,11 +1599,7 @@ class ArgoWorkflows(object):
|
|
|
1594
1599
|
# {{foo.bar['param_name']}}.
|
|
1595
1600
|
# https://argoproj.github.io/argo-events/tutorials/02-parameterization/
|
|
1596
1601
|
# http://masterminds.github.io/sprig/strings.html
|
|
1597
|
-
|
|
1598
|
-
"--%s='{{workflow.parameters.%s}}'"
|
|
1599
|
-
if parameter["type"] == "JSON"
|
|
1600
|
-
else "--%s={{workflow.parameters.%s}}"
|
|
1601
|
-
)
|
|
1602
|
+
"--%s={{workflow.parameters.%s}}"
|
|
1602
1603
|
% (parameter["name"], parameter["name"])
|
|
1603
1604
|
for parameter in self.parameters.values()
|
|
1604
1605
|
]
|
|
@@ -3156,15 +3157,37 @@ class ArgoWorkflows(object):
|
|
|
3156
3157
|
# NOTE: We need the conditional logic in order to successfully fall back to the default value
|
|
3157
3158
|
# when the event payload does not contain a key for a parameter.
|
|
3158
3159
|
# NOTE: Keys might contain dashes, so use the safer 'get' for fetching the value
|
|
3159
|
-
data_template='{{ if (hasKey $.Input.body.payload "%s") }}{{- (get $.Input.body.payload "%s"
|
|
3160
|
-
% (
|
|
3160
|
+
data_template='{{ if (hasKey $.Input.body.payload "%s") }}{{- (get $.Input.body.payload "%s" %s) -}}{{- else -}}{{ (fail "use-default-instead") }}{{- end -}}'
|
|
3161
|
+
% (
|
|
3162
|
+
v,
|
|
3163
|
+
v,
|
|
3164
|
+
(
|
|
3165
|
+
"| toRawJson | squote"
|
|
3166
|
+
if self.parameters[
|
|
3167
|
+
parameter_name
|
|
3168
|
+
]["type"]
|
|
3169
|
+
== "JSON"
|
|
3170
|
+
else "| toRawJson"
|
|
3171
|
+
),
|
|
3172
|
+
),
|
|
3161
3173
|
# Unfortunately the sensor needs to
|
|
3162
3174
|
# record the default values for
|
|
3163
3175
|
# the parameters - there doesn't seem
|
|
3164
3176
|
# to be any way for us to skip
|
|
3165
|
-
value=
|
|
3166
|
-
|
|
3167
|
-
|
|
3177
|
+
value=(
|
|
3178
|
+
json.dumps(
|
|
3179
|
+
self.parameters[parameter_name][
|
|
3180
|
+
"value"
|
|
3181
|
+
]
|
|
3182
|
+
)
|
|
3183
|
+
if self.parameters[parameter_name][
|
|
3184
|
+
"type"
|
|
3185
|
+
]
|
|
3186
|
+
== "JSON"
|
|
3187
|
+
else self.parameters[
|
|
3188
|
+
parameter_name
|
|
3189
|
+
]["value"]
|
|
3190
|
+
),
|
|
3168
3191
|
)
|
|
3169
3192
|
.dest(
|
|
3170
3193
|
# this undocumented (mis?)feature in
|
|
@@ -19,6 +19,7 @@ def generate_fake_flow_file_contents(
|
|
|
19
19
|
):
|
|
20
20
|
params_code = ""
|
|
21
21
|
for _, param_details in param_info.items():
|
|
22
|
+
param_python_var_name = param_details["python_var_name"]
|
|
22
23
|
param_name = param_details["name"]
|
|
23
24
|
param_type = param_details["type"]
|
|
24
25
|
param_help = param_details["description"]
|
|
@@ -26,21 +27,21 @@ def generate_fake_flow_file_contents(
|
|
|
26
27
|
|
|
27
28
|
if param_type == "JSON":
|
|
28
29
|
params_code += (
|
|
29
|
-
f" {
|
|
30
|
-
f"type=JSONType, help='{param_help}', required={param_required})\n"
|
|
30
|
+
f" {param_python_var_name} = Parameter('{param_name}', "
|
|
31
|
+
f"type=JSONType, help='''{param_help}''', required={param_required})\n"
|
|
31
32
|
)
|
|
32
33
|
elif param_type == "FilePath":
|
|
33
34
|
is_text = param_details.get("is_text", True)
|
|
34
35
|
encoding = param_details.get("encoding", "utf-8")
|
|
35
36
|
params_code += (
|
|
36
|
-
f" {
|
|
37
|
-
f"is_text={is_text}, encoding='{encoding}', help='{param_help}', "
|
|
37
|
+
f" {param_python_var_name} = IncludeFile('{param_name}', "
|
|
38
|
+
f"is_text={is_text}, encoding='{encoding}', help='''{param_help}''', "
|
|
38
39
|
f"required={param_required})\n"
|
|
39
40
|
)
|
|
40
41
|
else:
|
|
41
42
|
params_code += (
|
|
42
|
-
f" {
|
|
43
|
-
f"type={param_type}, help='{param_help}', required={param_required})\n"
|
|
43
|
+
f" {param_python_var_name} = Parameter('{param_name}', "
|
|
44
|
+
f"type={param_type}, help='''{param_help}''', required={param_required})\n"
|
|
44
45
|
)
|
|
45
46
|
|
|
46
47
|
project_decorator = f"@project(name='{project_name}')\n" if project_name else ""
|
metaflow/version.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
metaflow_version = "2.15.
|
|
1
|
+
metaflow_version = "2.15.7"
|
|
@@ -75,7 +75,7 @@ check-docker:
|
|
|
75
75
|
@if [ "$(shell uname)" = "Darwin" ]; then \
|
|
76
76
|
open -a Docker || (echo "❌ Please start Docker Desktop" && exit 1); \
|
|
77
77
|
else \
|
|
78
|
-
|
|
78
|
+
docker info >/dev/null 2>&1 || (echo "❌ Docker daemon is not running." && exit 1); \
|
|
79
79
|
fi
|
|
80
80
|
@echo "✅ Docker is running"
|
|
81
81
|
|
|
@@ -339,4 +339,4 @@ ui: setup-tilt
|
|
|
339
339
|
|
|
340
340
|
.PHONY: install-helm setup-minikube setup-tilt teardown-minikube tunnel up down check-docker install-curl install-gum install-brew up down dashboard shell ui all-up help
|
|
341
341
|
|
|
342
|
-
.DEFAULT_GOAL := help
|
|
342
|
+
.DEFAULT_GOAL := help
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: metaflow
|
|
3
|
-
Version: 2.15.
|
|
3
|
+
Version: 2.15.7
|
|
4
4
|
Summary: Metaflow: More AI and ML, Less Engineering
|
|
5
5
|
Author: Metaflow Developers
|
|
6
6
|
Author-email: help@metaflow.org
|
|
@@ -26,13 +26,14 @@ License-File: LICENSE
|
|
|
26
26
|
Requires-Dist: requests
|
|
27
27
|
Requires-Dist: boto3
|
|
28
28
|
Provides-Extra: stubs
|
|
29
|
-
Requires-Dist: metaflow-stubs==2.15.
|
|
29
|
+
Requires-Dist: metaflow-stubs==2.15.7; extra == "stubs"
|
|
30
30
|
Dynamic: author
|
|
31
31
|
Dynamic: author-email
|
|
32
32
|
Dynamic: classifier
|
|
33
33
|
Dynamic: description
|
|
34
34
|
Dynamic: description-content-type
|
|
35
35
|
Dynamic: license
|
|
36
|
+
Dynamic: license-file
|
|
36
37
|
Dynamic: project-url
|
|
37
38
|
Dynamic: provides-extra
|
|
38
39
|
Dynamic: requires-dist
|
|
@@ -36,7 +36,7 @@ metaflow/tuple_util.py,sha256=_G5YIEhuugwJ_f6rrZoelMFak3DqAR2tt_5CapS1XTY,830
|
|
|
36
36
|
metaflow/unbounded_foreach.py,sha256=p184WMbrMJ3xKYHwewj27ZhRUsSj_kw1jlye5gA9xJk,387
|
|
37
37
|
metaflow/util.py,sha256=mJBkV5tShIyCsLDeM1zygQGeciQVMrVPm_qI8Oi33G0,14656
|
|
38
38
|
metaflow/vendor.py,sha256=LZgXrh7ZSDmD32D1T5jj3OKKpXIqqxKzdMAOc5V0SD4,5162
|
|
39
|
-
metaflow/version.py,sha256=
|
|
39
|
+
metaflow/version.py,sha256=mmpM7KoxX80ooct0ho2OKpy5xnA-HgJXYdJElu0ET2M,28
|
|
40
40
|
metaflow/_vendor/__init__.py,sha256=y_CiwUD3l4eAKvTVDZeqgVujMy31cAM1qjAB-HfI-9s,353
|
|
41
41
|
metaflow/_vendor/typing_extensions.py,sha256=q9zxWa6p6CzF1zZvSkygSlklduHf_b3K7MCxGz7MJRc,134519
|
|
42
42
|
metaflow/_vendor/zipp.py,sha256=ajztOH-9I7KA_4wqDYygtHa6xUBVZgFpmZ8FE74HHHI,8425
|
|
@@ -209,11 +209,11 @@ metaflow/plugins/airflow/sensors/s3_sensor.py,sha256=iDReG-7FKnumrtQg-HY6cCUAAqN
|
|
|
209
209
|
metaflow/plugins/argo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
210
210
|
metaflow/plugins/argo/argo_client.py,sha256=A1kI9rjVjCadDsBscZ2Wk8xRBI6GNgWV6SU7TyrdfrI,16530
|
|
211
211
|
metaflow/plugins/argo/argo_events.py,sha256=_C1KWztVqgi3zuH57pInaE9OzABc2NnncC-zdwOMZ-w,5909
|
|
212
|
-
metaflow/plugins/argo/argo_workflows.py,sha256=
|
|
212
|
+
metaflow/plugins/argo/argo_workflows.py,sha256=JEgXzfL_4MMTZsxtO6ydMgza_DI-LirDaprS_LTASOY,185013
|
|
213
213
|
metaflow/plugins/argo/argo_workflows_cli.py,sha256=27eLtcp5N5plapP-uIJqR41B0zDfXOV39AGM0nchymo,37952
|
|
214
214
|
metaflow/plugins/argo/argo_workflows_decorator.py,sha256=ogCSBmwsC2C3eusydrgjuAJd4qK18f1sI4jJwA4Fd-o,7800
|
|
215
215
|
metaflow/plugins/argo/argo_workflows_deployer.py,sha256=6kHxEnYXJwzNCM9swI8-0AckxtPWqwhZLerYkX8fxUM,4444
|
|
216
|
-
metaflow/plugins/argo/argo_workflows_deployer_objects.py,sha256=
|
|
216
|
+
metaflow/plugins/argo/argo_workflows_deployer_objects.py,sha256=lRRHUcpiyJZFltthxZoIp7aJWwy7pcdhaRm0etKN9es,14182
|
|
217
217
|
metaflow/plugins/argo/capture_error.py,sha256=Ys9dscGrTpW-ZCirLBU0gD9qBM0BjxyxGlUMKcwewQc,1852
|
|
218
218
|
metaflow/plugins/argo/generate_input_paths.py,sha256=loYsI6RFX9LlFsHb7Fe-mzlTTtRdySoOu7sYDy-uXK0,881
|
|
219
219
|
metaflow/plugins/argo/jobset_input_paths.py,sha256=-h0E_e0w6FMiBUod9Rf_XOSCtZv_C0exacw4q1SfIfg,501
|
|
@@ -389,12 +389,12 @@ metaflow/user_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
|
|
|
389
389
|
metaflow/user_configs/config_decorators.py,sha256=qCKVAvd0NKgaCxQ2OThes5-DYHXq6A1HqURubYNeFdw,20481
|
|
390
390
|
metaflow/user_configs/config_options.py,sha256=m6jccSpzI4qUJ7vyYkYBIf8G3V0Caunxg_k7zg4Zlqg,21067
|
|
391
391
|
metaflow/user_configs/config_parameters.py,sha256=oeJGVKu1ao_YQX6Lg6P2FEv5k5-_F4sARLlVpTW9ezM,15502
|
|
392
|
-
metaflow-2.15.
|
|
393
|
-
metaflow-2.15.
|
|
394
|
-
metaflow-2.15.
|
|
395
|
-
metaflow-2.15.
|
|
396
|
-
metaflow-2.15.
|
|
397
|
-
metaflow-2.15.
|
|
398
|
-
metaflow-2.15.
|
|
399
|
-
metaflow-2.15.
|
|
400
|
-
metaflow-2.15.
|
|
392
|
+
metaflow-2.15.7.data/data/share/metaflow/devtools/Makefile,sha256=kZJDrvY2qRfqkue3mBecZutaGs35zsZR_vNu8WOBcto,13632
|
|
393
|
+
metaflow-2.15.7.data/data/share/metaflow/devtools/Tiltfile,sha256=P5_rn_F3xYLN1_cEAQ9mNeS22HG2rb8beKIz2RIK6fU,20634
|
|
394
|
+
metaflow-2.15.7.data/data/share/metaflow/devtools/pick_services.sh,sha256=DCnrMXwtApfx3B4S-YiZESMyAFHbXa3VuNL0MxPLyiE,2196
|
|
395
|
+
metaflow-2.15.7.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
|
|
396
|
+
metaflow-2.15.7.dist-info/METADATA,sha256=4s0oOBFv9UjhBzCjGFY3m1XOmzEi_14ELD7rYRHN8_4,6740
|
|
397
|
+
metaflow-2.15.7.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
|
|
398
|
+
metaflow-2.15.7.dist-info/entry_points.txt,sha256=RvEq8VFlgGe_FfqGOZi0D7ze1hLD0pAtXeNyGfzc_Yc,103
|
|
399
|
+
metaflow-2.15.7.dist-info/top_level.txt,sha256=v1pDHoWaSaKeuc5fKTRSfsXCKSdW1zvNVmvA-i0if3o,9
|
|
400
|
+
metaflow-2.15.7.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|