Skip to content

Commit

Permalink
[SL-7546] add name to fast dataset metadata loading
Browse files Browse the repository at this point in the history
  • Loading branch information
natechols committed Jan 18, 2022
1 parent 273a5f3 commit 79df482
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pbcommand/models/common.py
Expand Up @@ -24,7 +24,7 @@
REGISTERED_FILE_TYPES = {}

# Light weight Dataset metatadata. Use pbcore for full dataset functionality
DataSetMetaData = namedtuple("DataSetMetaData", 'uuid metatype')
DataSetMetaData = namedtuple("DataSetMetaData", 'uuid metatype name')


class PacBioNamespaces:
Expand Down
5 changes: 3 additions & 2 deletions pbcommand/utils.py
Expand Up @@ -470,16 +470,17 @@ def get_dataset_metadata(path):
:raises: ValueError
:return: DataSetMetaData
"""
uuid = mt = None
uuid = mt = name = None
for event, element in ET.iterparse(path, events=("start",)):
uuid = element.get("UniqueId")
mt = element.get("MetaType")
name = element.get("Name")
break
else:
raise ValueError(
'Did not find events=("start",) in XML path={}'.format(path))
if mt in FileTypes.ALL_DATASET_TYPES().keys():
return DataSetMetaData(uuid, mt)
return DataSetMetaData(uuid, mt, name)
else:
raise ValueError("Unsupported dataset type '{t}'".format(t=mt))

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -15,7 +15,7 @@

setup(
name='pbcommand',
version='2.3.1',
version='2.3.2',
author='Pacific Biosciences',
author_email='devnet@pacificbiosciences.com',
description='Library and Tools for interfacing with PacBio® data CLI tools',
Expand Down
1 change: 1 addition & 0 deletions tests/test_utils.py
Expand Up @@ -105,6 +105,7 @@ def test_get_dataset_metadata(self):
import pbtestdata
md = get_dataset_metadata(pbtestdata.get_file("subreads-xml"))
assert md.metatype == "PacBio.DataSet.SubreadSet"
assert md.name == "subreads-xml"

from pbcore.io import SubreadSet
ds = SubreadSet(pbtestdata.get_file("subreads-xml"))
Expand Down

0 comments on commit 79df482

Please sign in to comment.