ap-client 0.6.1.dev13__tar.gz → 0.7.0.dev1__tar.gz

{ap_client-0.6.1.dev13 → ap_client-0.7.0.dev1}/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.5
 Name: ap-client
-Version: 0.6.1.dev13
+Version: 0.7.0.dev1
 Summary: Agent Platform API Client & CLI
 Requires-Python: >=3.10
-Requires-Dist: irepo-artifact==0.2.2
+Requires-Dist: irepo-artifact==0.2.3.dev0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: requests>=2.28.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: typer>=0.9.0
 Requires-Dist: websockets>=13.0
 Provides-Extra: all
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.1.dev0; extra == 'all'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.5; extra == 'all'
 Provides-Extra: dataset
-Requires-Dist: instance-repo[oss]<2.0.0,>=1.4.1.dev0; extra == 'dataset'
+Requires-Dist: instance-repo[oss]<2.0.0,>=1.3.5; extra == 'dataset'
 Description-Content-Type: text/markdown
 
 A lightweight Python SDK and command line interface for Agent Platform. It provides helpers for configuring API access and managing templates, datasets, jobs, and groups.

{ap_client-0.6.1.dev13 → ap_client-0.7.0.dev1}/ap_client/cli.py

@@ -23,7 +23,6 @@ from ap_client.api import (
 )
 from ap_client.config import ENV_VAR_SPECS, ConfigurationError, _parse_bool, normalize_output_format
 from ap_client.dataset_commands import register as _register_dataset_commands
-from ap_client.dfs_commands import register as _register_dfs_commands
 from ap_client.exporter import export_group, export_job, export_jobs
 from ap_client.fs_commands import register as _register_fs_commands
 from ap_client.instance_commands import register as _register_instance_commands
@@ -166,7 +165,6 @@ app.add_typer(checkpoint_app, name="checkpoint")
 # ap dataset version/split/access 嵌套在 dataset 下;instance/fs 是一等资源。
 _register_dataset_commands(dataset_app)
 _register_instance_commands(app)
-_register_dfs_commands(app)
 _register_fs_commands(app)
 _register_akpool_commands(app)
 
@@ -955,6 +953,25 @@ def _print_job_get_plain(job: dict) -> None:
         ]
     )
 
