nominal-api 0.910.0__py3-none-any.whl → 0.911.0__py3-none-any.whl

nominal_api/__init__.py

@@ -81,5 +81,5 @@ __all__ = [
 
 __conjure_generator_version__ = "4.17.0"
 
-__version__ = "0.910.0"
+__version__ = "0.911.0"
 

nominal_api/_impl.py

@@ -21586,6 +21586,31 @@ scout_asset_api_AssetTypeDataScopeConfig.__qualname__ = "AssetTypeDataScopeConfi
 scout_asset_api_AssetTypeDataScopeConfig.__module__ = "nominal_api.scout_asset_api"
 
 
+class scout_asset_api_AssetTypesFilter(ConjureBeanType):
+    """returns runs that match any of the provided assetTypes.
+    """
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'asset_types': ConjureFieldDefinition('assetTypes', List[scout_rids_api_TypeRid])
+        }
+
+    __slots__: List[str] = ['_asset_types']
+
+    def __init__(self, asset_types: List[str]) -> None:
+        self._asset_types = asset_types
+
+    @builtins.property
+    def asset_types(self) -> List[str]:
+        return self._asset_types
+
+
+scout_asset_api_AssetTypesFilter.__name__ = "AssetTypesFilter"
+scout_asset_api_AssetTypesFilter.__qualname__ = "AssetTypesFilter"
+scout_asset_api_AssetTypesFilter.__module__ = "nominal_api.scout_asset_api"
+
+
 class scout_asset_api_ChannelMetadata(ConjureBeanType):
 
     @builtins.classmethod
@@ -21994,11 +22019,15 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
     _search_text: Optional[str] = None
     _exact_substring: Optional[str] = None
     _label: Optional[str] = None
+    _labels: Optional["scout_rids_api_LabelsFilter"] = None
     _property: Optional["api_Property"] = None
+    _properties: Optional["scout_rids_api_PropertiesFilter"] = None
     _type_rid: Optional[str] = None
+    _asset_types: Optional["scout_asset_api_AssetTypesFilter"] = None
+    _is_staged: Optional[bool] = None
+    _archived: Optional[bool] = None
     _and_: Optional[List["scout_asset_api_SearchAssetsQuery"]] = None
     _or_: Optional[List["scout_asset_api_SearchAssetsQuery"]] = None
-    _is_staged: Optional[bool] = None
     _workspace: Optional[str] = None
 
     @builtins.classmethod
@@ -22007,11 +22036,15 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
             'search_text': ConjureFieldDefinition('searchText', str),
             'exact_substring': ConjureFieldDefinition('exactSubstring', str),
             'label': ConjureFieldDefinition('label', api_Label),
+            'labels': ConjureFieldDefinition('labels', scout_rids_api_LabelsFilter),
             'property': ConjureFieldDefinition('property', api_Property),
+            'properties': ConjureFieldDefinition('properties', scout_rids_api_PropertiesFilter),
             'type_rid': ConjureFieldDefinition('typeRid', scout_rids_api_TypeRid),
+            'asset_types': ConjureFieldDefinition('assetTypes', scout_asset_api_AssetTypesFilter),
+            'is_staged': ConjureFieldDefinition('isStaged', bool),
+            'archived': ConjureFieldDefinition('archived', bool),
             'and_': ConjureFieldDefinition('and', List[scout_asset_api_SearchAssetsQuery]),
             'or_': ConjureFieldDefinition('or', List[scout_asset_api_SearchAssetsQuery]),
-            'is_staged': ConjureFieldDefinition('isStaged', bool),
             'workspace': ConjureFieldDefinition('workspace', api_rids_WorkspaceRid)
         }
 
@@ -22020,16 +22053,20 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
             search_text: Optional[str] = None,
             exact_substring: Optional[str] = None,
             label: Optional[str] = None,
+            labels: Optional["scout_rids_api_LabelsFilter"] = None,
             property: Optional["api_Property"] = None,
+            properties: Optional["scout_rids_api_PropertiesFilter"] = None,
             type_rid: Optional[str] = None,
+            asset_types: Optional["scout_asset_api_AssetTypesFilter"] = None,
+            is_staged: Optional[bool] = None,
+            archived: Optional[bool] = None,
             and_: Optional[List["scout_asset_api_SearchAssetsQuery"]] = None,
             or_: Optional[List["scout_asset_api_SearchAssetsQuery"]] = None,
-            is_staged: Optional[bool] = None,
             workspace: Optional[str] = None,
             type_of_union: Optional[str] = None
             ) -> None:
         if type_of_union is None:
-            if (search_text is not None) + (exact_substring is not None) + (label is not None) + (property is not None) + (type_rid is not None) + (and_ is not None) + (or_ is not None) + (is_staged is not None) + (workspace is not None) != 1:
+            if (search_text is not None) + (exact_substring is not None) + (label is not None) + (labels is not None) + (property is not None) + (properties is not None) + (type_rid is not None) + (asset_types is not None) + (is_staged is not None) + (archived is not None) + (and_ is not None) + (or_ is not None) + (workspace is not None) != 1:
                 raise ValueError('a union must contain a single member')
 
             if search_text is not None:
@@ -22041,21 +22078,33 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
             if label is not None:
                 self._label = label
                 self._type = 'label'
+            if labels is not None:
+                self._labels = labels
+                self._type = 'labels'
             if property is not None:
                 self._property = property
                 self._type = 'property'
+            if properties is not None:
+                self._properties = properties
+                self._type = 'properties'
             if type_rid is not None:
                 self._type_rid = type_rid
                 self._type = 'typeRid'
+            if asset_types is not None:
+                self._asset_types = asset_types
+                self._type = 'assetTypes'
+            if is_staged is not None:
+                self._is_staged = is_staged
+                self._type = 'isStaged'
+            if archived is not None:
+                self._archived = archived
+                self._type = 'archived'
             if and_ is not None:
                 self._and_ = and_
                 self._type = 'and'
             if or_ is not None:
                 self._or_ = or_
                 self._type = 'or'
-            if is_staged is not None:
-                self._is_staged = is_staged
-                self._type = 'isStaged'
             if workspace is not None:
                 self._workspace = workspace
                 self._type = 'workspace'
@@ -22075,16 +22124,41 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._label = label
             self._type = 'label'
+        elif type_of_union == 'labels':
+            if labels is None:
+                raise ValueError('a union value must not be None')
+            self._labels = labels
+            self._type = 'labels'
         elif type_of_union == 'property':
             if property is None:
                 raise ValueError('a union value must not be None')
             self._property = property
             self._type = 'property'
+        elif type_of_union == 'properties':
+            if properties is None:
+                raise ValueError('a union value must not be None')
+            self._properties = properties
+            self._type = 'properties'
         elif type_of_union == 'typeRid':
             if type_rid is None:
                 raise ValueError('a union value must not be None')
             self._type_rid = type_rid
             self._type = 'typeRid'
+        elif type_of_union == 'assetTypes':
+            if asset_types is None:
+                raise ValueError('a union value must not be None')
+            self._asset_types = asset_types
+            self._type = 'assetTypes'
+        elif type_of_union == 'isStaged':
+            if is_staged is None:
+                raise ValueError('a union value must not be None')
+            self._is_staged = is_staged
+            self._type = 'isStaged'
+        elif type_of_union == 'archived':
+            if archived is None:
+                raise ValueError('a union value must not be None')
+            self._archived = archived
+            self._type = 'archived'
         elif type_of_union == 'and':
             if and_ is None:
                 raise ValueError('a union value must not be None')
