chore!: remove type in dataset (#405)

Signed-off-by: ThibaultFy <[email protected]>
Substra · Mar 25, 2024 · 3fb14fe · 3fb14fe
1 parent 88854ac
commit 3fb14fe
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 8 deletions.
diff --git a/changes/.gitkeep b/changes/.gitkeep
diff --git a/changes/405.changed b/changes/405.changed
@@ -0,0 +1 @@
+- BREAKING: Remove `type` from `DatasetSpec` ([#405](https://github.com/Substra/substra/pull/405))
diff --git a/references/sdk_models.md b/references/sdk_models.md
@@ -31,7 +31,6 @@ Dataset asset
 - name: <class 'str'>
 - owner: <class 'str'>
 - permissions: <class 'substra.sdk.models.Permissions'>
-- type: <class 'str'>
 - data_sample_keys: typing.List[str]
 - opener: <class 'substra.sdk.models._File'>
 - description: <class 'substra.sdk.models._File'>

diff --git a/references/sdk_schemas.md b/references/sdk_schemas.md
@@ -36,7 +36,6 @@ note : metadata field does not accept strings containing '__' as dict key
 ```text
 - name: <class 'str'>
 - data_opener: <class 'pathlib.Path'>
-- type: <class 'str'>
 - description: <class 'pathlib.Path'>
 - permissions: <class 'substra.sdk.schemas.Permissions'>
 - metadata: typing.Optional[typing.Dict[str, str]]

diff --git a/substra/sdk/backends/local/backend.py b/substra/sdk/backends/local/backend.py
@@ -324,7 +324,6 @@ def _add_dataset(self, key, spec, spec_options=None):
                     "authorized_ids": permissions.authorized_ids,
                 },
             },
-            type=spec.type,
             data_sample_keys=[],
             opener={"checksum": fs.hash_file(dataset_file_path), "storage_address": dataset_file_path},
             description={

diff --git a/substra/sdk/models.py b/substra/sdk/models.py
@@ -150,7 +150,6 @@ class Dataset(_Model):
     name: str
     owner: str
     permissions: Permissions
-    type: str
     data_sample_keys: List[str] = []
     opener: _File
     description: _File

diff --git a/substra/sdk/schemas.py b/substra/sdk/schemas.py
@@ -282,7 +282,6 @@ class DatasetSpec(_Spec):
 
     name: str
     data_opener: pathlib.Path  # Path to the data opener
-    type: str
     description: pathlib.Path  # Path to the description file
     permissions: Permissions
     metadata: Optional[Dict[str, str]] = None

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -40,7 +40,6 @@ def dataset_query(tmpdir):
     return {
         "name": "dataset_name",
         "data_opener": str(opener_path),
-        "type": "images",
         "description": str(desc_path),
         "permissions": {
             "public": True,

diff --git a/tests/data_factory.py b/tests/data_factory.py
@@ -362,7 +362,6 @@ def create_dataset(self, permissions=None, metadata=None, py_script=None, logs_p
         return substra.sdk.schemas.DatasetSpec(
             name=name,
             data_opener=str(opener_path),
-            type="Test",
             metadata=metadata,
             description=str(description_path),
             permissions=permissions or DEFAULT_PERMISSIONS,

diff --git a/tests/datastore.py b/tests/datastore.py
@@ -33,7 +33,6 @@
         "process": {"public": True, "authorized_ids": ["MyOrg1MSP"]},
         "download": {"public": True, "authorized_ids": ["MyOrg1MSP"]},
     },
-    "type": "Test",
     "data_sample_keys": [],
     "metadata": {"foo": "bar"},
     "opener": {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- BREAKING: Remove `type` from `DatasetSpec` ([#405](https://github.com/Substra/substra/pull/405))