+    bindings = job.get("ak_bindings") or []
+    rows = [
+        {**parameter, "ak_id": binding["ak_id"]}
+        for binding in bindings
+        for parameter in binding.get("parameters", [])
+    ]
+    if "ak_bindings.parameters" in (job.get("restricted_fields") or []):
+        typer.echo("\nManaged AK parameters: content access required")
+    elif rows:
+        typer.echo("\nManaged AK parameters")
+        for row in rows:
+            typer.echo(f"  {row['parameter']}: {row['value']} -> {row['ak_id']}")
+        if any("parameters" not in binding for binding in bindings):
+            typer.echo("  Some historical parameter mappings are unavailable")
+    elif response_ak_ids(job):
+        typer.echo("\nManaged AK parameters: historical mapping unavailable")
+    elif "ak_bindings" in job:
+        typer.echo("\nManaged AK parameters\n  No managed AK used")
+
     meta_pairs = [
         ("meta_model", job.get("meta_model")),
         ("meta_job_type", job.get("meta_job_type")),

{ap_client-0.6.1.dev13 → ap_client-0.7.0.dev1}/ap_client/dataset_commands.py

@@ -123,10 +123,7 @@ _NO_BENCHMARK = "none"
 _FORMAT_HELP = "Output format: plain/table/json/yaml (default: AP_FORMAT or command default)"
 
 _METADATA_MODELS = ("version_first", "split_first")
-# IR SDK >= 1.4.0.dev3 的业务入口固定 split_first：business_metadata_model 拒绝
-# version_first（仅保留给低层 legacy 读）。带 version 的 split 查询在两种模型下
-# 结果一致（实测），显式 split_first 与 SDK 归一值一致且新旧 SDK 均接受。
-_VERSION_SPLIT_METADATA_MODEL = "split_first"
+_VERSION_SPLIT_METADATA_MODEL = "version_first"
 
 #: CLI **不替 SDK 决定元数据模型**:不下发 ``metadata_model``,由 SDK 按 profile 归一
 #: (当前为 ``split_first``)。
@@ -694,74 +691,6 @@ def _unversioned_split(
     return detail if detail is not None and not _version_value(detail.get("version")) else None
 
 
-def _versioned_split(
-    dataset: str, version: str, split: str, *, environment: Optional[str] = None
-) -> Optional[dict]:
-    """取指定 version 里的单个 split 记录;不存在返回 ``None``(不当作错误)。
-
-    与 ``_unversioned_split`` 同源,走 recordsvc 的 ``splits.get``(SDK 自带
-    version_first 内嵌投影的 legacy 回退)。
-    """
-    from .irepo_sdk import _reason
-
-    env = _environment(environment)
-    repo = _dataset_repo()
-    try:
-        record = repo.splits.get(
-            dataset, split, version=version, **_read_env_kwargs(repo, repo.splits, "get", env)
-        )
-    except Exception as exc:  # noqa: BLE001
-        raise _fail(
-            f"dataset {dataset} version {version} split {split}: query failed: {_reason(exc)}",
-            f"Check the dataset name and permission: ap dataset get {dataset}",
-        ) from exc
-    detail = _model_dict(record) if record is not None else None
-    return detail if detail is not None and _version_value(detail.get("version")) == version else None
-
-
-def _versioned_splits(
-    dataset: str, version: str, *, stage: str, environment: Optional[str] = None
-) -> list[dict]:
-    """读**指定 version**的 split——走 SDK ``repo.splits``(recordsvc)。
-
-    与 ``_unversioned_splits`` 同源:version 文档不内嵌 ``splits[]``(服务端只给
-    ``split_count`` 聚合,split 记录由 recordsvc 的 ``/datasets/splits`` 承载),
-    SDK ``splits.list(version=...)`` 是唯一正确读法,且自带存量 version_first
-    内嵌投影的 legacy 回退。
-    """
-    from .irepo_sdk import _reason
-
-    env = _environment(environment)
-    repo = _dataset_repo()
-    try:
-        records: list[dict] = []
-        page = 1
-        while True:
-            result = repo.splits.list(
-                dataset,
-                version=version,
-                page_size=_SPLIT_PAGE_SIZE,
-                **({"page": page} if page > 1 else {}),
-                **_read_env_kwargs(repo, repo.splits, "list", env),
-            )
-            items = getattr(result, "items", None) or []
-            for item in items:
-                record = _model_dict(item)
-                # 与 ``_versioned_split`` 同口径:只收 version 匹配的记录(服务端
-                # exact scope 保证;legacy 投影与 OSS 发现也会带 version)。
-                if _version_value(record.get("version")) == version:
-                    records.append(record)
-            if not items or getattr(result, "has_more", False) is not True:
-                break
-            page += 1
-    except Exception as exc:  # noqa: BLE001 - 统一走设计 §5.1 的映射
-        raise _fail(
-            f"dataset {dataset} version {version}: {stage} failed: {_reason(exc)}",
-            f"Check the version name: ap dataset version get {version} --dataset {dataset}",
-        ) from exc
-    return records
-
-
 def _split_records(detail: dict) -> list[dict]:
     """version 文档内嵌的 ``splits[]``(设计 §4.3:split 没有独立资源)。"""
     splits = detail.get("splits")
@@ -795,12 +724,12 @@ def _split_names(detail: dict) -> list[str]:
     return names
 
 
-def _dataset_repo(*, request_timeout: float | None = None) -> "Repo":
+def _dataset_repo() -> "Repo":
     """dataset 写路径统一走 InstanceRepo SDK;未装 ``dataset`` extra 时退出 2。"""
     from .irepo_sdk import SdkMissing, load_repo
 
     try:
-        return load_repo(request_timeout=request_timeout)
+        return load_repo()
     except SdkMissing as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(2) from exc
@@ -1257,26 +1186,9 @@ def dataset_get(
             "dataset_name": dataset,
             "registered": False,
         }
-        from .dataset_name import (
-            DatasetNameError,
-            DatasetNameUpgradeRequired,
-            parse_dataset_name,
-        )
-
-        try:
-            name = parse_dataset_name(dataset)
-        except DatasetNameUpgradeRequired as exc:
-            raise _fail(
-                f"Failed to query dataset {dataset}: {exc}",
-                "pip install 'ap-client[dataset]' --upgrade",
-                exit_code=2,
-            ) from exc
-        except DatasetNameError:
-            # 非规范名:不凭空发明 level 字段(与历史行为一致)。
-            pass
-        else:
-            rendered["dataset_l1"] = name.l1
-            rendered["dataset_l2"] = name.l2
+        parts = dataset.split("/")
+        if len(parts) == 2 and all(parts):
+            rendered.update(dataset_l1=parts[0], dataset_l2=parts[1])
     else:
         rendered = _registered_dict(detail)
     _emit_detail(rendered, output_format, order=_DATASET_DETAIL_ORDER, always=("status",))
@@ -1285,10 +1197,7 @@ def dataset_get(
 
 
 def dataset_create(
-    dataset: str = typer.Argument(
-        ..., help="Dataset name: L1, L1/L2, or a deeper path "
-        "(e.g. my-bench, alibaba/my-bench, or gdpval/synthetic/my-bench)"
-    ),
+    dataset: str = typer.Argument(..., help="Dataset name (e.g. alibaba/my-bench)"),
     benchmark: str = typer.Option(..., "--benchmark", help="Benchmark name or source_id"),
     description: Optional[str] = typer.Option(None, "--description", help="Dataset description"),
     visibility: str = typer.Option(
@@ -1307,32 +1216,20 @@ def dataset_create(
 
     from instance_repo.models import DatasetSeries
 
-    from .dataset_name import (
-        DatasetNameError,
-        DatasetNameUpgradeRequired,
-        parse_dataset_name,
-    )
     from .irepo_sdk import _reason
 
-    try:
-        name = parse_dataset_name(dataset)
-    except DatasetNameUpgradeRequired as exc:
+    parts = dataset.split("/")
+    if len(parts) != 2 or not all(parts):
         raise _fail(
-            f"Failed to create dataset {dataset}: {exc}",
-            "pip install 'ap-client[dataset]' --upgrade",
-            exit_code=2,
-        ) from exc
-    except DatasetNameError:
-        raise _fail(
-            f"Failed to create dataset {dataset}: the name must be one or more "
-            "canonical path segments",
-            "e.g. my-bench, your-team/my-bench, or gdpval/synthetic/my-bench",
+            f"Failed to create dataset {dataset}: the name must be two segments <team>/<name>",
+            "e.g. your-team/my-bench",
             exit_code=2,
         )
+    l1, l2 = parts
     series = DatasetSeries(
         dataset_name=dataset,
-        dataset_l1=name.l1,
-        dataset_l2=name.l2,
+        dataset_l1=l1,
+        dataset_l2=l2,
         benchmark_id=benchmark_id,
         visibility=resolved_visibility,
         description=description or None,
@@ -1916,10 +1813,15 @@ def dataset_split_list(
     resolved_run_type = _check_choice(run_type, _RUN_TYPES, "--run-type") if run_type else ""
 
     if resolved_version:
-        records = _versioned_splits(
-            dataset, resolved_version, stage="split query", environment=environment
+        detail = _fetch_version(
+            dataset,
+            resolved_version,
+            stage="split query",
+            environment=environment,
+            metadata_model=_VERSION_SPLIT_METADATA_MODEL,
         )
-        rows = [_split_row(record, {}) for record in records]
+        records = _split_records(detail)
+        rows = [_split_row(record, detail) for record in records]
     else:
         records = _unversioned_splits(dataset, stage="split query", environment=environment)
         rows = [_split_row(record, {}) for record in records]
@@ -1946,26 +1848,22 @@ def dataset_split_get(
     resolved_version = _version_value(version)
 
     if resolved_version:
-        record = _versioned_split(
-            dataset, resolved_version, split, environment=environment
-        )
-        if record is not None:
-            payload = dict(record)
-            payload.setdefault("dataset", dataset)
-            payload.setdefault("version", resolved_version)
-            payload.setdefault("registered", True)
-            _emit_detail(payload, output_format)
-            return
-        known = (
-            ", ".join(
-                _split_names_of(
-                    _versioned_splits(
-                        dataset, resolved_version, stage="split query", environment=environment
-                    )
-                )
-            )
-            or "<none>"
+        detail = _fetch_version(
+            dataset,
+            resolved_version,
+            stage="split query",
+            environment=environment,
+            metadata_model=_VERSION_SPLIT_METADATA_MODEL,
         )
+        for record in _split_records(detail):
+            if str(record.get("name") or "") == split:
+                payload = dict(record)
+                payload.setdefault("dataset", dataset)
+                payload.setdefault("version", resolved_version)
+                payload.setdefault("registered", detail.get("registered", True))
+                _emit_detail(payload, output_format)
+                return
+        known = ", ".join(_split_names(detail)) or "<none>"
     else:
         record = _unversioned_split(dataset, split, environment=environment)
         if record is not None:
@@ -2022,40 +1920,71 @@ def dataset_split_create(
             exit_code=2,
         )
 
-    # 版本化创建走独立 Split API（POST /datasets/splits），与 split-first 服务端
-    # 契约对齐——旧 Version PATCH（splits 全量替换 / split_run_types）已被服务端
-    # 拒绝（"split-first Version group updates are not supported"）。
-    env = _environment(environment)
-    existing = _versioned_split(dataset, resolved_version, split, environment=environment)
-    if existing is not None:
+    detail = _fetch_version(
+        dataset,
+        resolved_version,
+        stage="split create precheck",
+        environment=environment,
+        metadata_model=_VERSION_SPLIT_METADATA_MODEL,
+    )
+
+    existing = _split_names(detail)
+    if split in existing:
         # 幂等:已存在同名 split(设计 §4.3)。
-        payload = dict(existing)
-        payload.setdefault("dataset", dataset)
-        payload.setdefault("version", resolved_version)
-        payload["created"] = False
-        _emit_detail(payload, output_format)
+        for record in _split_records(detail):
+            if str(record.get("name") or "") == split:
+                payload = dict(record)
+                payload.setdefault("dataset", dataset)
+                payload.setdefault("version", resolved_version)
+                payload["created"] = False
+                _emit_detail(payload, output_format)
+                return
+        _emit_detail(
+            {"dataset": dataset, "version": resolved_version, "split": split, "created": False},
+            output_format,
+        )
         return
 
-    from .instance_commands import _sdk_read_kwargs
-    from .irepo_sdk import _reason
+    # ① splits 全量 PATCH(现有 ∪ 新增)。
+    names = existing + [split]
+    _patch_version(
+        dataset,
+        resolved_version,
+        {"splits": names},
+        stage="split create",
+        environment=environment,
+        metadata_model=_VERSION_SPLIT_METADATA_MODEL,
+    )
 
-    repo = _dataset_repo()
-    create_kwargs = _sdk_read_kwargs(repo.splits, "create", environment=env, metadata_model="")
+    # ② run_type 只能第二次 PATCH:服务端 splits 与 split_run_types 互斥。
     if resolved_run_type:
-        create_kwargs["run_type"] = resolved_run_type
-    try:
-        record = repo.splits.create(dataset, split, version=resolved_version, **create_kwargs)
-    except Exception as exc:  # noqa: BLE001 - 统一走设计 §5.1 的映射
-        raise _fail(
-            f"Failed to create split {split} of dataset {dataset} version {resolved_version}: {_reason(exc)}",
-            "Check the version name and write permission, then retry",
-        ) from exc
-    payload = _model_dict(record) if record is not None else {}
-    payload.setdefault("dataset", dataset)
-    payload.setdefault("version", resolved_version)
-    payload.setdefault("split", split)
-    payload["created"] = True
-    _emit_detail(payload, output_format)
+        retry = (
+            f"ap dataset split update {split} --dataset {dataset} --run-type {resolved_run_type}"
+        )
+        if resolved_version:
+            retry += f" --version {resolved_version}"
+        _patch_version(
+            dataset,
+            resolved_version,
+            {"split_run_types": [{"name": split, "run_type": resolved_run_type}]},
+            stage=f"split {split} set run_type",
+            # 第一段 PATCH 已建出 split,失败后的恢复动作是补打 run_type,不是重跑 create。
+            fallback_hint=f"split {split} was created but run_type is not set; set it now: {retry}",
+            environment=environment,
+            metadata_model=_VERSION_SPLIT_METADATA_MODEL,
+        )
+
+    _emit_detail(
+        {
+            "dataset": dataset,
+            "version": resolved_version,
+            "split": split,
+            "run_type": resolved_run_type,
+            "splits": names,
+            "created": True,
+        },
+        output_format,
+    )
 
 
 @dataset_split_app.command("update")
@@ -2135,48 +2064,31 @@ def dataset_split_update(
         )
         return
 
-    # 版本化更新走独立 Split API（PATCH /datasets/splits/detail），预检用精确
-    # split 身份（splits.get with version）——旧实现查 Version 内嵌 splits 再
-    # PATCH Version，与独立 Split 记录不匹配，导致"已存在却报 not found"。
-    env = _environment(environment)
-    if env == "pre":
-        raise _fail(
-            f"Failed to update split {split} of dataset {dataset}: split records can only be changed in the online environment",
-            "PATCH on split records only supports online; drop --environment pre",
-            exit_code=2,
-        )
-    record = _versioned_split(dataset, resolved_version, split, environment=environment)
-    if record is None:
-        known = (
-            ", ".join(
-                _split_names_of(
-                    _versioned_splits(
-                        dataset, resolved_version, stage="split update precheck",
-                        environment=environment,
-                    )
-                )
-            )
-            or "<none>"
-        )
+    detail = _fetch_version(
+        dataset,
+        resolved_version,
+        stage="split update precheck",
+        environment=environment,
+        metadata_model=_VERSION_SPLIT_METADATA_MODEL,
+    )
+
+    if split not in _split_names(detail):
+        known = ", ".join(_split_names(detail)) or "<none>"
+        hint = f"Create it first: ap dataset split create {split} --dataset {dataset} (existing: {known})"
         raise _fail(
             f"dataset {dataset} version {_version_label(resolved_version)} split {split}: "
             f"update failed: not found",
-            f"Create it first: ap dataset split create {split} --dataset {dataset} "
-            f"--version {resolved_version} (existing: {known})",
+            hint,
         )
 
-    from .instance_commands import _sdk_read_kwargs
-    from .irepo_sdk import _reason
-
-    repo = _dataset_repo()
-    update_kwargs = _sdk_read_kwargs(repo.splits, "update", environment=env, metadata_model="")
-    try:
-        repo.splits.update(dataset, split, version=resolved_version, run_type=resolved_run_type, **update_kwargs)
-    except Exception as exc:  # noqa: BLE001 - 统一走设计 §5.1 的映射
-        raise _fail(
-            f"Failed to update split {split} of dataset {dataset} version {resolved_version}: {_reason(exc)}",
-            "Write permission on this dataset is required; check the split name and the online environment, then retry",
-        ) from exc
+    _patch_version(
+        dataset,
+        resolved_version,
+        {"split_run_types": [{"name": split, "run_type": resolved_run_type}]},
+        stage="split update",
+        environment=environment,
+        metadata_model=_VERSION_SPLIT_METADATA_MODEL,
+    )
     _emit_detail(
         {
             "dataset": dataset,

{ap_client-0.6.1.dev13 → ap_client-0.7.0.dev1}/ap_client/dataset_register.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import json
 import math
-import os
 import sys
 from typing import Any, List, Optional
 from urllib.parse import quote
@@ -34,42 +33,6 @@ def _emit_preview_stderr(payload: dict, output_format: str) -> None:
     typer.echo(json.dumps(payload, ensure_ascii=False, indent=2), err=True)
 
 
-def _parse_request_timeout() -> float:
-    """Read ``AP_REQUEST_TIMEOUT`` from the environment, falling back to 30 s.
-
-    Empty, missing, or non-numeric values all resolve to the default rather
-    than raising ``ValueError`` at import time (which would break ``ap --help``).
-    """
-    raw = os.environ.get("AP_REQUEST_TIMEOUT", "").strip()
-    if not raw:
-        return 30.0
-    try:
-        value = float(raw)
-    except (TypeError, ValueError):
-        return 30.0
-    return value if math.isfinite(value) and value > 0 else 30.0
-
-
-def _set_sdk_request_timeout(repo: Any, timeout: float) -> None:
-    """Override the IR SDK per-request HTTP timeout on the shared Transport.
-
-    All sub-clients (``datasets``, ``versions``, ``instances``) share
-    ``repo.transport``, so a single assignment covers every control-plane
-    call the register command makes (preview and submission alike).
-    Falls back to setting the attribute on each sub-client's ``_t`` when the
-    ``transport`` attribute is absent (older SDK shapes).
-    """
-    transport = getattr(repo, "transport", None)
-    if transport is not None and hasattr(transport, "timeout"):
-        transport.timeout = timeout
-        return
-    for name in ("datasets", "versions", "instances", "images"):
-        client = getattr(repo, name, None)
-        t = getattr(client, "_t", None)
-        if t is not None and hasattr(t, "timeout"):
-            t.timeout = timeout
-
-
 def _confirm(dataset: str, *, yes: bool) -> None:
     if yes:
         return
@@ -103,26 +66,11 @@ def _claim_without_workspace(
 
 
 def _create_owned_dataset(repo: Any, dataset: str, benchmark_id: str) -> dict:
-    from .dataset_name import (
-        DatasetNameError,
-        DatasetNameUpgradeRequired,
-        parse_dataset_name,
-    )
-
-    try:
-        name = parse_dataset_name(dataset)
-    except DatasetNameUpgradeRequired as exc:
+    parts = dataset.split("/")
+    if len(parts) != 2 or not all(parts):
         raise datasets._fail(
-            f"Failed to create dataset {dataset}: {exc}",
-            "pip install 'ap-client[dataset]' --upgrade",
-            exit_code=2,
-        ) from exc
-    except DatasetNameError:
-        raise datasets._fail(
-            f"Failed to create dataset {dataset}: the name must be one or more "
-            "canonical path segments",
-            "Use a dataset name such as my-bench, your-team/my-bench, "
-            "or gdpval/synthetic/my-bench",
+            f"Failed to create dataset {dataset}: the name must be two segments <team>/<name>",
+            "Use a dataset name such as your-team/my-bench",
             exit_code=2,
         )
 
@@ -130,8 +78,8 @@ def _create_owned_dataset(repo: Any, dataset: str, benchmark_id: str) -> dict:
 
     fields: dict[str, Any] = {
         "dataset_name": dataset,
-        "dataset_l1": name.l1,
-        "dataset_l2": name.l2,
+        "dataset_l1": parts[0],
+        "dataset_l2": parts[1],
         "visibility": "private",
     }
     if benchmark_id:
@@ -258,13 +206,6 @@ def dataset_register(
     yes: bool = typer.Option(False, "--yes", "-y", help="Skip the registration confirmation"),
     wait: bool = typer.Option(False, "--wait", help="Wait for the ingest task to finish"),
     timeout: float = typer.Option(1800.0, "--timeout", help="Local wait timeout in seconds"),
-    request_timeout: float = typer.Option(
-        _parse_request_timeout(),
-        "--request-timeout",
-        help="Per-request HTTP timeout in seconds for control-plane calls "
-        "(env: AP_REQUEST_TIMEOUT, default: 30). "
-        "Increase for datasets with many objects where the preview scan takes longer.",
-    ),
     output_format: Optional[str] = typer.Option(None, "--format", help=datasets._FORMAT_HELP),
     owner: Optional[str] = typer.Option(
         None, "--owner", help="Ensure ownership before ingest; the only supported value is @me"
@@ -318,17 +259,7 @@ def dataset_register(
         )
 
     env = datasets._environment(environment)
-    repo = datasets._dataset_repo(request_timeout=request_timeout)
-    # Override the IR SDK per-request HTTP timeout. All sub-clients
-    # (datasets, versions, instances) share repo.transport, so one
-    # assignment covers preview and submission alike.
-    if not math.isfinite(request_timeout) or request_timeout <= 0:
-        raise datasets._fail(
-            "--request-timeout must be a positive finite number",
-            "Pass a positive number of seconds",
-            exit_code=2,
-        )
-    _set_sdk_request_timeout(repo, request_timeout)
+    repo = datasets._dataset_repo()
     datasets._check_storage_side(repo, env)
     ingest = getattr(getattr(repo, "versions", None), "ingest", None)
     if not callable(ingest):