@@ -22095,11 +22169,6 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._or_ = or_
             self._type = 'or'
-        elif type_of_union == 'isStaged':
-            if is_staged is None:
-                raise ValueError('a union value must not be None')
-            self._is_staged = is_staged
-            self._type = 'isStaged'
         elif type_of_union == 'workspace':
             if workspace is None:
                 raise ValueError('a union value must not be None')
@@ -22120,14 +22189,34 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
     def label(self) -> Optional[str]:
         return self._label
 
+    @builtins.property
+    def labels(self) -> Optional["scout_rids_api_LabelsFilter"]:
+        return self._labels
+
     @builtins.property
     def property(self) -> Optional["api_Property"]:
         return self._property
 
+    @builtins.property
+    def properties(self) -> Optional["scout_rids_api_PropertiesFilter"]:
+        return self._properties
+
     @builtins.property
     def type_rid(self) -> Optional[str]:
         return self._type_rid
 
+    @builtins.property
+    def asset_types(self) -> Optional["scout_asset_api_AssetTypesFilter"]:
+        return self._asset_types
+
+    @builtins.property
+    def is_staged(self) -> Optional[bool]:
+        return self._is_staged
+
+    @builtins.property
+    def archived(self) -> Optional[bool]:
+        return self._archived
+
     @builtins.property
     def and_(self) -> Optional[List["scout_asset_api_SearchAssetsQuery"]]:
         return self._and_
@@ -22136,10 +22225,6 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
     def or_(self) -> Optional[List["scout_asset_api_SearchAssetsQuery"]]:
         return self._or_
 
-    @builtins.property
-    def is_staged(self) -> Optional[bool]:
-        return self._is_staged
-
     @builtins.property
     def workspace(self) -> Optional[str]:
         return self._workspace
@@ -22153,16 +22238,24 @@ class scout_asset_api_SearchAssetsQuery(ConjureUnionType):
             return visitor._exact_substring(self.exact_substring)
         if self._type == 'label' and self.label is not None:
             return visitor._label(self.label)
+        if self._type == 'labels' and self.labels is not None:
+            return visitor._labels(self.labels)
         if self._type == 'property' and self.property is not None:
             return visitor._property(self.property)
+        if self._type == 'properties' and self.properties is not None:
+            return visitor._properties(self.properties)
         if self._type == 'typeRid' and self.type_rid is not None:
             return visitor._type_rid(self.type_rid)
+        if self._type == 'assetTypes' and self.asset_types is not None:
+            return visitor._asset_types(self.asset_types)
+        if self._type == 'isStaged' and self.is_staged is not None:
+            return visitor._is_staged(self.is_staged)
+        if self._type == 'archived' and self.archived is not None:
+            return visitor._archived(self.archived)
         if self._type == 'and' and self.and_ is not None:
             return visitor._and(self.and_)
         if self._type == 'or' and self.or_ is not None:
             return visitor._or(self.or_)
-        if self._type == 'isStaged' and self.is_staged is not None:
-            return visitor._is_staged(self.is_staged)
         if self._type == 'workspace' and self.workspace is not None:
             return visitor._workspace(self.workspace)
 
@@ -22186,26 +22279,42 @@ class scout_asset_api_SearchAssetsQueryVisitor:
     def _label(self, label: str) -> Any:
         pass
 
+    @abstractmethod
+    def _labels(self, labels: "scout_rids_api_LabelsFilter") -> Any:
+        pass
+
     @abstractmethod
     def _property(self, property: "api_Property") -> Any:
         pass
 
     @abstractmethod
-    def _type_rid(self, type_rid: str) -> Any:
+    def _properties(self, properties: "scout_rids_api_PropertiesFilter") -> Any:
         pass
 
     @abstractmethod
-    def _and(self, and_: List["scout_asset_api_SearchAssetsQuery"]) -> Any:
+    def _type_rid(self, type_rid: str) -> Any:
         pass
 
     @abstractmethod
-    def _or(self, or_: List["scout_asset_api_SearchAssetsQuery"]) -> Any:
+    def _asset_types(self, asset_types: "scout_asset_api_AssetTypesFilter") -> Any:
         pass
 
     @abstractmethod
     def _is_staged(self, is_staged: bool) -> Any:
         pass
 
+    @abstractmethod
+    def _archived(self, archived: bool) -> Any:
+        pass
+
+    @abstractmethod
+    def _and(self, and_: List["scout_asset_api_SearchAssetsQuery"]) -> Any:
+        pass
+
+    @abstractmethod
+    def _or(self, or_: List["scout_asset_api_SearchAssetsQuery"]) -> Any:
+        pass
+
     @abstractmethod
     def _workspace(self, workspace: str) -> Any:
         pass
@@ -22498,8 +22607,6 @@ class scout_asset_api_SearchTypesRequest(ConjureBeanType):
 
     @builtins.property
     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.
