nominal-api 0.546.0__py3-none-any.whl → 0.548.0__py3-none-any.whl

nominal_api/_impl.py

@@ -25,6 +25,24 @@ from typing import (
     Set,
 )
 
+class api_ArchivedStatus(ConjureEnumType):
+
+    NOT_ARCHIVED = 'NOT_ARCHIVED'
+    '''NOT_ARCHIVED'''
+    ARCHIVED = 'ARCHIVED'
+    '''ARCHIVED'''
+    UNKNOWN = 'UNKNOWN'
+    '''UNKNOWN'''
+
+    def __reduce_ex__(self, proto):
+        return self.__class__, (self.name,)
+
+
+api_ArchivedStatus.__name__ = "ArchivedStatus"
+api_ArchivedStatus.__qualname__ = "ArchivedStatus"
+api_ArchivedStatus.__module__ = "nominal_api.api"
+
+
 class api_Empty(ConjureBeanType):
 
     @builtins.classmethod
@@ -138,6 +156,35 @@ api_McapChannelLocatorVisitor.__qualname__ = "McapChannelLocatorVisitor"
 api_McapChannelLocatorVisitor.__module__ = "nominal_api.api"
 
 
+class api_Property(ConjureBeanType):
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'name': ConjureFieldDefinition('name', api_PropertyName),
+            'value': ConjureFieldDefinition('value', api_PropertyValue)
+        }
+
+    __slots__: List[str] = ['_name', '_value']
+
+    def __init__(self, name: str, value: str) -> None:
+        self._name = name
+        self._value = value
+
+    @builtins.property
+    def name(self) -> str:
+        return self._name
+
+    @builtins.property
+    def value(self) -> str:
+        return self._value
+
+
+api_Property.__name__ = "Property"
+api_Property.__qualname__ = "Property"
+api_Property.__module__ = "nominal_api.api"
+
+
 class api_SerializableError(ConjureBeanType):
     """
     A SerializableError is a representation of a ServiceException that exists to send error
@@ -286,8 +333,8 @@ class attachments_api_Attachment(ConjureBeanType):
             'file_type': ConjureFieldDefinition('fileType', str),
             'description': ConjureFieldDefinition('description', str),
             'created_by': ConjureFieldDefinition('createdBy', str),
-            'properties': ConjureFieldDefinition('properties', Dict[attachments_api_PropertyName, attachments_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[attachments_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'created_at': ConjureFieldDefinition('createdAt', str),
             'is_archived': ConjureFieldDefinition('isArchived', bool)
         }
@@ -655,8 +702,8 @@ class attachments_api_CreateAttachmentRequest(ConjureBeanType):
             's3_path': ConjureFieldDefinition('s3Path', attachments_api_S3Path),
             'title': ConjureFieldDefinition('title', str),
             'description': ConjureFieldDefinition('description', str),
-            'properties': ConjureFieldDefinition('properties', Dict[attachments_api_PropertyName, attachments_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[attachments_api_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_s3_path', '_title', '_description', '_properties', '_labels']
@@ -740,39 +787,10 @@ attachments_api_GetAttachmentsResponse.__qualname__ = "GetAttachmentsResponse"
 attachments_api_GetAttachmentsResponse.__module__ = "nominal_api.attachments_api"
 
 
-class attachments_api_Property(ConjureBeanType):
-
-    @builtins.classmethod
-    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
-        return {
-            'name': ConjureFieldDefinition('name', attachments_api_PropertyName),
-            'value': ConjureFieldDefinition('value', attachments_api_PropertyValue)
-        }
-
-    __slots__: List[str] = ['_name', '_value']
-
-    def __init__(self, name: str, value: str) -> None:
-        self._name = name
-        self._value = value
-
-    @builtins.property
-    def name(self) -> str:
-        return self._name
-
-    @builtins.property
-    def value(self) -> str:
-        return self._value
-
-
-attachments_api_Property.__name__ = "Property"
-attachments_api_Property.__qualname__ = "Property"
-attachments_api_Property.__module__ = "nominal_api.attachments_api"
-
-
 class attachments_api_SearchAttachmentsQuery(ConjureUnionType):
     _search_text: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["attachments_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _and_: Optional[List["attachments_api_SearchAttachmentsQuery"]] = None
     _or_: Optional[List["attachments_api_SearchAttachmentsQuery"]] = None
 
@@ -780,8 +798,8 @@ class attachments_api_SearchAttachmentsQuery(ConjureUnionType):
     def _options(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'search_text': ConjureFieldDefinition('searchText', str),
-            'label': ConjureFieldDefinition('label', attachments_api_Label),
-            'property': ConjureFieldDefinition('property', attachments_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'and_': ConjureFieldDefinition('and', List[attachments_api_SearchAttachmentsQuery]),
             'or_': ConjureFieldDefinition('or', List[attachments_api_SearchAttachmentsQuery])
         }
@@ -790,7 +808,7 @@ class attachments_api_SearchAttachmentsQuery(ConjureUnionType):
             self,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["attachments_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             and_: Optional[List["attachments_api_SearchAttachmentsQuery"]] = None,
             or_: Optional[List["attachments_api_SearchAttachmentsQuery"]] = None,
             type_of_union: Optional[str] = None
@@ -850,7 +868,7 @@ class attachments_api_SearchAttachmentsQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["attachments_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -892,7 +910,7 @@ class attachments_api_SearchAttachmentsQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "attachments_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -916,8 +934,8 @@ class attachments_api_UpdateAttachmentRequest(ConjureBeanType):
         return {
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[attachments_api_PropertyName, attachments_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[attachments_api_Label]])
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]])
         }
 
     __slots__: List[str] = ['_title', '_description', '_properties', '_labels']
@@ -3472,35 +3490,6 @@ comments_api_ResourceType.__qualname__ = "ResourceType"
 comments_api_ResourceType.__module__ = "nominal_api.comments_api"
 
 
-class datasource_Property(ConjureBeanType):
-
-    @builtins.classmethod
-    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
-        return {
-            'name': ConjureFieldDefinition('name', datasource_PropertyName),
-            'value': ConjureFieldDefinition('value', datasource_PropertyValue)
-        }
-
-    __slots__: List[str] = ['_name', '_value']
-
-    def __init__(self, name: str, value: str) -> None:
-        self._name = name
-        self._value = value
-
-    @builtins.property
-    def name(self) -> str:
-        return self._name
-
-    @builtins.property
-    def value(self) -> str:
-        return self._value
-
-
-datasource_Property.__name__ = "Property"
-datasource_Property.__qualname__ = "Property"
-datasource_Property.__module__ = "nominal_api.datasource"
-
-
 class datasource_TimestampType(ConjureEnumType):
 
     RELATIVE = 'RELATIVE'
@@ -5234,8 +5223,8 @@ class event_CreateEvent(ConjureBeanType):
             'duration': ConjureFieldDefinition('duration', scout_run_api_Duration),
             'name': ConjureFieldDefinition('name', str),
             'type': ConjureFieldDefinition('type', event_EventType),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue])
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue])
         }
 
     __slots__: List[str] = ['_asset_rids', '_origins', '_timestamp', '_duration', '_name', '_type', '_labels', '_properties']
@@ -5306,8 +5295,8 @@ class event_Event(ConjureBeanType):
             'duration': ConjureFieldDefinition('duration', scout_run_api_Duration),
             'name': ConjureFieldDefinition('name', str),
             'type': ConjureFieldDefinition('type', event_EventType),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
             'is_archived': ConjureFieldDefinition('isArchived', bool),
             'created_by': ConjureFieldDefinition('createdBy', OptionalTypeWrapper[scout_rids_api_UserRid])
         }
@@ -5720,12 +5709,12 @@ class event_SearchEventsRequest(ConjureBeanType):
             'page_size': ConjureFieldDefinition('pageSize', int),
             'next_page_token': ConjureFieldDefinition('nextPageToken', OptionalTypeWrapper[scout_api_Token]),
             'query': ConjureFieldDefinition('query', event_SearchQuery),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[scout_rids_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_sort', '_page_size', '_next_page_token', '_query', '_archived_statuses']
 
-    def __init__(self, page_size: int, query: "event_SearchQuery", sort: "event_SortOptions", archived_statuses: Optional[List["scout_rids_api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None) -> None:
+    def __init__(self, page_size: int, query: "event_SearchQuery", sort: "event_SortOptions", archived_statuses: Optional[List["api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None) -> None:
         self._sort = sort
         self._page_size = page_size
         self._next_page_token = next_page_token
@@ -5752,7 +5741,7 @@ class event_SearchEventsRequest(ConjureBeanType):
         return self._query
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["scout_rids_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Default search status is NOT_ARCHIVED if none are provided. Allows for including archived events in search.
         """
@@ -5799,7 +5788,7 @@ class event_SearchQuery(ConjureUnionType):
     _before: Optional["api_Timestamp"] = None
     _asset: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["scout_run_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _and_: Optional[List["event_SearchQuery"]] = None
     _or_: Optional[List["event_SearchQuery"]] = None
 
@@ -5810,8 +5799,8 @@ class event_SearchQuery(ConjureUnionType):
             'after': ConjureFieldDefinition('after', api_Timestamp),
             'before': ConjureFieldDefinition('before', api_Timestamp),
             'asset': ConjureFieldDefinition('asset', scout_rids_api_AssetRid),
-            'label': ConjureFieldDefinition('label', scout_run_api_Label),
-            'property': ConjureFieldDefinition('property', scout_run_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'and_': ConjureFieldDefinition('and', List[event_SearchQuery]),
             'or_': ConjureFieldDefinition('or', List[event_SearchQuery])
         }
@@ -5823,7 +5812,7 @@ class event_SearchQuery(ConjureUnionType):
             before: Optional["api_Timestamp"] = None,
             asset: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["scout_run_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             and_: Optional[List["event_SearchQuery"]] = None,
             or_: Optional[List["event_SearchQuery"]] = None,
             type_of_union: Optional[str] = None
@@ -5925,7 +5914,7 @@ class event_SearchQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["scout_run_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -5985,7 +5974,7 @@ class event_SearchQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "scout_run_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -6081,8 +6070,8 @@ class event_UpdateEvent(ConjureBeanType):
             'duration': ConjureFieldDefinition('duration', OptionalTypeWrapper[scout_run_api_Duration]),
             'name': ConjureFieldDefinition('name', OptionalTypeWrapper[str]),
             'type': ConjureFieldDefinition('type', OptionalTypeWrapper[event_EventType]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[scout_run_api_Label]]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]])
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]]),
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]])
         }
 
     __slots__: List[str] = ['_uuid', '_asset_rids', '_timestamp', '_duration', '_name', '_type', '_labels', '_properties']
@@ -7113,8 +7102,8 @@ class ingest_api_IngestMcapRequest(ConjureBeanType):
             'sources': ConjureFieldDefinition('sources', List[ingest_api_IngestSource]),
             'channel_config': ConjureFieldDefinition('channelConfig', List[ingest_api_McapChannelConfig]),
             'channels': ConjureFieldDefinition('channels', OptionalTypeWrapper[ingest_api_McapChannels]),
-            'properties': ConjureFieldDefinition('properties', Dict[ingest_api_PropertyName, ingest_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[ingest_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str])
         }
@@ -7463,8 +7452,8 @@ class ingest_api_IngestRunRequest(ConjureBeanType):
             'description': ConjureFieldDefinition('description', str),
             'start_time': ConjureFieldDefinition('startTime', ingest_api_UtcTimestamp),
             'end_time': ConjureFieldDefinition('endTime', OptionalTypeWrapper[ingest_api_UtcTimestamp]),
