Skip to content

Commit 1417d42

Browse files
author
Victor
committed
Log messages improved.
1 parent fc2236e commit 1417d42

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

cutlass/SixteenSRawSeqSet.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,10 @@ def required_fields():
455455
Args:
456456
None
457457
Returns:
458-
None
458+
Tuple of strings of required properties.
459459
"""
460-
module_logger.debug("In required fields.")
460+
module_logger.debug("In required_fields.")
461+
461462
return ("checksums", "comment", "exp_length", "format", "format_doc",
462463
"seq_model", "size", "study", "tags")
463464

@@ -643,7 +644,7 @@ def load_16s_raw_seq_set(seq_set_data):
643644
if 'private_files' in seq_set_data['meta']:
644645
seq_set.private_files = seq_set_data['meta']['private_files']
645646

646-
module_logger.debug("Returning loaded " + __name__)
647+
module_logger.debug("Returning loaded %s", __name__)
647648
return seq_set
648649

649650
@staticmethod
@@ -667,7 +668,7 @@ def load(seq_set_id):
667668
seq_set_data = session.get_osdf().get_node(seq_set_id)
668669
seq_set = SixteenSRawSeqSet.load_16s_raw_seq_set(seq_set_data)
669670

670-
module_logger.debug("Returning loaded " + __name__)
671+
module_logger.debug("Returning loaded %s", __name__)
671672

672673
return seq_set
673674

@@ -808,13 +809,15 @@ def trimmed_seq_sets(self):
808809
Return iterator of all trimmed sequence sets that were computed from
809810
this sequence set.
810811
"""
812+
self.logger.debug("In trimmed_seq_sets().")
813+
811814
linkage_query = '"{}"[linkage.computed_from]'.format(self.id)
812815
query = iHMPSession.get_session().get_osdf().oql_query
813816

814817
from cutlass.SixteenSTrimmedSeqSet import SixteenSTrimmedSeqSet
815818

816819
for page_no in count(1):
817-
res = query("ihmp", linkage_query, page=page_no)
820+
res = query(SixteenSRawSeqSet.namespace, linkage_query, page=page_no)
818821
res_count = res['result_count']
819822

820823
for doc in res['results']:

cutlass/VisitAttribute.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,8 @@ def required_fields():
301301
Returns:
302302
Tuple of strings of required properties.
303303
"""
304+
module_logger.debug("In required_fields.")
305+
304306
return ("comment", "study", "tags")
305307

306308
@staticmethod

0 commit comments

Comments
 (0)