-        """
         return self._archived_statuses
 
 
@@ -35470,7 +35577,9 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
     _or_: Optional[List["scout_checks_api_ChecklistSearchQuery"]] = None
     _search_text: Optional[str] = None
     _label: Optional[str] = None
+    _labels: Optional["scout_rids_api_LabelsFilter"] = None
     _property: Optional["api_Property"] = None
+    _properties: Optional["scout_rids_api_PropertiesFilter"] = None
     _author_rid: Optional[str] = None
     _assignee_rid: Optional[str] = None
     _is_published: Optional[bool] = None
@@ -35486,7 +35595,9 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
             'or_': ConjureFieldDefinition('or', List[scout_checks_api_ChecklistSearchQuery]),
             'search_text': ConjureFieldDefinition('searchText', str),
             'label': ConjureFieldDefinition('label', api_Label),
+            'labels': ConjureFieldDefinition('labels', scout_rids_api_LabelsFilter),
             'property': ConjureFieldDefinition('property', api_Property),
+            'properties': ConjureFieldDefinition('properties', scout_rids_api_PropertiesFilter),
             'author_rid': ConjureFieldDefinition('authorRid', scout_rids_api_UserRid),
             'assignee_rid': ConjureFieldDefinition('assigneeRid', scout_rids_api_UserRid),
             'is_published': ConjureFieldDefinition('isPublished', bool),
@@ -35502,7 +35613,9 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
             or_: Optional[List["scout_checks_api_ChecklistSearchQuery"]] = None,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
+            labels: Optional["scout_rids_api_LabelsFilter"] = None,
             property: Optional["api_Property"] = None,
+            properties: Optional["scout_rids_api_PropertiesFilter"] = None,
             author_rid: Optional[str] = None,
             assignee_rid: Optional[str] = None,
             is_published: Optional[bool] = None,
@@ -35513,7 +35626,7 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
             type_of_union: Optional[str] = None
             ) -> None:
         if type_of_union is None:
-            if (and_ is not None) + (or_ is not None) + (search_text is not None) + (label is not None) + (property is not None) + (author_rid is not None) + (assignee_rid is not None) + (is_published is not None) + (not_ is not None) + (workspace is not None) + (author_is_current_user is not None) + (author_rids is not None) != 1:
+            if (and_ is not None) + (or_ is not None) + (search_text is not None) + (label is not None) + (labels is not None) + (property is not None) + (properties is not None) + (author_rid is not None) + (assignee_rid is not None) + (is_published is not None) + (not_ is not None) + (workspace is not None) + (author_is_current_user is not None) + (author_rids is not None) != 1:
                 raise ValueError('a union must contain a single member')
 
             if and_ is not None:
@@ -35528,9 +35641,15 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
             if label is not None:
                 self._label = label
                 self._type = 'label'
+            if labels is not None:
+                self._labels = labels
+                self._type = 'labels'
             if property is not None:
                 self._property = property
                 self._type = 'property'
+            if properties is not None:
+                self._properties = properties
+                self._type = 'properties'
             if author_rid is not None:
                 self._author_rid = author_rid
                 self._type = 'authorRid'
@@ -35573,11 +35692,21 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._label = label
             self._type = 'label'
+        elif type_of_union == 'labels':
+            if labels is None:
+                raise ValueError('a union value must not be None')
+            self._labels = labels
+            self._type = 'labels'
         elif type_of_union == 'property':
             if property is None:
                 raise ValueError('a union value must not be None')
             self._property = property
             self._type = 'property'
+        elif type_of_union == 'properties':
+            if properties is None:
+                raise ValueError('a union value must not be None')
+            self._properties = properties
+            self._type = 'properties'
         elif type_of_union == 'authorRid':
             if author_rid is None:
                 raise ValueError('a union value must not be None')
@@ -35630,10 +35759,18 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
     def label(self) -> Optional[str]:
         return self._label
 
+    @builtins.property
+    def labels(self) -> Optional["scout_rids_api_LabelsFilter"]:
+        return self._labels
+
     @builtins.property
     def property(self) -> Optional["api_Property"]:
         return self._property
 
+    @builtins.property
+    def properties(self) -> Optional["scout_rids_api_PropertiesFilter"]:
+        return self._properties
+
     @builtins.property
     def author_rid(self) -> Optional[str]:
         return self._author_rid
@@ -35673,8 +35810,12 @@ class scout_checks_api_ChecklistSearchQuery(ConjureUnionType):
             return visitor._search_text(self.search_text)
         if self._type == 'label' and self.label is not None:
             return visitor._label(self.label)
+        if self._type == 'labels' and self.labels is not None:
+            return visitor._labels(self.labels)
         if self._type == 'property' and self.property is not None:
             return visitor._property(self.property)
+        if self._type == 'properties' and self.properties is not None:
+            return visitor._properties(self.properties)
         if self._type == 'authorRid' and self.author_rid is not None:
             return visitor._author_rid(self.author_rid)
         if self._type == 'assigneeRid' and self.assignee_rid is not None:
@@ -35714,10 +35855,18 @@ class scout_checks_api_ChecklistSearchQueryVisitor:
     def _label(self, label: str) -> Any:
         pass
 
+    @abstractmethod
+    def _labels(self, labels: "scout_rids_api_LabelsFilter") -> Any:
+        pass
+
     @abstractmethod
     def _property(self, property: "api_Property") -> Any:
         pass
 
+    @abstractmethod
+    def _properties(self, properties: "scout_rids_api_PropertiesFilter") -> Any:
+        pass
+
     @abstractmethod
     def _author_rid(self, author_rid: str) -> Any:
         pass
@@ -76398,6 +76547,37 @@ scout_metadata_StringArrayLengthQuery.__qualname__ = "StringArrayLengthQuery"
 scout_metadata_StringArrayLengthQuery.__module__ = "nominal_api.scout_metadata"
 
 
+class scout_notebook_api_AssetsFilter(ConjureBeanType):
+    """for an exact match, use the exactAssetRids filter
+    """
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'operator': ConjureFieldDefinition('operator', api_SetOperator),
+            'assets': ConjureFieldDefinition('assets', List[scout_rids_api_AssetRid])
+        }
+
+    __slots__: List[str] = ['_operator', '_assets']
+
+    def __init__(self, assets: List[str], operator: "api_SetOperator") -> None:
+        self._operator = operator
+        self._assets = assets
+
+    @builtins.property
+    def operator(self) -> "api_SetOperator":
+        return self._operator
+
+    @builtins.property
+    def assets(self) -> List[str]:
+        return self._assets
+
+
+scout_notebook_api_AssetsFilter.__name__ = "AssetsFilter"
+scout_notebook_api_AssetsFilter.__qualname__ = "AssetsFilter"
+scout_notebook_api_AssetsFilter.__module__ = "nominal_api.scout_notebook_api"
+
+
 class scout_notebook_api_ChartWithOverlays(ConjureBeanType):
 
     @builtins.classmethod
@@ -76918,6 +77098,60 @@ scout_notebook_api_NotebookType.__qualname__ = "NotebookType"
 scout_notebook_api_NotebookType.__module__ = "nominal_api.scout_notebook_api"
 
 
+class scout_notebook_api_NotebookTypesFilter(ConjureBeanType):
+    """returns notebooks that match any of the provided notebook types
+    """
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'types': ConjureFieldDefinition('types', List[scout_notebook_api_NotebookType])
+        }
+
+    __slots__: List[str] = ['_types']
+
+    def __init__(self, types: List["scout_notebook_api_NotebookType"]) -> None:
+        self._types = types
+
+    @builtins.property
+    def types(self) -> List["scout_notebook_api_NotebookType"]:
+        return self._types
+
+
+scout_notebook_api_NotebookTypesFilter.__name__ = "NotebookTypesFilter"
+scout_notebook_api_NotebookTypesFilter.__qualname__ = "NotebookTypesFilter"
+scout_notebook_api_NotebookTypesFilter.__module__ = "nominal_api.scout_notebook_api"
+
+
+class scout_notebook_api_RunsFilter(ConjureBeanType):
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'operator': ConjureFieldDefinition('operator', api_SetOperator),
+            'runs': ConjureFieldDefinition('runs', List[scout_run_api_RunRid])
+        }
+
+    __slots__: List[str] = ['_operator', '_runs']
+
+    def __init__(self, operator: "api_SetOperator", runs: List[str]) -> None:
+        self._operator = operator
+        self._runs = runs
+
+    @builtins.property
+    def operator(self) -> "api_SetOperator":
+        return self._operator
+
+    @builtins.property
+    def runs(self) -> List[str]:
+        return self._runs
+
+
+scout_notebook_api_RunsFilter.__name__ = "RunsFilter"
+scout_notebook_api_RunsFilter.__qualname__ = "RunsFilter"
+scout_notebook_api_RunsFilter.__module__ = "nominal_api.scout_notebook_api"
+
+
 class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
     _and_: Optional[List["scout_notebook_api_SearchNotebooksQuery"]] = None
     _or_: Optional[List["scout_notebook_api_SearchNotebooksQuery"]] = None
@@ -76925,12 +77159,17 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
     _exact_match: Optional[str] = None
     _search_text: Optional[str] = None
     _label: Optional[str] = None
+    _labels: Optional["scout_rids_api_LabelsFilter"] = None
     _property: Optional["api_Property"] = None
+    _properties: Optional["scout_rids_api_PropertiesFilter"] = None
     _asset_rid: Optional[str] = None
+    _asset_rids: Optional["scout_notebook_api_AssetsFilter"] = None
     _exact_asset_rids: Optional[List[str]] = None
     _author_rid: Optional[str] = None
     _run_rid: Optional[str] = None
+    _run_rids: Optional["scout_notebook_api_RunsFilter"] = None
     _notebook_type: Optional["scout_notebook_api_NotebookType"] = None
+    _notebook_types: Optional["scout_notebook_api_NotebookTypesFilter"] = None
     _draft_state: Optional[bool] = None
     _archived: Optional[bool] = None
     _workspace: Optional[str] = None
@@ -76946,12 +77185,17 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
             'exact_match': ConjureFieldDefinition('exactMatch', str),
             'search_text': ConjureFieldDefinition('searchText', str),
             'label': ConjureFieldDefinition('label', api_Label),
+            'labels': ConjureFieldDefinition('labels', scout_rids_api_LabelsFilter),
             'property': ConjureFieldDefinition('property', api_Property),
+            'properties': ConjureFieldDefinition('properties', scout_rids_api_PropertiesFilter),
             'asset_rid': ConjureFieldDefinition('assetRid', scout_rids_api_AssetRid),
+            'asset_rids': ConjureFieldDefinition('assetRids', scout_notebook_api_AssetsFilter),
             'exact_asset_rids': ConjureFieldDefinition('exactAssetRids', List[scout_rids_api_AssetRid]),
             'author_rid': ConjureFieldDefinition('authorRid', scout_rids_api_UserRid),
             'run_rid': ConjureFieldDefinition('runRid', scout_run_api_RunRid),
+            'run_rids': ConjureFieldDefinition('runRids', scout_notebook_api_RunsFilter),
             'notebook_type': ConjureFieldDefinition('notebookType', scout_notebook_api_NotebookType),
+            'notebook_types': ConjureFieldDefinition('notebookTypes', scout_notebook_api_NotebookTypesFilter),
             'draft_state': ConjureFieldDefinition('draftState', bool),
             'archived': ConjureFieldDefinition('archived', bool),
             'workspace': ConjureFieldDefinition('workspace', api_rids_WorkspaceRid),
@@ -76967,12 +77211,17 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
             exact_match: Optional[str] = None,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
+            labels: Optional["scout_rids_api_LabelsFilter"] = None,
             property: Optional["api_Property"] = None,
+            properties: Optional["scout_rids_api_PropertiesFilter"] = None,
             asset_rid: Optional[str] = None,
+            asset_rids: Optional["scout_notebook_api_AssetsFilter"] = None,
             exact_asset_rids: Optional[List[str]] = None,
             author_rid: Optional[str] = None,
             run_rid: Optional[str] = None,
+            run_rids: Optional["scout_notebook_api_RunsFilter"] = None,
             notebook_type: Optional["scout_notebook_api_NotebookType"] = None,
+            notebook_types: Optional["scout_notebook_api_NotebookTypesFilter"] = None,
             draft_state: Optional[bool] = None,
             archived: Optional[bool] = None,
             workspace: Optional[str] = None,
@@ -76981,7 +77230,7 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
             type_of_union: Optional[str] = None
             ) -> None:
         if type_of_union is None:
-            if (and_ is not None) + (or_ is not None) + (not_ is not None) + (exact_match is not None) + (search_text is not None) + (label is not None) + (property is not None) + (asset_rid is not None) + (exact_asset_rids is not None) + (author_rid is not None) + (run_rid is not None) + (notebook_type is not None) + (draft_state is not None) + (archived is not None) + (workspace is not None) + (author_is_current_user is not None) + (author_rids is not None) != 1:
+            if (and_ is not None) + (or_ is not None) + (not_ is not None) + (exact_match is not None) + (search_text is not None) + (label is not None) + (labels is not None) + (property is not None) + (properties is not None) + (asset_rid is not None) + (asset_rids is not None) + (exact_asset_rids is not None) + (author_rid is not None) + (run_rid is not None) + (run_rids is not None) + (notebook_type is not None) + (notebook_types is not None) + (draft_state is not None) + (archived is not None) + (workspace is not None) + (author_is_current_user is not None) + (author_rids is not None) != 1:
                 raise ValueError('a union must contain a single member')
 
             if and_ is not None:
@@ -77002,12 +77251,21 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
             if label is not None:
                 self._label = label
                 self._type = 'label'
+            if labels is not None:
+                self._labels = labels
+                self._type = 'labels'
             if property is not None:
                 self._property = property
                 self._type = 'property'
+            if properties is not None:
+                self._properties = properties
+                self._type = 'properties'
             if asset_rid is not None:
                 self._asset_rid = asset_rid
                 self._type = 'assetRid'
+            if asset_rids is not None:
+                self._asset_rids = asset_rids
+                self._type = 'assetRids'
             if exact_asset_rids is not None:
                 self._exact_asset_rids = exact_asset_rids
                 self._type = 'exactAssetRids'
@@ -77017,9 +77275,15 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
             if run_rid is not None:
                 self._run_rid = run_rid
                 self._type = 'runRid'
+            if run_rids is not None:
+                self._run_rids = run_rids
+                self._type = 'runRids'
             if notebook_type is not None:
                 self._notebook_type = notebook_type
                 self._type = 'notebookType'
+            if notebook_types is not None:
+                self._notebook_types = notebook_types
+                self._type = 'notebookTypes'
             if draft_state is not None:
                 self._draft_state = draft_state
                 self._type = 'draftState'
@@ -77066,16 +77330,31 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._label = label
             self._type = 'label'
+        elif type_of_union == 'labels':
+            if labels is None:
+                raise ValueError('a union value must not be None')
+            self._labels = labels
+            self._type = 'labels'
         elif type_of_union == 'property':
             if property is None:
                 raise ValueError('a union value must not be None')
             self._property = property
             self._type = 'property'
+        elif type_of_union == 'properties':
+            if properties is None:
+                raise ValueError('a union value must not be None')
+            self._properties = properties
+            self._type = 'properties'
         elif type_of_union == 'assetRid':
             if asset_rid is None:
                 raise ValueError('a union value must not be None')
             self._asset_rid = asset_rid
             self._type = 'assetRid'
+        elif type_of_union == 'assetRids':
+            if asset_rids is None:
+                raise ValueError('a union value must not be None')
+            self._asset_rids = asset_rids
+            self._type = 'assetRids'
         elif type_of_union == 'exactAssetRids':
             if exact_asset_rids is None:
                 raise ValueError('a union value must not be None')
@@ -77091,11 +77370,21 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._run_rid = run_rid
             self._type = 'runRid'
+        elif type_of_union == 'runRids':
+            if run_rids is None:
+                raise ValueError('a union value must not be None')
+            self._run_rids = run_rids
+            self._type = 'runRids'
         elif type_of_union == 'notebookType':
             if notebook_type is None:
                 raise ValueError('a union value must not be None')
             self._notebook_type = notebook_type
             self._type = 'notebookType'
+        elif type_of_union == 'notebookTypes':
+            if notebook_types is None:
+                raise ValueError('a union value must not be None')
+            self._notebook_types = notebook_types
+            self._type = 'notebookTypes'
         elif type_of_union == 'draftState':
             if draft_state is None:
                 raise ValueError('a union value must not be None')
@@ -77148,18 +77437,30 @@ class scout_notebook_api_SearchNotebooksQuery(ConjureUnionType):
     def label(self) -> Optional[str]:
         return self._label
 
+    @builtins.property
+    def labels(self) -> Optional["scout_rids_api_LabelsFilter"]:
+        return self._labels
+
     @builtins.property
     def property(self) -> Optional["api_Property"]:
         return self._property
 
+    @builtins.property
+    def properties(self) -> Optional["scout_rids_api_PropertiesFilter"]:
+        return self._properties
+
     @builtins.property
     def asset_rid(self) -> Optional[str]:
         return self._asset_rid
 
+    @builtins.property
+    def asset_rids(self) -> Optional["scout_notebook_api_AssetsFilter"]:
+        return self._asset_rids
+
     @builtins.property
     def exact_asset_rids(self) -> Optional[List[str]]:
         """Requires the set of assets in the query to exactly match the set of assets in the notebook.
