diff --git a/src/cell_annotation_schema/ontology/data.py b/src/cell_annotation_schema/ontology/data.py index 053b8b0..56177ca 100644 --- a/src/cell_annotation_schema/ontology/data.py +++ b/src/cell_annotation_schema/ontology/data.py @@ -64,8 +64,7 @@ def dump_to_rdf( prefixes["_base"] = ontology_iri prefixes[ontology_namespace] = ontology_iri - labelsets = [labelset['name'] for labelset in sorted(instance["labelsets"], key=lambda x: x['rank'])] - for labelset in labelsets: + for labelset in [labelset['name'] for labelset in instance["labelsets"]]: prefixes[labelset] = ontology_iri + f"{labelset}#" g = rdflib_dumper.as_rdf_graph( diff --git a/src/cell_annotation_schema/ontology/export.py b/src/cell_annotation_schema/ontology/export.py index 4a72547..850a227 100644 --- a/src/cell_annotation_schema/ontology/export.py +++ b/src/cell_annotation_schema/ontology/export.py @@ -48,13 +48,12 @@ def export_to_rdf( base_linkml_schema = read_schema(cas_schema) data = get_instance_data(data) - labelsets = [labelset['name'] for labelset in sorted(data["labelsets"], key=lambda x: x['rank'])] decorated_schema = decorate_linkml_ontology_schema( base_linkml_schema, ontology_namespace=ontology_namespace, ontology_iri=ontology_iri, - labelsets=labelsets, + labelsets=[labelset['name'] for labelset in data["labelsets"]], ) expanded_schema = expand_schema( config=None, yaml_obj=decorated_schema, value_set_names=["CellTypeEnum"]