[issue-426] update model: dataset type

to 6607944c0d23488db607b8f56ad83c0b4fc3f264

Signed-off-by: Armin Tänzer <armin.taenzer@tngtech.com>

Author: armintaenzertng

README.md

@@ -50,7 +50,7 @@ additional installation of optional dependencies
 * Serialize to JSON-LD
 
 See [Quickstart to SPDX 3.0](#quickstart-to-spdx-30) below.  
-The implementation is based on the descriptive markdown files in the repository https://github.com/spdx/spdx-3-model (latest commit: d2c0975128d4e0ecb32b9bb5484272e9010318bb).
+The implementation is based on the descriptive markdown files in the repository https://github.com/spdx/spdx-3-model (latest commit: 6607944c0d23488db607b8f56ad83c0b4fc3f264).
 
 
 # Installation

src/spdx_tools/spdx3/model/dataset/dataset.py

@@ -14,6 +14,23 @@
 from spdx_tools.spdx3.model.software import Package, SoftwarePurpose
 
 
+class DatasetType(Enum):
+    STRUCTURED = auto()
+    NUMERIC = auto()
+    TEXT = auto()
+    CATEGORICAL = auto()
+    GRAPH = auto()
+    TIMESERIES = auto()
+    TIMESTAMP = auto()
+    SENSOR = auto()
+    IMAGE = auto()
+    SYNTACTIC = auto()
+    AUDIO = auto()
+    VIDEO = auto()
+    OTHER = auto()
+    NO_ASSERTION = auto()
+
+
 class ConfidentialityLevelType(Enum):
     RED = auto()
     AMBER = auto()
@@ -31,7 +48,7 @@ class DatasetAvailabilityType(Enum):
 
 @dataclass_with_properties
 class Dataset(Package):
-    dataset_type: str = None
+    dataset_type: List[DatasetType] = None
     data_collection_process: Optional[str] = None
     intended_use: Optional[str] = None
     dataset_size: Optional[int] = None
@@ -54,7 +71,7 @@ def __init__(
         primary_purpose: SoftwarePurpose,
         built_time: datetime,
         release_time: datetime,
-        dataset_type: str,
+        dataset_type: List[DatasetType],
         creation_info: Optional[CreationInfo] = None,
         summary: Optional[str] = None,
         description: Optional[str] = None,

tests/spdx3/fixtures.py

@@ -35,7 +35,12 @@
 )
 from spdx_tools.spdx3.model.ai.ai_package import AIPackage, SafetyRiskAssessmentType
 from spdx_tools.spdx3.model.build import Build
-from spdx_tools.spdx3.model.dataset.dataset import ConfidentialityLevelType, Dataset, DatasetAvailabilityType
+from spdx_tools.spdx3.model.dataset.dataset import (
+    ConfidentialityLevelType,
+    Dataset,
+    DatasetAvailabilityType,
+    DatasetType,
+)
 from spdx_tools.spdx3.model.licensing import (
     CustomLicense,
     CustomLicenseAddition,
@@ -406,7 +411,7 @@ def listed_license_fixture(
 }
 
 DATASET_DICT = {
-    "dataset_type": "DatasetType",
+    "dataset_type": [DatasetType.OTHER],
     "data_collection_process": "DatasetDataCollectionProcess",
     "intended_use": "DatasetIntendedUse",
     "dataset_size": 10,