-To do a partial match, use an "and" on AssetRid queries.
+To do a partial match, use an assetRids query.
         """
         return self._exact_asset_rids
 
@@ -77171,10 +77472,18 @@ To do a partial match, use an "and" on AssetRid queries.
     def run_rid(self) -> Optional[str]:
         return self._run_rid
 
+    @builtins.property
+    def run_rids(self) -> Optional["scout_notebook_api_RunsFilter"]:
+        return self._run_rids
+
     @builtins.property
     def notebook_type(self) -> Optional["scout_notebook_api_NotebookType"]:
         return self._notebook_type
 
+    @builtins.property
+    def notebook_types(self) -> Optional["scout_notebook_api_NotebookTypesFilter"]:
+        return self._notebook_types
+
     @builtins.property
     def draft_state(self) -> Optional[bool]:
         return self._draft_state
@@ -77210,18 +77519,28 @@ To do a partial match, use an "and" on AssetRid queries.
             return visitor._search_text(self.search_text)
         if self._type == 'label' and self.label is not None:
             return visitor._label(self.label)
+        if self._type == 'labels' and self.labels is not None:
+            return visitor._labels(self.labels)
         if self._type == 'property' and self.property is not None:
             return visitor._property(self.property)
+        if self._type == 'properties' and self.properties is not None:
+            return visitor._properties(self.properties)
         if self._type == 'assetRid' and self.asset_rid is not None:
             return visitor._asset_rid(self.asset_rid)
+        if self._type == 'assetRids' and self.asset_rids is not None:
+            return visitor._asset_rids(self.asset_rids)
         if self._type == 'exactAssetRids' and self.exact_asset_rids is not None:
             return visitor._exact_asset_rids(self.exact_asset_rids)
         if self._type == 'authorRid' and self.author_rid is not None:
             return visitor._author_rid(self.author_rid)
         if self._type == 'runRid' and self.run_rid is not None:
             return visitor._run_rid(self.run_rid)
+        if self._type == 'runRids' and self.run_rids is not None:
+            return visitor._run_rids(self.run_rids)
         if self._type == 'notebookType' and self.notebook_type is not None:
             return visitor._notebook_type(self.notebook_type)
+        if self._type == 'notebookTypes' and self.notebook_types is not None:
+            return visitor._notebook_types(self.notebook_types)
         if self._type == 'draftState' and self.draft_state is not None:
             return visitor._draft_state(self.draft_state)
         if self._type == 'archived' and self.archived is not None:
@@ -77265,14 +77584,26 @@ class scout_notebook_api_SearchNotebooksQueryVisitor:
     def _label(self, label: str) -> Any:
         pass
 
+    @abstractmethod
+    def _labels(self, labels: "scout_rids_api_LabelsFilter") -> Any:
+        pass
+
     @abstractmethod
     def _property(self, property: "api_Property") -> Any:
         pass
 
+    @abstractmethod
+    def _properties(self, properties: "scout_rids_api_PropertiesFilter") -> Any:
+        pass
+
     @abstractmethod
     def _asset_rid(self, asset_rid: str) -> Any:
         pass
 
+    @abstractmethod
+    def _asset_rids(self, asset_rids: "scout_notebook_api_AssetsFilter") -> Any:
+        pass
+
     @abstractmethod
     def _exact_asset_rids(self, exact_asset_rids: List[str]) -> Any:
         pass
@@ -77285,10 +77616,18 @@ class scout_notebook_api_SearchNotebooksQueryVisitor:
     def _run_rid(self, run_rid: str) -> Any:
         pass
 
+    @abstractmethod
+    def _run_rids(self, run_rids: "scout_notebook_api_RunsFilter") -> Any:
+        pass
+
     @abstractmethod
     def _notebook_type(self, notebook_type: "scout_notebook_api_NotebookType") -> Any:
         pass
 
+    @abstractmethod
+    def _notebook_types(self, notebook_types: "scout_notebook_api_NotebookTypesFilter") -> Any:
+        pass
+
     @abstractmethod
     def _draft_state(self, draft_state: bool) -> Any:
         pass
@@ -77783,6 +78122,35 @@ scout_rids_api_ClosedWithIgnoreAlertState.__qualname__ = "ClosedWithIgnoreAlertS
 scout_rids_api_ClosedWithIgnoreAlertState.__module__ = "nominal_api.scout_rids_api"
 
 
+class scout_rids_api_LabelsFilter(ConjureBeanType):
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'operator': ConjureFieldDefinition('operator', api_SetOperator),
+            'labels': ConjureFieldDefinition('labels', List[api_Label])
+        }
+
+    __slots__: List[str] = ['_operator', '_labels']
+
+    def __init__(self, labels: List[str], operator: "api_SetOperator") -> None:
+        self._operator = operator
+        self._labels = labels
+
+    @builtins.property
+    def operator(self) -> "api_SetOperator":
+        return self._operator
+
+    @builtins.property
+    def labels(self) -> List[str]:
+        return self._labels
+
+
+scout_rids_api_LabelsFilter.__name__ = "LabelsFilter"
+scout_rids_api_LabelsFilter.__qualname__ = "LabelsFilter"
+scout_rids_api_LabelsFilter.__module__ = "nominal_api.scout_rids_api"
+
+
 class scout_rids_api_PendingReviewAlertState(ConjureBeanType):
 
     @builtins.classmethod
@@ -77799,6 +78167,35 @@ scout_rids_api_PendingReviewAlertState.__qualname__ = "PendingReviewAlertState"
 scout_rids_api_PendingReviewAlertState.__module__ = "nominal_api.scout_rids_api"
 
 
+class scout_rids_api_PropertiesFilter(ConjureBeanType):
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'name': ConjureFieldDefinition('name', api_PropertyName),
+            'values': ConjureFieldDefinition('values', List[api_PropertyValue])
+        }
+
+    __slots__: List[str] = ['_name', '_values']
+
+    def __init__(self, name: str, values: List[str]) -> None:
+        self._name = name
+        self._values = values
+
+    @builtins.property
+    def name(self) -> str:
+        return self._name
+
+    @builtins.property
+    def values(self) -> List[str]:
+        return self._values
+
+
+scout_rids_api_PropertiesFilter.__name__ = "PropertiesFilter"
+scout_rids_api_PropertiesFilter.__qualname__ = "PropertiesFilter"
+scout_rids_api_PropertiesFilter.__module__ = "nominal_api.scout_rids_api"
+
+
 class scout_rids_api_UserDuration(ConjureBeanType):
     """Represents a time duration with a unit for user-facing display
     """
@@ -78700,35 +79097,6 @@ scout_run_api_GetRunsByAssetResponse.__qualname__ = "GetRunsByAssetResponse"
 scout_run_api_GetRunsByAssetResponse.__module__ = "nominal_api.scout_run_api"
 
 
-class scout_run_api_LabelsFilter(ConjureBeanType):
-
-    @builtins.classmethod
-    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
-        return {
-            'operator': ConjureFieldDefinition('operator', api_SetOperator),
-            'labels': ConjureFieldDefinition('labels', List[api_Label])
-        }
-
-    __slots__: List[str] = ['_operator', '_labels']
-
-    def __init__(self, labels: List[str], operator: "api_SetOperator") -> None:
-        self._operator = operator
-        self._labels = labels
-
-    @builtins.property
-    def operator(self) -> "api_SetOperator":
-        return self._operator
-
-    @builtins.property
-    def labels(self) -> List[str]:
-        return self._labels
-
-
-scout_run_api_LabelsFilter.__name__ = "LabelsFilter"
-scout_run_api_LabelsFilter.__qualname__ = "LabelsFilter"
-scout_run_api_LabelsFilter.__module__ = "nominal_api.scout_run_api"
-
-
 class scout_run_api_Link(ConjureBeanType):
 
     @builtins.classmethod
@@ -78805,35 +79173,6 @@ scout_run_api_PresetTimeframeFilter.__qualname__ = "PresetTimeframeFilter"
 scout_run_api_PresetTimeframeFilter.__module__ = "nominal_api.scout_run_api"
 
 
-class scout_run_api_PropertiesFilter(ConjureBeanType):
-
-    @builtins.classmethod
-    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
-        return {
-            'name': ConjureFieldDefinition('name', api_PropertyName),
-            'values': ConjureFieldDefinition('values', List[api_PropertyValue])
-        }
-
-    __slots__: List[str] = ['_name', '_values']
-
-    def __init__(self, name: str, values: List[str]) -> None:
-        self._name = name
-        self._values = values
-
-    @builtins.property
-    def name(self) -> str:
-        return self._name
-
-    @builtins.property
-    def values(self) -> List[str]:
-        return self._values
-
-
-scout_run_api_PropertiesFilter.__name__ = "PropertiesFilter"
-scout_run_api_PropertiesFilter.__qualname__ = "PropertiesFilter"
-scout_run_api_PropertiesFilter.__module__ = "nominal_api.scout_run_api"
-
-
 class scout_run_api_RefNameAndType(ConjureBeanType):
     """Scoped to the org-level, intended to help the frontend
 prevent users from submitting invalid ref names, ex.
