nominal 1.101.0__tar.gz → 1.103.0__tar.gz

{nominal-1.101.0 → nominal-1.103.0}/.gitignore

@@ -170,3 +170,10 @@ playground/
 # Backup files
 *~
 \#*
+
+# Don't check in local uv.toml settings
+uv.toml
+
+# Don't check in data
+*.csv
+*.parquet

{nominal-1.101.0 → nominal-1.103.0}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [1.103.0](https://github.com/nominal-io/nominal-client/compare/v1.102.0...v1.103.0) (2026-01-06)
+
+
+### Features
+
+* add clone/copy run ([#563](https://github.com/nominal-io/nominal-client/issues/563)) ([276c511](https://github.com/nominal-io/nominal-client/commit/276c511d10c73b9f80ea2efed32d4047fe33795b))
+* universally support paths and strings, and add PathLike alias ([#566](https://github.com/nominal-io/nominal-client/issues/566)) ([860dd3d](https://github.com/nominal-io/nominal-client/commit/860dd3d67456d269356b66b5434b904647e5a2ff))
+
+## [1.102.0](https://github.com/nominal-io/nominal-client/compare/v1.101.0...v1.102.0) (2026-01-05)
+
+
+### Features
+
+* add run creation on an asset ([#558](https://github.com/nominal-io/nominal-client/issues/558)) ([9c0718a](https://github.com/nominal-io/nominal-client/commit/9c0718ae2706d4192087fb787e99f76d702a18c9))
+* add util to search events by origin type and add clone/copy events ([#555](https://github.com/nominal-io/nominal-client/issues/555)) ([bc427d6](https://github.com/nominal-io/nominal-client/commit/bc427d6b97a777e6802dc8139c8d389582558a77))
+* allow unarchiving a run ([#560](https://github.com/nominal-io/nominal-client/issues/560)) ([0221a56](https://github.com/nominal-io/nominal-client/commit/0221a56c73d133581567cc5183fda237607d79b5))
+* clean up and deprecate old video creation methods in NominalClient ([#561](https://github.com/nominal-io/nominal-client/issues/561)) ([e61919c](https://github.com/nominal-io/nominal-client/commit/e61919ca338a5e0de818471431d750246d87977c))
+
+
+### Bug Fixes
+
+* update how workspaces are selected in migration_utils ([#559](https://github.com/nominal-io/nominal-client/issues/559)) ([4379121](https://github.com/nominal-io/nominal-client/commit/4379121f44411eed19248ee16540672bbed743a0))
+
 ## [1.101.0](https://github.com/nominal-io/nominal-client/compare/v1.100.0...v1.101.0) (2025-12-23)
 
 

{nominal-1.101.0 → nominal-1.103.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nominal
-Version: 1.101.0
+Version: 1.103.0
 Summary: Automate Nominal workflows in Python
 Project-URL: Homepage, https://nominal.io
 Project-URL: Documentation, https://docs.nominal.io

{nominal-1.101.0 → nominal-1.103.0}/nominal/core/__init__.py

@@ -1,3 +1,4 @@
+from nominal.core._event_types import EventType, SearchEventOriginType
 from nominal.core._stream.write_stream import WriteStream
 from nominal.core._utils.api_tools import LinkDict
 from nominal.core.asset import Asset
@@ -19,7 +20,7 @@ from nominal.core.data_review import CheckViolation, DataReview, DataReviewBuild
 from nominal.core.dataset import Dataset, poll_until_ingestion_completed
 from nominal.core.dataset_file import DatasetFile, IngestWaitType, as_files_ingested, wait_for_files_to_ingest
 from nominal.core.datasource import DataSource
-from nominal.core.event import Event, EventType
+from nominal.core.event import Event
 from nominal.core.filetype import FileType, FileTypes
 from nominal.core.log import LogPoint
 from nominal.core.run import Run
@@ -60,6 +61,7 @@ __all__ = [
     "NominalClient",
     "poll_until_ingestion_completed",
     "Run",
+    "SearchEventOriginType",
     "Secret",
     "TagDetails",
     "TimestampMetadata",

nominal-1.103.0/nominal/core/_event_types.py

@@ -0,0 +1,100 @@
+from __future__ import annotations
+
+from enum import Enum
+from typing import Iterable, NamedTuple
+
+from nominal_api import event
+
+
+class EventType(Enum):
+    INFO = "INFO"
+    FLAG = "FLAG"
+    ERROR = "ERROR"
+    SUCCESS = "SUCCESS"
+    UNKNOWN = "UNKNOWN"
+
+    @classmethod
+    def from_api_event_type(cls, event: event.EventType) -> EventType:
+        if event.name == "INFO":
+            return cls.INFO
+        elif event.name == "FLAG":
+            return cls.FLAG
+        elif event.name == "ERROR":
+            return cls.ERROR
+        elif event.name == "SUCCESS":
+            return cls.SUCCESS
+        else:
+            return cls.UNKNOWN
+
+    def _to_api_event_type(self) -> event.EventType:
+        if self.name == "INFO":
+            return event.EventType.INFO
+        elif self.name == "FLAG":
+            return event.EventType.FLAG
+        elif self.name == "ERROR":
+            return event.EventType.ERROR
+        elif self.name == "SUCCESS":
+            return event.EventType.SUCCESS
+        else:
+            return event.EventType.UNKNOWN
+
+
+class EventCreationType(Enum):
+    MANUAL = "MANUAL"
+    BY_EXTERNAL_RESOURCE = "BY_EXTERNAL_RESOURCE"
+
+
+class SearchEventOriginType(NamedTuple):
+    name: str
+    creation_type: EventCreationType
+
+    @classmethod
+    def from_api_origin_type(cls, event: event.SearchEventOriginType) -> SearchEventOriginType:
+        if event.name == "WORKBOOK":
+            return SearchEventOriginTypes.WORKBOOK
+        elif event.name == "TEMPLATE":
+            return SearchEventOriginTypes.TEMPLATE
+        elif event.name == "API":
+            return SearchEventOriginTypes.API
+        elif event.name == "DATA_REVIEW":
+            return SearchEventOriginTypes.DATA_REVIEW
+        elif event.name == "PROCEDURE":
+            return SearchEventOriginTypes.PROCEDURE
+        elif event.name == "STREAMING_CHECKLIST":
+            return SearchEventOriginTypes.STREAMING_CHECKLIST
+        else:
+            raise ValueError(f"Unexpected Event Origin {event.name}")
+
+    def _to_api_search_event_origin_type(self) -> event.SearchEventOriginType:
+        if self.name == "WORKBOOK":
+            return event.SearchEventOriginType.WORKBOOK
+        elif self.name == "TEMPLATE":
+            return event.SearchEventOriginType.TEMPLATE
+        elif self.name == "API":
+            return event.SearchEventOriginType.API
+        elif self.name == "DATA_REVIEW":
+            return event.SearchEventOriginType.DATA_REVIEW
+        elif self.name == "PROCEDURE":
+            return event.SearchEventOriginType.PROCEDURE
+        elif self.name == "STREAMING_CHECKLIST":
+            return event.SearchEventOriginType.STREAMING_CHECKLIST
+        else:
+            raise ValueError(f"Unexpected Event Origin {self.name}")
+
+    @classmethod
+    def get_manual_origin_types(cls) -> Iterable[SearchEventOriginType]:
+        """Return all origin types that are manually created."""
+        return [
+            origin_type
+            for origin_type in SearchEventOriginTypes.__dict__.values()
+            if isinstance(origin_type, SearchEventOriginType) and origin_type.creation_type == EventCreationType.MANUAL
+        ]
+
+
+class SearchEventOriginTypes:
+    WORKBOOK = SearchEventOriginType("WORKBOOK", EventCreationType.MANUAL)
+    TEMPLATE = SearchEventOriginType("TEMPLATE", EventCreationType.MANUAL)
+    API = SearchEventOriginType("API", EventCreationType.MANUAL)
+    DATA_REVIEW = SearchEventOriginType("DATA_REVIEW", EventCreationType.BY_EXTERNAL_RESOURCE)
+    PROCEDURE = SearchEventOriginType("PROCEDURE", EventCreationType.BY_EXTERNAL_RESOURCE)
+    STREAMING_CHECKLIST = SearchEventOriginType("STREAMING_CHECKLIST", EventCreationType.BY_EXTERNAL_RESOURCE)

nominal-1.103.0/nominal/core/_types.py

@@ -0,0 +1,6 @@
+from __future__ import annotations
+
+import pathlib
+from typing import TypeAlias
+
+PathLike: TypeAlias = pathlib.Path | str

{nominal-1.101.0 → nominal-1.103.0}/nominal/core/_utils/query_tools.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Mapping, Sequence
+from typing import Iterable, Mapping, Sequence
 
 from nominal_api import (
     api,
     authentication_api,
+    event,
     ingest_api,
     scout_asset_api,
     scout_catalog,
@@ -350,3 +351,53 @@ def create_search_workbook_templates_query(
         queries.append(scout_template_api.SearchTemplatesQuery(is_published=published))
 
     return scout_template_api.SearchTemplatesQuery(and_=queries)
+
+
+def _create_search_events_query(  # noqa: PLR0912
+    search_text: str | None = None,
+    after: str | datetime | IntegralNanosecondsUTC | None = None,
+    before: str | datetime | IntegralNanosecondsUTC | None = None,
+    asset_rids: Iterable[str] | None = None,
+    labels: Iterable[str] | None = None,
+    properties: Mapping[str, str] | None = None,
+    created_by_rid: str | None = None,
+    workbook_rid: str | None = None,
+    data_review_rid: str | None = None,
+    assignee_rid: str | None = None,
+    event_type: event.EventType | None = None,
+    origin_types: Iterable[event.SearchEventOriginType] | None = None,
+    workspace_rid: str | None = None,
+) -> event.SearchQuery:
+    queries = []
+    if search_text is not None:
+        queries.append(event.SearchQuery(search_text=search_text))
+    if after is not None:
+        queries.append(event.SearchQuery(after=_SecondsNanos.from_flexible(after).to_api()))
+    if before is not None:
+        queries.append(event.SearchQuery(before=_SecondsNanos.from_flexible(before).to_api()))
+    if asset_rids:
+        for asset in asset_rids:
+            queries.append(event.SearchQuery(asset=asset))
+    if labels:
+        for label in labels:
+            queries.append(event.SearchQuery(label=label))
+    if properties:
+        for name, value in properties.items():
+            queries.append(event.SearchQuery(property=api.Property(name=name, value=value)))
+    if created_by_rid:
+        queries.append(event.SearchQuery(created_by=created_by_rid))
+    if workbook_rid is not None:
+        queries.append(event.SearchQuery(workbook=workbook_rid))
+    if data_review_rid is not None:
+        queries.append(event.SearchQuery(data_review=data_review_rid))
+    if assignee_rid is not None:
+        queries.append(event.SearchQuery(assignee=assignee_rid))
+    if event_type is not None:
+        queries.append(event.SearchQuery(event_type=event_type))
+    if origin_types is not None:
+        origin_type_filter = event.OriginTypesFilter(api.SetOperator.OR, list(origin_types))
+        queries.append(event.SearchQuery(origin_types=origin_type_filter))
+    if workspace_rid is not None:
+        queries.append(event.SearchQuery(workspace=workspace_rid))
+
+    return event.SearchQuery(and_=queries)

{nominal-1.101.0 → nominal-1.103.0}/nominal/core/asset.py

@@ -4,7 +4,7 @@ import datetime
 import logging
 from dataclasses import dataclass, field
 from types import MappingProxyType
-from typing import Iterable, Literal, Mapping, Protocol, Sequence, TypeAlias, cast
+from typing import Iterable, Literal, Mapping, Protocol, Sequence, TypeAlias
 
 from nominal_api import (
     event,
@@ -16,13 +16,21 @@ from nominal_api import (
 from typing_extensions import Self
 
 from nominal.core._clientsbunch import HasScoutParams
-from nominal.core._utils.api_tools import HasRid, Link, RefreshableMixin, create_links, rid_from_instance_or_string
+from nominal.core._event_types import EventType, SearchEventOriginType
+from nominal.core._utils.api_tools import (
+    HasRid,
+    Link,
+    LinkDict,
+    RefreshableMixin,
+    create_links,
+    rid_from_instance_or_string,
+)
 from nominal.core._utils.pagination_tools import search_runs_by_asset_paginated
 from nominal.core.attachment import Attachment, _iter_get_attachments
 from nominal.core.connection import Connection, _get_connections
 from nominal.core.dataset import Dataset, _create_dataset, _DatasetWrapper, _get_datasets
 from nominal.core.datasource import DataSource
-from nominal.core.event import Event, EventType, _create_event, _search_events
+from nominal.core.event import Event, _create_event, _search_events
 from nominal.core.video import Video, _create_video, _get_video
 from nominal.ts import IntegralNanosecondsDuration, IntegralNanosecondsUTC, _SecondsNanos
 
@@ -38,6 +46,14 @@ def _filter_scopes(
     return [scope for scope in scopes if scope.data_source.type.lower() == scope_type]
 
 
+def _filter_scope_rids(
+    scopes: Sequence[scout_asset_api.DataScope], scope_type: ScopeTypeSpecifier
+) -> Mapping[str, str]:
+    return {
+        scope.data_scope_name: getattr(scope.data_source, scope_type) for scope in _filter_scopes(scopes, scope_type)
+    }
+
+
 @dataclass(frozen=True)
 class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
     rid: str
@@ -80,13 +96,9 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
     def _list_dataset_scopes(self) -> Sequence[scout_asset_api.DataScope]:
         return _filter_scopes(self._get_latest_api().data_scopes, "dataset")
 
-    def _scope_rid(self, stype: Literal["dataset", "video", "connection"]) -> dict[str, str]:
+    def _scope_rids(self, scope_type: ScopeTypeSpecifier) -> Mapping[str, str]:
         asset = self._get_latest_api()
-        return {
-            scope.data_scope_name: cast(str, getattr(scope.data_source, stype))
-            for scope in asset.data_scopes
-            if scope.data_source.type.lower() == stype
-        }
+        return _filter_scope_rids(asset.data_scopes, scope_type)
 
     def update(
         self,
@@ -153,23 +165,25 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
         """
         return (*self.list_datasets(), *self.list_connections(), *self.list_videos())
 
-    def _remove_data_sources(
+    def remove_data_scopes(
         self,
         *,
-        data_scope_names: Sequence[str] | None = None,
-        data_sources: Sequence[ScopeType | str] | None = None,
+        names: Sequence[str] | None = None,
+        scopes: Sequence[ScopeType | str] | None = None,
     ) -> None:
-        data_scope_names = data_scope_names or []
-        data_sources = data_sources or []
-
-        if isinstance(data_sources, str):
-            raise RuntimeError("Expect `data_sources` to be a sequence, not a string")
+        """Remove data scopes from this asset.
 
-        data_source_rids = {rid_from_instance_or_string(ds) for ds in data_sources}
+        Args:
+            names: Names of datascopes to remove
+            scopes: Rids or instances of scope types (dataset, video, connection) to remove.
+        """
+        scope_names_to_remove = names or []
+        data_scopes_to_remove = scopes or []
 
+        scope_rids_to_remove = {rid_from_instance_or_string(ds) for ds in data_scopes_to_remove}
         conjure_asset = self._get_latest_api()
 
-        data_sources_to_keep = [
+        data_scopes_to_keep = [
             scout_asset_api.CreateAssetDataScope(
                 data_scope_name=ds.data_scope_name,
                 data_source=ds.data_source,
@@ -177,31 +191,21 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
                 offset=ds.offset,
             )
             for ds in conjure_asset.data_scopes
-            if ds.data_scope_name not in data_scope_names
-            and (ds.data_source.dataset or ds.data_source.connection or ds.data_source.video) not in data_source_rids
+            if ds.data_scope_name not in scope_names_to_remove
+            and all(
+                rid not in scope_rids_to_remove
+                for rid in (ds.data_source.dataset, ds.data_source.connection, ds.data_source.video)
+            )
         ]
 
-        api_asset = self._clients.assets.update_asset(
+        updated_asset = self._clients.assets.update_asset(
             self._clients.auth_header,
             scout_asset_api.UpdateAssetRequest(
-                data_scopes=data_sources_to_keep,
+                data_scopes=data_scopes_to_keep,
             ),
             self.rid,
         )
-        self._refresh_from_api(api_asset)
-
-    def remove_data_scopes(
-        self,
-        *,
-        names: Sequence[str] | None = None,
-        scopes: Sequence[ScopeType | str] | None = None,
-    ) -> None:
-        """Remove data scopes from this asset.
-
-        `names` are scope names.
-        `scopes` are rids or scope objects.
-        """
-        self._remove_data_sources(data_scope_names=names, data_sources=scopes)
+        self._refresh_from_api(updated_asset)
 
     def add_dataset(
         self,
@@ -382,6 +386,46 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
             labels=labels,
         )
 
+    def create_run(
+        self,
+        name: str,
+        start: datetime.datetime | IntegralNanosecondsUTC,
+        end: datetime.datetime | IntegralNanosecondsUTC | None,
+        *,
+        description: str | None = None,
+        properties: Mapping[str, str] | None = None,
+        labels: Sequence[str] = (),
+        links: Sequence[str | Link | LinkDict] = (),
+        attachments: Iterable[Attachment] | Iterable[str] = (),
+    ) -> Run:
+        """Create a run associated with this Asset for a given span of time.
+
+        Args:
+            name: Name of the run.
+            start: Starting timestamp of the run.
+            end: Ending timestamp of the run, or None for an unbounded run.
+            description: Optionally, a human readable description of the run to create.
+            properties: Key-value pairs to use as properties on the created run.
+            labels: Sequence of labels to use on the created run.
+            links: Link metadata to add to the created run.
+            attachments: Attachments to associate with the created run.
+
+        Returns:
+            Returns the created run
+        """
+        return _create_run(
+            self._clients,
+            name=name,
+            start=start,
+            end=end,
+            description=description,
+            properties=properties,
+            labels=labels,
+            links=links,
+            attachments=attachments,
+            asset_rids=[self.rid],
+        )
+
     def get_dataset(self, data_scope_name: str) -> Dataset:
         """Retrieve a dataset by data scope name, or raise ValueError if one is not found."""
         dataset = self.get_data_scope(data_scope_name)
@@ -410,7 +454,7 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
         """List the datasets associated with this asset.
         Returns (data_scope_name, dataset) pairs for each dataset.
         """
-        scope_rid = self._scope_rid(stype="dataset")
+        scope_rid = self._scope_rids(scope_type="dataset")
         if not scope_rid:
             return []
 
@@ -428,7 +472,7 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
         """List the connections associated with this asset.
         Returns (data_scope_name, connection) pairs for each connection.
         """
-        scope_rid = self._scope_rid(stype="connection")
+        scope_rid = self._scope_rids(scope_type="connection")
         connections_meta = _get_connections(self._clients, list(scope_rid.values()))
         return [
             (scope, Connection._from_conjure(self._clients, connection))
@@ -439,7 +483,7 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
         """List the videos associated with this asset.
         Returns (data_scope_name, dataset) pairs for each video.
         """
-        scope_rid = self._scope_rid(stype="video")
+        scope_rid = self._scope_rids(scope_type="video")
         return [
             (scope, Video._from_conjure(self._clients, _get_video(self._clients, rid)))
             for (scope, rid) in scope_rid.items()
@@ -477,6 +521,7 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
         data_review_rid: str | None = None,
         assignee_rid: str | None = None,
         event_type: EventType | None = None,
+        origin_types: Iterable[SearchEventOriginType] | None = None,
     ) -> Sequence[Event]:
         """Search for events associated with this Asset. See nominal.core.event._search_events for details."""
         return _search_events(
@@ -492,6 +537,7 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
             data_review_rid=data_review_rid,
             assignee_rid=assignee_rid,
             event_type=event_type,
+            origin_types=origin_types,
         )
 
     def remove_attachments(self, attachments: Iterable[Attachment] | Iterable[str]) -> None:
@@ -528,4 +574,4 @@ class Asset(_DatasetWrapper, HasRid, RefreshableMixin[scout_asset_api.Asset]):
 
 
 # Moving to bottom to deal with circular dependencies
-from nominal.core.run import Run  # noqa: E402
+from nominal.core.run import Run, _create_run  # noqa: E402

{nominal-1.101.0 → nominal-1.103.0}/nominal/core/attachment.py

@@ -10,6 +10,7 @@ from nominal_api import attachments_api
 from typing_extensions import Self
 
 from nominal.core._clientsbunch import HasScoutParams
+from nominal.core._types import PathLike
 from nominal.core._utils.api_tools import HasRid, RefreshableMixin
 from nominal.ts import IntegralNanosecondsUTC, _SecondsNanos
 
@@ -69,11 +70,12 @@ class Attachment(HasRid, RefreshableMixin[attachments_api.Attachment]):
         # this acts like a file-like object in binary-mode.
         return cast(BinaryIO, response)
 
-    def write(self, path: Path, mkdir: bool = True) -> None:
+    def write(self, path: PathLike, mkdir: bool = True) -> None:
         """Write an attachment to the filesystem.
 
         `path` should be the path you want to save to, i.e. a file, not a directory.
         """
+        path = Path(path)
         if mkdir:
             path.parent.mkdir(exist_ok=True, parents=True)
         with open(path, "wb") as wf:

{nominal-1.101.0 → nominal-1.103.0}/nominal/core/client.py

@@ -36,6 +36,8 @@ from nominal._utils.deprecation_tools import warn_on_deprecated_argument
 from nominal.config import NominalConfig, _config
 from nominal.core._clientsbunch import ClientsBunch
 from nominal.core._constants import DEFAULT_API_BASE_URL
+from nominal.core._event_types import EventType
+from nominal.core._types import PathLike
 from nominal.core._utils.api_tools import (
     Link,
     LinkDict,
@@ -43,7 +45,6 @@ from nominal.core._utils.api_tools import (
     rid_from_instance_or_string,
 )
 from nominal.core._utils.multipart import (
-    path_upload_name,
     upload_multipart_io,
 )
 from nominal.core._utils.pagination_tools import (
@@ -91,8 +92,8 @@ from nominal.core.dataset import (
     _get_datasets,
 )
 from nominal.core.datasource import DataSource
-from nominal.core.event import Event, EventType, _create_event, _search_events
-from nominal.core.exceptions import NominalConfigError, NominalError, NominalIngestError, NominalMethodRemovedError
+from nominal.core.event import Event, _create_event, _search_events
+from nominal.core.exceptions import NominalConfigError, NominalError, NominalMethodRemovedError
 from nominal.core.filetype import FileType, FileTypes
 from nominal.core.run import Run, _create_run
 from nominal.core.secret import Secret
@@ -732,7 +733,7 @@ class NominalClient:
 
         return dataset
 
-    def create_empty_video(
+    def create_video(
         self,
         name: str,
         *,
@@ -762,6 +763,8 @@ class NominalClient:
         )
         return Video._from_conjure(self._clients, response)
 
+    create_empty_video = create_video
+
     def get_video(self, rid: str) -> Video:
         """Retrieve a video by its RID."""
         response = self._clients.video.get(self._clients.auth_header, rid)
@@ -851,7 +854,7 @@ class NominalClient:
 
     def create_attachment(
         self,
-        attachment_file: Path | str,
+        attachment_file: PathLike,
         *,
         description: str | None = None,
         properties: Mapping[str, str] | None = None,
@@ -957,9 +960,13 @@ class NominalClient:
         response = self._clients.connection.get_connection(self._clients.auth_header, rid)
         return Connection._from_conjure(self._clients, response)
 
+    @deprecated(
+        "`create_video_from_mcap` is deprecated and will be removed in a future version. "
+        "Create a new video with `create_video` and then `add_mcap` to upload a file to the video."
+    )
     def create_video_from_mcap(
         self,
-        path: Path | str,
+        path: PathLike,
         topic: str,
         name: str | None = None,
         description: str | None = None,
@@ -977,18 +984,14 @@ class NominalClient:
         if name is None:
             name = path.name
 
-        with path.open("rb") as data_file:
-            return self.create_video_from_mcap_io(
-                data_file,
-                name=name,
-                topic=topic,
-                file_type=FileTypes.MCAP,
-                description=description,
-                labels=labels,
-                properties=properties,
-                file_name=path_upload_name(path, FileTypes.MCAP),
-            )
+        video = self.create_video(name, description=description, labels=labels, properties=properties)
+        video.add_mcap(path, topic, description)
+        return video
 
+    @deprecated(
+        "`create_video_from_mcap_io` is deprecated and will be removed in a future version. "
+        "Create a new video with `create_video` and then `add_mcap_from_io` to upload a file to the video."
+    )
     def create_video_from_mcap_io(
         self,
         mcap: BinaryIO,
@@ -1007,40 +1010,9 @@ class NominalClient:
 
         If name is None, the name of the file will be used.
         """
-        if isinstance(mcap, TextIOBase):
-            raise TypeError(f"dataset {mcap} must be open in binary mode, rather than text mode")
-
-        if file_name is None:
-            file_name = name
-
-        file_type = FileType(*file_type)
-        s3_path = upload_multipart_io(
-            self._clients.auth_header, self._clients.workspace_rid, mcap, file_name, file_type, self._clients.upload
-        )
-        request = ingest_api.IngestRequest(
-            options=ingest_api.IngestOptions(
-                video=ingest_api.VideoOpts(
-                    source=ingest_api.IngestSource(s3=ingest_api.S3IngestSource(s3_path)),
-                    target=ingest_api.VideoIngestTarget(
-                        new=ingest_api.NewVideoIngestDestination(
-                            title=name,
-                            description=description,
-                            properties={} if properties is None else dict(properties),
-                            labels=list(labels),
-                            workspace=self._clients.workspace_rid,
-                            marking_rids=[],
-                        )
-                    ),
-                    timestamp_manifest=scout_video_api.VideoFileTimestampManifest(
-                        mcap=scout_video_api.McapTimestampManifest(api.McapChannelLocator(topic=topic))
-                    ),
-                )
-            )
-        )
-        response = self._clients.ingest.ingest(self._clients.auth_header, request)
-        if response.details.video is None:
-            raise NominalIngestError("error ingesting mcap video: no video created")
-        return self.get_video(response.details.video.video_rid)
+        video = self.create_video(name, description=description, labels=labels, properties=properties)
+        video.add_mcap_from_io(mcap, file_name or name, topic, description, file_type)
+        return video
 
     def create_streaming_connection(
         self,
@@ -1514,7 +1486,7 @@ class NominalClient:
             properties: A mapping of key-value pairs that must ALL be present on an workbook to be included.
             created_by: Searches for workbook templates with the given creator's rid
             archived: Searches for workbook templates that are archived if true
-            published: Searches f8or workbook templates that have been published if true
+            published: Searches for workbook templates that have been published if true
 
         Returns:
             All workbook templates which match all of the provided conditions