nominal-api 0.584.0__py3-none-any.whl → 0.584.1__py3-none-any.whl

nominal_api/__init__.py

@@ -73,5 +73,5 @@ __all__ = [
 
 __conjure_generator_version__ = "4.9.0"
 
-__version__ = "0.584.0"
+__version__ = "0.584.1"
 

nominal_api/_impl.py

@@ -12086,83 +12086,6 @@ scout_api_ChannelLocator.__qualname__ = "ChannelLocator"
 scout_api_ChannelLocator.__module__ = "nominal_api.scout_api"
 
 
-class scout_api_DataScope(ConjureBeanType):
-
-    @builtins.classmethod
-    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
-        return {
-            'data_source': ConjureFieldDefinition('dataSource', scout_run_api_DataSource),
-            'offset': ConjureFieldDefinition('offset', scout_run_api_Duration),
-            'ref_name': ConjureFieldDefinition('refName', scout_api_DataSourceRefName),
-            'timestamp_type': ConjureFieldDefinition('timestampType', scout_api_WeakTimestampType),
-            'series_tags': ConjureFieldDefinition('seriesTags', Dict[api_TagName, api_TagValue])
-        }
-
-    __slots__: List[str] = ['_data_source', '_offset', '_ref_name', '_timestamp_type', '_series_tags']
-
-    def __init__(self, data_source: "scout_run_api_DataSource", offset: "scout_run_api_Duration", ref_name: str, series_tags: Dict[str, str], timestamp_type: "scout_api_WeakTimestampType") -> None:
-        self._data_source = data_source
-        self._offset = offset
-        self._ref_name = ref_name
-        self._timestamp_type = timestamp_type
-        self._series_tags = series_tags
-
-    @builtins.property
-    def data_source(self) -> "scout_run_api_DataSource":
-        return self._data_source
-
-    @builtins.property
-    def offset(self) -> "scout_run_api_Duration":
-        """
-        This offset is used for small time-sync corrections. Notably, it is
-not the offset to move a relative data source to the start of the run.
-        """
-        return self._offset
-
-    @builtins.property
-    def ref_name(self) -> str:
-        return self._ref_name
-
-    @builtins.property
-    def timestamp_type(self) -> "scout_api_WeakTimestampType":
-        return self._timestamp_type
-
-    @builtins.property
-    def series_tags(self) -> Dict[str, str]:
-        """
-        Used to resolve logical series for this data source.
-        """
-        return self._series_tags
-
-
-scout_api_DataScope.__name__ = "DataScope"
-scout_api_DataScope.__qualname__ = "DataScope"
-scout_api_DataScope.__module__ = "nominal_api.scout_api"
-
-
-class scout_api_WeakTimestampType(ConjureEnumType):
-    """
-    If a CSV data source is still being split, the timestamp type is not known.
-    """
-
-    ABSOLUTE = 'ABSOLUTE'
-    '''ABSOLUTE'''
-    RELATIVE = 'RELATIVE'
-    '''RELATIVE'''
-    PENDING = 'PENDING'
-    '''PENDING'''
-    UNKNOWN = 'UNKNOWN'
-    '''UNKNOWN'''
-
-    def __reduce_ex__(self, proto):
-        return self.__class__, (self.name,)
-
-
-scout_api_WeakTimestampType.__name__ = "WeakTimestampType"
-scout_api_WeakTimestampType.__qualname__ = "WeakTimestampType"
-scout_api_WeakTimestampType.__module__ = "nominal_api.scout_api"
-
-
 class scout_asset_api_AddDataScopesToAssetRequest(ConjureBeanType):
 
     @builtins.classmethod
@@ -12302,10 +12225,6 @@ scout_asset_api_Asset.__module__ = "nominal_api.scout_asset_api"
 
 
 class scout_asset_api_AssetDataScope(ConjureBeanType):
-    """
-    This type is equivalent to the DataScope type, except it uses a dataScopeName instead of refName. It will
-eventually be deprecated in favor of DataScope.
-    """
 
     @builtins.classmethod
     def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
@@ -12313,13 +12232,13 @@ eventually be deprecated in favor of DataScope.
             'data_scope_name': ConjureFieldDefinition('dataScopeName', scout_asset_api_DataScopeName),
             'data_source': ConjureFieldDefinition('dataSource', scout_run_api_DataSource),
             'offset': ConjureFieldDefinition('offset', OptionalTypeWrapper[scout_run_api_Duration]),
-            'timestamp_type': ConjureFieldDefinition('timestampType', scout_api_WeakTimestampType),
+            'timestamp_type': ConjureFieldDefinition('timestampType', scout_run_api_WeakTimestampType),
             'series_tags': ConjureFieldDefinition('seriesTags', Dict[scout_asset_api_SeriesTagName, scout_asset_api_SeriesTagValue])
         }
 
     __slots__: List[str] = ['_data_scope_name', '_data_source', '_offset', '_timestamp_type', '_series_tags']
 