@@ -79211,9 +79550,9 @@ class scout_run_api_SearchQuery(ConjureUnionType):
     _assets: Optional["scout_run_api_AssetsFilter"] = None
     _is_single_asset: Optional[bool] = None
     _label: Optional[str] = None
-    _labels: Optional["scout_run_api_LabelsFilter"] = None
+    _labels: Optional["scout_rids_api_LabelsFilter"] = None
     _property: Optional["api_Property"] = None
-    _properties: Optional["scout_run_api_PropertiesFilter"] = None
+    _properties: Optional["scout_rids_api_PropertiesFilter"] = 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
@@ -79240,9 +79579,9 @@ class scout_run_api_SearchQuery(ConjureUnionType):
             'assets': ConjureFieldDefinition('assets', scout_run_api_AssetsFilter),
             'is_single_asset': ConjureFieldDefinition('isSingleAsset', bool),
             'label': ConjureFieldDefinition('label', api_Label),
-            'labels': ConjureFieldDefinition('labels', scout_run_api_LabelsFilter),
+            'labels': ConjureFieldDefinition('labels', scout_rids_api_LabelsFilter),
             'property': ConjureFieldDefinition('property', api_Property),
-            'properties': ConjureFieldDefinition('properties', scout_run_api_PropertiesFilter),
+            'properties': ConjureFieldDefinition('properties', scout_rids_api_PropertiesFilter),
             '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),
