yellowdog-cli 9.2.2__tar.gz → 9.2.4__tar.gz

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-cli
-Version: 9.2.2
+Version: 9.2.4
 Summary: Python-based CLI the YellowDog Platform
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -18,12 +18,13 @@ License-File: LICENSE
 Requires-Dist: PyPAC>=0.16.4
 Requires-Dist: dateparser
 Requires-Dist: python-dotenv
+Requires-Dist: jsons
 Requires-Dist: requests
 Requires-Dist: rclone-api
 Requires-Dist: rich>=13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: tomli>=2.4.1
-Requires-Dist: yellowdog-sdk>=15.1.0
+Requires-Dist: yellowdog-sdk>=15.2.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/README.md

@@ -178,7 +178,7 @@
    * [yd-upload](#yd-upload-1)
 
 <!-- Created by https://github.com/ekalinin/github-markdown-toc -->
-<!-- Added by: pwt, at: Wed Apr 22 11:28:15 BST 2026 -->
+<!-- Added by: pwt, at: Wed Apr 22 11:51:22 BST 2026 -->
 
 <!--te-->
 
@@ -900,12 +900,13 @@ The following table outlines all the properties available for defining Work Requ
 | `taskCount`                 | The number of times to execute the Task.                                                                                                                                                                                            | Yes  | Yes | Yes  |      |
 | `taskData`                  | The data to be passed to the Worker when the Task is started. E.g., `"mydata"`. Becomes file `taskdata.txt` in the Task's working directory when the task executes.                                                                 | Yes  | Yes | Yes  | Yes  |
 | `taskDataFile`              | Populate the `taskData` property above with the contents of the specified file. E.g., `"my_task_data_file.txt"`.                                                                                                                    | Yes  | Yes | Yes  | Yes  |
+| `taskDataFiles`             | Populate the `taskData` property above by concatenating the contents of a list of files. Mutually exclusive with `taskData` and `taskDataFile`. E.g., `["header.txt", "body.txt"]`.                                                | Yes  | Yes | Yes  | Yes  |
 | `taskDataInputs`            | A list of data inputs to be downloaded by the task E.g., JSON: `{"source": "src", "destination": "dest"}`, TOML: `{source = "src", destination = "dest"}`.                                                                          | Yes  | Yes | Yes  | Yes  |
 | `taskDataOutputs`           | A list of data outputs to be uploaded at the conclusion of a task E.g., JSON: `{"source": "src", "destination": "dest", "alwaysUpload": true}`, TOML: `{source = "src", destination = "dest", alwaysUpload = true}`.                | Yes  | Yes | Yes  | Yes  |
 | `taskName`                  | The name to use for the Task. Only usable in the TOML file. Mostly useful in conjunction with CSV Task data. E.g., `"my_task_number_{{task_number}}"`.                                                                              | Yes  |     |      |      |
 | `taskGroupCount`            | Create `taskGroupCount` duplicates of a single Task Group.                                                                                                                                                                          | Yes  | Yes |      |      |
 | `taskGroupName`             | The name to use for the Task Group. Only usable in the TOML file. E.g., `"my_tg_number_{{task_group_number}}"`.                                                                                                                     | Yes  |     |      |      |
-| `taskTemplate`              | Sets default `taskType`, `taskData` (or `taskDataFile`), and/or `environment` for all Tasks in a Task Group; applied by the platform, allowing Tasks to be more compact. E.g., `{"taskType": "docker", "environment": {"X": "1"}}`. | Yes  | Yes | Yes  |      |
+| `taskTemplate`              | Sets default `taskType`, `taskData` (or `taskDataFile`/`taskDataFiles`), and/or `environment` for all Tasks in a Task Group; applied by the platform, allowing Tasks to be more compact. E.g., `{"taskType": "docker", "environment": {"X": "1"}}`. | Yes  | Yes | Yes  |      |
 | `taskTimeout`               | The timeout in minutes after which an executing Task will be terminated and reported as `FAILED`. E.g. `120.0`. The default is no timeout.                                                                                          | Yes  | Yes | Yes  |      |
 | `timeout`                   | As above, but set at the individual Task level, which overrides the group level `taskTimeout` property (if present).                                                                                                                | Yes  |     |      | Yes  |
 | `taskType`                  | The Task Type of a Task. E.g., `"docker"`.                                                                                                                                                                                          | Yes  |     |      | Yes  |
@@ -1017,7 +1018,7 @@ The `taskTemplate` property on a Task Group optionally sets default values for `
 
 Any combination of the three fields can be specified; omitted fields are simply not defaulted. Values specified directly on an individual Task take precedence over the template.
 
-`taskDataFile` can be used inside `taskTemplate` as an alternative to `taskData`, exactly as it can at the Task level — the file contents are read client-side and used as the `taskData` value.
+`taskDataFile` or `taskDataFiles` can be used inside `taskTemplate` as an alternative to `taskData`, exactly as they can at the Task level — the file contents are read client-side and used as the `taskData` value. `taskDataFiles` concatenates multiple files in order.
 
 `taskTemplate` can be set in the TOML config (applying globally as a default), at the Work Requirement level, or at the Task Group level. More specific levels take precedence.
 
@@ -1136,6 +1137,7 @@ Here's an example of the `workRequirement` section of a TOML configuration file,
     taskCount = 100
     taskData = "my_data_string"
     taskDataFile = "my_data_file.txt"
+    taskDataFiles = ["header.txt", "body.txt"]
     taskDataInputs = [
       {source = "in_src_path_1", destination = "dest_path_1"},
       {localPath = "local_file", uploadPath = "in_src_path_2", source = "in_src_path_2", destination = "dest_path_2"},
@@ -1194,6 +1196,7 @@ Showing all possible properties at the Work Requirement level:
   "taskCount": 100,
   "taskData": "my_task_data_string",
   "taskDataFile": "my_data_file.txt",
+  "taskDataFiles": ["header.txt", "body.txt"],
   "taskDataInputs": [
     {"destination": "dest_path_1", "source": "in_src_path_1"},
     {"localPath": "local_file", "uploadPath": "in_src_path_2", "destination": "dest_path_2", "source": "in_src_path_2"}
@@ -1260,6 +1263,7 @@ Showing all possible properties at the Task Group level:
       "taskCount": 5,
       "taskData": "my_task_data_string",
       "taskDataFile": "my_data_file.txt",
+      "taskDataFiles": ["header.txt", "body.txt"],
       "taskDataInputs": [
         {"destination": "dest_path_1", "source": "in_src_path_1"},
         {"localPath": "local_file", "uploadPath": "in_src_path_2", "destination": "dest_path_2", "source": "in_src_path_2"}
@@ -1307,6 +1311,7 @@ Showing all possible properties at the Task level:
           "tag": "my_tag",
           "taskData": "my_task_data_string",
           "taskDataFile": "my_data_file.txt",
+          "taskDataFiles": ["header.txt", "body.txt"],
           "taskDataInputs": [
             {"destination": "dest_path_1", "source": "in_src_path_1"},
             {"localPath": "local_file", "uploadPath": "in_src_path_2", "destination": "dest_path_2", "source": "in_src_path_2"}

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/pyproject.toml

@@ -21,12 +21,13 @@
         "PyPAC >= 0.16.4",
         "dateparser",
         "python-dotenv",
+        "jsons",
         "requests",
         "rclone-api",
         "rich >= 13.9.4",
         "tabulate >= 0.9.0",
         "tomli >= 2.4.1",
-        "yellowdog-sdk >= 15.1.0",
+        "yellowdog-sdk >= 15.2.0",
     ]
 
 [[project.authors]]
@@ -102,7 +103,7 @@
     packages = ["yellowdog_cli", "yellowdog_cli.utils"]
 
 [tool.setuptools.dynamic.version]
-    attr = "yellowdog_cli.__init__.__version__"
+    attr = "yellowdog_cli._version.__version__"
 
 [tool.ruff]
     target-version = "py310"

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/tests/test_submit_utils.py

@@ -15,6 +15,7 @@ from yellowdog_cli.utils.config_types import ConfigWorkRequirement
 from yellowdog_cli.utils.property_names import (
     TASK_DATA,
     TASK_DATA_FILE,
+    TASK_DATA_FILES,
     TASK_GROUPS,
     TASK_TAG,
     TASKS,
@@ -166,9 +167,40 @@ class TestResolveTaskData:
         assert su.resolve_task_data({TASK_DATA_FILE: str(f)}) == "from-file"
 
     def test_raises_when_both_set(self):
-        with pytest.raises(ValueError, match="both set"):
+        with pytest.raises(ValueError, match="Only one of"):
             su.resolve_task_data({TASK_DATA: "x", TASK_DATA_FILE: "f.txt"})
 
+    def test_raises_when_task_data_and_files_both_set(self):
+        with pytest.raises(ValueError, match="Only one of"):
+            su.resolve_task_data({TASK_DATA: "x", TASK_DATA_FILES: ["f.txt"]})
+
+    def test_raises_when_task_data_file_and_files_both_set(self, tmp_path):
+        f = tmp_path / "a.txt"
+        f.write_text("a")
+        with pytest.raises(ValueError, match="Only one of"):
+            su.resolve_task_data({TASK_DATA_FILE: str(f), TASK_DATA_FILES: [str(f)]})
+
+    def test_concatenates_task_data_files(self, tmp_path):
+        f1 = tmp_path / "a.txt"
+        f1.write_text("hello")
+        f2 = tmp_path / "b.txt"
+        f2.write_text("world")
+        result = su.resolve_task_data({TASK_DATA_FILES: [str(f1), str(f2)]})
+        assert result == "hello\nworld\n"
+
+    def test_task_data_files_single_file(self, tmp_path):
+        f = tmp_path / "only.txt"
+        f.write_text("content")
+        result = su.resolve_task_data({TASK_DATA_FILES: [str(f)]})
+        assert result == "content\n"
+
+    def test_task_data_files_variable_substitution(self, tmp_path, monkeypatch):
+        monkeypatch.setenv("_YD_TEST_TDF_VAR", "sub")
+        f = tmp_path / "t.txt"
+        f.write_text("{{env:_YD_TEST_TDF_VAR}}")
+        result = su.resolve_task_data({TASK_DATA_FILES: [str(f)]})
+        assert result == "sub\n"
+
     def test_variable_substitution_applied_to_file_contents(
         self, tmp_path, monkeypatch
     ):
@@ -218,7 +250,7 @@ class TestGetTaskDataProperty:
         self, empty_config_wr
     ):
         task = {TASK_DATA: "inline", TASK_DATA_FILE: "file.txt"}
-        with pytest.raises(ValueError, match="both set"):
+        with pytest.raises(ValueError, match="Only one of"):
             su.get_task_data_property(empty_config_wr, {}, {}, task, "t1")
 
     def test_task_data_file_read_from_disk(self, empty_config_wr, tmp_path):
@@ -235,6 +267,28 @@ class TestGetTaskDataProperty:
         result = su.get_task_data_property(config, {}, {}, {}, "t1")
         assert result == "cfg-file-contents"
 
+    def test_task_level_task_data_files_wins_over_wr(self, empty_config_wr, tmp_path):
+        f = tmp_path / "t.txt"
+        f.write_text("task-files")
+        task = {TASK_DATA_FILES: [str(f)]}
+        wr_data = {TASK_DATA: "wr-level"}
+        result = su.get_task_data_property(empty_config_wr, wr_data, {}, task, "t1")
+        assert result == "task-files\n"
+
+    def test_config_wr_task_data_files_used_as_final_fallback(self, tmp_path):
+        f1 = tmp_path / "a.txt"
+        f1.write_text("part1")
+        f2 = tmp_path / "b.txt"
+        f2.write_text("part2")
+        config = ConfigWorkRequirement(task_data_files=[str(f1), str(f2)])
+        result = su.get_task_data_property(config, {}, {}, {}, "t1")
+        assert result == "part1\npart2\n"
+
+    def test_raises_when_task_data_and_files_set_at_task_level(self, empty_config_wr):
+        task = {TASK_DATA: "inline", TASK_DATA_FILES: ["f.txt"]}
+        with pytest.raises(ValueError, match="Only one of"):
+            su.get_task_data_property(empty_config_wr, {}, {}, task, "t1")
+
 
 # ---------------------------------------------------------------------------
 # create_task

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/__init__.py

@@ -1,3 +1,4 @@
-__version__ = "9.2.2"
+from yellowdog_cli._version import __version__ as __version__
+
 __author__ = "YellowDog Limited"
 __email__ = "support@yellowdog.ai"

yellowdog_cli-9.2.4/yellowdog_cli/_version.py

@@ -0,0 +1 @@
+__version__ = "9.2.4"

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/create.py

@@ -14,32 +14,24 @@ import yellowdog_client.model as model
 from dateparser import parse as date_parse
 from requests import post, put
 from requests.exceptions import HTTPError
+from yellowdog_client.common.json import Json
 from yellowdog_client.model import (
-    AccountAllowance,
     AddApplicationResponse,
     AddConfiguredWorkerPoolResponse,
     AddGroupRequest,
-    AllowanceLimitEnforcement,
-    AllowanceResetType,
     ApiKey,
     Application,
-    AwsFleetComputeSource,
-    AwsFleetPurchaseOption,
     CloudProvider,
     CreateNamespaceRequest,
     Group,
     GroupRole,
     ImageOsType,
-    InstanceStatus,
     InternalUser,
     MachineImage,
     MachineImageFamily,
     MachineImageGroup,
     NamespacePolicy,
-    RequirementsAllowance,
     RoleScope,
-    SourceAllowance,
-    SourcesAllowance,
     UpdateGroupRequest,
     User,
 )
@@ -1328,40 +1320,17 @@ def _get_model_object(class_name: str, resource: dict, **kwargs):
     if missing:
         raise KeyError(f"Missing expected property '{missing[0]}'")
 
-    model_object = cls(**resource, **kwargs)
-    _patch_aws_fleet_enums(model_object)
-    _patch_allowance_enums(model_object)
-    return model_object
-
-
-def _patch_aws_fleet_enums(model_object) -> None:
-    if isinstance(model_object, AwsFleetComputeSource):
-        try:
-            model_object.purchaseOption = AwsFleetPurchaseOption[
-                str(model_object.purchaseOption)
-            ]
-        except KeyError:
-            raise ValueError(
-                "Invalid AWS Fleet Compute Source Purchase Option property: "
-                f"'{model_object.purchaseOption!s}'"
-            )
-
-
-def _patch_allowance_enums(model_object) -> None:
-    if isinstance(
-        model_object,
-        (SourceAllowance, SourcesAllowance, RequirementsAllowance, AccountAllowance),
-    ):
-        try:
-            model_object.limitEnforcement = AllowanceLimitEnforcement(
-                model_object.limitEnforcement
-            )
-            model_object.resetType = AllowanceResetType(model_object.resetType)
-            model_object.monitoredStatuses = [
-                InstanceStatus(status) for status in model_object.monitoredStatuses
-            ]
-        except KeyError as e:
-            raise KeyError(f"Invalid Allowance property: {e}")
+    # Normalize all values to their JSON-compatible representations so that
+    # Json.load can properly structure nested typed fields (e.g. enums,
+    # timedeltas, and nested model objects) — necessary because the SDK's
+    # proxy now calls Json.dump on every outbound request.
+    merged = {}
+    for k, v in {**resource, **kwargs}.items():
+        if isinstance(v, (str, int, float, bool, type(None))):
+            merged[k] = v
+        else:
+            merged[k] = Json.dump(v)
+    return Json.load(merged, cls)
 
 
 def _get_model_class(class_name: str):

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/help.py

@@ -4,7 +4,7 @@
 List all available yd-* commands and their purposes.
 """
 
-from yellowdog_cli.__init__ import __version__
+from yellowdog_cli._version import __version__
 
 # Ordered list of (command, one-line description) pairs.
 _COMMANDS: list[tuple[str, str]] = [

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/list.py

@@ -10,6 +10,7 @@ from typing import cast
 
 from requests import get
 from yellowdog_client.common import SearchClient
+from yellowdog_client.common.json import Json
 from yellowdog_client.model import (
     Allowance,
     AllowanceSearch,
@@ -620,7 +621,7 @@ def get_keyring(name: str) -> Keyring:
         headers={"Authorization": f"yd-key {CONFIG_COMMON.key}:{CONFIG_COMMON.secret}"},
     )
     if response.status_code == 200:
-        return Keyring(**response.json())
+        return Json.load(response.json(), Keyring)
     else:
         raise RuntimeError(f"Failed to get Keyring '{name}' ({response.text})")
 

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/submit.py

@@ -79,6 +79,7 @@ from yellowdog_cli.utils.property_names import (
     TASK_COUNT,
     TASK_DATA,
     TASK_DATA_FILE,
+    TASK_DATA_FILES,
     TASK_DATA_INPUTS,
     TASK_DATA_OUTPUTS,
     TASK_GROUP_COUNT,
@@ -651,6 +652,7 @@ def create_task_group(
         except ValueError as e:
             raise ValueError(f"taskTemplate: {e}") from e
         tt.pop(TASK_DATA_FILE, None)
+        tt.pop(TASK_DATA_FILES, None)
         if task_data is not None:
             tt[TASK_DATA] = task_data
         task_template = TaskTemplate(**tt)

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/utils/args.py

@@ -5,7 +5,7 @@ Class to parse command line arguments for all commands.
 import argparse
 import sys
 
-from yellowdog_cli.__init__ import __version__
+from yellowdog_cli._version import __version__
 from yellowdog_cli.utils.settings import (
     DEFAULT_PARALLEL_TASK_BATCH_UPLOAD_THREADS,
     DEFAULT_URL,

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/utils/config_types.py

@@ -1,5 +1,5 @@
 """
-Configuration classes and constants.
+Configuration classes.
 """
 
 from dataclasses import dataclass, field
@@ -54,6 +54,7 @@ class ConfigWorkRequirement:
     task_count: int = 1
     task_data: str | None = None
     task_data_file: str | None = None
+    task_data_files: list[str] | None = None
     task_data_inputs: list[dict] | None = None
     task_data_outputs: list[dict] | None = None
     task_group_count: int = 1

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/utils/csv_data.py

@@ -380,6 +380,7 @@ def csv_expand_toml_tasks(
         (config_wr.set_task_names, SET_TASK_NAMES),
         (config_wr.task_data, TASK_DATA),
         (config_wr.task_data_file, TASK_DATA_FILE),
+        (config_wr.task_data_files, TASK_DATA_FILES),
         (config_wr.task_data_inputs, TASK_DATA_INPUTS),
         (config_wr.task_data_outputs, TASK_DATA_OUTPUTS),
         (config_wr.task_group_name, TASK_GROUP_NAME),  # Note: oddity

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/utils/load_config.py

@@ -622,8 +622,9 @@ def load_config_work_requirement() -> ConfigWorkRequirement:
             task_batch_size=task_batch_size,
             task_count=task_count,
             task_data=wr_section.get(TASK_DATA),
-            task_data_inputs=wr_section.get(TASK_DATA_INPUTS),
             task_data_file=wr_section.get(TASK_DATA_FILE),
+            task_data_files=wr_section.get(TASK_DATA_FILES),
+            task_data_inputs=wr_section.get(TASK_DATA_INPUTS),
             task_data_outputs=wr_section.get(TASK_DATA_OUTPUTS),
             task_group_count=task_group_count,
             task_group_name=wr_section.get(TASK_GROUP_NAME),

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/utils/property_names.py

@@ -84,6 +84,7 @@ TASK_COUNT = "taskCount"  # Integer
 TASK_DATA = "taskData"  # String
 TASK_DATA_DESTINATION = "destination"  # String
 TASK_DATA_FILE = "taskDataFile"  # String
+TASK_DATA_FILES = "taskDataFiles"  # List of Strings
 TASK_DATA_INPUTS = "taskDataInputs"  # List of dictionaries
 TASK_DATA_OUTPUTS = "taskDataOutputs"  # List of dictionaries
 TASK_DATA_SOURCE = "source"  # String
@@ -200,6 +201,7 @@ ALL_KEYS = [
     TASK_DATA,
     TASK_DATA_DESTINATION,
     TASK_DATA_FILE,
+    TASK_DATA_FILES,
     TASK_DATA_INPUTS,
     TASK_DATA_OUTPUTS,
     TASK_DATA_SOURCE,

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/utils/submit_utils.py

@@ -34,6 +34,7 @@ from yellowdog_cli.utils.property_names import (
     STATUSES_AT_FAILURE,
     TASK_DATA,
     TASK_DATA_FILE,
+    TASK_DATA_FILES,
     TASK_DATA_SOURCE,
     TASK_GROUPS,
     TASK_TAG,
@@ -582,25 +583,36 @@ def resolve_task_data(
     files_directory: str = "",
     task_data_default: str | None = None,
     task_data_file_default: str | None = None,
+    task_data_files_default: list[str] | None = None,
 ) -> str | None:
     """
     Resolve 'taskData' from a single dict level.
 
-    Returns the task data string (reading from file if 'taskDataFile' is used),
-    or None if neither property is present at this level.
-    Raises ValueError if both 'taskData' and 'taskDataFile' are set.
+    Returns the task data string — inline, read from a single file, or
+    concatenated from a list of files. Returns None if none of the three
+    properties are present at this level. Raises ValueError if more than
+    one of 'taskData', 'taskDataFile', 'taskDataFiles' is set.
     """
     task_data = data.get(TASK_DATA, task_data_default)
     task_data_file = data.get(TASK_DATA_FILE, task_data_file_default)
-    if task_data and task_data_file:
+    task_data_files = data.get(TASK_DATA_FILES, task_data_files_default)
+    if sum(bool(x) for x in [task_data, task_data_file, task_data_files]) > 1:
         raise ValueError(
-            f"Properties '{TASK_DATA}' and '{TASK_DATA_FILE}' are both set"
+            f"Only one of '{TASK_DATA}', '{TASK_DATA_FILE}' or "
+            f"'{TASK_DATA_FILES}' should be set"
         )
     if task_data:
         return task_data
     if task_data_file:
         with open(resolve_filename(files_directory, task_data_file)) as f:
             return process_variable_substitutions_in_file_contents(f.read())
+    if task_data_files:
+        result = ""
+        for filename in task_data_files:
+            with open(resolve_filename(files_directory, filename)) as f:
+                result += process_variable_substitutions_in_file_contents(f.read())
+                result += "\n"
+        return result
     return None
 
 
@@ -617,19 +629,28 @@ def get_task_data_property(
     level in order. 'taskDataFile' is resolved to its file contents at whichever
     level it is found.
     """
-    for data, task_data_default, task_data_file_default in [
-        (task, None, None),
-        (task_group_data, None, None),
-        (wr_data, config_wr.task_data, config_wr.task_data_file),
+    for data, task_data_default, task_data_file_default, task_data_files_default in [
+        (task, None, None, None),
+        (task_group_data, None, None, None),
+        (
+            wr_data,
+            config_wr.task_data,
+            config_wr.task_data_file,
+            config_wr.task_data_files,
+        ),
     ]:
         try:
             result = resolve_task_data(
-                data, files_directory, task_data_default, task_data_file_default
+                data,
+                files_directory,
+                task_data_default,
+                task_data_file_default,
+                task_data_files_default,
             )
         except ValueError:
             raise ValueError(
-                f"Task '{task_name}': Properties '{TASK_DATA}' and "
-                f"'{TASK_DATA_FILE}' are both set"
+                f"Task '{task_name}': Only one of '{TASK_DATA}', "
+                f"'{TASK_DATA_FILE}' or '{TASK_DATA_FILES}' should be set"
             )
         if result is not None:
             return result

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli/version.py

@@ -10,7 +10,8 @@ from sys import version as py_version
 
 from yellowdog_client._version import __version__ as yd_sdk_version
 
-from yellowdog_cli.__init__ import __author__, __email__, __version__
+from yellowdog_cli import __author__, __email__
+from yellowdog_cli._version import __version__
 
 DOCS_URL = f"https://github.com/yellowdog/yellowdog-cli/blob/v{__version__}/README.md"
 

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yellowdog-cli
-Version: 9.2.2
+Version: 9.2.4
 Summary: Python-based CLI the YellowDog Platform
 Author-email: YellowDog Limited <support@yellowdog.co>
 License-Expression: Apache-2.0
@@ -18,12 +18,13 @@ License-File: LICENSE
 Requires-Dist: PyPAC>=0.16.4
 Requires-Dist: dateparser
 Requires-Dist: python-dotenv
+Requires-Dist: jsons
 Requires-Dist: requests
 Requires-Dist: rclone-api
 Requires-Dist: rich>=13.9.4
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: tomli>=2.4.1
-Requires-Dist: yellowdog-sdk>=15.1.0
+Requires-Dist: yellowdog-sdk>=15.2.0
 Provides-Extra: jsonnet
 Requires-Dist: jsonnet; extra == "jsonnet"
 Provides-Extra: cloudwizard

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ tests/test_variable_processing.py
 tests/test_variable_subs.py
 tests/test_ydid_utils.py
 yellowdog_cli/__init__.py
+yellowdog_cli/_version.py
 yellowdog_cli/abort.py
 yellowdog_cli/application.py
 yellowdog_cli/boost.py

{yellowdog_cli-9.2.2 → yellowdog_cli-9.2.4}/yellowdog_cli.egg-info/requires.txt

@@ -1,12 +1,13 @@
 PyPAC>=0.16.4
 dateparser
 python-dotenv
+jsons
 requests
 rclone-api
 rich>=13.9.4
 tabulate>=0.9.0
 tomli>=2.4.1
-yellowdog-sdk>=15.1.0
+yellowdog-sdk>=15.2.0
 
 [cloudwizard]
 boto3