-    def __init__(self, data_scope_name: str, data_source: "scout_run_api_DataSource", series_tags: Dict[str, str], timestamp_type: "scout_api_WeakTimestampType", offset: Optional["scout_run_api_Duration"] = None) -> None:
+    def __init__(self, data_scope_name: str, data_source: "scout_run_api_DataSource", series_tags: Dict[str, str], timestamp_type: "scout_run_api_WeakTimestampType", offset: Optional["scout_run_api_Duration"] = None) -> None:
         self._data_scope_name = data_scope_name
         self._data_source = data_source
         self._offset = offset
@@ -12342,7 +12261,7 @@ eventually be deprecated in favor of DataScope.
         return self._offset
 
     @builtins.property
-    def timestamp_type(self) -> "scout_api_WeakTimestampType":
+    def timestamp_type(self) -> "scout_run_api_WeakTimestampType":
         return self._timestamp_type
 
     @builtins.property
@@ -60358,17 +60277,16 @@ class scout_run_api_Run(ConjureBeanType):
             'links': ConjureFieldDefinition('links', List[scout_run_api_Link]),
             'created_at': ConjureFieldDefinition('createdAt', str),
             'updated_at': ConjureFieldDefinition('updatedAt', str),
-            'asset_data_scopes': ConjureFieldDefinition('assetDataScopes', List[scout_api_DataScope]),
-            'additional_data_scopes': ConjureFieldDefinition('additionalDataScopes', List[scout_api_DataScope]),
-            'data_sources': ConjureFieldDefinition('dataSources', Dict[scout_api_DataSourceRefName, scout_api_DataScope]),
+            'asset_data_scopes': ConjureFieldDefinition('assetDataScopes', List[scout_asset_api_AssetDataScope]),
+            'data_sources': ConjureFieldDefinition('dataSources', Dict[scout_api_DataSourceRefName, scout_run_api_RunDataSource]),
             'attachments': ConjureFieldDefinition('attachments', List[api_rids_AttachmentRid]),
             'asset': ConjureFieldDefinition('asset', OptionalTypeWrapper[scout_rids_api_AssetRid]),
             'assets': ConjureFieldDefinition('assets', List[scout_rids_api_AssetRid])
         }
 
-    __slots__: List[str] = ['_rid', '_run_number', '_run_prefix', '_title', '_description', '_author_rid', '_start_time', '_end_time', '_properties', '_labels', '_links', '_created_at', '_updated_at', '_asset_data_scopes', '_additional_data_scopes', '_data_sources', '_attachments', '_asset', '_assets']
+    __slots__: List[str] = ['_rid', '_run_number', '_run_prefix', '_title', '_description', '_author_rid', '_start_time', '_end_time', '_properties', '_labels', '_links', '_created_at', '_updated_at', '_asset_data_scopes', '_data_sources', '_attachments', '_asset', '_assets']
 
-    def __init__(self, additional_data_scopes: List["scout_api_DataScope"], asset_data_scopes: List["scout_api_DataScope"], assets: List[str], attachments: List[str], created_at: str, data_sources: Dict[str, "scout_api_DataScope"], description: str, labels: List[str], links: List["scout_run_api_Link"], properties: Dict[str, str], rid: str, run_number: int, start_time: "scout_run_api_UtcTimestamp", title: str, updated_at: str, asset: Optional[str] = None, author_rid: Optional[str] = None, end_time: Optional["scout_run_api_UtcTimestamp"] = None, run_prefix: Optional[str] = None) -> None:
+    def __init__(self, asset_data_scopes: List["scout_asset_api_AssetDataScope"], assets: List[str], attachments: List[str], created_at: str, data_sources: Dict[str, "scout_run_api_RunDataSource"], description: str, labels: List[str], links: List["scout_run_api_Link"], properties: Dict[str, str], rid: str, run_number: int, start_time: "scout_run_api_UtcTimestamp", title: str, updated_at: str, asset: Optional[str] = None, author_rid: Optional[str] = None, end_time: Optional["scout_run_api_UtcTimestamp"] = None, run_prefix: Optional[str] = None) -> None:
         self._rid = rid
         self._run_number = run_number
         self._run_prefix = run_prefix
