Skip to content

Commit 4a79231

Browse files
authored
Merge pull request #7 from BioImage-Archive/update_ro_crate_models
update to ro-crate models and connections to linked data terms
2 parents aa2f669 + 0f157d5 commit 4a79231

File tree

10 files changed

+411
-478
lines changed

10 files changed

+411
-478
lines changed

bia_ro_crate/cli.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import json
44
from typing import Annotated, Optional
55
from uuid import UUID
6-
from pydantic import RootModel, BaseModel
7-
from bia_ro_crate.ro_crate_to_bia.crate_reader import crate_read, process_ro_crate
6+
from pydantic import RootModel
7+
from bia_ro_crate.ro_crate_to_bia.crate_reader import process_ro_crate
88
from bia_ro_crate.ro_crate_to_bia.entity_conversion import (
99
AnnotationMethod,
1010
BioSample,
@@ -13,7 +13,7 @@
1313
Protocol,
1414
SpecimenImagingPreparationProtocol,
1515
Study,
16-
FileReference
16+
FileReference,
1717
)
1818
from .bia_to_zarr_crate.conversion import create_ro_crate_for_image
1919
from pathlib import Path
@@ -80,9 +80,6 @@ def convert(
8080
] = Path(__file__).parents[1],
8181
):
8282

83-
# Just for validation
84-
crate_read(crate_path)
85-
8683
entities = process_ro_crate(crate_path)
8784

8885
api_objects = []
@@ -106,10 +103,7 @@ def convert(
106103
entities, study_uuid
107104
)
108105

109-
110-
api_objects += FileReference.create_file_reference(
111-
entities, study_uuid, crate_path
112-
)
106+
api_objects += FileReference.create_file_reference(entities, study_uuid, crate_path)
113107

114108
ApiModels = RootModel[list]
115109
write_out = ApiModels(api_objects)

0 commit comments

Comments
 (0)