@@ -79269,9 +79608,9 @@ class scout_run_api_SearchQuery(ConjureUnionType):
             assets: Optional["scout_run_api_AssetsFilter"] = None,
             is_single_asset: Optional[bool] = None,
             label: Optional[str] = None,
-            labels: Optional["scout_run_api_LabelsFilter"] = None,
+            labels: Optional["scout_rids_api_LabelsFilter"] = None,
             property: Optional["api_Property"] = None,
-            properties: Optional["scout_run_api_PropertiesFilter"] = None,
+            properties: Optional["scout_rids_api_PropertiesFilter"] = 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,
@@ -79540,7 +79879,7 @@ class scout_run_api_SearchQuery(ConjureUnionType):
         return self._label
 
     @builtins.property
-    def labels(self) -> Optional["scout_run_api_LabelsFilter"]:
+    def labels(self) -> Optional["scout_rids_api_LabelsFilter"]:
         return self._labels
 
     @builtins.property
@@ -79548,7 +79887,7 @@ class scout_run_api_SearchQuery(ConjureUnionType):
         return self._property
 
     @builtins.property
-    def properties(self) -> Optional["scout_run_api_PropertiesFilter"]:
+    def properties(self) -> Optional["scout_rids_api_PropertiesFilter"]:
         return self._properties
 
     @builtins.property
@@ -79704,7 +80043,7 @@ class scout_run_api_SearchQueryVisitor:
         pass
 
     @abstractmethod
-    def _labels(self, labels: "scout_run_api_LabelsFilter") -> Any:
+    def _labels(self, labels: "scout_rids_api_LabelsFilter") -> Any:
         pass
 
     @abstractmethod
@@ -79712,7 +80051,7 @@ class scout_run_api_SearchQueryVisitor:
         pass
 
     @abstractmethod
-    def _properties(self, properties: "scout_run_api_PropertiesFilter") -> Any:
+    def _properties(self, properties: "scout_rids_api_PropertiesFilter") -> Any:
         pass
 
     @abstractmethod
@@ -82261,7 +82600,9 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
     _exact_match: Optional[str] = None
     _search_text: Optional[str] = None
     _label: Optional[str] = None
+    _labels: Optional["scout_rids_api_LabelsFilter"] = None
     _property: Optional["api_Property"] = None
+    _properties: Optional["scout_rids_api_PropertiesFilter"] = None
     _created_by: Optional[str] = None
     _is_archived: Optional[bool] = None
     _is_published: Optional[bool] = None
@@ -82278,7 +82619,9 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
             'exact_match': ConjureFieldDefinition('exactMatch', str),
             'search_text': ConjureFieldDefinition('searchText', str),
             'label': ConjureFieldDefinition('label', api_Label),
+            'labels': ConjureFieldDefinition('labels', scout_rids_api_LabelsFilter),
             'property': ConjureFieldDefinition('property', api_Property),
+            'properties': ConjureFieldDefinition('properties', scout_rids_api_PropertiesFilter),
             'created_by': ConjureFieldDefinition('createdBy', scout_rids_api_UserRid),
             'is_archived': ConjureFieldDefinition('isArchived', bool),
             'is_published': ConjureFieldDefinition('isPublished', bool),
@@ -82295,7 +82638,9 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
             exact_match: Optional[str] = None,
             search_text: Optional[str] = None,
             label: Optional[str] = None,
+            labels: Optional["scout_rids_api_LabelsFilter"] = None,
             property: Optional["api_Property"] = None,
+            properties: Optional["scout_rids_api_PropertiesFilter"] = None,
             created_by: Optional[str] = None,
             is_archived: Optional[bool] = None,
             is_published: Optional[bool] = None,
@@ -82305,7 +82650,7 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
             type_of_union: Optional[str] = None
             ) -> None:
         if type_of_union is None:
-            if (and_ is not None) + (or_ is not None) + (not_ is not None) + (exact_match is not None) + (search_text is not None) + (label is not None) + (property is not None) + (created_by is not None) + (is_archived is not None) + (is_published is not None) + (workspace is not None) + (author_is_current_user is not None) + (author_rids is not None) != 1:
+            if (and_ is not None) + (or_ is not None) + (not_ is not None) + (exact_match is not None) + (search_text is not None) + (label is not None) + (labels is not None) + (property is not None) + (properties is not None) + (created_by is not None) + (is_archived is not None) + (is_published is not None) + (workspace is not None) + (author_is_current_user is not None) + (author_rids is not None) != 1:
                 raise ValueError('a union must contain a single member')
 
             if and_ is not None:
@@ -82326,9 +82671,15 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
             if label is not None:
                 self._label = label
                 self._type = 'label'