@@ -60383,7 +60301,6 @@ class scout_run_api_Run(ConjureBeanType):
         self._created_at = created_at
         self._updated_at = updated_at
         self._asset_data_scopes = asset_data_scopes
-        self._additional_data_scopes = additional_data_scopes
         self._data_sources = data_sources
         self._attachments = attachments
         self._asset = asset
@@ -60442,24 +60359,14 @@ class scout_run_api_Run(ConjureBeanType):
         return self._updated_at
 
     @builtins.property
-    def asset_data_scopes(self) -> List["scout_api_DataScope"]:
+    def asset_data_scopes(self) -> List["scout_asset_api_AssetDataScope"]:
         """
         returns the data scopes for the assets associated with the run.
         """
         return self._asset_data_scopes
 
     @builtins.property
-    def additional_data_scopes(self) -> List["scout_api_DataScope"]:
-        """
-        returns any data scopes added directly to the run.
-        """
-        return self._additional_data_scopes
-
-    @builtins.property
-    def data_sources(self) -> Dict[str, "scout_api_DataScope"]:
-        """
-        returns all of the data scopes under the run. This includes data scopes of any associated assets. If there are data scopes attached directly to the run that have the same ref name as data scopes from the asset, they will override them.
-        """
+    def data_sources(self) -> Dict[str, "scout_run_api_RunDataSource"]:
         return self._data_sources
 
     @builtins.property
@@ -60557,6 +60464,66 @@ scout_run_api_RunDataReviewSummary.__qualname__ = "RunDataReviewSummary"
 scout_run_api_RunDataReviewSummary.__module__ = "nominal_api.scout_run_api"
 
 
+class scout_run_api_RunDataSource(ConjureBeanType):
+    """
+    For read requests, we want to require all fields
+    """
+
+    @builtins.classmethod
+    def _fields(cls) -> Dict[str, ConjureFieldDefinition]:
+        return {
+            'data_source': ConjureFieldDefinition('dataSource', scout_run_api_DataSource),
+            'offset': ConjureFieldDefinition('offset', scout_run_api_Duration),
+            'ref_name': ConjureFieldDefinition('refName', scout_api_DataSourceRefName),
+            'timestamp_type': ConjureFieldDefinition('timestampType', scout_run_api_WeakTimestampType),
+            'series_tags': ConjureFieldDefinition('seriesTags', Dict[api_TagName, api_TagValue])
+        }
+
+    __slots__: List[str] = ['_data_source', '_offset', '_ref_name', '_timestamp_type', '_series_tags']
+
+    def __init__(self, data_source: "scout_run_api_DataSource", offset: "scout_run_api_Duration", ref_name: str, series_tags: Dict[str, str], timestamp_type: "scout_run_api_WeakTimestampType") -> None:
+        self._data_source = data_source
+        self._offset = offset
+        self._ref_name = ref_name
+        self._timestamp_type = timestamp_type
+        self._series_tags = series_tags
+
+    @builtins.property
+    def data_source(self) -> "scout_run_api_DataSource":
+        return self._data_source
+
+    @builtins.property
+    def offset(self) -> "scout_run_api_Duration":
+        """
+        This offset is used for small time-sync corrections. Notably, it is
+not the offset to move a relative data source to the start of the run.
+        """
+        return self._offset
+
+    @builtins.property
+    def ref_name(self) -> str:
+        """
+        Included for convenience, duplicated from the key of the map
+        """
+        return self._ref_name
+
+    @builtins.property
+    def timestamp_type(self) -> "scout_run_api_WeakTimestampType":
+        return self._timestamp_type
+
+    @builtins.property
+    def series_tags(self) -> Dict[str, str]:
+        """
+        Used to resolve logical series for this data source.
+        """
+        return self._series_tags
+
+
+scout_run_api_RunDataSource.__name__ = "RunDataSource"
+scout_run_api_RunDataSource.__qualname__ = "RunDataSource"
+scout_run_api_RunDataSource.__module__ = "nominal_api.scout_run_api"
+
+
 class scout_run_api_RunWithDataReviewMetrics(ConjureBeanType):
 
     @builtins.classmethod