-            'properties': ConjureFieldDefinition('properties', Dict[ingest_api_PropertyName, ingest_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[ingest_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'run_prefix': ConjureFieldDefinition('runPrefix', OptionalTypeWrapper[str]),
             'data_sources': ConjureFieldDefinition('dataSources', Dict[ingest_api_DataSourceRefName, ingest_api_IngestRunDataSource])
         }
@@ -8070,8 +8059,8 @@ class ingest_api_IngestVideoRequest(ConjureBeanType):
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'sources': ConjureFieldDefinition('sources', List[ingest_api_IngestSource]),
-            'properties': ConjureFieldDefinition('properties', Dict[ingest_api_PropertyName, ingest_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[ingest_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
             'timestamps': ConjureFieldDefinition('timestamps', ingest_api_VideoTimestampManifest)
@@ -8786,8 +8775,8 @@ class ingest_api_NewDataSource(ConjureBeanType):
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'source': ConjureFieldDefinition('source', ingest_api_IngestSource),
-            'properties': ConjureFieldDefinition('properties', Dict[ingest_api_PropertyName, ingest_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[ingest_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
             'name': ConjureFieldDefinition('name', OptionalTypeWrapper[str]),
             'time_column_spec': ConjureFieldDefinition('timeColumnSpec', OptionalTypeWrapper[ingest_api_TimestampMetadata]),
@@ -8846,8 +8835,8 @@ class ingest_api_NewDatasetIngestDestination(ConjureBeanType):
         return {
             'dataset_name': ConjureFieldDefinition('datasetName', OptionalTypeWrapper[str]),
             'dataset_description': ConjureFieldDefinition('datasetDescription', OptionalTypeWrapper[str]),
-            'properties': ConjureFieldDefinition('properties', Dict[ingest_api_PropertyName, ingest_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[ingest_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'channel_config': ConjureFieldDefinition('channelConfig', OptionalTypeWrapper[ingest_api_ChannelConfig])
         }
 
@@ -8891,8 +8880,8 @@ class ingest_api_NewVideoIngestDestination(ConjureBeanType):
     @builtins.classmethod
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
-            'properties': ConjureFieldDefinition('properties', Dict[ingest_api_PropertyName, ingest_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[ingest_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str])
         }
@@ -9498,8 +9487,8 @@ class ingest_api_TriggerIngest(ConjureBeanType):
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'source': ConjureFieldDefinition('source', ingest_api_IngestSource),
-            'properties': ConjureFieldDefinition('properties', Dict[ingest_api_PropertyName, ingest_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[ingest_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'dataset_name': ConjureFieldDefinition('datasetName', OptionalTypeWrapper[str]),
             'dataset_description': ConjureFieldDefinition('datasetDescription', OptionalTypeWrapper[str]),
             'timestamp_metadata': ConjureFieldDefinition('timestampMetadata', OptionalTypeWrapper[ingest_api_TimestampMetadata]),
@@ -11975,8 +11964,8 @@ class scout_asset_api_Asset(ConjureBeanType):
             'rid': ConjureFieldDefinition('rid', scout_rids_api_AssetRid),
             'title': ConjureFieldDefinition('title', str),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'links': ConjureFieldDefinition('links', List[scout_run_api_Link]),
             'data_scopes': ConjureFieldDefinition('dataScopes', List[scout_asset_api_AssetDataScope]),
             'created_by': ConjureFieldDefinition('createdBy', OptionalTypeWrapper[str]),
@@ -12232,8 +12221,8 @@ class scout_asset_api_CreateAssetRequest(ConjureBeanType):
         return {
             'title': ConjureFieldDefinition('title', str),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'links': ConjureFieldDefinition('links', List[scout_run_api_Link]),
             'data_scopes': ConjureFieldDefinition('dataScopes', List[scout_asset_api_CreateAssetDataScope]),
             'attachments': ConjureFieldDefinition('attachments', List[api_rids_AttachmentRid]),
@@ -12299,7 +12288,7 @@ class scout_asset_api_CreateTypeRequest(ConjureBeanType):
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'name': ConjureFieldDefinition('name', str),
-            'property_configs': ConjureFieldDefinition('propertyConfigs', Dict[scout_run_api_PropertyName, scout_asset_api_PropertyConfig]),
+            'property_configs': ConjureFieldDefinition('propertyConfigs', Dict[api_PropertyName, scout_asset_api_PropertyConfig]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
             'icon_name': ConjureFieldDefinition('iconName', OptionalTypeWrapper[str])
         }
@@ -12461,7 +12450,7 @@ scout_asset_api_SearchAssetChannelsResponse.__module__ = "nominal_api.scout_asse
 class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
     _search_text: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["scout_run_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _type_rid: Optional[str] = None
     _and_: Optional[List["scout_asset_api_SearchAssetsQuery"]] = None
     _or_: Optional[List["scout_asset_api_SearchAssetsQuery"]] = None
@@ -12471,8 +12460,8 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
     def _options(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'search_text': ConjureFieldDefinition('searchText', str),
-            'label': ConjureFieldDefinition('label', scout_run_api_Label),
-            'property': ConjureFieldDefinition('property', scout_run_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'type_rid': ConjureFieldDefinition('typeRid', scout_rids_api_TypeRid),
             'and_': ConjureFieldDefinition('and', List[scout_asset_api_SearchAssetsQuery]),
             'or_': ConjureFieldDefinition('or', List[scout_asset_api_SearchAssetsQuery]),
@@ -12483,7 +12472,7 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
             self,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["scout_run_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             type_rid: Optional[str] = None,
             and_: Optional[List["scout_asset_api_SearchAssetsQuery"]] = None,
             or_: Optional[List["scout_asset_api_SearchAssetsQuery"]] = None,
@@ -12561,7 +12550,7 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["scout_run_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -12615,7 +12604,7 @@ class scout_asset_api_SearchAssetsQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "scout_run_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -12649,12 +12638,12 @@ class scout_asset_api_SearchAssetsRequest(ConjureBeanType):
             'page_size': ConjureFieldDefinition('pageSize', OptionalTypeWrapper[int]),
             'next_page_token': ConjureFieldDefinition('nextPageToken', OptionalTypeWrapper[scout_api_Token]),
             'query': ConjureFieldDefinition('query', scout_asset_api_SearchAssetsQuery),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[scout_rids_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_sort', '_page_size', '_next_page_token', '_query', '_archived_statuses']
 
-    def __init__(self, query: "scout_asset_api_SearchAssetsQuery", sort: "scout_asset_api_SortOptions", archived_statuses: Optional[List["scout_rids_api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None, page_size: Optional[int] = None) -> None:
+    def __init__(self, query: "scout_asset_api_SearchAssetsQuery", sort: "scout_asset_api_SortOptions", archived_statuses: Optional[List["api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None, page_size: Optional[int] = None) -> None:
         self._sort = sort
         self._page_size = page_size
         self._next_page_token = next_page_token
@@ -12681,7 +12670,7 @@ class scout_asset_api_SearchAssetsRequest(ConjureBeanType):
         return self._query
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["scout_rids_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Default search status is NOT_ARCHIVED if none are provided. Allows for including archived assets in search.
         """
@@ -12732,7 +12721,7 @@ class scout_asset_api_SearchTypesQuery(ConjureUnionType):
     def _options(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'search_text': ConjureFieldDefinition('searchText', str),
-            'property': ConjureFieldDefinition('property', scout_run_api_PropertyName),
+            'property': ConjureFieldDefinition('property', api_PropertyName),
             'and_': ConjureFieldDefinition('and', List[scout_asset_api_SearchTypesQuery]),
             'or_': ConjureFieldDefinition('or', List[scout_asset_api_SearchTypesQuery])
         }
@@ -12850,12 +12839,12 @@ class scout_asset_api_SearchTypesRequest(ConjureBeanType):
             'page_size': ConjureFieldDefinition('pageSize', OptionalTypeWrapper[int]),
             'next_page_token': ConjureFieldDefinition('nextPageToken', OptionalTypeWrapper[scout_api_Token]),
             'query': ConjureFieldDefinition('query', scout_asset_api_SearchTypesQuery),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[scout_rids_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_sort', '_page_size', '_next_page_token', '_query', '_archived_statuses']
 
-    def __init__(self, query: "scout_asset_api_SearchTypesQuery", sort: "scout_asset_api_SortOptions", archived_statuses: Optional[List["scout_rids_api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None, page_size: Optional[int] = None) -> None:
+    def __init__(self, query: "scout_asset_api_SearchTypesQuery", sort: "scout_asset_api_SortOptions", archived_statuses: Optional[List["api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None, page_size: Optional[int] = None) -> None:
         self._sort = sort
         self._page_size = page_size
         self._next_page_token = next_page_token
@@ -12882,7 +12871,7 @@ class scout_asset_api_SearchTypesRequest(ConjureBeanType):
         return self._query
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["scout_rids_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Default search status is NOT_ARCHIVED if none are provided. Allows for including archived assets in search.
         """
@@ -12976,7 +12965,7 @@ class scout_asset_api_Type(ConjureBeanType):
             'rid': ConjureFieldDefinition('rid', scout_rids_api_TypeRid),
             'name': ConjureFieldDefinition('name', str),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'property_configs': ConjureFieldDefinition('propertyConfigs', Dict[scout_run_api_PropertyName, scout_asset_api_PropertyConfig]),
+            'property_configs': ConjureFieldDefinition('propertyConfigs', Dict[api_PropertyName, scout_asset_api_PropertyConfig]),
             'created_at': ConjureFieldDefinition('createdAt', str),
             'icon_name': ConjureFieldDefinition('iconName', OptionalTypeWrapper[str])
         }
@@ -13031,8 +13020,8 @@ class scout_asset_api_UpdateAssetRequest(ConjureBeanType):
         return {
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[scout_run_api_Label]]),
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]]),
             'links': ConjureFieldDefinition('links', OptionalTypeWrapper[List[scout_run_api_Link]]),
             'data_scopes': ConjureFieldDefinition('dataScopes', OptionalTypeWrapper[List[scout_asset_api_CreateAssetDataScope]]),
             'type': ConjureFieldDefinition('type', OptionalTypeWrapper[scout_asset_api_UpdateOrRemoveAssetType]),
@@ -13210,7 +13199,7 @@ specified in the request.
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'name': ConjureFieldDefinition('name', OptionalTypeWrapper[str]),
-            'property_configs': ConjureFieldDefinition('propertyConfigs', OptionalTypeWrapper[Dict[scout_run_api_PropertyName, scout_asset_api_PropertyConfig]]),
+            'property_configs': ConjureFieldDefinition('propertyConfigs', OptionalTypeWrapper[Dict[api_PropertyName, scout_asset_api_PropertyConfig]]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
             'icon_name': ConjureFieldDefinition('iconName', OptionalTypeWrapper[str])
         }
@@ -13842,8 +13831,8 @@ class scout_catalog_AllPropertiesAndLabelsResponse(ConjureBeanType):
     @builtins.classmethod
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
-            'properties': ConjureFieldDefinition('properties', Dict[datasource_PropertyName, List[datasource_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', List[datasource_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, List[api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_properties', '_labels']
@@ -14753,8 +14742,8 @@ class scout_catalog_CreateDataset(ConjureBeanType):
             'handle': ConjureFieldDefinition('handle', OptionalTypeWrapper[scout_catalog_Handle]),
             'metadata': ConjureFieldDefinition('metadata', Dict[str, str]),
             'origin_metadata': ConjureFieldDefinition('originMetadata', scout_catalog_DatasetOriginMetadata),
-            'labels': ConjureFieldDefinition('labels', List[datasource_Label]),
-            'properties': ConjureFieldDefinition('properties', Dict[datasource_PropertyName, datasource_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
             'granularity': ConjureFieldDefinition('granularity', OptionalTypeWrapper[api_Granularity])
         }
@@ -14867,8 +14856,8 @@ class scout_catalog_Dataset(ConjureBeanType):
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
             'origin_metadata': ConjureFieldDefinition('originMetadata', scout_catalog_DatasetOriginMetadata),
             'bounds': ConjureFieldDefinition('bounds', OptionalTypeWrapper[scout_catalog_Bounds]),
-            'properties': ConjureFieldDefinition('properties', Dict[datasource_PropertyName, datasource_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[datasource_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'timestamp_type': ConjureFieldDefinition('timestampType', scout_catalog_WeakTimestampType)
         }
 
@@ -15210,8 +15199,8 @@ class scout_catalog_EnrichedDataset(ConjureBeanType):
             'source': ConjureFieldDefinition('source', OptionalTypeWrapper[str]),
             'bounds': ConjureFieldDefinition('bounds', OptionalTypeWrapper[scout_catalog_Bounds]),
             'timestamp_type': ConjureFieldDefinition('timestampType', scout_catalog_WeakTimestampType),
-            'labels': ConjureFieldDefinition('labels', List[datasource_Label]),
-            'properties': ConjureFieldDefinition('properties', Dict[datasource_PropertyName, datasource_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
             'granularity': ConjureFieldDefinition('granularity', api_Granularity)
         }
 
@@ -16125,7 +16114,7 @@ class scout_catalog_SearchDatasetsQuery(ConjureUnionType):
     _search_text: Optional[str] = None
     _exact_match: Optional[str] = None
     _label: Optional[str] = None
-    _properties: Optional["datasource_Property"] = None
+    _properties: Optional["api_Property"] = None
     _ingest_status: Optional["scout_catalog_IngestStatus"] = None
     _ingested_before_inclusive: Optional[str] = None
     _ingested_after_inclusive: Optional[str] = None
@@ -16138,8 +16127,8 @@ class scout_catalog_SearchDatasetsQuery(ConjureUnionType):
         return {
             'search_text': ConjureFieldDefinition('searchText', str),
             'exact_match': ConjureFieldDefinition('exactMatch', str),
-            'label': ConjureFieldDefinition('label', datasource_Label),
-            'properties': ConjureFieldDefinition('properties', datasource_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'properties': ConjureFieldDefinition('properties', api_Property),
             'ingest_status': ConjureFieldDefinition('ingestStatus', scout_catalog_IngestStatus),
             'ingested_before_inclusive': ConjureFieldDefinition('ingestedBeforeInclusive', str),
             'ingested_after_inclusive': ConjureFieldDefinition('ingestedAfterInclusive', str),
@@ -16153,7 +16142,7 @@ class scout_catalog_SearchDatasetsQuery(ConjureUnionType):
             search_text: Optional[str] = None,
             exact_match: Optional[str] = None,
             label: Optional[str] = None,
-            properties: Optional["datasource_Property"] = None,
+            properties: Optional["api_Property"] = None,
             ingest_status: Optional["scout_catalog_IngestStatus"] = None,
             ingested_before_inclusive: Optional[str] = None,
             ingested_after_inclusive: Optional[str] = None,
@@ -16264,7 +16253,7 @@ class scout_catalog_SearchDatasetsQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def properties(self) -> Optional["datasource_Property"]:
+    def properties(self) -> Optional["api_Property"]:
         return self._properties
 
     @builtins.property
@@ -16336,7 +16325,7 @@ class scout_catalog_SearchDatasetsQueryVisitor:
         pass
 
     @abstractmethod
-    def _properties(self, properties: "datasource_Property") -> Any:
+    def _properties(self, properties: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -16747,8 +16736,8 @@ class scout_catalog_UpdateDatasetMetadata(ConjureBeanType):
         return {
             'name': ConjureFieldDefinition('name', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[datasource_Label]]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[datasource_PropertyName, datasource_PropertyValue]])
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]]),
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]])
         }
 
     __slots__: List[str] = ['_name', '_description', '_labels', '_properties']
@@ -22232,8 +22221,8 @@ class scout_checks_api_ChecklistMetadata(ConjureBeanType):
             'title': ConjureFieldDefinition('title', str),
             'description': ConjureFieldDefinition('description', str),
             'created_at': ConjureFieldDefinition('createdAt', str),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'last_used': ConjureFieldDefinition('lastUsed', OptionalTypeWrapper[str]),
             'is_archived': ConjureFieldDefinition('isArchived', bool),
             'is_published': ConjureFieldDefinition('isPublished', bool)
@@ -22337,7 +22326,7 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
     _or_: Optional[List["scout_checks_api_ChecklistSearchQuery"]] = None
     _search_text: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["scout_run_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _author_rid: Optional[str] = None
     _assignee_rid: Optional[str] = None
     _is_published: Optional[bool] = None
@@ -22349,8 +22338,8 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
             'and_': ConjureFieldDefinition('and', List[scout_checks_api_ChecklistSearchQuery]),
             'or_': ConjureFieldDefinition('or', List[scout_checks_api_ChecklistSearchQuery]),
             'search_text': ConjureFieldDefinition('searchText', str),
-            'label': ConjureFieldDefinition('label', scout_run_api_Label),
-            'property': ConjureFieldDefinition('property', scout_run_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'author_rid': ConjureFieldDefinition('authorRid', scout_rids_api_UserRid),
             'assignee_rid': ConjureFieldDefinition('assigneeRid', scout_rids_api_UserRid),
             'is_published': ConjureFieldDefinition('isPublished', bool),
@@ -22363,7 +22352,7 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
             or_: Optional[List["scout_checks_api_ChecklistSearchQuery"]] = None,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["scout_run_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             author_rid: Optional[str] = None,
             assignee_rid: Optional[str] = None,
             is_published: Optional[bool] = None,
@@ -22465,7 +22454,7 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["scout_run_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -22531,7 +22520,7 @@ class scout_checks_api_ChecklistSearchQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "scout_run_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -23364,8 +23353,8 @@ class scout_checks_api_CreateChecklistRequest(ConjureBeanType):
             'description': ConjureFieldDefinition('description', str),
             'functions': ConjureFieldDefinition('functions', Dict[scout_compute_api_FunctionReference, scout_checks_api_CreateFunctionRequest]),
             'checks': ConjureFieldDefinition('checks', List[scout_checks_api_CreateChecklistEntryRequest]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'checklist_variables': ConjureFieldDefinition('checklistVariables', List[scout_checks_api_UnresolvedChecklistVariable]),
             'is_published': ConjureFieldDefinition('isPublished', OptionalTypeWrapper[bool])
         }
@@ -23752,8 +23741,8 @@ class scout_checks_api_GetAllLabelsAndPropertiesResponse(ConjureBeanType):
     @builtins.classmethod
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, List[scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, List[api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_properties', '_labels']
@@ -24401,12 +24390,12 @@ class scout_checks_api_SearchChecklistsRequest(ConjureBeanType):
             'sort_by': ConjureFieldDefinition('sortBy', OptionalTypeWrapper[scout_checks_api_SortOptions]),
             'next_page_token': ConjureFieldDefinition('nextPageToken', OptionalTypeWrapper[scout_api_Token]),
             'page_size': ConjureFieldDefinition('pageSize', OptionalTypeWrapper[int]),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[scout_rids_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_query', '_sort_by', '_next_page_token', '_page_size', '_archived_statuses']
 
-    def __init__(self, query: "scout_checks_api_ChecklistSearchQuery", archived_statuses: Optional[List["scout_rids_api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None, page_size: Optional[int] = None, sort_by: Optional["scout_checks_api_SortOptions"] = None) -> None:
+    def __init__(self, query: "scout_checks_api_ChecklistSearchQuery", archived_statuses: Optional[List["api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None, page_size: Optional[int] = None, sort_by: Optional["scout_checks_api_SortOptions"] = None) -> None:
         self._query = query
         self._sort_by = sort_by
         self._next_page_token = next_page_token
@@ -24436,7 +24425,7 @@ class scout_checks_api_SearchChecklistsRequest(ConjureBeanType):
         return self._page_size
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["scout_rids_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Default search status is NOT_ARCHIVED if none are provided. Allows for including archived checklists in search.
         """
@@ -25172,8 +25161,8 @@ class scout_checks_api_UpdateChecklistMetadataRequest(ConjureBeanType):
             'assignee_rid': ConjureFieldDefinition('assigneeRid', OptionalTypeWrapper[scout_rids_api_UserRid]),
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[scout_run_api_Label]]),
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]]),
             'is_published': ConjureFieldDefinition('isPublished', OptionalTypeWrapper[bool])
         }
 
@@ -27494,6 +27483,74 @@ scout_compute_api_AllowNegativeValues.__qualname__ = "AllowNegativeValues"
 scout_compute_api_AllowNegativeValues.__module__ = "nominal_api.scout_compute_api"
 
 
+class scout_compute_api_ApproximateThresholdOperator(ConjureEnumType):
+
+    EQUAL_TO = 'EQUAL_TO'
+    '''EQUAL_TO'''
+    NOT_EQUAL_TO = 'NOT_EQUAL_TO'
+    '''NOT_EQUAL_TO'''
+    UNKNOWN = 'UNKNOWN'
+    '''UNKNOWN'''
+
+    def __reduce_ex__(self, proto):
+        return self.__class__, (self.name,)
+
+
+scout_compute_api_ApproximateThresholdOperator.__name__ = "ApproximateThresholdOperator"
+scout_compute_api_ApproximateThresholdOperator.__qualname__ = "ApproximateThresholdOperator"
+scout_compute_api_ApproximateThresholdOperator.__module__ = "nominal_api.scout_compute_api"
+
+
+class scout_compute_api_ApproximateThresholdRanges(ConjureBeanType):
+    """
+    Produces a list of ranges for which the threshold condition is satisfied.
+    """
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'input': ConjureFieldDefinition('input', scout_compute_api_NumericSeries),
+            'threshold': ConjureFieldDefinition('threshold', scout_compute_api_DoubleConstant),
+            'tolerance': ConjureFieldDefinition('tolerance', scout_compute_api_DoubleConstant),
+            'operator': ConjureFieldDefinition('operator', scout_compute_api_ApproximateThresholdOperator),
+            'persistence_window_configuration': ConjureFieldDefinition('persistenceWindowConfiguration', OptionalTypeWrapper[scout_compute_api_PersistenceWindowConfiguration])
+        }
+
+    __slots__: List[str] = ['_input', '_threshold', '_tolerance', '_operator', '_persistence_window_configuration']
+
+    def __init__(self, input: "scout_compute_api_NumericSeries", operator: "scout_compute_api_ApproximateThresholdOperator", threshold: "scout_compute_api_DoubleConstant", tolerance: "scout_compute_api_DoubleConstant", persistence_window_configuration: Optional["scout_compute_api_PersistenceWindowConfiguration"] = None) -> None:
+        self._input = input
+        self._threshold = threshold
+        self._tolerance = tolerance
+        self._operator = operator
+        self._persistence_window_configuration = persistence_window_configuration
+
+    @builtins.property
+    def input(self) -> "scout_compute_api_NumericSeries":
+        return self._input
+
+    @builtins.property
+    def threshold(self) -> "scout_compute_api_DoubleConstant":
+        return self._threshold
+
+    @builtins.property
+    def tolerance(self) -> "scout_compute_api_DoubleConstant":
+        return self._tolerance
+
+    @builtins.property
+    def operator(self) -> "scout_compute_api_ApproximateThresholdOperator":
+        return self._operator
+
+    @builtins.property
+    def persistence_window_configuration(self) -> Optional["scout_compute_api_PersistenceWindowConfiguration"]:
+        return self._persistence_window_configuration
+
+
+scout_compute_api_ApproximateThresholdRanges.__name__ = "ApproximateThresholdRanges"
+scout_compute_api_ApproximateThresholdRanges.__qualname__ = "ApproximateThresholdRanges"
+scout_compute_api_ApproximateThresholdRanges.__module__ = "nominal_api.scout_compute_api"
+
+
 class scout_compute_api_ArithmeticSeries(ConjureBeanType):
 
     @builtins.classmethod
@@ -30237,6 +30294,32 @@ scout_compute_api_EnumBucket.__qualname__ = "EnumBucket"
 scout_compute_api_EnumBucket.__module__ = "nominal_api.scout_compute_api"
 
 
+class scout_compute_api_EnumCountDuplicateSeries(ConjureBeanType):
+    """
+    Counts the number of points along each timestamp in the input series.
+    """
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'inputs': ConjureFieldDefinition('inputs', List[scout_compute_api_EnumSeries])
+        }
+
+    __slots__: List[str] = ['_inputs']
+
+    def __init__(self, inputs: List["scout_compute_api_EnumSeries"]) -> None:
+        self._inputs = inputs
+
+    @builtins.property
+    def inputs(self) -> List["scout_compute_api_EnumSeries"]:
+        return self._inputs
+
+
+scout_compute_api_EnumCountDuplicateSeries.__name__ = "EnumCountDuplicateSeries"
+scout_compute_api_EnumCountDuplicateSeries.__qualname__ = "EnumCountDuplicateSeries"
+scout_compute_api_EnumCountDuplicateSeries.__module__ = "nominal_api.scout_compute_api"
+
+
 class scout_compute_api_EnumFilterOperator(ConjureEnumType):
 
     IS_IN = 'IS_IN'
@@ -32884,6 +32967,8 @@ class scout_compute_api_NumericAggregationFunction(ConjureEnumType):
     '''MIN'''
     MAX = 'MAX'
     '''MAX'''
+    COUNT = 'COUNT'
+    '''COUNT'''
     UNKNOWN = 'UNKNOWN'
     '''UNKNOWN'''
 
@@ -32896,6 +32981,50 @@ scout_compute_api_NumericAggregationFunction.__qualname__ = "NumericAggregationF
 scout_compute_api_NumericAggregationFunction.__module__ = "nominal_api.scout_compute_api"
 
 
+class scout_compute_api_NumericApproximateFilterSeries(ConjureBeanType):
+    """
+    Outputs the values of the numeric plot value that are approximately equal to the threshold value.
+    """
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'input': ConjureFieldDefinition('input', scout_compute_api_NumericSeries),
+            'threshold': ConjureFieldDefinition('threshold', scout_compute_api_DoubleConstant),
+            'tolerance': ConjureFieldDefinition('tolerance', scout_compute_api_DoubleConstant),
+            'operator': ConjureFieldDefinition('operator', scout_compute_api_ApproximateThresholdOperator)
+        }
+
+    __slots__: List[str] = ['_input', '_threshold', '_tolerance', '_operator']
+
+    def __init__(self, input: "scout_compute_api_NumericSeries", operator: "scout_compute_api_ApproximateThresholdOperator", threshold: "scout_compute_api_DoubleConstant", tolerance: "scout_compute_api_DoubleConstant") -> None:
+        self._input = input
+        self._threshold = threshold
+        self._tolerance = tolerance
+        self._operator = operator
+
+    @builtins.property
+    def input(self) -> "scout_compute_api_NumericSeries":
+        return self._input
+
+    @builtins.property
+    def threshold(self) -> "scout_compute_api_DoubleConstant":
+        return self._threshold
+
+    @builtins.property
+    def tolerance(self) -> "scout_compute_api_DoubleConstant":
+        return self._tolerance
+
+    @builtins.property
+    def operator(self) -> "scout_compute_api_ApproximateThresholdOperator":
+        return self._operator
+
+
+scout_compute_api_NumericApproximateFilterSeries.__name__ = "NumericApproximateFilterSeries"
+scout_compute_api_NumericApproximateFilterSeries.__qualname__ = "NumericApproximateFilterSeries"
+scout_compute_api_NumericApproximateFilterSeries.__module__ = "nominal_api.scout_compute_api"
+
+
 class scout_compute_api_NumericBucket(ConjureBeanType):
 
     @builtins.classmethod
@@ -33314,6 +33443,7 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
     _aggregate: Optional["scout_compute_api_AggregateNumericSeries"] = None
     _arithmetic: Optional["scout_compute_api_ArithmeticSeries"] = None
     _bit_operation: Optional["scout_compute_api_BitOperationSeries"] = None
+    _count_duplicate: Optional["scout_compute_api_EnumCountDuplicateSeries"] = None
     _cumulative_sum: Optional["scout_compute_api_CumulativeSumSeries"] = None
     _derivative: Optional["scout_compute_api_DerivativeSeries"] = None
     _function: Optional["scout_compute_api_NumericSeriesFunction"] = None
@@ -33340,6 +33470,7 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
     _value_difference: Optional["scout_compute_api_ValueDifferenceSeries"] = None
     _filter_transformation: Optional["scout_compute_api_NumericFilterTransformationSeries"] = None
     _threshold_filter: Optional["scout_compute_api_NumericThresholdFilterSeries"] = None
+    _approximate_filter: Optional["scout_compute_api_NumericApproximateFilterSeries"] = None
 
     @builtins.classmethod
     def _options(cls) -> Dict[str, ConjureFieldDefinition]:
@@ -33347,6 +33478,7 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
             'aggregate': ConjureFieldDefinition('aggregate', scout_compute_api_AggregateNumericSeries),
             'arithmetic': ConjureFieldDefinition('arithmetic', scout_compute_api_ArithmeticSeries),
             'bit_operation': ConjureFieldDefinition('bitOperation', scout_compute_api_BitOperationSeries),
+            'count_duplicate': ConjureFieldDefinition('countDuplicate', scout_compute_api_EnumCountDuplicateSeries),
             'cumulative_sum': ConjureFieldDefinition('cumulativeSum', scout_compute_api_CumulativeSumSeries),
             'derivative': ConjureFieldDefinition('derivative', scout_compute_api_DerivativeSeries),
             'function': ConjureFieldDefinition('function', scout_compute_api_NumericSeriesFunction),
@@ -33372,7 +33504,8 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
             'unit_conversion': ConjureFieldDefinition('unitConversion', scout_compute_api_UnitConversionSeries),
             'value_difference': ConjureFieldDefinition('valueDifference', scout_compute_api_ValueDifferenceSeries),
             'filter_transformation': ConjureFieldDefinition('filterTransformation', scout_compute_api_NumericFilterTransformationSeries),
-            'threshold_filter': ConjureFieldDefinition('thresholdFilter', scout_compute_api_NumericThresholdFilterSeries)
+            'threshold_filter': ConjureFieldDefinition('thresholdFilter', scout_compute_api_NumericThresholdFilterSeries),
+            'approximate_filter': ConjureFieldDefinition('approximateFilter', scout_compute_api_NumericApproximateFilterSeries)
         }
 
     def __init__(
@@ -33380,6 +33513,7 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
             aggregate: Optional["scout_compute_api_AggregateNumericSeries"] = None,
             arithmetic: Optional["scout_compute_api_ArithmeticSeries"] = None,
             bit_operation: Optional["scout_compute_api_BitOperationSeries"] = None,
+            count_duplicate: Optional["scout_compute_api_EnumCountDuplicateSeries"] = None,
             cumulative_sum: Optional["scout_compute_api_CumulativeSumSeries"] = None,
             derivative: Optional["scout_compute_api_DerivativeSeries"] = None,
             function: Optional["scout_compute_api_NumericSeriesFunction"] = None,
@@ -33406,10 +33540,11 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
             value_difference: Optional["scout_compute_api_ValueDifferenceSeries"] = None,
             filter_transformation: Optional["scout_compute_api_NumericFilterTransformationSeries"] = None,
             threshold_filter: Optional["scout_compute_api_NumericThresholdFilterSeries"] = None,
+            approximate_filter: Optional["scout_compute_api_NumericApproximateFilterSeries"] = None,
             type_of_union: Optional[str] = None
             ) -> None:
         if type_of_union is None:
-            if (aggregate is not None) + (arithmetic is not None) + (bit_operation is not None) + (cumulative_sum is not None) + (derivative is not None) + (function is not None) + (integral is not None) + (max is not None) + (mean is not None) + (min is not None) + (offset is not None) + (product is not None) + (raw is not None) + (channel is not None) + (resample is not None) + (rolling_operation is not None) + (signal_filter is not None) + (sum is not None) + (scale is not None) + (time_difference is not None) + (time_range_filter is not None) + (time_shift is not None) + (unary_arithmetic is not None) + (binary_arithmetic is not None) + (union is not None) + (unit_conversion is not None) + (value_difference is not None) + (filter_transformation is not None) + (threshold_filter is not None) != 1:
+            if (aggregate is not None) + (arithmetic is not None) + (bit_operation is not None) + (count_duplicate is not None) + (cumulative_sum is not None) + (derivative is not None) + (function is not None) + (integral is not None) + (max is not None) + (mean is not None) + (min is not None) + (offset is not None) + (product is not None) + (raw is not None) + (channel is not None) + (resample is not None) + (rolling_operation is not None) + (signal_filter is not None) + (sum is not None) + (scale is not None) + (time_difference is not None) + (time_range_filter is not None) + (time_shift is not None) + (unary_arithmetic is not None) + (binary_arithmetic is not None) + (union is not None) + (unit_conversion is not None) + (value_difference is not None) + (filter_transformation is not None) + (threshold_filter is not None) + (approximate_filter is not None) != 1:
                 raise ValueError('a union must contain a single member')
 
             if aggregate is not None:
@@ -33421,6 +33556,9 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
             if bit_operation is not None:
                 self._bit_operation = bit_operation
                 self._type = 'bitOperation'
+            if count_duplicate is not None:
+                self._count_duplicate = count_duplicate
+                self._type = 'countDuplicate'
             if cumulative_sum is not None:
                 self._cumulative_sum = cumulative_sum
                 self._type = 'cumulativeSum'
@@ -33499,6 +33637,9 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
             if threshold_filter is not None:
                 self._threshold_filter = threshold_filter
                 self._type = 'thresholdFilter'
+            if approximate_filter is not None:
+                self._approximate_filter = approximate_filter
+                self._type = 'approximateFilter'
 
         elif type_of_union == 'aggregate':
             if aggregate is None:
@@ -33515,6 +33656,11 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._bit_operation = bit_operation
             self._type = 'bitOperation'
+        elif type_of_union == 'countDuplicate':
+            if count_duplicate is None:
+                raise ValueError('a union value must not be None')
+            self._count_duplicate = count_duplicate
+            self._type = 'countDuplicate'
         elif type_of_union == 'cumulativeSum':
             if cumulative_sum is None:
                 raise ValueError('a union value must not be None')
@@ -33645,6 +33791,11 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._threshold_filter = threshold_filter
             self._type = 'thresholdFilter'
+        elif type_of_union == 'approximateFilter':
+            if approximate_filter is None:
+                raise ValueError('a union value must not be None')
+            self._approximate_filter = approximate_filter
+            self._type = 'approximateFilter'
 
     @builtins.property
     def aggregate(self) -> Optional["scout_compute_api_AggregateNumericSeries"]:
@@ -33658,6 +33809,10 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
     def bit_operation(self) -> Optional["scout_compute_api_BitOperationSeries"]:
         return self._bit_operation
 
+    @builtins.property
+    def count_duplicate(self) -> Optional["scout_compute_api_EnumCountDuplicateSeries"]:
+        return self._count_duplicate
+
     @builtins.property
     def cumulative_sum(self) -> Optional["scout_compute_api_CumulativeSumSeries"]:
         return self._cumulative_sum
@@ -33762,6 +33917,10 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
     def threshold_filter(self) -> Optional["scout_compute_api_NumericThresholdFilterSeries"]:
         return self._threshold_filter
 
+    @builtins.property
+    def approximate_filter(self) -> Optional["scout_compute_api_NumericApproximateFilterSeries"]:
+        return self._approximate_filter
+
     def accept(self, visitor) -> Any:
         if not isinstance(visitor, scout_compute_api_NumericSeriesVisitor):
             raise ValueError('{} is not an instance of scout_compute_api_NumericSeriesVisitor'.format(visitor.__class__.__name__))
@@ -33771,6 +33930,8 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
             return visitor._arithmetic(self.arithmetic)
         if self._type == 'bitOperation' and self.bit_operation is not None:
             return visitor._bit_operation(self.bit_operation)
+        if self._type == 'countDuplicate' and self.count_duplicate is not None:
+            return visitor._count_duplicate(self.count_duplicate)
         if self._type == 'cumulativeSum' and self.cumulative_sum is not None:
             return visitor._cumulative_sum(self.cumulative_sum)
         if self._type == 'derivative' and self.derivative is not None:
@@ -33823,6 +33984,8 @@ class scout_compute_api_NumericSeries(ConjureUnionType):
             return visitor._filter_transformation(self.filter_transformation)
         if self._type == 'thresholdFilter' and self.threshold_filter is not None:
             return visitor._threshold_filter(self.threshold_filter)
+        if self._type == 'approximateFilter' and self.approximate_filter is not None:
+            return visitor._approximate_filter(self.approximate_filter)
 
 
 scout_compute_api_NumericSeries.__name__ = "NumericSeries"
@@ -33844,6 +34007,10 @@ class scout_compute_api_NumericSeriesVisitor:
     def _bit_operation(self, bit_operation: "scout_compute_api_BitOperationSeries") -> Any:
         pass
 
+    @abstractmethod
+    def _count_duplicate(self, count_duplicate: "scout_compute_api_EnumCountDuplicateSeries") -> Any:
+        pass
+
     @abstractmethod
     def _cumulative_sum(self, cumulative_sum: "scout_compute_api_CumulativeSumSeries") -> Any:
         pass
@@ -33948,6 +34115,10 @@ class scout_compute_api_NumericSeriesVisitor:
     def _threshold_filter(self, threshold_filter: "scout_compute_api_NumericThresholdFilterSeries") -> Any:
         pass
 
+    @abstractmethod
+    def _approximate_filter(self, approximate_filter: "scout_compute_api_NumericApproximateFilterSeries") -> Any:
+        pass
+
 
 scout_compute_api_NumericSeriesVisitor.__name__ = "NumericSeriesVisitor"
 scout_compute_api_NumericSeriesVisitor.__qualname__ = "NumericSeriesVisitor"
@@ -34113,6 +34284,8 @@ class scout_compute_api_NumericUnionOperation(ConjureEnumType):
     '''MEAN'''
     SUM = 'SUM'
     '''SUM'''
+    COUNT = 'COUNT'
+    '''COUNT'''
     THROW = 'THROW'
     '''THROW'''
     UNKNOWN = 'UNKNOWN'
@@ -34870,6 +35043,7 @@ class scout_compute_api_RangeSeries(ConjureUnionType):
     _intersect_range: Optional["scout_compute_api_IntersectRanges"] = None
     _not_: Optional["scout_compute_api_NotRanges"] = None
     _on_change: Optional["scout_compute_api_OnChangeRanges"] = None
+    _approximate_threshold: Optional["scout_compute_api_ApproximateThresholdRanges"] = None
     _min_max_threshold: Optional["scout_compute_api_MinMaxThresholdRanges"] = None
     _peak: Optional["scout_compute_api_PeakRanges"] = None
     _raw: Optional["scout_compute_api_Reference"] = None
@@ -34890,6 +35064,7 @@ class scout_compute_api_RangeSeries(ConjureUnionType):
             'intersect_range': ConjureFieldDefinition('intersectRange', scout_compute_api_IntersectRanges),
             'not_': ConjureFieldDefinition('not', scout_compute_api_NotRanges),
             'on_change': ConjureFieldDefinition('onChange', scout_compute_api_OnChangeRanges),
+            'approximate_threshold': ConjureFieldDefinition('approximateThreshold', scout_compute_api_ApproximateThresholdRanges),
             'min_max_threshold': ConjureFieldDefinition('minMaxThreshold', scout_compute_api_MinMaxThresholdRanges),
             'peak': ConjureFieldDefinition('peak', scout_compute_api_PeakRanges),
             'raw': ConjureFieldDefinition('raw', scout_compute_api_Reference),
@@ -34910,6 +35085,7 @@ class scout_compute_api_RangeSeries(ConjureUnionType):
             intersect_range: Optional["scout_compute_api_IntersectRanges"] = None,
             not_: Optional["scout_compute_api_NotRanges"] = None,
             on_change: Optional["scout_compute_api_OnChangeRanges"] = None,
+            approximate_threshold: Optional["scout_compute_api_ApproximateThresholdRanges"] = None,
             min_max_threshold: Optional["scout_compute_api_MinMaxThresholdRanges"] = None,
             peak: Optional["scout_compute_api_PeakRanges"] = None,
             raw: Optional["scout_compute_api_Reference"] = None,
@@ -34924,7 +35100,7 @@ class scout_compute_api_RangeSeries(ConjureUnionType):
             type_of_union: Optional[str] = None
             ) -> None:
         if type_of_union is None:
-            if (enum_filter is not None) + (function is not None) + (intersect_range is not None) + (not_ is not None) + (on_change is not None) + (min_max_threshold is not None) + (peak is not None) + (raw is not None) + (series_crossover_ranges_node is not None) + (series_equality_ranges_node is not None) + (enum_series_equality_ranges_node is not None) + (stale_range is not None) + (threshold is not None) + (union_range is not None) + (range_numeric_aggregation is not None) + (stability_detection is not None) != 1:
+            if (enum_filter is not None) + (function is not None) + (intersect_range is not None) + (not_ is not None) + (on_change is not None) + (approximate_threshold is not None) + (min_max_threshold is not None) + (peak is not None) + (raw is not None) + (series_crossover_ranges_node is not None) + (series_equality_ranges_node is not None) + (enum_series_equality_ranges_node is not None) + (stale_range is not None) + (threshold is not None) + (union_range is not None) + (range_numeric_aggregation is not None) + (stability_detection is not None) != 1:
                 raise ValueError('a union must contain a single member')
 
             if enum_filter is not None:
@@ -34942,6 +35118,9 @@ class scout_compute_api_RangeSeries(ConjureUnionType):
             if on_change is not None:
                 self._on_change = on_change
                 self._type = 'onChange'
+            if approximate_threshold is not None:
+                self._approximate_threshold = approximate_threshold
+                self._type = 'approximateThreshold'
             if min_max_threshold is not None:
                 self._min_max_threshold = min_max_threshold
                 self._type = 'minMaxThreshold'
@@ -35001,6 +35180,11 @@ class scout_compute_api_RangeSeries(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._on_change = on_change
             self._type = 'onChange'
+        elif type_of_union == 'approximateThreshold':
+            if approximate_threshold is None:
+                raise ValueError('a union value must not be None')
+            self._approximate_threshold = approximate_threshold
+            self._type = 'approximateThreshold'
         elif type_of_union == 'minMaxThreshold':
             if min_max_threshold is None:
                 raise ValueError('a union value must not be None')
@@ -35077,6 +35261,10 @@ class scout_compute_api_RangeSeries(ConjureUnionType):
     def on_change(self) -> Optional["scout_compute_api_OnChangeRanges"]:
         return self._on_change
 
+    @builtins.property
+    def approximate_threshold(self) -> Optional["scout_compute_api_ApproximateThresholdRanges"]:
+        return self._approximate_threshold
+
     @builtins.property
     def min_max_threshold(self) -> Optional["scout_compute_api_MinMaxThresholdRanges"]:
         """
@@ -35140,6 +35328,8 @@ class scout_compute_api_RangeSeries(ConjureUnionType):
             return visitor._not(self.not_)
         if self._type == 'onChange' and self.on_change is not None:
             return visitor._on_change(self.on_change)
+        if self._type == 'approximateThreshold' and self.approximate_threshold is not None:
+            return visitor._approximate_threshold(self.approximate_threshold)
         if self._type == 'minMaxThreshold' and self.min_max_threshold is not None:
             return visitor._min_max_threshold(self.min_max_threshold)
         if self._type == 'peak' and self.peak is not None:
@@ -35191,6 +35381,10 @@ class scout_compute_api_RangeSeriesVisitor:
     def _on_change(self, on_change: "scout_compute_api_OnChangeRanges") -> Any:
         pass
 
+    @abstractmethod
+    def _approximate_threshold(self, approximate_threshold: "scout_compute_api_ApproximateThresholdRanges") -> Any:
+        pass
+
     @abstractmethod
     def _min_max_threshold(self, min_max_threshold: "scout_compute_api_MinMaxThresholdRanges") -> Any:
         pass
@@ -41183,6 +41377,29 @@ scout_compute_resolved_api_DerivativeSeriesNode.__qualname__ = "DerivativeSeries
 scout_compute_resolved_api_DerivativeSeriesNode.__module__ = "nominal_api.scout_compute_resolved_api"
 
 
+class scout_compute_resolved_api_EnumCountDuplicateSeriesNode(ConjureBeanType):
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'inputs': ConjureFieldDefinition('inputs', List[scout_compute_resolved_api_EnumSeriesNode])
+        }
+
+    __slots__: List[str] = ['_inputs']
+
+    def __init__(self, inputs: List["scout_compute_resolved_api_EnumSeriesNode"]) -> None:
+        self._inputs = inputs
+
+    @builtins.property
+    def inputs(self) -> List["scout_compute_resolved_api_EnumSeriesNode"]:
+        return self._inputs
+
+
+scout_compute_resolved_api_EnumCountDuplicateSeriesNode.__name__ = "EnumCountDuplicateSeriesNode"
+scout_compute_resolved_api_EnumCountDuplicateSeriesNode.__qualname__ = "EnumCountDuplicateSeriesNode"
+scout_compute_resolved_api_EnumCountDuplicateSeriesNode.__module__ = "nominal_api.scout_compute_resolved_api"
+
+
 class scout_compute_resolved_api_EnumEqualityRangesNode(ConjureBeanType):
 
     @builtins.classmethod
@@ -42569,6 +42786,7 @@ scout_compute_resolved_api_NumericResampleSeriesNode.__module__ = "nominal_api.s
 class scout_compute_resolved_api_NumericSeriesNode(ConjureUnionType):
     _arithmetic: Optional["scout_compute_resolved_api_ArithmeticSeriesNode"] = None
     _bit_operation: Optional["scout_compute_resolved_api_BitOperationSeriesNode"] = None
+    _count_duplicate: Optional["scout_compute_resolved_api_EnumCountDuplicateSeriesNode"] = None
     _cumulative_sum: Optional["scout_compute_resolved_api_CumulativeSumSeriesNode"] = None
     _derivative: Optional["scout_compute_resolved_api_DerivativeSeriesNode"] = None
     _integral: Optional["scout_compute_resolved_api_IntegralSeriesNode"] = None
@@ -42599,6 +42817,7 @@ class scout_compute_resolved_api_NumericSeriesNode(ConjureUnionType):
         return {
             'arithmetic': ConjureFieldDefinition('arithmetic', scout_compute_resolved_api_ArithmeticSeriesNode),
             'bit_operation': ConjureFieldDefinition('bitOperation', scout_compute_resolved_api_BitOperationSeriesNode),
+            'count_duplicate': ConjureFieldDefinition('countDuplicate', scout_compute_resolved_api_EnumCountDuplicateSeriesNode),
             'cumulative_sum': ConjureFieldDefinition('cumulativeSum', scout_compute_resolved_api_CumulativeSumSeriesNode),
             'derivative': ConjureFieldDefinition('derivative', scout_compute_resolved_api_DerivativeSeriesNode),
             'integral': ConjureFieldDefinition('integral', scout_compute_resolved_api_IntegralSeriesNode),
@@ -42629,6 +42848,7 @@ class scout_compute_resolved_api_NumericSeriesNode(ConjureUnionType):
             self,
             arithmetic: Optional["scout_compute_resolved_api_ArithmeticSeriesNode"] = None,
             bit_operation: Optional["scout_compute_resolved_api_BitOperationSeriesNode"] = None,
+            count_duplicate: Optional["scout_compute_resolved_api_EnumCountDuplicateSeriesNode"] = None,
             cumulative_sum: Optional["scout_compute_resolved_api_CumulativeSumSeriesNode"] = None,
             derivative: Optional["scout_compute_resolved_api_DerivativeSeriesNode"] = None,
             integral: Optional["scout_compute_resolved_api_IntegralSeriesNode"] = None,
@@ -42656,7 +42876,7 @@ class scout_compute_resolved_api_NumericSeriesNode(ConjureUnionType):
             type_of_union: Optional[str] = None
             ) -> None:
         if type_of_union is None:
-            if (arithmetic is not None) + (bit_operation is not None) + (cumulative_sum is not None) + (derivative is not None) + (integral is not None) + (max is not None) + (mean is not None) + (min is not None) + (offset is not None) + (product is not None) + (raw is not None) + (resample is not None) + (rolling_operation is not None) + (aggregate is not None) + (signal_filter is not None) + (sum is not None) + (scale is not None) + (time_difference is not None) + (time_range_filter is not None) + (time_shift is not None) + (unary_arithmetic is not None) + (binary_arithmetic is not None) + (union is not None) + (unit_conversion is not None) + (value_difference is not None) + (filter_transformation is not None) != 1:
+            if (arithmetic is not None) + (bit_operation is not None) + (count_duplicate is not None) + (cumulative_sum is not None) + (derivative is not None) + (integral is not None) + (max is not None) + (mean is not None) + (min is not None) + (offset is not None) + (product is not None) + (raw is not None) + (resample is not None) + (rolling_operation is not None) + (aggregate is not None) + (signal_filter is not None) + (sum is not None) + (scale is not None) + (time_difference is not None) + (time_range_filter is not None) + (time_shift is not None) + (unary_arithmetic is not None) + (binary_arithmetic is not None) + (union is not None) + (unit_conversion is not None) + (value_difference is not None) + (filter_transformation is not None) != 1:
                 raise ValueError('a union must contain a single member')
 
             if arithmetic is not None:
@@ -42665,6 +42885,9 @@ class scout_compute_resolved_api_NumericSeriesNode(ConjureUnionType):
             if bit_operation is not None:
                 self._bit_operation = bit_operation
                 self._type = 'bitOperation'
+            if count_duplicate is not None:
+                self._count_duplicate = count_duplicate
+                self._type = 'countDuplicate'
             if cumulative_sum is not None:
                 self._cumulative_sum = cumulative_sum
                 self._type = 'cumulativeSum'
@@ -42748,6 +42971,11 @@ class scout_compute_resolved_api_NumericSeriesNode(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._bit_operation = bit_operation
             self._type = 'bitOperation'
+        elif type_of_union == 'countDuplicate':
+            if count_duplicate is None:
+                raise ValueError('a union value must not be None')
+            self._count_duplicate = count_duplicate
+            self._type = 'countDuplicate'
         elif type_of_union == 'cumulativeSum':
             if cumulative_sum is None:
                 raise ValueError('a union value must not be None')
@@ -42877,6 +43105,10 @@ class scout_compute_resolved_api_NumericSeriesNode(ConjureUnionType):
     def bit_operation(self) -> Optional["scout_compute_resolved_api_BitOperationSeriesNode"]:
         return self._bit_operation
 
+    @builtins.property
+    def count_duplicate(self) -> Optional["scout_compute_resolved_api_EnumCountDuplicateSeriesNode"]:
+        return self._count_duplicate
+
     @builtins.property
     def cumulative_sum(self) -> Optional["scout_compute_resolved_api_CumulativeSumSeriesNode"]:
         return self._cumulative_sum
@@ -42980,6 +43212,8 @@ class scout_compute_resolved_api_NumericSeriesNode(ConjureUnionType):
             return visitor._arithmetic(self.arithmetic)
         if self._type == 'bitOperation' and self.bit_operation is not None:
             return visitor._bit_operation(self.bit_operation)
+        if self._type == 'countDuplicate' and self.count_duplicate is not None:
+            return visitor._count_duplicate(self.count_duplicate)
         if self._type == 'cumulativeSum' and self.cumulative_sum is not None:
             return visitor._cumulative_sum(self.cumulative_sum)
         if self._type == 'derivative' and self.derivative is not None:
@@ -43045,6 +43279,10 @@ class scout_compute_resolved_api_NumericSeriesNodeVisitor:
     def _bit_operation(self, bit_operation: "scout_compute_resolved_api_BitOperationSeriesNode") -> Any:
         pass
 
+    @abstractmethod
+    def _count_duplicate(self, count_duplicate: "scout_compute_resolved_api_EnumCountDuplicateSeriesNode") -> Any:
+        pass
+
     @abstractmethod
     def _cumulative_sum(self, cumulative_sum: "scout_compute_resolved_api_CumulativeSumSeriesNode") -> Any:
         pass
@@ -47161,12 +47399,12 @@ class scout_datareview_api_CheckAlertsHistogramRequest(ConjureBeanType):
             'chart_rids': ConjureFieldDefinition('chartRids', OptionalTypeWrapper[List[scout_rids_api_VersionedVizId]]),
             'notebook_rids': ConjureFieldDefinition('notebookRids', OptionalTypeWrapper[List[scout_rids_api_NotebookRid]]),
             'show_archived': ConjureFieldDefinition('showArchived', OptionalTypeWrapper[bool]),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[scout_rids_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_num_bins', '_search_text', '_distribution_variable', '_sub_group_variable', '_start_time_after', '_start_time_before', '_status', '_check_rids', '_data_review_rids', '_assignee_rids', '_priorities', '_run_rids', '_asset_rids', '_pinned_checklist_refs', '_chart_rids', '_notebook_rids', '_show_archived', '_archived_statuses']
 
-    def __init__(self, asset_rids: List[str], distribution_variable: "scout_datareview_api_HistogramDistributionVariable", run_rids: List[str], start_time_after: "api_Timestamp", start_time_before: "api_Timestamp", archived_statuses: Optional[List["scout_rids_api_ArchivedStatus"]] = None, assignee_rids: Optional[List[str]] = None, chart_rids: Optional[List["scout_rids_api_VersionedVizId"]] = None, check_rids: Optional[List[str]] = None, data_review_rids: Optional[List[str]] = None, notebook_rids: Optional[List[str]] = None, num_bins: Optional[int] = None, pinned_checklist_refs: Optional[List["scout_checks_api_PinnedChecklistRef"]] = None, priorities: Optional[List["scout_checks_api_Priority"]] = None, search_text: Optional[str] = None, show_archived: Optional[bool] = None, status: Optional[List["scout_datareview_api_CheckAlertStatus"]] = None, sub_group_variable: Optional["scout_datareview_api_HistogramSubGroupVariable"] = None) -> None:
+    def __init__(self, asset_rids: List[str], distribution_variable: "scout_datareview_api_HistogramDistributionVariable", run_rids: List[str], start_time_after: "api_Timestamp", start_time_before: "api_Timestamp", archived_statuses: Optional[List["api_ArchivedStatus"]] = None, assignee_rids: Optional[List[str]] = None, chart_rids: Optional[List["scout_rids_api_VersionedVizId"]] = None, check_rids: Optional[List[str]] = None, data_review_rids: Optional[List[str]] = None, notebook_rids: Optional[List[str]] = None, num_bins: Optional[int] = None, pinned_checklist_refs: Optional[List["scout_checks_api_PinnedChecklistRef"]] = None, priorities: Optional[List["scout_checks_api_Priority"]] = None, search_text: Optional[str] = None, show_archived: Optional[bool] = None, status: Optional[List["scout_datareview_api_CheckAlertStatus"]] = None, sub_group_variable: Optional["scout_datareview_api_HistogramSubGroupVariable"] = None) -> None:
         self._num_bins = num_bins
         self._search_text = search_text
         self._distribution_variable = distribution_variable
@@ -47277,7 +47515,7 @@ in search results.
         return self._show_archived
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["scout_rids_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Filters search on check alerts based on the archived statuses provided. 
 Default is NOT_ARCHIVED only if none are provided.
@@ -48753,12 +48991,12 @@ If commitId is omitted from a ChecklistRef, it will match all commits.
             'next_page_token': ConjureFieldDefinition('nextPageToken', OptionalTypeWrapper[scout_api_Token]),
             'page_size': ConjureFieldDefinition('pageSize', OptionalTypeWrapper[int]),
             'show_archived': ConjureFieldDefinition('showArchived', OptionalTypeWrapper[bool]),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[scout_rids_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_run_rids', '_asset_rids', '_checklist_refs', '_next_page_token', '_page_size', '_show_archived', '_archived_statuses']
 
-    def __init__(self, asset_rids: List[str], checklist_refs: List["scout_checks_api_ChecklistRef"], run_rids: List[str], archived_statuses: Optional[List["scout_rids_api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None, page_size: Optional[int] = None, show_archived: Optional[bool] = None) -> None:
+    def __init__(self, asset_rids: List[str], checklist_refs: List["scout_checks_api_ChecklistRef"], run_rids: List[str], archived_statuses: Optional[List["api_ArchivedStatus"]] = None, next_page_token: Optional[str] = None, page_size: Optional[int] = None, show_archived: Optional[bool] = None) -> None:
         self._run_rids = run_rids
         self._asset_rids = asset_rids
         self._checklist_refs = checklist_refs
@@ -48799,7 +49037,7 @@ in search results alongside non-archived ones. Defaults to false if not specifie
         return self._show_archived
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["scout_rids_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Filters search on data reviews based on the archived statuses provided. 
 Default is NOT_ARCHIVED only if none are provided.
@@ -50042,12 +50280,12 @@ class scout_datareview_api_SearchCheckAlertsRequest(ConjureBeanType):
             'chart_rids': ConjureFieldDefinition('chartRids', OptionalTypeWrapper[List[scout_rids_api_VersionedVizId]]),
             'notebook_rids': ConjureFieldDefinition('notebookRids', OptionalTypeWrapper[List[scout_rids_api_NotebookRid]]),
             'show_archived': ConjureFieldDefinition('showArchived', OptionalTypeWrapper[bool]),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[scout_rids_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_next_page_token', '_page_size', '_sort_by', '_search_text', '_after', '_before', '_status', '_check_rids', '_data_review_rids', '_assignee_rids', '_priorities', '_run_rids', '_asset_rids', '_pinned_checklist_refs', '_chart_rids', '_notebook_rids', '_show_archived', '_archived_statuses']
 
-    def __init__(self, asset_rids: List[str], run_rids: List[str], after: Optional["api_Timestamp"] = None, archived_statuses: Optional[List["scout_rids_api_ArchivedStatus"]] = None, assignee_rids: Optional[List[str]] = None, before: Optional["api_Timestamp"] = None, chart_rids: Optional[List["scout_rids_api_VersionedVizId"]] = None, check_rids: Optional[List[str]] = None, data_review_rids: Optional[List[str]] = None, next_page_token: Optional[str] = None, notebook_rids: Optional[List[str]] = None, page_size: Optional[int] = None, pinned_checklist_refs: Optional[List["scout_checks_api_PinnedChecklistRef"]] = None, priorities: Optional[List["scout_checks_api_Priority"]] = None, search_text: Optional[str] = None, show_archived: Optional[bool] = None, sort_by: Optional["scout_datareview_api_SearchCheckAlertsSortOptions"] = None, status: Optional[List["scout_datareview_api_CheckAlertStatus"]] = None) -> None:
+    def __init__(self, asset_rids: List[str], run_rids: List[str], after: Optional["api_Timestamp"] = None, archived_statuses: Optional[List["api_ArchivedStatus"]] = None, assignee_rids: Optional[List[str]] = None, before: Optional["api_Timestamp"] = None, chart_rids: Optional[List["scout_rids_api_VersionedVizId"]] = None, check_rids: Optional[List[str]] = None, data_review_rids: Optional[List[str]] = None, next_page_token: Optional[str] = None, notebook_rids: Optional[List[str]] = None, page_size: Optional[int] = None, pinned_checklist_refs: Optional[List["scout_checks_api_PinnedChecklistRef"]] = None, priorities: Optional[List["scout_checks_api_Priority"]] = None, search_text: Optional[str] = None, show_archived: Optional[bool] = None, sort_by: Optional["scout_datareview_api_SearchCheckAlertsSortOptions"] = None, status: Optional[List["scout_datareview_api_CheckAlertStatus"]] = None) -> None:
         self._next_page_token = next_page_token
         self._page_size = page_size
         self._sort_by = sort_by
@@ -50155,7 +50393,7 @@ results. If not present or false, will not show archived data reviews in search
         return self._show_archived
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["scout_rids_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Filters search on check alerts based on the archived statuses provided.
 Default is NOT_ARCHIVED only if none are provided.
@@ -54162,7 +54400,7 @@ class scout_internal_search_api_SearchQuery(ConjureUnionType):
     _exact_match: Optional[str] = None
     _search_text: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["scout_run_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _and_: Optional[List["scout_internal_search_api_SearchQuery"]] = None
     _or_: Optional[List["scout_internal_search_api_SearchQuery"]] = None
 
@@ -54176,8 +54414,8 @@ class scout_internal_search_api_SearchQuery(ConjureUnionType):
             'boolean_field': ConjureFieldDefinition('booleanField', scout_internal_search_api_BooleanField),
             'exact_match': ConjureFieldDefinition('exactMatch', str),
             'search_text': ConjureFieldDefinition('searchText', str),
-            'label': ConjureFieldDefinition('label', scout_run_api_Label),
-            'property': ConjureFieldDefinition('property', scout_run_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'and_': ConjureFieldDefinition('and', List[scout_internal_search_api_SearchQuery]),
             'or_': ConjureFieldDefinition('or', List[scout_internal_search_api_SearchQuery])
         }
@@ -54192,7 +54430,7 @@ class scout_internal_search_api_SearchQuery(ConjureUnionType):
             exact_match: Optional[str] = None,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["scout_run_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             and_: Optional[List["scout_internal_search_api_SearchQuery"]] = None,
             or_: Optional[List["scout_internal_search_api_SearchQuery"]] = None,
             type_of_union: Optional[str] = None
@@ -54327,7 +54565,7 @@ class scout_internal_search_api_SearchQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["scout_run_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -54405,7 +54643,7 @@ class scout_internal_search_api_SearchQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "scout_run_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -55390,8 +55628,8 @@ class scout_metadata_ListPropertiesAndLabelsResponse(ConjureBeanType):
     @builtins.classmethod
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, List[scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, List[api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_properties', '_labels']
@@ -55613,8 +55851,8 @@ class scout_notebook_api_GetAllLabelsAndPropertiesResponse(ConjureBeanType):
     @builtins.classmethod
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, List[scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, List[api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_properties', '_labels']
@@ -55841,8 +56079,8 @@ class scout_notebook_api_NotebookMetadata(ConjureBeanType):
             'lock': ConjureFieldDefinition('lock', scout_notebook_api_Lock),
             'created_by_rid': ConjureFieldDefinition('createdByRid', scout_rids_api_UserRid),
             'created_at': ConjureFieldDefinition('createdAt', str),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_run_rid', '_data_scope', '_notebook_type', '_title', '_description', '_is_draft', '_is_archived', '_lock', '_created_by_rid', '_created_at', '_properties', '_labels']
@@ -55971,7 +56209,7 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
     _exact_match: Optional[str] = None
     _search_text: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["scout_run_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _asset_rid: Optional[str] = None
     _author_rid: Optional[str] = None
     _run_rid: Optional[str] = None
@@ -55986,8 +56224,8 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
             'or_': ConjureFieldDefinition('or', List[scout_notebook_api_SearchNotebooksQuery]),
             'exact_match': ConjureFieldDefinition('exactMatch', str),
             'search_text': ConjureFieldDefinition('searchText', str),
-            'label': ConjureFieldDefinition('label', scout_run_api_Label),
-            'property': ConjureFieldDefinition('property', scout_run_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'asset_rid': ConjureFieldDefinition('assetRid', scout_rids_api_AssetRid),
             'author_rid': ConjureFieldDefinition('authorRid', scout_rids_api_UserRid),
             'run_rid': ConjureFieldDefinition('runRid', scout_run_api_RunRid),
@@ -56003,7 +56241,7 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
             exact_match: Optional[str] = None,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["scout_run_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             asset_rid: Optional[str] = None,
             author_rid: Optional[str] = None,
             run_rid: Optional[str] = None,
@@ -56138,7 +56376,7 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["scout_run_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -56222,7 +56460,7 @@ class scout_notebook_api_SearchNotebooksQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "scout_run_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -56406,8 +56644,8 @@ class scout_notebook_api_UpdateNotebookMetadataRequest(ConjureBeanType):
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'data_scope': ConjureFieldDefinition('dataScope', OptionalTypeWrapper[scout_notebook_api_NotebookDataScope]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[scout_run_api_Label]]),
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]]),
             'is_draft': ConjureFieldDefinition('isDraft', OptionalTypeWrapper[bool])
         }
 
@@ -56532,24 +56770,6 @@ scout_plotting_TimestampType.__qualname__ = "TimestampType"
 scout_plotting_TimestampType.__module__ = "nominal_api.scout_plotting"
 
 
-class scout_rids_api_ArchivedStatus(ConjureEnumType):
-
-    ARCHIVED = 'ARCHIVED'
-    '''ARCHIVED'''
-    NOT_ARCHIVED = 'NOT_ARCHIVED'
-    '''NOT_ARCHIVED'''
-    UNKNOWN = 'UNKNOWN'
-    '''UNKNOWN'''
-
-    def __reduce_ex__(self, proto):
-        return self.__class__, (self.name,)
-
-
-scout_rids_api_ArchivedStatus.__name__ = "ArchivedStatus"
-scout_rids_api_ArchivedStatus.__qualname__ = "ArchivedStatus"
-scout_rids_api_ArchivedStatus.__module__ = "nominal_api.scout_rids_api"
-
-
 class scout_rids_api_CheckAlertState(ConjureUnionType):
     _pending_review: Optional["scout_rids_api_PendingReviewAlertState"] = None
     _closed_with_further_action: Optional["scout_rids_api_ClosedWithFurtherActionAlertState"] = None
@@ -56772,8 +56992,8 @@ class scout_run_api_AllRunsPropertiesAndLabelsResponse(ConjureBeanType):
     @builtins.classmethod
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, List[scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, List[api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_properties', '_labels']
@@ -56961,8 +57181,8 @@ class scout_run_api_CreateRunRequest(ConjureBeanType):
             'description': ConjureFieldDefinition('description', str),
             'start_time': ConjureFieldDefinition('startTime', scout_run_api_UtcTimestamp),
             'end_time': ConjureFieldDefinition('endTime', OptionalTypeWrapper[scout_run_api_UtcTimestamp]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'links': ConjureFieldDefinition('links', List[scout_run_api_Link]),
             'run_prefix': ConjureFieldDefinition('runPrefix', OptionalTypeWrapper[str]),
             'data_sources': ConjureFieldDefinition('dataSources', Dict[scout_api_DataSourceRefName, scout_run_api_CreateRunDataSource]),
@@ -57497,35 +57717,6 @@ scout_run_api_Link.__qualname__ = "Link"
 scout_run_api_Link.__module__ = "nominal_api.scout_run_api"
 
 
-class scout_run_api_Property(ConjureBeanType):
-
-    @builtins.classmethod
-    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
-        return {
-            'name': ConjureFieldDefinition('name', scout_run_api_PropertyName),
-            'value': ConjureFieldDefinition('value', scout_run_api_PropertyValue)
-        }
-
-    __slots__: List[str] = ['_name', '_value']
-
-    def __init__(self, name: str, value: str) -> None:
-        self._name = name
-        self._value = value
-
-    @builtins.property
-    def name(self) -> str:
-        return self._name
-
-    @builtins.property
-    def value(self) -> str:
-        return self._value
-
-
-scout_run_api_Property.__name__ = "Property"
-scout_run_api_Property.__qualname__ = "Property"
-scout_run_api_Property.__module__ = "nominal_api.scout_run_api"
-
-
 class scout_run_api_RefNameAndType(ConjureBeanType):
     """
     Scoped to the org-level, intended to help the frontend
@@ -57573,8 +57764,8 @@ class scout_run_api_Run(ConjureBeanType):
             'author_rid': ConjureFieldDefinition('authorRid', OptionalTypeWrapper[scout_rids_api_UserRid]),
             'start_time': ConjureFieldDefinition('startTime', scout_run_api_UtcTimestamp),
             'end_time': ConjureFieldDefinition('endTime', OptionalTypeWrapper[scout_run_api_UtcTimestamp]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'links': ConjureFieldDefinition('links', List[scout_run_api_Link]),
             'created_at': ConjureFieldDefinition('createdAt', str),
             'updated_at': ConjureFieldDefinition('updatedAt', str),
@@ -57890,7 +58081,7 @@ class scout_run_api_SearchQuery(ConjureUnionType):
     _search_text: Optional[str] = None
     _asset: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["scout_run_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _data_source_series_tag: Optional["scout_run_api_DataSourceSeriesTag"] = None
     _data_source_ref_name: Optional[str] = None
     _data_source: Optional["scout_run_api_DataSource"] = None
@@ -57906,8 +58097,8 @@ class scout_run_api_SearchQuery(ConjureUnionType):
             'exact_match': ConjureFieldDefinition('exactMatch', str),
             'search_text': ConjureFieldDefinition('searchText', str),
             'asset': ConjureFieldDefinition('asset', scout_rids_api_AssetRid),
-            'label': ConjureFieldDefinition('label', scout_run_api_Label),
-            'property': ConjureFieldDefinition('property', scout_run_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'data_source_series_tag': ConjureFieldDefinition('dataSourceSeriesTag', scout_run_api_DataSourceSeriesTag),
             'data_source_ref_name': ConjureFieldDefinition('dataSourceRefName', scout_api_DataSourceRefName),
             'data_source': ConjureFieldDefinition('dataSource', scout_run_api_DataSource),
@@ -57924,7 +58115,7 @@ class scout_run_api_SearchQuery(ConjureUnionType):
             search_text: Optional[str] = None,
             asset: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["scout_run_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             data_source_series_tag: Optional["scout_run_api_DataSourceSeriesTag"] = None,
             data_source_ref_name: Optional[str] = None,
             data_source: Optional["scout_run_api_DataSource"] = None,
@@ -58071,7 +58262,7 @@ class scout_run_api_SearchQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["scout_run_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -58164,7 +58355,7 @@ class scout_run_api_SearchQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "scout_run_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -58528,8 +58719,8 @@ class scout_run_api_UpdateRunRequest(ConjureBeanType):
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
             'start_time': ConjureFieldDefinition('startTime', OptionalTypeWrapper[scout_run_api_UtcTimestamp]),
             'end_time': ConjureFieldDefinition('endTime', OptionalTypeWrapper[scout_run_api_UtcTimestamp]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[scout_run_api_Label]]),
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]]),
             'links': ConjureFieldDefinition('links', OptionalTypeWrapper[List[scout_run_api_Link]]),
             'run_prefix': ConjureFieldDefinition('runPrefix', OptionalTypeWrapper[str]),
             'data_sources': ConjureFieldDefinition('dataSources', OptionalTypeWrapper[Dict[scout_api_DataSourceRefName, scout_run_api_CreateRunDataSource]]),
@@ -58718,8 +58909,8 @@ class scout_template_api_CreateTemplateRequest(ConjureBeanType):
         return {
             'title': ConjureFieldDefinition('title', str),
             'description': ConjureFieldDefinition('description', str),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
             'is_published': ConjureFieldDefinition('isPublished', OptionalTypeWrapper[bool]),
             'charts': ConjureFieldDefinition('charts', OptionalTypeWrapper[List[scout_rids_api_VersionedVizId]]),
             'layout': ConjureFieldDefinition('layout', scout_layout_api_WorkbookLayout),
@@ -58790,8 +58981,8 @@ class scout_template_api_GetAllLabelsAndPropertiesResponse(ConjureBeanType):
     @builtins.classmethod
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, List[scout_run_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, List[api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_properties', '_labels']
@@ -58907,7 +59098,7 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
     _exact_match: Optional[str] = None
     _search_text: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["scout_run_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _created_by: Optional[str] = None
     _is_archived: Optional[bool] = None
     _is_published: Optional[bool] = None
@@ -58919,8 +59110,8 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
             'or_': ConjureFieldDefinition('or', List[scout_template_api_SearchTemplatesQuery]),
             'exact_match': ConjureFieldDefinition('exactMatch', str),
             'search_text': ConjureFieldDefinition('searchText', str),
-            'label': ConjureFieldDefinition('label', scout_run_api_Label),
-            'property': ConjureFieldDefinition('property', scout_run_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'created_by': ConjureFieldDefinition('createdBy', scout_rids_api_UserRid),
             'is_archived': ConjureFieldDefinition('isArchived', bool),
             'is_published': ConjureFieldDefinition('isPublished', bool)
@@ -58933,7 +59124,7 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
             exact_match: Optional[str] = None,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["scout_run_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             created_by: Optional[str] = None,
             is_archived: Optional[bool] = None,
             is_published: Optional[bool] = None,
@@ -59044,7 +59235,7 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["scout_run_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -59110,7 +59301,7 @@ class scout_template_api_SearchTemplatesQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "scout_run_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -59321,8 +59512,8 @@ class scout_template_api_TemplateMetadata(ConjureBeanType):
         return {
             'title': ConjureFieldDefinition('title', str),
             'description': ConjureFieldDefinition('description', str),
-            'labels': ConjureFieldDefinition('labels', List[scout_run_api_Label]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
             'is_archived': ConjureFieldDefinition('isArchived', bool),
             'is_published': ConjureFieldDefinition('isPublished', bool),
             'created_by': ConjureFieldDefinition('createdBy', scout_rids_api_UserRid),
@@ -59430,8 +59621,8 @@ class scout_template_api_UpdateMetadataRequest(ConjureBeanType):
         return {
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[scout_run_api_Label]]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[scout_run_api_PropertyName, scout_run_api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]]),
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]]),
             'is_archived': ConjureFieldDefinition('isArchived', OptionalTypeWrapper[bool]),
             'is_published': ConjureFieldDefinition('isPublished', OptionalTypeWrapper[bool])
         }
@@ -60680,24 +60871,6 @@ scout_video_VideoService.__qualname__ = "VideoService"
 scout_video_VideoService.__module__ = "nominal_api.scout_video"
 
 
-class scout_video_api_ArchivedStatus(ConjureEnumType):
-
-    ARCHIVED = 'ARCHIVED'
-    '''ARCHIVED'''
-    NOT_ARCHIVED = 'NOT_ARCHIVED'
-    '''NOT_ARCHIVED'''
-    UNKNOWN = 'UNKNOWN'
-    '''UNKNOWN'''
-
-    def __reduce_ex__(self, proto):
-        return self.__class__, (self.name,)
-
-
-scout_video_api_ArchivedStatus.__name__ = "ArchivedStatus"
-scout_video_api_ArchivedStatus.__qualname__ = "ArchivedStatus"
-scout_video_api_ArchivedStatus.__module__ = "nominal_api.scout_video_api"
-
-
 class scout_video_api_CreateSegment(ConjureBeanType):
 
     @builtins.classmethod
@@ -60801,8 +60974,8 @@ class scout_video_api_CreateVideoRequest(ConjureBeanType):
         return {
             'title': ConjureFieldDefinition('title', str),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'labels': ConjureFieldDefinition('labels', List[scout_video_api_Label]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_video_api_PropertyName, scout_video_api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
             'origin_metadata': ConjureFieldDefinition('originMetadata', scout_video_api_VideoOriginMetadata)
         }
 
@@ -61183,7 +61356,7 @@ scout_video_api_McapTimestampManifest.__module__ = "nominal_api.scout_video_api"
 
 class scout_video_api_NoTimestampManifest(ConjureBeanType):
     """
-    these values will not be updated after ingest time, to allow for resetting. The updated values are stored 
+    these values will not be updated after ingest time, to allow for resetting. The updated values are stored
 implicitly through the segment timestamps.
     """
 
@@ -61220,35 +61393,6 @@ scout_video_api_NoTimestampManifest.__qualname__ = "NoTimestampManifest"
 scout_video_api_NoTimestampManifest.__module__ = "nominal_api.scout_video_api"
 
 
-class scout_video_api_Property(ConjureBeanType):
-
-    @builtins.classmethod
-    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
-        return {
-            'name': ConjureFieldDefinition('name', scout_video_api_PropertyName),
-            'value': ConjureFieldDefinition('value', scout_video_api_PropertyValue)
-        }
-
-    __slots__: List[str] = ['_name', '_value']
-
-    def __init__(self, name: str, value: str) -> None:
-        self._name = name
-        self._value = value
-
-    @builtins.property
-    def name(self) -> str:
-        return self._name
-
-    @builtins.property
-    def value(self) -> str:
-        return self._value
-
-
-scout_video_api_Property.__name__ = "Property"
-scout_video_api_Property.__qualname__ = "Property"
-scout_video_api_Property.__module__ = "nominal_api.scout_video_api"
-
-
 class scout_video_api_ScaleParameter(ConjureUnionType):
     _true_frame_rate: Optional[float] = None
     _ending_timestamp: Optional["api_Timestamp"] = None
@@ -61353,7 +61497,7 @@ scout_video_api_ScaleParameterVisitor.__module__ = "nominal_api.scout_video_api"
 class scout_video_api_SearchVideosQuery(ConjureUnionType):
     _search_text: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["scout_video_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _and_: Optional[List["scout_video_api_SearchVideosQuery"]] = None
     _or_: Optional[List["scout_video_api_SearchVideosQuery"]] = None
     _ingest_status: Optional["scout_video_api_IngestStatus"] = None
@@ -61362,8 +61506,8 @@ class scout_video_api_SearchVideosQuery(ConjureUnionType):
     def _options(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'search_text': ConjureFieldDefinition('searchText', str),
-            'label': ConjureFieldDefinition('label', scout_video_api_Label),
-            'property': ConjureFieldDefinition('property', scout_video_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'and_': ConjureFieldDefinition('and', List[scout_video_api_SearchVideosQuery]),
             'or_': ConjureFieldDefinition('or', List[scout_video_api_SearchVideosQuery]),
             'ingest_status': ConjureFieldDefinition('ingestStatus', scout_video_api_IngestStatus)
@@ -61373,7 +61517,7 @@ class scout_video_api_SearchVideosQuery(ConjureUnionType):
             self,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["scout_video_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             and_: Optional[List["scout_video_api_SearchVideosQuery"]] = None,
             or_: Optional[List["scout_video_api_SearchVideosQuery"]] = None,
             ingest_status: Optional["scout_video_api_IngestStatus"] = None,
@@ -61442,7 +61586,7 @@ class scout_video_api_SearchVideosQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["scout_video_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -61490,7 +61634,7 @@ class scout_video_api_SearchVideosQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "scout_video_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -61520,12 +61664,12 @@ class scout_video_api_SearchVideosRequest(ConjureBeanType):
             'page_size': ConjureFieldDefinition('pageSize', OptionalTypeWrapper[int]),
             'token': ConjureFieldDefinition('token', OptionalTypeWrapper[scout_backend_Token]),
             'sort_options': ConjureFieldDefinition('sortOptions', scout_video_api_SortOptions),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[scout_video_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_query', '_page_size', '_token', '_sort_options', '_archived_statuses']
 
-    def __init__(self, query: "scout_video_api_SearchVideosQuery", sort_options: "scout_video_api_SortOptions", archived_statuses: Optional[List["scout_video_api_ArchivedStatus"]] = None, page_size: Optional[int] = None, token: Optional[str] = None) -> None:
+    def __init__(self, query: "scout_video_api_SearchVideosQuery", sort_options: "scout_video_api_SortOptions", archived_statuses: Optional[List["api_ArchivedStatus"]] = None, page_size: Optional[int] = None, token: Optional[str] = None) -> None:
         self._query = query
         self._page_size = page_size
         self._token = token
@@ -61552,7 +61696,7 @@ class scout_video_api_SearchVideosRequest(ConjureBeanType):
         return self._sort_options
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["scout_video_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Default search status is NOT_ARCHIVED if none are provided. Allows for including archived videos in search.
         """
@@ -61658,7 +61802,7 @@ scout_video_api_Segment.__module__ = "nominal_api.scout_video_api"
 
 class scout_video_api_SegmentSummary(ConjureBeanType):
     """
-    Bounding timestamps for the frames within a segment. For non-frame-mapped videos, the min and max media 
+    Bounding timestamps for the frames within a segment. For non-frame-mapped videos, the min and max media
 timestamps will be empty.
     """
 
@@ -61703,8 +61847,8 @@ scout_video_api_SegmentSummary.__module__ = "nominal_api.scout_video_api"
 
 class scout_video_api_SegmentTimestamps(ConjureUnionType):
     """A video segment will either contain timestamps or timestamp mappings depending on whether it is intended to
-be frame-mapped. Without a frame-timestamp mapping manifest file, a list of absolute timestamps will be 
-automatically assigned to each segment based on media timestamps.. Otherwise, media timestamps will be 
+be frame-mapped. Without a frame-timestamp mapping manifest file, a list of absolute timestamps will be
+automatically assigned to each segment based on media timestamps.. Otherwise, media timestamps will be
 extracted and mapped to those in the provided manifest."""
     _timestamps: Optional[List["api_Timestamp"]] = None
     _timestamp_mappings: Optional["scout_video_api_TimestampMappings"] = None
@@ -61990,7 +62134,7 @@ class scout_video_api_UpdateTargetDurationRequest(ConjureBeanType):
     @builtins.property
     def target_duration_seconds(self) -> float:
         """
-        A value used to construct the HLS playlist which must be greater than or equal to the durations of all 
+        A value used to construct the HLS playlist which must be greater than or equal to the durations of all
 the segments within a video, when rounded to the nearest integer.
         """
         return self._target_duration_seconds
@@ -62035,8 +62179,8 @@ class scout_video_api_UpdateVideoMetadataRequest(ConjureBeanType):
         return {
             'title': ConjureFieldDefinition('title', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[scout_video_api_Label]]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_video_api_PropertyName, scout_video_api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
             'starting_timestamp': ConjureFieldDefinition('startingTimestamp', OptionalTypeWrapper[api_Timestamp]),
             'scale_parameter': ConjureFieldDefinition('scaleParameter', OptionalTypeWrapper[scout_video_api_ScaleParameter])
         }
@@ -62089,8 +62233,8 @@ class scout_video_api_Video(ConjureBeanType):
             'rid': ConjureFieldDefinition('rid', api_rids_VideoRid),
             'title': ConjureFieldDefinition('title', str),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'labels': ConjureFieldDefinition('labels', List[scout_video_api_Label]),
-            'properties': ConjureFieldDefinition('properties', Dict[scout_video_api_PropertyName, scout_video_api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
             'created_by': ConjureFieldDefinition('createdBy', str),
             'created_at': ConjureFieldDefinition('createdAt', str),
             'origin_metadata': ConjureFieldDefinition('originMetadata', scout_video_api_VideoOriginMetadata),
@@ -62504,24 +62648,6 @@ scout_workbookcommon_api_WorkbookContent.__qualname__ = "WorkbookContent"
 scout_workbookcommon_api_WorkbookContent.__module__ = "nominal_api.scout_workbookcommon_api"
 
 
-class secrets_api_ArchivedStatus(ConjureEnumType):
-
-    NOT_ARCHIVED = 'NOT_ARCHIVED'
-    '''NOT_ARCHIVED'''
-    ARCHIVED = 'ARCHIVED'
-    '''ARCHIVED'''
-    UNKNOWN = 'UNKNOWN'
-    '''UNKNOWN'''
-
-    def __reduce_ex__(self, proto):
-        return self.__class__, (self.name,)
-
-
-secrets_api_ArchivedStatus.__name__ = "ArchivedStatus"
-secrets_api_ArchivedStatus.__qualname__ = "ArchivedStatus"
-secrets_api_ArchivedStatus.__module__ = "nominal_api.secrets_api"
-
-
 class secrets_api_CreateSecretRequest(ConjureBeanType):
 
     @builtins.classmethod
@@ -62530,8 +62656,8 @@ class secrets_api_CreateSecretRequest(ConjureBeanType):
             'name': ConjureFieldDefinition('name', str),
             'description': ConjureFieldDefinition('description', str),
             'decrypted_value': ConjureFieldDefinition('decryptedValue', str),
-            'properties': ConjureFieldDefinition('properties', Dict[secrets_api_PropertyName, secrets_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[secrets_api_Label])
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
         }
 
     __slots__: List[str] = ['_name', '_description', '_decrypted_value', '_properties', '_labels']
@@ -62615,39 +62741,10 @@ secrets_api_GetSecretsResponse.__qualname__ = "GetSecretsResponse"
 secrets_api_GetSecretsResponse.__module__ = "nominal_api.secrets_api"
 
 
-class secrets_api_Property(ConjureBeanType):
-
-    @builtins.classmethod
-    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
-        return {
-            'name': ConjureFieldDefinition('name', secrets_api_PropertyName),
-            'value': ConjureFieldDefinition('value', secrets_api_PropertyValue)
-        }
-
-    __slots__: List[str] = ['_name', '_value']
-
-    def __init__(self, name: str, value: str) -> None:
-        self._name = name
-        self._value = value
-
-    @builtins.property
-    def name(self) -> str:
-        return self._name
-
-    @builtins.property
-    def value(self) -> str:
-        return self._value
-
-
-secrets_api_Property.__name__ = "Property"
-secrets_api_Property.__qualname__ = "Property"
-secrets_api_Property.__module__ = "nominal_api.secrets_api"
-
-
 class secrets_api_SearchSecretsQuery(ConjureUnionType):
     _search_text: Optional[str] = None
     _label: Optional[str] = None
-    _property: Optional["secrets_api_Property"] = None
+    _property: Optional["api_Property"] = None
     _and_: Optional[List["secrets_api_SearchSecretsQuery"]] = None
     _or_: Optional[List["secrets_api_SearchSecretsQuery"]] = None
 
@@ -62655,8 +62752,8 @@ class secrets_api_SearchSecretsQuery(ConjureUnionType):
     def _options(cls) -> Dict[str, ConjureFieldDefinition]:
         return {
             'search_text': ConjureFieldDefinition('searchText', str),
-            'label': ConjureFieldDefinition('label', secrets_api_Label),
-            'property': ConjureFieldDefinition('property', secrets_api_Property),
+            'label': ConjureFieldDefinition('label', api_Label),
+            'property': ConjureFieldDefinition('property', api_Property),
             'and_': ConjureFieldDefinition('and', List[secrets_api_SearchSecretsQuery]),
             'or_': ConjureFieldDefinition('or', List[secrets_api_SearchSecretsQuery])
         }
@@ -62665,7 +62762,7 @@ class secrets_api_SearchSecretsQuery(ConjureUnionType):
             self,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
-            property: Optional["secrets_api_Property"] = None,
+            property: Optional["api_Property"] = None,
             and_: Optional[List["secrets_api_SearchSecretsQuery"]] = None,
             or_: Optional[List["secrets_api_SearchSecretsQuery"]] = None,
             type_of_union: Optional[str] = None
@@ -62725,7 +62822,7 @@ class secrets_api_SearchSecretsQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def property(self) -> Optional["secrets_api_Property"]:
+    def property(self) -> Optional["api_Property"]:
         return self._property
 
     @builtins.property
@@ -62767,7 +62864,7 @@ class secrets_api_SearchSecretsQueryVisitor:
         pass
 
     @abstractmethod
-    def _property(self, property: "secrets_api_Property") -> Any:
+    def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
@@ -62793,12 +62890,12 @@ class secrets_api_SearchSecretsRequest(ConjureBeanType):
             'page_size': ConjureFieldDefinition('pageSize', OptionalTypeWrapper[int]),
             'sort': ConjureFieldDefinition('sort', secrets_api_SortOptions),
             'token': ConjureFieldDefinition('token', OptionalTypeWrapper[scout_backend_Token]),
-            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[secrets_api_ArchivedStatus]])
+            'archived_statuses': ConjureFieldDefinition('archivedStatuses', OptionalTypeWrapper[List[api_ArchivedStatus]])
         }
 
     __slots__: List[str] = ['_query', '_page_size', '_sort', '_token', '_archived_statuses']
 
-    def __init__(self, query: "secrets_api_SearchSecretsQuery", sort: "secrets_api_SortOptions", archived_statuses: Optional[List["secrets_api_ArchivedStatus"]] = None, page_size: Optional[int] = None, token: Optional[str] = None) -> None:
+    def __init__(self, query: "secrets_api_SearchSecretsQuery", sort: "secrets_api_SortOptions", archived_statuses: Optional[List["api_ArchivedStatus"]] = None, page_size: Optional[int] = None, token: Optional[str] = None) -> None:
         self._query = query
         self._page_size = page_size
         self._sort = sort
@@ -62825,7 +62922,7 @@ class secrets_api_SearchSecretsRequest(ConjureBeanType):
         return self._token
 
     @builtins.property
-    def archived_statuses(self) -> Optional[List["secrets_api_ArchivedStatus"]]:
+    def archived_statuses(self) -> Optional[List["api_ArchivedStatus"]]:
         """
         Default search status is NOT_ARCHIVED if none are provided. Allows for including archived secrets in search.
         """
@@ -62875,8 +62972,8 @@ class secrets_api_Secret(ConjureBeanType):
             'name': ConjureFieldDefinition('name', str),
             'description': ConjureFieldDefinition('description', str),
             'created_by': ConjureFieldDefinition('createdBy', str),
-            'properties': ConjureFieldDefinition('properties', Dict[secrets_api_PropertyName, secrets_api_PropertyValue]),
-            'labels': ConjureFieldDefinition('labels', List[secrets_api_Label]),
+            'properties': ConjureFieldDefinition('properties', Dict[api_PropertyName, api_PropertyValue]),
+            'labels': ConjureFieldDefinition('labels', List[api_Label]),
             'created_at': ConjureFieldDefinition('createdAt', str),
             'is_archived': ConjureFieldDefinition('isArchived', bool)
         }
@@ -63249,8 +63346,8 @@ class secrets_api_UpdateSecretRequest(ConjureBeanType):
         return {
             'name': ConjureFieldDefinition('name', OptionalTypeWrapper[str]),
             'description': ConjureFieldDefinition('description', OptionalTypeWrapper[str]),
-            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[secrets_api_PropertyName, secrets_api_PropertyValue]]),
-            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[secrets_api_Label]])
+            'properties': ConjureFieldDefinition('properties', OptionalTypeWrapper[Dict[api_PropertyName, api_PropertyValue]]),
+            'labels': ConjureFieldDefinition('labels', OptionalTypeWrapper[List[api_Label]])
         }
 
     __slots__: List[str] = ['_name', '_description', '_properties', '_labels']
@@ -68979,26 +69076,22 @@ upload_api_UploadService.__qualname__ = "UploadService"
 upload_api_UploadService.__module__ = "nominal_api.upload_api"
 
 
+api_Label = str
+
 timeseries_archetype_api_SeriesArchetypeName = str
 
 ingest_api_S3Path = str
 
 scout_datasource_connection_api_influx_OrgId = str
 
-attachments_api_PropertyName = str
+api_PropertyValue = str
 
 scout_video_api_S3Path = str
 
-secrets_api_Label = str
-
 timeseries_logicalseries_api_AttributeName = str
 
 authentication_api_OrgRid = str
 
-datasource_PropertyName = str
-
-ingest_api_PropertyName = str
-
 themes_api_ChartThemeRid = str
 
 scout_datareview_api_DataReviewRid = str
@@ -69011,6 +69104,8 @@ scout_datasource_connection_api_TableName = str
 
 timeseries_seriescache_api_Resolution = int
 
+api_PropertyName = str
+
 scout_catalog_ErrorType = str
 
 scout_integrations_api_IntegrationRid = str
@@ -69025,8 +69120,6 @@ datasource_DatasetFileId = str
 
 api_McapChannelTopic = str
 
-ingest_api_Label = str
-
 scout_compute_api_VariableName = str
 
 scout_datasource_connection_api_MeasurementName = str
@@ -69065,8 +69158,6 @@ timeseries_seriescache_api_S3Path = str
 
 scout_chart_api_JsonString = str
 
-secrets_api_PropertyValue = str
-
 attachments_api_S3Path = str
 
 scout_checks_api_JobRid = str
@@ -69079,7 +69170,7 @@ datasource_pagination_api_PageToken = str
 
 scout_datasource_connection_api_ProjectName = str
 
-datasource_PropertyValue = str
+api_rids_SegmentRid = str
 
 scout_comparisonnotebook_api_VariableName = str
 
@@ -69133,8 +69224,6 @@ scout_rids_api_NotebookRid = str
 
 scout_asset_api_SeriesTagValue = str
 
-scout_run_api_PropertyValue = str
-
 scout_rids_api_UserRid = str
 
 api_rids_DatasetRid = str
@@ -69149,12 +69238,6 @@ timeseries_logicalseries_api_LocationName = str
 
 api_rids_DataSourceRid = str
 
-datasource_Label = str
-
-ingest_api_PropertyValue = str
-
-scout_run_api_Label = str
-
 scout_rids_api_CheckLineageRid = str
 
 scout_rids_api_VizId = str
@@ -69165,8 +69248,6 @@ scout_video_api_ErrorType = str
 
 scout_comparisonnotebook_api_ComparisonChannelVariableMap = Dict[scout_comparisonnotebook_api_VariableName, scout_comparisonnotebook_api_ChannelVariable]
 
-scout_video_api_Label = str
-
 ingest_api_ErrorType = str
 
 timeseries_logicalseries_api_FieldName = str
@@ -69197,12 +69278,8 @@ storage_writer_api_MeasurementName = str
 
 storage_datasource_api_NominalDataSourceId = str
 
-scout_video_api_PropertyValue = str
-
 scout_datareview_api_AutomaticCheckEvaluationRid = str
 
-scout_video_api_PropertyName = str
-
 scout_compute_api_ErrorType = str
 
 comments_api_ResourceRid = str
@@ -69247,8 +69324,6 @@ scout_rids_api_AssetRid = str
 
 comments_api_CommentRid = str
 
-scout_run_api_PropertyName = str
-
 scout_chartdefinition_api_DataSourceRefName = str
 
 api_LogicalSeriesRid = str
@@ -69263,15 +69338,9 @@ scout_datasource_connection_api_OrganizationRid = str
 
 scout_rids_api_CheckRid = str
 
-secrets_api_PropertyName = str
-
 timeseries_logicalseries_api_ProjectName = str
 
 api_Channel = str
 
-attachments_api_PropertyValue = str
-
 scout_datasource_connection_api_SecretName = str
 
-attachments_api_Label = str
-