+            if labels is not None:
+                self._labels = labels
+                self._type = 'labels'
             if property is not None:
                 self._property = property
                 self._type = 'property'
+            if properties is not None:
+                self._properties = properties
+                self._type = 'properties'
             if created_by is not None:
                 self._created_by = created_by
                 self._type = 'createdBy'
@@ -82378,11 +82729,21 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
                 raise ValueError('a union value must not be None')
             self._label = label
             self._type = 'label'
+        elif type_of_union == 'labels':
+            if labels is None:
+                raise ValueError('a union value must not be None')
+            self._labels = labels
+            self._type = 'labels'
         elif type_of_union == 'property':
             if property is None:
                 raise ValueError('a union value must not be None')
             self._property = property
             self._type = 'property'
+        elif type_of_union == 'properties':
+            if properties is None:
+                raise ValueError('a union value must not be None')
+            self._properties = properties
+            self._type = 'properties'
         elif type_of_union == 'createdBy':
             if created_by is None:
                 raise ValueError('a union value must not be None')
@@ -82442,10 +82803,18 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
     def label(self) -> Optional[str]:
         return self._label
 
+    @builtins.property
+    def labels(self) -> Optional["scout_rids_api_LabelsFilter"]:
+        return self._labels
+
     @builtins.property
     def property(self) -> Optional["api_Property"]:
         return self._property
 
+    @builtins.property
+    def properties(self) -> Optional["scout_rids_api_PropertiesFilter"]:
+        return self._properties
+
     @builtins.property
     def created_by(self) -> Optional[str]:
         return self._created_by
@@ -82485,8 +82854,12 @@ class scout_template_api_SearchTemplatesQuery(ConjureUnionType):
             return visitor._search_text(self.search_text)
         if self._type == 'label' and self.label is not None:
             return visitor._label(self.label)
+        if self._type == 'labels' and self.labels is not None:
+            return visitor._labels(self.labels)
         if self._type == 'property' and self.property is not None:
             return visitor._property(self.property)
+        if self._type == 'properties' and self.properties is not None:
+            return visitor._properties(self.properties)
         if self._type == 'createdBy' and self.created_by is not None:
             return visitor._created_by(self.created_by)
         if self._type == 'isArchived' and self.is_archived is not None:
@@ -82532,10 +82905,18 @@ class scout_template_api_SearchTemplatesQueryVisitor:
     def _label(self, label: str) -> Any:
         pass
 
+    @abstractmethod
+    def _labels(self, labels: "scout_rids_api_LabelsFilter") -> Any:
+        pass
+
     @abstractmethod
     def _property(self, property: "api_Property") -> Any:
         pass
 
+    @abstractmethod
+    def _properties(self, properties: "scout_rids_api_PropertiesFilter") -> Any:
+        pass
+
     @abstractmethod
     def _created_by(self, created_by: str) -> Any:
         pass

nominal_api/scout_asset_api/__init__.py