@@ -61411,6 +61378,29 @@ scout_run_api_UtcTimestamp.__qualname__ = "UtcTimestamp"
 scout_run_api_UtcTimestamp.__module__ = "nominal_api.scout_run_api"
 
 
+class scout_run_api_WeakTimestampType(ConjureEnumType):
+    """
+    If a CSV data source is still being split, the timestamp type is not known.
+    """
+
+    ABSOLUTE = 'ABSOLUTE'
+    '''ABSOLUTE'''
+    RELATIVE = 'RELATIVE'
+    '''RELATIVE'''
+    PENDING = 'PENDING'
+    '''PENDING'''
+    UNKNOWN = 'UNKNOWN'
+    '''UNKNOWN'''
+
+    def __reduce_ex__(self, proto):
+        return self.__class__, (self.name,)
+
+
+scout_run_api_WeakTimestampType.__name__ = "WeakTimestampType"
+scout_run_api_WeakTimestampType.__qualname__ = "WeakTimestampType"
+scout_run_api_WeakTimestampType.__module__ = "nominal_api.scout_run_api"
+
+
 class scout_template_api_CommitTemplateRequest(ConjureBeanType):
 
     @builtins.classmethod

nominal_api/scout_api/__init__.py

@@ -1,9 +1,7 @@
 # coding=utf-8
 from .._impl import (
     scout_api_ChannelLocator as ChannelLocator,
-    scout_api_DataScope as DataScope,
     scout_api_DataSourceRefName as DataSourceRefName,
     scout_api_HexColor as HexColor,
-    scout_api_WeakTimestampType as WeakTimestampType,
 )
 

nominal_api/scout_run_api/__init__.py

@@ -24,6 +24,7 @@ from .._impl import (
     scout_run_api_Run as Run,
     scout_run_api_RunDataReviewEvaluationStatus as RunDataReviewEvaluationStatus,
     scout_run_api_RunDataReviewSummary as RunDataReviewSummary,
+    scout_run_api_RunDataSource as RunDataSource,
     scout_run_api_RunRid as RunRid,
     scout_run_api_RunWithDataReviewMetrics as RunWithDataReviewMetrics,
     scout_run_api_RunWithDataReviewSummary as RunWithDataReviewSummary,
@@ -41,5 +42,6 @@ from .._impl import (
     scout_run_api_UpdateAttachmentsRequest as UpdateAttachmentsRequest,
     scout_run_api_UpdateRunRequest as UpdateRunRequest,
     scout_run_api_UtcTimestamp as UtcTimestamp,
+    scout_run_api_WeakTimestampType as WeakTimestampType,
 )
 

{nominal_api-0.584.0.dist-info → nominal_api-0.584.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nominal-api
-Version: 0.584.0
+Version: 0.584.1
 Requires-Python: >=3.8
 Requires-Dist: requests
 Requires-Dist: conjure-python-client<3,>=2.8.0

{nominal_api-0.584.0.dist-info → nominal_api-0.584.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-nominal_api/__init__.py,sha256=hlazt7F04ugLjExfDf-M_qjlB1Z-VbbmPj7SxygJdlc,1923
-nominal_api/_impl.py,sha256=NRyDv2wZFU9Tlz50mpswAh1yhSxrUJnFVNDLVLSJHz8,2828743
+nominal_api/__init__.py,sha256=5PeQ3gJZUe-tQ06IoXPGNxBCUqNjY2bYgESx0omnO2g,1923
+nominal_api/_impl.py,sha256=ve4kz6aF6u4zPf93SstNaFup4rC1T035r6nr_OFWrEU,2828133
 nominal_api/py.typed,sha256=eoZ6GfifbqhMLNzjlqRDVil-yyBkOmVN9ujSgJWNBlY,15
 nominal_api/api/__init__.py,sha256=kJBEE_HLVpKYdLH12KyO-cSAVzwxYpBwaaDutCtT-LM,1236
 nominal_api/api_rids/__init__.py,sha256=Bu-pKUh3aS9_f5m-DZf6W_BUlVo9qYE7EDvaT-rvWQ0,423
@@ -16,7 +16,7 @@ nominal_api/datasource_pagination_api/__init__.py,sha256=3GO8TAUavOe6dUEitOhje74
 nominal_api/event/__init__.py,sha256=YUhvDFXtyAn08WNd7Xwnybz3PtflvtTcIOaunRS5-1I,836
 nominal_api/ingest_api/__init__.py,sha256=U4rA8WoGLgVr8yzWcigZijvOOy13BYYzpz5ium94sp4,5532
 nominal_api/scout/__init__.py,sha256=ip3XK_9jJKAoFiCifUVMTpDMiUE4mWIdGzMDu7LASus,324
-nominal_api/scout_api/__init__.py,sha256=zl03M5lLjNaxN9WxRgx96xKYWwked6WM6nfxSFnak4Q,270
+nominal_api/scout_api/__init__.py,sha256=biO4DEygbGcLwM6Dg2VuvMra3A5EW6NBjukbIemXoG8,178
 nominal_api/scout_asset_api/__init__.py,sha256=Ph-KlW-ki0JRejYQZDvbZ2jRzNAttVBux27lcEj7--Q,1910
 nominal_api/scout_assets/__init__.py,sha256=dT-b9HnbwVbI-fEalfskKSMGzhGRwZDZ2cdzWul1daY,87
 nominal_api/scout_catalog/__init__.py,sha256=ZGm4w1YKd4B-3CNxijTpB-1B653nctA_R0u24oPS3To,3508
@@ -47,7 +47,7 @@ nominal_api/scout_metadata/__init__.py,sha256=GIhWKJL2XSMB0iGaKfcGgmPHuvGWWmkK4l
 nominal_api/scout_notebook_api/__init__.py,sha256=QW0vg8ZrAmuctjnNLxTnqtwyQoX-H9MOkHlLWioe5AA,1230
 nominal_api/scout_plotting/__init__.py,sha256=m6u3y7R70mo3ugaCp_-fwlS8_tDwrsq1l5ElOTY0TBc,91
 nominal_api/scout_rids_api/__init__.py,sha256=zAioy5BpuLLgZQpF-11wWUEhntcHNj6sK5YzNC5z-3w,1188
-nominal_api/scout_run_api/__init__.py,sha256=3ITK86gMknGWi9RaHs4XmB3Xx16AHAL8GPPe1OwpVJk,2488
+nominal_api/scout_run_api/__init__.py,sha256=lTAFwaHSqRs7dx316MzdQcgdBy7Y_fe_BbfbaktaZGs,2596
 nominal_api/scout_template_api/__init__.py,sha256=bsu8qPiZ4gf67G5iFvwsfkqEKJRZ7L5Wyg6qcFyogO0,1037
 nominal_api/scout_units_api/__init__.py,sha256=KxRDScfumX__0ncWJftGvgApn_LBTfnIBAvnaBrcA5A,368
 nominal_api/scout_versioning_api/__init__.py,sha256=Sf4T4t0rZXNRIZgkqLBN3yh0sAnrxiuzaTfDQVVkyO4,1323
@@ -70,7 +70,7 @@ nominal_api/timeseries_logicalseries_api/__init__.py,sha256=7NlQhIzOKOcjwMNUI89f
 nominal_api/timeseries_seriescache/__init__.py,sha256=tFCkNuyrVMgtj-HIl1pOYPJHaL2VikI4C_x97bX_Lcs,109
 nominal_api/timeseries_seriescache_api/__init__.py,sha256=U9EhlqdF9qzD1O9al0vcvcdgS_C5lq-lN3Kmr0K3g84,1191
 nominal_api/upload_api/__init__.py,sha256=ZMudWMSqCrNozohbHaJKuxJnT9Edepe7nxxXMz_pT9k,87
-nominal_api-0.584.0.dist-info/METADATA,sha256=AVBm4C-YAk5fuSH0l-Avc9kt7H3PgKsDThqVw9pjT9c,199
-nominal_api-0.584.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-nominal_api-0.584.0.dist-info/top_level.txt,sha256=gI1ZdNJbuHcJZeKtCzzBXsEtpU1GX6XJKs6ksi_gCRA,12
-nominal_api-0.584.0.dist-info/RECORD,,
+nominal_api-0.584.1.dist-info/METADATA,sha256=uX0pSdwJaKPQfSTE9tBxMAmHgkCrBiN_kyWGDHYKqB8,199
+nominal_api-0.584.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+nominal_api-0.584.1.dist-info/top_level.txt,sha256=gI1ZdNJbuHcJZeKtCzzBXsEtpU1GX6XJKs6ksi_gCRA,12
+nominal_api-0.584.1.dist-info/RECORD,,