@@ -5,6 +5,7 @@ from .._impl import (
     scout_asset_api_AssetSortField as AssetSortField,
     scout_asset_api_AssetSortOptions as AssetSortOptions,
     scout_asset_api_AssetTypeDataScopeConfig as AssetTypeDataScopeConfig,
+    scout_asset_api_AssetTypesFilter as AssetTypesFilter,
     scout_asset_api_Channel as Channel,
     scout_asset_api_ChannelMetadata as ChannelMetadata,
     scout_asset_api_CreateAssetDataScope as CreateAssetDataScope,
@@ -45,6 +46,7 @@ __all__ = [
     'AssetSortField',
     'AssetSortOptions',
     'AssetTypeDataScopeConfig',
+    'AssetTypesFilter',
     'Channel',
     'ChannelMetadata',
     'CreateAssetDataScope',

nominal_api/scout_notebook_api/__init__.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 from .._impl import (
+    scout_notebook_api_AssetsFilter as AssetsFilter,
     scout_notebook_api_ChartWithOverlays as ChartWithOverlays,
     scout_notebook_api_CreateNotebookRequest as CreateNotebookRequest,
     scout_notebook_api_GetAllLabelsAndPropertiesResponse as GetAllLabelsAndPropertiesResponse,
@@ -10,6 +11,8 @@ from .._impl import (
     scout_notebook_api_NotebookMetadata as NotebookMetadata,
     scout_notebook_api_NotebookMetadataWithRid as NotebookMetadataWithRid,
     scout_notebook_api_NotebookType as NotebookType,
+    scout_notebook_api_NotebookTypesFilter as NotebookTypesFilter,
+    scout_notebook_api_RunsFilter as RunsFilter,
     scout_notebook_api_SearchNotebooksQuery as SearchNotebooksQuery,
     scout_notebook_api_SearchNotebooksQueryVisitor as SearchNotebooksQueryVisitor,
     scout_notebook_api_SearchNotebooksRequest as SearchNotebooksRequest,
@@ -22,6 +25,7 @@ from .._impl import (
 )
 
 __all__ = [
+    'AssetsFilter',
     'ChartWithOverlays',
     'CreateNotebookRequest',
     'GetAllLabelsAndPropertiesResponse',
@@ -32,6 +36,8 @@ __all__ = [
     'NotebookMetadata',
     'NotebookMetadataWithRid',
     'NotebookType',
+    'NotebookTypesFilter',
+    'RunsFilter',
     'SearchNotebooksQuery',
     'SearchNotebooksQueryVisitor',
     'SearchNotebooksRequest',

nominal_api/scout_rids_api/__init__.py

@@ -15,10 +15,12 @@ from .._impl import (
     scout_rids_api_FunctionLineageRid as FunctionLineageRid,
     scout_rids_api_FunctionRid as FunctionRid,
     scout_rids_api_GroupRid as GroupRid,
+    scout_rids_api_LabelsFilter as LabelsFilter,
     scout_rids_api_MarkingRid as MarkingRid,
     scout_rids_api_NotebookRid as NotebookRid,
     scout_rids_api_PendingReviewAlertState as PendingReviewAlertState,
     scout_rids_api_ProcedureExecutionRid as ProcedureExecutionRid,
+    scout_rids_api_PropertiesFilter as PropertiesFilter,
     scout_rids_api_SavedViewRid as SavedViewRid,
     scout_rids_api_SnapshotRid as SnapshotRid,
     scout_rids_api_TemplateRid as TemplateRid,
@@ -46,10 +48,12 @@ __all__ = [
     'FunctionLineageRid',
     'FunctionRid',
     'GroupRid',
+    'LabelsFilter',
     'MarkingRid',
     'NotebookRid',
     'PendingReviewAlertState',
     'ProcedureExecutionRid',
+    'PropertiesFilter',
     'SavedViewRid',
     'SnapshotRid',
     'TemplateRid',

nominal_api/scout_run_api/__init__.py

@@ -22,12 +22,10 @@ from .._impl import (
     scout_run_api_GetRunByIdRequest as GetRunByIdRequest,
     scout_run_api_GetRunsByAssetRequest as GetRunsByAssetRequest,
     scout_run_api_GetRunsByAssetResponse as GetRunsByAssetResponse,
-    scout_run_api_LabelsFilter as LabelsFilter,
     scout_run_api_Link as Link,
     scout_run_api_LogSetRid as LogSetRid,
     scout_run_api_PresetTimeframeDuration as PresetTimeframeDuration,
     scout_run_api_PresetTimeframeFilter as PresetTimeframeFilter,
-    scout_run_api_PropertiesFilter as PropertiesFilter,
     scout_run_api_RefNameAndType as RefNameAndType,
     scout_run_api_Run as Run,
     scout_run_api_RunDataReviewEvaluationStatus as RunDataReviewEvaluationStatus,
@@ -83,12 +81,10 @@ __all__ = [
     'GetRunByIdRequest',
     'GetRunsByAssetRequest',
     'GetRunsByAssetResponse',
-    'LabelsFilter',
     'Link',
     'LogSetRid',
     'PresetTimeframeDuration',
     'PresetTimeframeFilter',
-    'PropertiesFilter',
     'RefNameAndType',
     'Run',
     'RunDataReviewEvaluationStatus',

{nominal_api-0.910.0.dist-info → nominal_api-0.911.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nominal-api
-Version: 0.910.0
+Version: 0.911.0
 Requires-Python: >=3.8
 Requires-Dist: requests
 Requires-Dist: conjure-python-client<4,>=2.8.0

{nominal_api-0.910.0.dist-info → nominal_api-0.911.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-nominal_api/__init__.py,sha256=LIruA8YiN6mKkqwtFhHo_IXRrXKRajZdZRHN3L67Qss,2088
-nominal_api/_impl.py,sha256=skjUVGReddMSDY3Nxxys9jz4_HB0bqRepyzJS1RVr2E,3786251
+nominal_api/__init__.py,sha256=5QUCJcToRGeZOOKLXjGB9f2QhAJ-iCY2lco7OzFnSHI,2088
+nominal_api/_impl.py,sha256=qFbE0QbhgnaVvaePLyFzpjavbfjIHilhwB5bUkSNa74,3801984
 nominal_api/py.typed,sha256=eoZ6GfifbqhMLNzjlqRDVil-yyBkOmVN9ujSgJWNBlY,15
 nominal_api/api/__init__.py,sha256=GqRLE9wwPPQgALVHFJViG8E4JJ2t3yfHedeXRLu1L70,2226
 nominal_api/api_ids/__init__.py,sha256=sxqN5dMk6bOx0SKOd0ANG3_kmx1VtdSVotzEGn_q6sE,114
@@ -23,7 +23,7 @@ nominal_api/modules_api/__init__.py,sha256=686IO0NDXIYDX1mJkE7YBwqYOTayga6JYs1AZ
 nominal_api/persistent_compute_api/__init__.py,sha256=bOWBiRLJbl3winMP9EowCUpPpRIUYyejua3059wJWQk,3314
 nominal_api/scout/__init__.py,sha256=dZzrrqBeio2l0txhlNoHSfv6QsA9a3EVDp0_XpubUGk,481
 nominal_api/scout_api/__init__.py,sha256=6rARWIRcx3zbNAxI1a01TNElG3ontr7-uIHQ8iaRWs8,1085
-nominal_api/scout_asset_api/__init__.py,sha256=vBMxiCJ7ysOK5f-Vj-F8LWEWgh5sSFdMdNRPahuznbY,3212
+nominal_api/scout_asset_api/__init__.py,sha256=1GMflPfQVpPOK5qcfWsJxAKmNjSRDqVdafwaUIvUJgo,3294
 nominal_api/scout_assets/__init__.py,sha256=1ZyiolDjhxnrhyeUxW_KyeQ_q-6stlqd1I2d3HeZqUg,122
 nominal_api/scout_catalog/__init__.py,sha256=1EnyVFs0chW7ne4yECCPvNC_Lzb9SIGtYlb2RzSc0KE,4988
 nominal_api/scout_channelvariables_api/__init__.py,sha256=Wahkyy-m3gEcaRFYU5ZV3beW-W4OeYnOs9Y4eirQO38,1033
@@ -49,10 +49,10 @@ nominal_api/scout_internal_search_api/__init__.py,sha256=1rHEb-Djc3wVIttJDUU9mlA
 nominal_api/scout_jobs_api/__init__.py,sha256=pxPUL0pQNZe0aY1HjRRBcAPoX9ut4qyjQUgFFRdhcY4,205
 nominal_api/scout_layout_api/__init__.py,sha256=sUWO0V8Y0I0pa-nmKAjkeoIgTpP9tSG13335DHWlLx0,1902
 nominal_api/scout_metadata/__init__.py,sha256=tfnzE6dlVBki1ZSy276mkDQQeKehmJLaG9dczHAx3jk,649
-nominal_api/scout_notebook_api/__init__.py,sha256=b-4ONsrgT2NziNHq8em09YxbZcQcKLWmPYkpxBFHPFA,1820
+nominal_api/scout_notebook_api/__init__.py,sha256=AciUoPZXPbhC0lIWyUxa7LFGsj4qqX8hTqf70DM_Pa8,2054
 nominal_api/scout_plotting/__init__.py,sha256=RJK9HlPmNW_dxSz7CprwjfNKke86x11rQ7BF5pwrBv4,127
-nominal_api/scout_rids_api/__init__.py,sha256=tObQlt4-bYGcBEgPDHXaadr159GlkYSDdZME1072m94,2101
-nominal_api/scout_run_api/__init__.py,sha256=gFB-Q8NMMpkWkaogn2FXWvI6CV83N1bHDBgkIec0Dx8,4911
+nominal_api/scout_rids_api/__init__.py,sha256=7K44IwVH-84rKCj6srKvJSrjfYRiEnhxUA0HtmgnyG4,2251
+nominal_api/scout_run_api/__init__.py,sha256=ZUd1CJa6EyAylMrTGD6rum7CyFAoehP6FyiT4W2EDDA,4763
 nominal_api/scout_savedviews/__init__.py,sha256=yky0iF6IK8U5xnDjfzvUuXOb-Tl5RF6dic6abhuX-V8,138
 nominal_api/scout_savedviews_api/__init__.py,sha256=qGCgh8Pv9N-uekuDwDCHlBu9DCflIT6MiDhtFSmtKQ4,3148
 nominal_api/scout_template_api/__init__.py,sha256=Yu7FHTypJv09dBKqnWS_dDeXdwI1hgGGZNDbMOHZKr8,1550
@@ -78,7 +78,7 @@ nominal_api/timeseries_seriescache/__init__.py,sha256=hL5hN8jKLEGE_fDiZzdASmWIrR
 nominal_api/timeseries_seriescache_api/__init__.py,sha256=USBxFmNnVFdnhTPLvWi3UgsvBZ4Iz4ycNgBTi10F-zI,1603
 nominal_api/upload_api/__init__.py,sha256=7-XXuZUqKPV4AMWvxNpZPZ5vBun4x-AomXj3Vol_BN4,123
 nominal_api/usercreation_api/__init__.py,sha256=Q6M70SlKFVfIxZqRohD4XYmBz5t2DP1DB0a0Q6glqGA,171
-nominal_api-0.910.0.dist-info/METADATA,sha256=55elEQ3XE-nS_mR3mm_vxiWxfTgagrhJZ-l62EYUkj8,199
-nominal_api-0.910.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nominal_api-0.910.0.dist-info/top_level.txt,sha256=gI1ZdNJbuHcJZeKtCzzBXsEtpU1GX6XJKs6ksi_gCRA,12
-nominal_api-0.910.0.dist-info/RECORD,,
+nominal_api-0.911.0.dist-info/METADATA,sha256=jictSFHETdinkP0TyvR7OY0fJCW6lvJ1NEwbv8Uss5A,199
+nominal_api-0.911.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nominal_api-0.911.0.dist-info/top_level.txt,sha256=gI1ZdNJbuHcJZeKtCzzBXsEtpU1GX6XJKs6ksi_gCRA,12
+nominal_api-0.911.0.dist-info/RECORD,,