4 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/6eae334427ce/ changeset: 6eae334427ce user: jgoecks date: 2012-09-14 17:11:04 summary: Add column data provider. affected #: 1 file diff -r a5f93d5b509835c9e4a29ba793c6406cb3a63ca2 -r 6eae334427ce58f209a53eb7833c5b442f797040 lib/galaxy/visualization/tracks/data_providers.py --- a/lib/galaxy/visualization/tracks/data_providers.py +++ b/lib/galaxy/visualization/tracks/data_providers.py @@ -18,24 +18,30 @@ from galaxy.util.lrucache import LRUCache from galaxy.visualization.tracks.summary import * import galaxy_utils.sequence.vcf -from galaxy.datatypes.tabular import Vcf +from galaxy.datatypes.tabular import Tabular, Vcf from galaxy.datatypes.interval import Interval, Bed, Gff, Gtf, ENCODEPeak, ChromatinInteractions from pysam import csamtools, ctabix ERROR_MAX_VALS = "Only the first %i %s in this region are displayed." -# Return None instead of NaN to pass jQuery 1.4's strict JSON +# +# Utility functions. +# + def float_nan(n): + ''' + Return None instead of NaN to pass jQuery 1.4's strict JSON + ''' if n != n: # NaN != NaN return None else: return float(n) def get_bounds( reads, start_pos_index, end_pos_index ): - """ + ''' Returns the minimum and maximum position for a set of reads. - """ + ''' max_low = sys.maxint max_high = -sys.maxint for read in reads: @@ -60,6 +66,50 @@ def _chrom_naming_matches( chrom1, chrom2 ): return ( chrom1.startswith( 'chr' ) and chrom2.startswith( 'chr' ) ) or ( not chrom1.startswith( 'chr' ) and not chrom2.startswith( 'chr' ) ) + +class ColumnDataProvider( object ): + """ Data provider for columnar data """ + + def __init__( self, original_dataset ): + # Compatibility check. + if not isinstance( original_dataset.datatype, Tabular ): + raise Exception( "Data provider can only be used with tabular data" ) + + # Attribute init. + self.original_dataset = original_dataset + + def get_data( self, cols, start_val=0, max_vals=sys.maxint ): + """ + Returns data from specified columns in dataset. Format is list of lists + where each list is a line of data. + """ + + def cast_val( val, type ): + """ Cast value based on type. """ + if type == 'int': + try: val = int( val ) + except: pass + elif type == 'float': + try: val = float( val ) + except: pass + return val + + data = [] + f = open( self.original_dataset.file_name ) + for count, line in enumerate( f ): + if count < start_val: + continue + if max_vals and count-start_val >= max_vals: + message = ERROR_MAX_VALS % ( max_vals, "features" ) + break + + fields = line.split() + data.append( [ cast_val( fields[c], self.original_dataset.metadata.column_types[c] ) for c in cols ] ) + + f.close() + + return data + class FeatureLocationIndexDataProvider( object ): ''' https://bitbucket.org/galaxy/galaxy-central/changeset/586506caaad4/ changeset: 586506caaad4 user: jgoecks date: 2012-09-14 18:14:15 summary: Codify data providers framework by adding and using a base provider. affected #: 2 files diff -r 6eae334427ce58f209a53eb7833c5b442f797040 -r 586506caaad452c533493e5db8f26a362fb61280 lib/galaxy/visualization/data_providers.py --- /dev/null +++ b/lib/galaxy/visualization/data_providers.py @@ -0,0 +1,93 @@ +import sys + +class BaseDataProvider( object ): + """ + Base class for data providers. Data providers (a) read and package data from datasets; + and (b) write subsets of data to new datasets. + """ + + def __init__( self, converted_dataset=None, original_dataset=None, dependencies=None, + error_max_vals="Only the first %i values are returned." ): + """ Create basic data provider. """ + self.converted_dataset = converted_dataset + self.original_dataset = original_dataset + self.dependencies = dependencies + self.error_max_vals = error_max_vals + + def has_data( self, **kwargs ): + """ + Returns true if dataset has data in the specified genome window, false + otherwise. + """ + raise Exception( "Unimplemented Function" ) + + def get_iterator( self, **kwargs ): + """ + Returns an iterator that provides data in the region chrom:start-end + """ + raise Exception( "Unimplemented Function" ) + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Process data from an iterator to a format that can be provided to client. + """ + raise Exception( "Unimplemented Function" ) + + def get_data( self, start_val=0, max_vals=sys.maxint, **kwargs ): + """ + Returns data as specified by kwargs. start_val is the first element to + return and max_vals indicates the number of values to return. + + Return value must be a dictionary with the following attributes: + dataset_type, data + """ + iterator = self.get_iterator( chrom, start, end ) + return self.process_data( iterator, start_val, max_vals, **kwargs ) + def write_data_to_file( self, filename, **kwargs ): + """ + Write data in region defined by chrom, start, and end to a file. + """ + raise Exception( "Unimplemented Function" ) + +class ColumnDataProvider( BaseDataProvider ): + """ Data provider for columnar data """ + + def __init__( self, original_dataset ): + # Compatibility check. + if not isinstance( original_dataset.datatype, Tabular ): + raise Exception( "Data provider can only be used with tabular data" ) + + # Attribute init. + self.original_dataset = original_dataset + + def get_data( self, cols, start_val=0, max_vals=sys.maxint ): + """ + Returns data from specified columns in dataset. Format is list of lists + where each list is a line of data. + """ + + def cast_val( val, type ): + """ Cast value based on type. """ + if type == 'int': + try: val = int( val ) + except: pass + elif type == 'float': + try: val = float( val ) + except: pass + return val + + data = [] + f = open( self.original_dataset.file_name ) + for count, line in enumerate( f ): + if count < start_val: + continue + if max_vals and count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "features" ) + break + + fields = line.split() + data.append( [ cast_val( fields[c], self.original_dataset.metadata.column_types[c] ) for c in cols ] ) + + f.close() + + return data diff -r 6eae334427ce58f209a53eb7833c5b442f797040 -r 586506caaad452c533493e5db8f26a362fb61280 lib/galaxy/visualization/tracks/data_providers.py --- a/lib/galaxy/visualization/tracks/data_providers.py +++ b/lib/galaxy/visualization/tracks/data_providers.py @@ -1,5 +1,5 @@ """ -Data providers for tracks visualizations. +Data providers for genome visualizations. """ import os, sys @@ -17,14 +17,13 @@ from bx.bbi.bigwig_file import BigWigFile from galaxy.util.lrucache import LRUCache from galaxy.visualization.tracks.summary import * +from galaxy.visualization.data_providers import BaseDataProvider import galaxy_utils.sequence.vcf from galaxy.datatypes.tabular import Tabular, Vcf from galaxy.datatypes.interval import Interval, Bed, Gff, Gtf, ENCODEPeak, ChromatinInteractions from pysam import csamtools, ctabix -ERROR_MAX_VALS = "Only the first %i %s in this region are displayed." - # # Utility functions. # @@ -66,54 +65,10 @@ def _chrom_naming_matches( chrom1, chrom2 ): return ( chrom1.startswith( 'chr' ) and chrom2.startswith( 'chr' ) ) or ( not chrom1.startswith( 'chr' ) and not chrom2.startswith( 'chr' ) ) - -class ColumnDataProvider( object ): - """ Data provider for columnar data """ - - def __init__( self, original_dataset ): - # Compatibility check. - if not isinstance( original_dataset.datatype, Tabular ): - raise Exception( "Data provider can only be used with tabular data" ) - - # Attribute init. - self.original_dataset = original_dataset - - def get_data( self, cols, start_val=0, max_vals=sys.maxint ): - """ - Returns data from specified columns in dataset. Format is list of lists - where each list is a line of data. - """ - - def cast_val( val, type ): - """ Cast value based on type. """ - if type == 'int': - try: val = int( val ) - except: pass - elif type == 'float': - try: val = float( val ) - except: pass - return val - - data = [] - f = open( self.original_dataset.file_name ) - for count, line in enumerate( f ): - if count < start_val: - continue - if max_vals and count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "features" ) - break - - fields = line.split() - data.append( [ cast_val( fields[c], self.original_dataset.metadata.column_types[c] ) for c in cols ] ) - - f.close() - - return data - -class FeatureLocationIndexDataProvider( object ): - ''' - - ''' +class FeatureLocationIndexDataProvider( BaseDataProvider ): + """ + Reads/writes/queries feature location index (FLI) datasets. + """ def __init__( self, converted_dataset ): self.converted_dataset = converted_dataset @@ -155,7 +110,7 @@ textloc_file.close() return result -class TracksDataProvider( object ): +class TracksDataProvider( BaseDataProvider ): """ Base class for tracks data providers. """ """ @@ -167,11 +122,12 @@ """ col_name_data_attr_mapping = {} - def __init__( self, converted_dataset=None, original_dataset=None, dependencies=None ): - """ Create basic data provider. """ - self.converted_dataset = converted_dataset - self.original_dataset = original_dataset - self.dependencies = dependencies + def __init__( self, converted_dataset=None, original_dataset=None, dependencies=None, + error_max_vals="Only the first %i %s in this region are displayed." ): + super( TracksDataProvider, self ).__init__( converted_dataset=converted_dataset, + original_dataset=original_dataset, + dependencies=dependencies, + error_max_vals=error_max_vals ) def write_data_to_file( self, regions, filename ): """ @@ -429,7 +385,7 @@ if count < start_val: continue if max_vals and count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "features" ) + message = self.error_max_vals % ( max_vals, "features" ) break feature = line.split() @@ -502,7 +458,7 @@ if count < start_val: continue if max_vals and count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "features" ) + message = self.error_max_vals % ( max_vals, "features" ) break # TODO: can we use column metadata to fill out payload? # TODO: use function to set payload data @@ -656,7 +612,7 @@ if count < start_val: continue if max_vals and count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "features" ) + message = self.error_max_vals % ( max_vals, "features" ) break feature = line.split() @@ -927,7 +883,7 @@ if count < start_val: continue if ( count - start_val - unmapped ) >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "reads" ) + message = self.error_max_vals % ( max_vals, "reads" ) break # If not mapped, skip read. @@ -1198,7 +1154,7 @@ if count < start_val: continue if count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "features" ) + message = self.error_max_vals % ( max_vals, "features" ) break source.seek( offset ) # TODO: can we use column metadata to fill out payload? @@ -1260,7 +1216,7 @@ if count < start_val: continue if count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "reads" ) + message = self.error_max_vals % ( max_vals, "reads" ) break payload = package_gff_feature( feature, no_detail=no_detail, filter_cols=filter_cols ) @@ -1302,7 +1258,7 @@ if count < start_val: continue if count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "reads" ) + message = self.error_max_vals % ( max_vals, "reads" ) break feature = GFFFeature( None, intervals=intervals ) @@ -1348,7 +1304,7 @@ if count < start_val: continue if max_vals and count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "features" ) + message = self.error_max_vals % ( max_vals, "features" ) break feature = line.split() @@ -1440,7 +1396,7 @@ if count < start_val: continue if max_vals and count-start_val >= max_vals: - message = ERROR_MAX_VALS % ( max_vals, "interactions" ) + message = self.error_max_vals % ( max_vals, "interactions" ) break feature = line.split() https://bitbucket.org/galaxy/galaxy-central/changeset/6805c477d616/ changeset: 6805c477d616 user: jgoecks date: 2012-09-14 18:23:03 summary: Rename tracks package to genome to reflect that code is used for all genome browsers, not just trackster. affected #: 16 files diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/datatypes/converters/interval_to_interval_index_converter.py --- a/lib/galaxy/datatypes/converters/interval_to_interval_index_converter.py +++ b/lib/galaxy/datatypes/converters/interval_to_interval_index_converter.py @@ -14,7 +14,7 @@ import sys, fileinput, optparse from galaxy import eggs import pkg_resources; pkg_resources.require( "bx-python" ) -from galaxy.visualization.tracks.summary import * +from galaxy.visualization.genome.summary import * from galaxy.datatypes.util.gff_util import convert_gff_coords_to_bed from bx.interval_index_file import Indexes diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/datatypes/converters/interval_to_summary_tree_converter.py --- a/lib/galaxy/datatypes/converters/interval_to_summary_tree_converter.py +++ b/lib/galaxy/datatypes/converters/interval_to_summary_tree_converter.py @@ -15,7 +15,7 @@ import sys, fileinput, optparse from galaxy import eggs import pkg_resources; pkg_resources.require( "bx-python" ) -from galaxy.visualization.tracks.summary import * +from galaxy.visualization.genome.summary import * from bx.intervals.io import * from galaxy.datatypes.util.gff_util import * diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/datatypes/converters/sam_or_bam_to_summary_tree_converter.py --- a/lib/galaxy/datatypes/converters/sam_or_bam_to_summary_tree_converter.py +++ b/lib/galaxy/datatypes/converters/sam_or_bam_to_summary_tree_converter.py @@ -14,7 +14,7 @@ pkg_resources.require( "pysam" ) from pysam import csamtools -from galaxy.visualization.tracks.summary import * +from galaxy.visualization.genome.summary import * def main(): parser = optparse.OptionParser() diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/datatypes/converters/vcf_to_summary_tree_converter.py --- a/lib/galaxy/datatypes/converters/vcf_to_summary_tree_converter.py +++ b/lib/galaxy/datatypes/converters/vcf_to_summary_tree_converter.py @@ -9,7 +9,7 @@ import optparse import galaxy_utils.sequence.vcf -from galaxy.visualization.tracks.summary import SummaryTree +from galaxy.visualization.genome.summary import SummaryTree def main(): # Read options, args. diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -35,7 +35,7 @@ from galaxy.util.shed_util import * from galaxy.web import url_for -from galaxy.visualization.tracks.visual_analytics import TracksterConfig +from galaxy.visualization.genome.visual_analytics import TracksterConfig log = logging.getLogger( __name__ ) diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/visualization/genome/__init__.py --- /dev/null +++ b/lib/galaxy/visualization/genome/__init__.py @@ -0,0 +1,3 @@ +""" +Code for Galaxy genome visualizations. +""" \ No newline at end of file diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/visualization/genome/data_providers.py --- /dev/null +++ b/lib/galaxy/visualization/genome/data_providers.py @@ -0,0 +1,1557 @@ +""" +Data providers for genome visualizations. +""" + +import os, sys +from math import ceil, log +import pkg_resources +pkg_resources.require( "bx-python" ) +if sys.version_info[:2] == (2, 4): + pkg_resources.require( "ctypes" ) +pkg_resources.require( "pysam" ) +pkg_resources.require( "numpy" ) +import numpy +from galaxy.datatypes.util.gff_util import * +from galaxy.util.json import from_json_string +from bx.interval_index_file import Indexes +from bx.bbi.bigwig_file import BigWigFile +from galaxy.util.lrucache import LRUCache +from galaxy.visualization.genome.summary import * +from galaxy.visualization.data_providers import BaseDataProvider +import galaxy_utils.sequence.vcf +from galaxy.datatypes.tabular import Tabular, Vcf +from galaxy.datatypes.interval import Interval, Bed, Gff, Gtf, ENCODEPeak, ChromatinInteractions + +from pysam import csamtools, ctabix + +# +# Utility functions. +# + +def float_nan(n): + ''' + Return None instead of NaN to pass jQuery 1.4's strict JSON + ''' + if n != n: # NaN != NaN + return None + else: + return float(n) + +def get_bounds( reads, start_pos_index, end_pos_index ): + ''' + Returns the minimum and maximum position for a set of reads. + ''' + max_low = sys.maxint + max_high = -sys.maxint + for read in reads: + if read[ start_pos_index ] < max_low: + max_low = read[ start_pos_index ] + if read[ end_pos_index ] > max_high: + max_high = read[ end_pos_index ] + return max_low, max_high + +def _convert_between_ucsc_and_ensemble_naming( chrom ): + ''' + Convert between UCSC chromosome ('chr1') naming conventions and Ensembl + naming conventions ('1') + ''' + if chrom.startswith( 'chr' ): + # Convert from UCSC to Ensembl + return chrom[ 3: ] + else: + # Convert from Ensembl to UCSC + return 'chr' + chrom + +def _chrom_naming_matches( chrom1, chrom2 ): + return ( chrom1.startswith( 'chr' ) and chrom2.startswith( 'chr' ) ) or ( not chrom1.startswith( 'chr' ) and not chrom2.startswith( 'chr' ) ) + +class FeatureLocationIndexDataProvider( BaseDataProvider ): + """ + Reads/writes/queries feature location index (FLI) datasets. + """ + + def __init__( self, converted_dataset ): + self.converted_dataset = converted_dataset + + def get_data( self, query ): + # Init. + textloc_file = open( self.converted_dataset.file_name, 'r' ) + line_len = int( textloc_file.readline() ) + file_len = os.path.getsize( self.converted_dataset.file_name ) + query = query.lower() + + # Find query in file using binary search. + low = 0 + high = file_len / line_len + while low < high: + mid = ( low + high ) // 2 + position = mid * line_len + textloc_file.seek( position ) + + # Compare line with query and update low, high. + line = textloc_file.readline() + if line < query: + low = mid + 1 + else: + high = mid + + position = low * line_len + + # At right point in file, generate hits. + result = [] + while True: + line = textloc_file.readline() + if not line.startswith( query ): + break + if line[ -1: ] == '\n': + line = line[ :-1 ] + result.append( line.split()[1:] ) + + textloc_file.close() + return result + +class GenomeDataProvider( BaseDataProvider ): + """ Base class for genome data providers. """ + + """ + Mapping from column name to payload data; this mapping is used to create + filters. Key is column name, value is a dict with mandatory key 'index' and + optional key 'name'. E.g. this defines column 4 + + col_name_data_attr_mapping = {4 : { index: 5, name: 'Score' } } + """ + col_name_data_attr_mapping = {} + + def __init__( self, converted_dataset=None, original_dataset=None, dependencies=None, + error_max_vals="Only the first %i %s in this region are displayed." ): + super( GenomeDataProvider, self ).__init__( converted_dataset=converted_dataset, + original_dataset=original_dataset, + dependencies=dependencies, + error_max_vals=error_max_vals ) + + def write_data_to_file( self, regions, filename ): + """ + Write data in region defined by chrom, start, and end to a file. + """ + raise Exception( "Unimplemented Function" ) + + def valid_chroms( self ): + """ + Returns chroms/contigs that the dataset contains + """ + return None # by default + + def has_data( self, chrom, start, end, **kwargs ): + """ + Returns true if dataset has data in the specified genome window, false + otherwise. + """ + raise Exception( "Unimplemented Function" ) + + def get_iterator( self, chrom, start, end ): + """ + Returns an iterator that provides data in the region chrom:start-end + """ + raise Exception( "Unimplemented Function" ) + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Process data from an iterator to a format that can be provided to client. + """ + raise Exception( "Unimplemented Function" ) + + def get_data( self, chrom, start, end, start_val=0, max_vals=sys.maxint, **kwargs ): + """ + Returns data in region defined by chrom, start, and end. start_val and + max_vals are used to denote the data to return: start_val is the first element to + return and max_vals indicates the number of values to return. + + Return value must be a dictionary with the following attributes: + dataset_type, data + """ + iterator = self.get_iterator( chrom, start, end ) + return self.process_data( iterator, start_val, max_vals, **kwargs ) + + def get_genome_data( self, chroms_info, **kwargs ): + """ + Returns data for complete genome. + """ + dataset_summary = [] + for chrom_info in chroms_info[ 'chrom_info' ]: + summary = self.get_data( chrom_info[ 'chrom' ], 0, chrom_info[ 'len' ], **kwargs ) + dataset_summary.append( summary ) + + return dataset_summary + + def get_filters( self ): + """ + Returns filters for provider's data. Return value is a list of + filters; each filter is a dictionary with the keys 'name', 'index', 'type'. + NOTE: This method uses the original dataset's datatype and metadata to + create the filters. + """ + # Get column names. + try: + column_names = self.original_dataset.datatype.column_names + except AttributeError: + try: + column_names = range( self.original_dataset.metadata.columns ) + except: # Give up + return [] + + # Dataset must have column types; if not, cannot create filters. + try: + column_types = self.original_dataset.metadata.column_types + except AttributeError: + return [] + + # Create and return filters. + filters = [] + if self.original_dataset.metadata.viz_filter_cols: + for viz_col_index in self.original_dataset.metadata.viz_filter_cols: + # Some columns are optional, so can't assume that a filter + # column is in dataset. + if viz_col_index >= len( column_names ): + continue; + col_name = column_names[ viz_col_index ] + # Make sure that column has a mapped index. If not, do not add filter. + try: + attrs = self.col_name_data_attr_mapping[ col_name ] + except KeyError: + continue + filters.append( + { 'name' : attrs[ 'name' ], 'type' : column_types[viz_col_index], \ + 'index' : attrs[ 'index' ] } ) + return filters + + def get_default_max_vals( self ): + return 5000 + +# +# -- Base mixins and providers -- +# + +class FilterableMixin: + def get_filters( self ): + """ Returns a dataset's filters. """ + + # is_ functions taken from Tabular.set_meta + def is_int( column_text ): + try: + int( column_text ) + return True + except: + return False + def is_float( column_text ): + try: + float( column_text ) + return True + except: + if column_text.strip().lower() == 'na': + return True #na is special cased to be a float + return False + + # + # Get filters. + # TODOs: + # (a) might be useful to move this into each datatype's set_meta method; + # (b) could look at first N lines to ensure GTF attribute types are consistent. + # + filters = [] + # HACK: first 8 fields are for drawing, so start filter column index at 9. + filter_col = 8 + if isinstance( self.original_dataset.datatype, Gff ): + # Can filter by score and GTF attributes. + filters = [ { 'name': 'Score', + 'type': 'number', + 'index': filter_col, + 'tool_id': 'Filter1', + 'tool_exp_name': 'c6' } ] + filter_col += 1 + if isinstance( self.original_dataset.datatype, Gtf ): + # Create filters based on dataset metadata. + for name, a_type in self.original_dataset.metadata.attribute_types.items(): + if a_type in [ 'int', 'float' ]: + filters.append( + { 'name': name, + 'type': 'number', + 'index': filter_col, + 'tool_id': 'gff_filter_by_attribute', + 'tool_exp_name': name } ) + filter_col += 1 + + ''' + # Old code: use first line in dataset to find attributes. + for i, line in enumerate( open(self.original_dataset.file_name) ): + if not line.startswith('#'): + # Look at first line for attributes and types. + attributes = parse_gff_attributes( line.split('\t')[8] ) + for attr, value in attributes.items(): + # Get attribute type. + if is_int( value ): + attr_type = 'int' + elif is_float( value ): + attr_type = 'float' + else: + attr_type = 'str' + # Add to filters. + if attr_type is not 'str': + filters.append( { 'name': attr, 'type': attr_type, 'index': filter_col } ) + filter_col += 1 + break + ''' + elif isinstance( self.original_dataset.datatype, Bed ): + # Can filter by score column only. + filters = [ { 'name': 'Score', + 'type': 'number', + 'index': filter_col, + 'tool_id': 'Filter1', + 'tool_exp_name': 'c5' + } ] + + return filters + + +class TabixDataProvider( FilterableMixin, GenomeDataProvider ): + """ + Tabix index data provider for the Galaxy track browser. + """ + + col_name_data_attr_mapping = { 4 : { 'index': 4 , 'name' : 'Score' } } + + def get_iterator( self, chrom, start, end ): + start, end = int(start), int(end) + if end >= (2<<29): + end = (2<<29 - 1) # Tabix-enforced maximum + + bgzip_fname = self.dependencies['bgzip'].file_name + + tabix = ctabix.Tabixfile(bgzip_fname, index_filename=self.converted_dataset.file_name) + + # If chrom not in data, try alternative. + if chrom not in tabix.contigs: + chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) + + return tabix.fetch(reference=chrom, start=start, end=end) + + def write_data_to_file( self, regions, filename ): + out = open( filename, "w" ) + + for region in regions: + # Write data in region. + chrom = region.chrom + start = region.start + end = region.end + iterator = self.get_iterator( chrom, start, end ) + for line in iterator: + out.write( "%s\n" % line ) + + out.close() + +# +# -- Interval data providers -- +# + +class IntervalDataProvider( GenomeDataProvider ): + """ + Processes BED data from native format to payload format. + + Payload format: [ uid (offset), start, end, name, strand, thick_start, thick_end, blocks ] + """ + + def get_iterator( self, chrom, start, end ): + raise Exception( "Unimplemented Function" ) + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Provides + """ + # Build data to return. Payload format is: + # [ <guid/offset>, <start>, <end>, <name>, <strand> ] + # + # First three entries are mandatory, others are optional. + # + filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) + no_detail = ( "no_detail" in kwargs ) + rval = [] + message = None + # Subtract one b/c columns are 1-based but indices are 0-based. + col_fn = lambda col: None if col is None else col - 1 + start_col = self.original_dataset.metadata.startCol - 1 + end_col = self.original_dataset.metadata.endCol - 1 + strand_col = col_fn( self.original_dataset.metadata.strandCol ) + name_col = col_fn( self.original_dataset.metadata.nameCol ) + for count, line in enumerate( iterator ): + if count < start_val: + continue + if max_vals and count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "features" ) + break + + feature = line.split() + length = len(feature) + # Unique id is just a hash of the line + payload = [ hash(line), int( feature[start_col] ), int( feature [end_col] ) ] + + if no_detail: + rval.append( payload ) + continue + + # Name, strand. + if name_col: + payload.append( feature[name_col] ) + if strand_col: + # Put empty name as placeholder. + if not name_col: payload.append( "" ) + payload.append( feature[strand_col] ) + + # Score (filter data) + if length >= 5 and filter_cols and filter_cols[0] == "Score": + try: + payload.append( float( feature[4] ) ) + except: + payload.append( feature[4] ) + + rval.append( payload ) + + return { 'data': rval, 'message': message } + + def write_data_to_file( self, regions, filename ): + raise Exception( "Unimplemented Function" ) + +class IntervalTabixDataProvider( TabixDataProvider, IntervalDataProvider ): + """ + Provides data from a BED file indexed via tabix. + """ + pass + + +# +# -- BED data providers -- +# + +class BedDataProvider( GenomeDataProvider ): + """ + Processes BED data from native format to payload format. + + Payload format: [ uid (offset), start, end, name, strand, thick_start, thick_end, blocks ] + """ + + def get_iterator( self, chrom, start, end ): + raise Exception( "Unimplemented Method" ) + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Provides + """ + # Build data to return. Payload format is: + # [ <guid/offset>, <start>, <end>, <name>, <strand>, <thick_start>, + # <thick_end>, <blocks> ] + # + # First three entries are mandatory, others are optional. + # + filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) + no_detail = ( "no_detail" in kwargs ) + rval = [] + message = None + for count, line in enumerate( iterator ): + if count < start_val: + continue + if max_vals and count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "features" ) + break + # TODO: can we use column metadata to fill out payload? + # TODO: use function to set payload data + + feature = line.split() + length = len(feature) + # Unique id is just a hash of the line + payload = [ hash(line), int(feature[1]), int(feature[2]) ] + + if no_detail: + rval.append( payload ) + continue + + # Name, strand, thick start, thick end. + if length >= 4: + payload.append(feature[3]) + if length >= 6: + payload.append(feature[5]) + if length >= 8: + payload.append(int(feature[6])) + payload.append(int(feature[7])) + + # Blocks. + if length >= 12: + block_sizes = [ int(n) for n in feature[10].split(',') if n != ''] + block_starts = [ int(n) for n in feature[11].split(',') if n != '' ] + blocks = zip( block_sizes, block_starts ) + payload.append( [ ( int(feature[1]) + block[1], int(feature[1]) + block[1] + block[0] ) for block in blocks ] ) + + # Score (filter data) + if length >= 5 and filter_cols and filter_cols[0] == "Score": + # If dataset doesn't have name/strand/thick start/thick end/blocks, + # add placeholders. There should be 8 entries if all attributes + # are present. + payload.extend( [ None for i in range( 8 - len( payload ) ) ] ) + + try: + payload.append( float( feature[4] ) ) + except: + payload.append( feature[4] ) + + rval.append( payload ) + + return { 'data': rval, 'message': message } + + def write_data_to_file( self, regions, filename ): + out = open( filename, "w" ) + + for region in regions: + # Write data in region. + chrom = region.chrom + start = region.start + end = region.end + iterator = self.get_iterator( chrom, start, end ) + for line in iterator: + out.write( "%s\n" % line ) + + out.close() + +class BedTabixDataProvider( TabixDataProvider, BedDataProvider ): + """ + Provides data from a BED file indexed via tabix. + """ + pass + +class RawBedDataProvider( BedDataProvider ): + """ + Provide data from BED file. + + NOTE: this data provider does not use indices, and hence will be very slow + for large datasets. + """ + + def get_iterator( self, chrom=None, start=None, end=None ): + # Read first line in order to match chrom naming format. + line = source.readline() + dataset_chrom = line.split()[0] + if not _chrom_naming_matches( chrom, dataset_chrom ): + chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) + # Undo read. + source.seek( 0 ) + + def line_filter_iter(): + for line in open( self.original_dataset.file_name ): + if line.startswith( "track" ) or line.startswith( "browser" ): + continue + feature = line.split() + feature_chrom = feature[0] + feature_start = int( feature[1] ) + feature_end = int( feature[2] ) + if ( chrom is not None and feature_chrom != chrom ) \ + or ( start is not None and feature_start > end ) \ + or ( end is not None and feature_end < start ): + continue + yield line + + return line_filter_iter() + +# +# -- VCF data providers -- +# + +class VcfDataProvider( GenomeDataProvider ): + """ + Abstract class that processes VCF data from native format to payload format. + + Payload format: TODO + """ + + col_name_data_attr_mapping = { 'Qual' : { 'index': 6 , 'name' : 'Qual' } } + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Returns a dict with the following attributes: + data - a list of variants with the format + [<guid>, <start>, <end>, <name>, cigar, seq] + + message - error/informative message + """ + rval = [] + message = None + + def get_mapping( ref, alt ): + """ + Returns ( offset, new_seq, cigar ) tuple that defines mapping of + alt to ref. Cigar format is an array of [ op_index, length ] pairs + where op_index is the 0-based index into the string "MIDNSHP=X" + """ + + cig_ops = "MIDNSHP=X" + + ref_len = len( ref ) + alt_len = len( alt ) + + # Substitutions? + if ref_len == alt_len: + return 0, alt, [ [ cig_ops.find( "M" ), ref_len ] ] + + # Deletions? + alt_in_ref_index = ref.find( alt ) + if alt_in_ref_index != -1: + return alt_in_ref_index, ref[ alt_in_ref_index + 1: ], [ [ cig_ops.find( "D" ), ref_len - alt_len ] ] + + # Insertions? + ref_in_alt_index = alt.find( ref ) + if ref_in_alt_index != -1: + return ref_in_alt_index, alt[ ref_in_alt_index + 1: ], [ [ cig_ops.find( "I" ), alt_len - ref_len ] ] + + # Pack data. + for count, line in enumerate( iterator ): + if count < start_val: + continue + if max_vals and count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "features" ) + break + + feature = line.split() + start = int( feature[1] ) - 1 + ref = feature[3] + alts = feature[4] + + # HACK? alts == '.' --> monomorphism. + if alts == '.': + alts = ref + + # Pack variants. + for alt in alts.split(","): + offset, new_seq, cigar = get_mapping( ref, alt ) + start += offset + end = start + len( new_seq ) + + # Pack line. + payload = [ + hash( line ), + start, + end, + # ID: + feature[2], + cigar, + # TODO? VCF does not have strand, so default to positive. + "+", + new_seq, + None if feature[5] == '.' else float( feature[5] ) + ] + rval.append(payload) + + return { 'data': rval, 'message': message } + + def write_data_to_file( self, regions, filename ): + out = open( filename, "w" ) + + for region in regions: + # Write data in region. + chrom = region.chrom + start = region.start + end = region.end + iterator = self.get_iterator( chrom, start, end ) + for line in iterator: + out.write( "%s\n" % line ) + out.close() + +class VcfTabixDataProvider( TabixDataProvider, VcfDataProvider ): + """ + Provides data from a VCF file indexed via tabix. + """ + pass + +class RawVcfDataProvider( VcfDataProvider ): + """ + Provide data from VCF file. + + NOTE: this data provider does not use indices, and hence will be very slow + for large datasets. + """ + + def get_iterator( self, chrom, start, end ): + # Read first line in order to match chrom naming format. + line = source.readline() + dataset_chrom = line.split()[0] + if not _chrom_naming_matches( chrom, dataset_chrom ): + chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) + # Undo read. + source.seek( 0 ) + + def line_filter_iter(): + for line in open( self.original_dataset.file_name ): + if line.startswith("#"): + continue + variant = line.split() + variant_chrom, variant_start, id, ref, alts = variant[ 0:5 ] + variant_start = int( variant_start ) + longest_alt = -1 + for alt in alts: + if len( alt ) > longest_alt: + longest_alt = len( alt ) + variant_end = variant_start + abs( len( ref ) - longest_alt ) + if variant_chrom != chrom or variant_start > end or variant_end < start: + continue + yield line + + return line_filter_iter() + +class SummaryTreeDataProvider( GenomeDataProvider ): + """ + Summary tree data provider for the Galaxy track browser. + """ + + CACHE = LRUCache( 20 ) # Store 20 recently accessed indices for performance + + def valid_chroms( self ): + st = summary_tree_from_file( self.converted_dataset.file_name ) + return st.chrom_blocks.keys() + + def get_data( self, chrom, start, end, level=None, resolution=None, detail_cutoff=None, draw_cutoff=None ): + """ + Returns summary tree data for a given genomic region. + """ + filename = self.converted_dataset.file_name + st = self.CACHE[filename] + if st is None: + st = summary_tree_from_file( self.converted_dataset.file_name ) + self.CACHE[filename] = st + + # Look for chrom in tree using both naming conventions. + if chrom not in st.chrom_blocks: + chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) + if chrom not in st.chrom_blocks: + return None + + # Get or compute level. + if level: + level = int( level ) + elif resolution: + resolution = max( 1, ceil( float( resolution ) ) ) + level = ceil( log( resolution, st.block_size ) ) - 1 + level = int( max( level, 0 ) ) + else: + # Either level or resolution is required. + return None + + if level <= 1: + return "detail" + + # Use level to get results. + stats = st.chrom_stats[ chrom ] + results = st.query( chrom, int(start), int(end), level, detail_cutoff=detail_cutoff, draw_cutoff=draw_cutoff ) + if results == "detail" or results == "draw": + return results + else: + return results, stats[ level ][ "max" ], stats[ level ]["avg" ], stats[ level ][ "delta" ] + + def has_data( self, chrom ): + """ + Returns true if dataset has data for this chrom + """ + + # Get summary tree. + filename = self.converted_dataset.file_name + st = self.CACHE[filename] + if st is None: + st = summary_tree_from_file( self.converted_dataset.file_name ) + self.CACHE[filename] = st + + # Check for data. + return st.chrom_blocks.get(chrom, None) or st.chrom_blocks.get(_convert_between_ucsc_and_ensemble_naming(chrom), None) + +class BamDataProvider( GenomeDataProvider, FilterableMixin ): + """ + Provides access to intervals from a sorted indexed BAM file. Position data + is reported in 1-based, closed format, i.e. SAM/BAM format. + """ + + def get_filters( self ): + """ + Returns filters for dataset. + """ + # HACK: first 7 fields are for drawing, so start filter column index at 7. + filter_col = 7 + filters = [] + filters.append( { 'name': 'Mapping Quality', + 'type': 'number', + 'index': filter_col + } ) + return filters + + + def write_data_to_file( self, regions, filename ): + """ + Write reads in regions to file. + """ + + # Open current BAM file using index. + bamfile = csamtools.Samfile( filename=self.original_dataset.file_name, mode='rb', \ + index_filename=self.converted_dataset.file_name ) + + # TODO: write headers as well? + new_bamfile = csamtools.Samfile( template=bamfile, filename=filename, mode='wb' ) + + for region in regions: + # Write data from region. + chrom = region.chrom + start = region.start + end = region.end + + try: + data = bamfile.fetch(start=start, end=end, reference=chrom) + except ValueError, e: + # Try alternative chrom naming. + chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) + try: + data = bamfile.fetch( start=start, end=end, reference=chrom ) + except ValueError: + return None + + # Write reads in region. + for i, read in enumerate( data ): + new_bamfile.write( read ) + + # Cleanup. + new_bamfile.close() + bamfile.close() + + def get_iterator( self, chrom, start, end ): + """ + Returns an iterator that provides data in the region chrom:start-end + """ + start, end = int(start), int(end) + orig_data_filename = self.original_dataset.file_name + index_filename = self.converted_dataset.file_name + + # Attempt to open the BAM file with index + bamfile = csamtools.Samfile( filename=orig_data_filename, mode='rb', index_filename=index_filename ) + try: + data = bamfile.fetch(start=start, end=end, reference=chrom) + except ValueError, e: + # Try alternative chrom naming. + chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) + try: + data = bamfile.fetch( start=start, end=end, reference=chrom ) + except ValueError: + return None + return data + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Returns a dict with the following attributes: + data - a list of reads with the format + [<guid>, <start>, <end>, <name>, <read_1>, <read_2>, [empty], <mapq_scores>] + where <read_1> has the format + [<start>, <end>, <cigar>, <strand>, <read_seq>] + and <read_2> has the format + [<start>, <end>, <cigar>, <strand>, <read_seq>] + Field 7 is empty so that mapq scores' location matches that in single-end reads. + For single-end reads, read has format: + [<guid>, <start>, <end>, <name>, <cigar>, <strand>, <seq>, <mapq_score>] + + NOTE: read end and sequence data are not valid for reads outside of + requested region and should not be used. + + max_low - lowest coordinate for the returned reads + max_high - highest coordinate for the returned reads + message - error/informative message + """ + # No iterator indicates no reads. + if iterator is None: + return { 'data': [], 'message': None } + + # Decode strand from read flag. + def decode_strand( read_flag, mask ): + strand_flag = ( read_flag & mask == 0 ) + if strand_flag: + return "+" + else: + return "-" + + # Encode reads as list of lists. + results = [] + paired_pending = {} + unmapped = 0 + message = None + for count, read in enumerate( iterator ): + if count < start_val: + continue + if ( count - start_val - unmapped ) >= max_vals: + message = self.error_max_vals % ( max_vals, "reads" ) + break + + # If not mapped, skip read. + is_mapped = ( read.flag & 0x0004 == 0 ) + if not is_mapped: + unmapped += 1 + continue + + qname = read.qname + seq = read.seq + strand = decode_strand( read.flag, 0x0010 ) + if read.cigar is not None: + read_len = sum( [cig[1] for cig in read.cigar] ) # Use cigar to determine length + else: + read_len = len(seq) # If no cigar, just use sequence length + + if read.is_proper_pair: + if qname in paired_pending: # one in dict is always first + pair = paired_pending[qname] + results.append( [ "%i_%s" % ( pair['start'], qname ), + pair['start'], + read.pos + read_len, + qname, + [ pair['start'], pair['end'], pair['cigar'], pair['strand'], pair['seq'] ], + [ read.pos, read.pos + read_len, read.cigar, strand, seq ], + None, [ pair['mapq'], read.mapq ] + ] ) + del paired_pending[qname] + else: + paired_pending[qname] = { 'start': read.pos, 'end': read.pos + read_len, 'seq': seq, 'mate_start': read.mpos, + 'rlen': read_len, 'strand': strand, 'cigar': read.cigar, 'mapq': read.mapq } + else: + results.append( [ "%i_%s" % ( read.pos, qname ), + read.pos, read.pos + read_len, qname, + read.cigar, strand, read.seq, read.mapq ] ) + + # Take care of reads whose mates are out of range. + # TODO: count paired reads when adhering to max_vals? + for qname, read in paired_pending.iteritems(): + if read['mate_start'] < read['start']: + # Mate is before read. + read_start = read['mate_start'] + read_end = read['end'] + # Make read_1 start=end so that length is 0 b/c we don't know + # read length. + r1 = [ read['mate_start'], read['mate_start'] ] + r2 = [ read['start'], read['end'], read['cigar'], read['strand'], read['seq'] ] + else: + # Mate is after read. + read_start = read['start'] + # Make read_2 start=end so that length is 0 b/c we don't know + # read length. Hence, end of read is start of read_2. + read_end = read['mate_start'] + r1 = [ read['start'], read['end'], read['cigar'], read['strand'], read['seq'] ] + r2 = [ read['mate_start'], read['mate_start'] ] + + results.append( [ "%i_%s" % ( read_start, qname ), read_start, read_end, qname, r1, r2, [read[ 'mapq' ], 125] ] ) + + # Clean up. TODO: is this needed? If so, we'll need a cleanup function after processing the data. + # bamfile.close() + + max_low, max_high = get_bounds( results, 1, 2 ) + + return { 'data': results, 'message': message, 'max_low': max_low, 'max_high': max_high } + +class SamDataProvider( BamDataProvider ): + + def __init__( self, converted_dataset=None, original_dataset=None, dependencies=None ): + """ Create SamDataProvider. """ + + # HACK: to use BamDataProvider, original dataset must be BAM and + # converted dataset must be BAI. Use BAI from BAM metadata. + if converted_dataset: + self.converted_dataset = converted_dataset.metadata.bam_index + self.original_dataset = converted_dataset + self.dependencies = dependencies + +class BBIDataProvider( GenomeDataProvider ): + """ + BBI data provider for the Galaxy track browser. + """ + def valid_chroms( self ): + # No way to return this info as of now + return None + + def has_data( self, chrom ): + f, bbi = self._get_dataset() + all_dat = bbi.query(chrom, 0, 2147483647, 1) + f.close() + return all_dat is not None + + def get_data( self, chrom, start, end, start_val=0, max_vals=None, **kwargs ): + # Bigwig can be a standalone bigwig file, in which case we use + # original_dataset, or coming from wig->bigwig conversion in + # which we use converted_dataset + f, bbi = self._get_dataset() + + # If stats requested, compute overall summary data for the range + # start:endbut no reduced data. This is currently used by client + # to determine the default range. + if 'stats' in kwargs: + summary = bbi.summarize( chrom, start, end, 1 ) + f.close() + + min = 0 + max = 0 + mean = 0 + sd = 0 + if summary is not None: + # Does the summary contain any defined values? + valid_count = summary.valid_count[0] + if summary.valid_count > 0: + # Compute $\mu \pm 2\sigma$ to provide an estimate for upper and lower + # bounds that contain ~95% of the data. + mean = summary.sum_data[0] / valid_count + var = summary.sum_squares[0] - mean + if valid_count > 1: + var /= valid_count - 1 + sd = numpy.sqrt( var ) + min = summary.min_val[0] + max = summary.max_val[0] + + return dict( data=dict( min=min, max=max, mean=mean, sd=sd ) ) + + # Sample from region using approximately this many samples. + N = 1000 + + def summarize_region( bbi, chrom, start, end, num_points ): + ''' + Returns results from summarizing a region using num_points. + NOTE: num_points cannot be greater than end - start or BBI + will return None for all positions.s + ''' + result = [] + + # Get summary; this samples at intervals of length + # (end - start)/num_points -- i.e. drops any fractional component + # of interval length. + summary = bbi.summarize( chrom, start, end, num_points ) + if summary: + #mean = summary.sum_data / summary.valid_count + + ## Standard deviation by bin, not yet used + ## var = summary.sum_squares - mean + ## var /= minimum( valid_count - 1, 1 ) + ## sd = sqrt( var ) + + pos = start + step_size = (end - start) / num_points + + for i in range( num_points ): + result.append( (pos, float_nan( summary.sum_data[i] / summary.valid_count[i] ) ) ) + pos += step_size + + return result + + # Approach is different depending on region size. + if end - start < N: + # Get values for individual bases in region, including start and end. + # To do this, need to increase end to next base and request number of points. + num_points = end - start + 1 + end += 1 + else: + # + # The goal is to sample the region between start and end uniformly + # using ~N data points. The challenge is that the size of sampled + # intervals rarely is full bases, so sampling using N points will + # leave the end of the region unsampled due to remainders for each + # interval. To recitify this, a new N is calculated based on the + # step size that covers as much of the region as possible. + # + # However, this still leaves some of the region unsampled. This + # could be addressed by repeatedly sampling remainder using a + # smaller and smaller step_size, but that would require iteratively + # going to BBI, which could be time consuming. + # + + # Start with N samples. + num_points = N + step_size = ( end - start ) / num_points + # Add additional points to sample in the remainder not covered by + # the initial N samples. + remainder_start = start + step_size * num_points + additional_points = ( end - remainder_start ) / step_size + num_points += additional_points + + result = summarize_region( bbi, chrom, start, end, num_points ) + + # Cleanup and return. + f.close() + return { 'data': result } + +class BigBedDataProvider( BBIDataProvider ): + def _get_dataset( self ): + # Nothing converts to bigBed so we don't consider converted dataset + f = open( self.original_dataset.file_name ) + return f, BigBedFile(file=f) + +class BigWigDataProvider ( BBIDataProvider ): + """ + Provides data from BigWig files; position data is reported in 1-based + coordinate system, i.e. wiggle format. + """ + def _get_dataset( self ): + if self.converted_dataset is not None: + f = open( self.converted_dataset.file_name ) + else: + f = open( self.original_dataset.file_name ) + return f, BigWigFile(file=f) + +class IntervalIndexDataProvider( FilterableMixin, GenomeDataProvider ): + """ + Interval index files used only for GFF files. + """ + col_name_data_attr_mapping = { 4 : { 'index': 4 , 'name' : 'Score' } } + + def write_data_to_file( self, regions, filename ): + source = open( self.original_dataset.file_name ) + index = Indexes( self.converted_dataset.file_name ) + out = open( filename, 'w' ) + + for region in regions: + # Write data from region. + chrom = region.chrom + start = region.start + end = region.end + for start, end, offset in index.find(chrom, start, end): + source.seek( offset ) + + reader = GFFReaderWrapper( source, fix_strand=True ) + feature = reader.next() + for interval in feature.intervals: + out.write( '\t'.join( interval.fields ) + '\n' ) + + out.close() + + def get_iterator( self, chrom, start, end ): + """ + Returns an array with values: (a) source file and (b) an iterator that + provides data in the region chrom:start-end + """ + start, end = int(start), int(end) + source = open( self.original_dataset.file_name ) + index = Indexes( self.converted_dataset.file_name ) + + if chrom not in index.indexes: + # Try alternative naming. + chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) + + return index.find(chrom, start, end) + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + results = [] + message = None + source = open( self.original_dataset.file_name ) + + # + # Build data to return. Payload format is: + # [ <guid/offset>, <start>, <end>, <name>, <score>, <strand>, <thick_start>, + # <thick_end>, <blocks> ] + # + # First three entries are mandatory, others are optional. + # + filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) + no_detail = ( "no_detail" in kwargs ) + for count, val in enumerate( iterator ): + start, end, offset = val[0], val[1], val[2] + if count < start_val: + continue + if count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "features" ) + break + source.seek( offset ) + # TODO: can we use column metadata to fill out payload? + + # GFF dataset. + reader = GFFReaderWrapper( source, fix_strand=True ) + feature = reader.next() + payload = package_gff_feature( feature, no_detail, filter_cols ) + payload.insert( 0, offset ) + + results.append( payload ) + + return { 'data': results, 'message': message } + +class RawGFFDataProvider( GenomeDataProvider ): + """ + Provide data from GFF file that has not been indexed. + + NOTE: this data provider does not use indices, and hence will be very slow + for large datasets. + """ + + def get_iterator( self, chrom, start, end ): + """ + Returns an iterator that provides data in the region chrom:start-end as well as + a file offset. + """ + source = open( self.original_dataset.file_name ) + + # Read first line in order to match chrom naming format. + line = source.readline() + dataset_chrom = line.split()[0] + if not _chrom_naming_matches( chrom, dataset_chrom ): + chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) + # Undo read. + source.seek( 0 ) + + def features_in_region_iter(): + offset = 0 + for feature in GFFReaderWrapper( source, fix_strand=True ): + # Only provide features that are in region. + feature_start, feature_end = convert_gff_coords_to_bed( [ feature.start, feature.end ] ) + if feature.chrom == chrom and feature_end > start and feature_start < end: + yield feature, offset + offset += feature.raw_size + + return features_in_region_iter() + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Process data from an iterator to a format that can be provided to client. + """ + filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) + no_detail = ( "no_detail" in kwargs ) + results = [] + message = None + + for count, ( feature, offset ) in enumerate( iterator ): + if count < start_val: + continue + if count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "reads" ) + break + + payload = package_gff_feature( feature, no_detail=no_detail, filter_cols=filter_cols ) + payload.insert( 0, offset ) + results.append( payload ) + + + return { 'data': results, 'message': message } + +class GtfTabixDataProvider( TabixDataProvider ): + """ + Returns data from GTF datasets that are indexed via tabix. + """ + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + # Loop through lines and group by transcript_id; each group is a feature. + + # TODO: extend this code or use code in gff_util to process GFF/3 as well + # and then create a generic GFFDataProvider that can be used with both + # raw and tabix datasets. + features = {} + for count, line in enumerate( iterator ): + line_attrs = parse_gff_attributes( line.split('\t')[8] ) + transcript_id = line_attrs[ 'transcript_id' ] + if transcript_id in features: + feature = features[ transcript_id ] + else: + feature = [] + features[ transcript_id ] = feature + feature.append( GFFInterval( None, line.split( '\t') ) ) + + # Process data. + filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) + no_detail = ( "no_detail" in kwargs ) + results = [] + message = None + + for count, intervals in enumerate( features.values() ): + if count < start_val: + continue + if count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "reads" ) + break + + feature = GFFFeature( None, intervals=intervals ) + payload = package_gff_feature( feature, no_detail=no_detail, filter_cols=filter_cols ) + payload.insert( 0, feature.intervals[ 0 ].attributes[ 'transcript_id' ] ) + results.append( payload ) + + return { 'data': results, 'message': message } + +# +# -- ENCODE Peak data providers. +# + +class ENCODEPeakDataProvider( GenomeDataProvider ): + """ + Abstract class that processes ENCODEPeak data from native format to payload format. + + Payload format: [ uid (offset), start, end, name, strand, thick_start, thick_end, blocks ] + """ + + def get_iterator( self, chrom, start, end ): + raise "Unimplemented Method" + + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Provides + """ + + ## FIXMEs: + # (1) should be able to unify some of this code with BedDataProvider.process_data + # (2) are optional number of parameters supported? + + # Build data to return. Payload format is: + # [ <guid/offset>, <start>, <end>, <name>, <strand>, <thick_start>, + # <thick_end>, <blocks> ] + # + # First three entries are mandatory, others are optional. + # + no_detail = ( "no_detail" in kwargs ) + rval = [] + message = None + for count, line in enumerate( iterator ): + if count < start_val: + continue + if max_vals and count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "features" ) + break + + feature = line.split() + length = len( feature ) + + # Feature initialization. + payload = [ + # GUID is just a hash of the line + hash( line ), + # Add start, end. + int( feature[1] ), + int( feature[2] ) + ] + + if no_detail: + rval.append( payload ) + continue + + # Extend with additional data. + payload.extend( [ + # Add name, strand. + feature[3], + feature[5], + # Thick start, end are feature start, end for now. + int( feature[1] ), + int( feature[2] ), + # No blocks. + None, + # Filtering data: Score, signalValue, pValue, qValue. + float( feature[4] ), + float( feature[6] ), + float( feature[7] ), + float( feature[8] ) + ] ) + + rval.append( payload ) + + return { 'data': rval, 'message': message } + +class ENCODEPeakTabixDataProvider( TabixDataProvider, ENCODEPeakDataProvider ): + """ + Provides data from an ENCODEPeak dataset indexed via tabix. + """ + + def get_filters( self ): + """ + Returns filters for dataset. + """ + # HACK: first 8 fields are for drawing, so start filter column index at 9. + filter_col = 8 + filters = [] + filters.append( { 'name': 'Score', + 'type': 'number', + 'index': filter_col, + 'tool_id': 'Filter1', + 'tool_exp_name': 'c6' } ) + filter_col += 1 + filters.append( { 'name': 'Signal Value', + 'type': 'number', + 'index': filter_col, + 'tool_id': 'Filter1', + 'tool_exp_name': 'c7' } ) + filter_col += 1 + filters.append( { 'name': 'pValue', + 'type': 'number', + 'index': filter_col, + 'tool_id': 'Filter1', + 'tool_exp_name': 'c8' } ) + filter_col += 1 + filters.append( { 'name': 'qValue', + 'type': 'number', + 'index': filter_col, + 'tool_id': 'Filter1', + 'tool_exp_name': 'c9' } ) + return filters + +# +# -- ChromatinInteraction data providers -- +# +class ChromatinInteractionsDataProvider( GenomeDataProvider ): + def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): + """ + Provides + """ + + rval = [] + message = None + for count, line in enumerate( iterator ): + if count < start_val: + continue + if max_vals and count-start_val >= max_vals: + message = self.error_max_vals % ( max_vals, "interactions" ) + break + + feature = line.split() + length = len( feature ) + + s1 = int( feature[1] ), + e1 = int( feature[2] ), + c = feature[3], + s2 = int( feature[4] ), + e2 = int( feature[5] ), + v = float( feature[6] ) + + # Feature initialization. + payload = [ + # GUID is just a hash of the line + hash( line ), + # Add start1, end1, chr2, start2, end2, value. + s1, e1, c, s2, e2, v + ] + + rval.append( payload ) + + return { 'data': rval, 'message': message } + + def get_default_max_vals( self ): + return 50000; + +class ChromatinInteractionsTabixDataProvider( TabixDataProvider, ChromatinInteractionsDataProvider ): + def get_iterator( self, chrom, start, end ): + """ + """ + # Modify start as needed to get earlier interactions with start region. + start = max( 0, int( start) - 1000000 ) + def filter( iter ): + for line in iter: + feature = line.split() + s1 = int( feature[1] ), + e1 = int( feature[2] ), + c = feature[3] + s2 = int( feature[4] ), + e2 = int( feature[5] ), + if ( ( c == chrom ) and ( s1 < end and e1 > start ) and ( s2 < end and e2 > start ) ): + yield line + return filter( TabixDataProvider.get_iterator( self, chrom, start, end ) ) + +# +# -- Helper methods. -- +# + +# Mapping from dataset type name to a class that can fetch data from a file of that +# type. First key is converted dataset type; if result is another dict, second key +# is original dataset type. TODO: This needs to be more flexible. +dataset_type_name_to_data_provider = { + "tabix": { + Vcf: VcfTabixDataProvider, + Bed: BedTabixDataProvider, + Gtf: GtfTabixDataProvider, + ENCODEPeak: ENCODEPeakTabixDataProvider, + Interval: IntervalTabixDataProvider, + ChromatinInteractions: ChromatinInteractionsTabixDataProvider, + "default" : TabixDataProvider + }, + "interval_index": IntervalIndexDataProvider, + "bai": BamDataProvider, + "bam": SamDataProvider, + "summary_tree": SummaryTreeDataProvider, + "bigwig": BigWigDataProvider, + "bigbed": BigBedDataProvider +} + +def get_data_provider( name=None, original_dataset=None ): + """ + Returns data provider class by name and/or original dataset. + """ + data_provider = None + if name: + value = dataset_type_name_to_data_provider[ name ] + if isinstance( value, dict ): + # Get converter by dataset extension; if there is no data provider, + # get the default. + data_provider = value.get( original_dataset.datatype.__class__, value.get( "default" ) ) + else: + data_provider = value + elif original_dataset: + # Look up data provider from datatype's informaton. + try: + # Get data provider mapping and data provider for 'data'. If + # provider available, use it; otherwise use generic provider. + _ , data_provider_mapping = original_dataset.datatype.get_track_type() + if 'data_standalone' in data_provider_mapping: + data_provider_name = data_provider_mapping[ 'data_standalone' ] + else: + data_provider_name = data_provider_mapping[ 'data' ] + if data_provider_name: + data_provider = get_data_provider( name=data_provider_name, original_dataset=original_dataset ) + else: + data_provider = GenomeDataProvider + except: + pass + return data_provider + +def package_gff_feature( feature, no_detail=False, filter_cols=[] ): + """ Package a GFF feature in an array for data providers. """ + feature = convert_gff_coords_to_bed( feature ) + + # No detail means only start, end. + if no_detail: + return [ feature.start, feature.end ] + + # Return full feature. + payload = [ feature.start, + feature.end, + feature.name(), + feature.strand, + # No notion of thick start, end in GFF, so make everything + # thick. + feature.start, + feature.end + ] + + # HACK: ignore interval with name 'transcript' from feature. + # Cufflinks puts this interval in each of its transcripts, + # and they mess up trackster by covering the feature's blocks. + # This interval will always be a feature's first interval, + # and the GFF's third column is its feature name. + feature_intervals = feature.intervals + if feature.intervals[0].fields[2] == 'transcript': + feature_intervals = feature.intervals[1:] + # Add blocks. + block_sizes = [ (interval.end - interval.start ) for interval in feature_intervals ] + block_starts = [ ( interval.start - feature.start ) for interval in feature_intervals ] + blocks = zip( block_sizes, block_starts ) + payload.append( [ ( feature.start + block[1], feature.start + block[1] + block[0] ) for block in blocks ] ) + + # Add filter data to payload. + for col in filter_cols: + if col == "Score": + if feature.score == 'nan': + payload.append( feature.score ) + else: + try: + f = float( feature.score ) + payload.append( f ) + except: + payload.append( feature.score ) + elif col in feature.attributes: + if feature.attributes[col] == 'nan': + payload.append( feature.attributes[col] ) + else: + try: + f = float( feature.attributes[col] ) + payload.append( f ) + except: + payload.append( feature.attributes[col] ) + else: + # Dummy value. + payload.append( 0 ) + return payload diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/visualization/genome/summary.py --- /dev/null +++ b/lib/galaxy/visualization/genome/summary.py @@ -0,0 +1,111 @@ +''' +Summary tree data structure for feature aggregation across large genomic regions. +''' + +import sys, os +import cPickle + +# TODO: What are the performance implications of setting min level to 1? Data +# structure size and/or query speed? It would be nice to have level 1 data +# so that client does not have to compute it. +MIN_LEVEL = 2 + +class SummaryTree: + def __init__( self, block_size=25, levels=6, draw_cutoff=150, detail_cutoff=30 ): + self.chrom_blocks = {} + self.levels = levels + self.draw_cutoff = draw_cutoff + self.detail_cutoff = detail_cutoff + self.block_size = block_size + self.chrom_stats = {} + + def find_block( self, num, level ): + """ Returns block that num is in for level. """ + return ( num / self.block_size ** level ) + + def insert_range( self, chrom, start, end ): + """ Inserts a feature at chrom:start-end into the tree. """ + + # Get or set up chrom blocks. + if chrom in self.chrom_blocks: + blocks = self.chrom_blocks[ chrom ] + else: + blocks = self.chrom_blocks[ chrom ] = {} + self.chrom_stats[ chrom ] = {} + for level in range( MIN_LEVEL, self.levels + 1 ): + blocks[ level ] = {} + + # Insert feature into all matching blocks at all levels. + for level in range( MIN_LEVEL, self.levels + 1 ): + block_level = blocks[ level ] + starting_block = self.find_block( start, level ) + ending_block = self.find_block( end, level ) + for block in range( starting_block, ending_block + 1 ): + if block in block_level: + block_level[ block ] += 1 + else: + block_level[ block ] = 1 + + def finish( self ): + """ Compute stats for levels. """ + + for chrom, blocks in self.chrom_blocks.iteritems(): + for level in range( self.levels, MIN_LEVEL - 1, -1 ): + # Set level's stats. + max_val = max( blocks[ level ].values() ) + self.chrom_stats[ chrom ][ level ] = {} + self.chrom_stats[ chrom ][ level ][ "delta" ] = self.block_size ** level + self.chrom_stats[ chrom ][ level ][ "max" ] = max_val + self.chrom_stats[ chrom ][ level ][ "avg" ] = float( max_val ) / len( blocks[ level ] ) + + self.chrom_blocks[ chrom ] = dict( [ ( key, value ) for key, value in blocks.iteritems() ] ) + + def query( self, chrom, start, end, level, draw_cutoff=None, detail_cutoff=None ): + """ Queries tree for data. """ + + # Set cutoffs to self's attributes if not defined. + if draw_cutoff != 0: + draw_cutoff = self.draw_cutoff + if detail_cutoff != 0: + detail_cutoff = self.detail_cutoff + + # Get data. + if chrom in self.chrom_blocks: + stats = self.chrom_stats[ chrom ] + + # For backwards compatibility: + if "detail_level" in stats and level <= stats[ "detail_level" ]: + return "detail" + elif "draw_level" in stats and level <= stats[ "draw_level" ]: + return "draw" + + # If below draw, detail level, return string to denote this. + max = stats[ level ][ "max" ] + if max < detail_cutoff: + return "detail" + if max < draw_cutoff: + return "draw" + + # Return block data. + blocks = self.chrom_blocks[ chrom ] + results = [] + multiplier = self.block_size ** level + starting_block = self.find_block( start, level ) + ending_block = self.find_block( end, level ) + for block in range( starting_block, ending_block + 1 ): + val = 0 + if block in blocks[ level ]: + val = blocks[ level ][ block ] + results.append( ( block * multiplier, val ) ) + return results + + return None + + def write( self, filename ): + """ Writes tree to file. """ + self.finish() + cPickle.dump( self, open( filename, 'wb' ), 2 ) + +def summary_tree_from_file( filename ): + return cPickle.load( open( filename, "rb" ) ) + diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/visualization/genome/visual_analytics.py --- /dev/null +++ b/lib/galaxy/visualization/genome/visual_analytics.py @@ -0,0 +1,80 @@ +import urllib + +from galaxy.tools.parameters.basic import IntegerToolParameter, FloatToolParameter, SelectToolParameter +from galaxy.tools.parameters.dynamic_options import DynamicOptions + +class TracksterConfig: + """ Trackster configuration encapsulation. """ + + def __init__( self, actions ): + self.actions = actions + + @staticmethod + def parse( root ): + actions = [] + for action_elt in root.findall( "action" ): + actions.append( SetParamAction.parse( action_elt ) ) + return TracksterConfig( actions ) + +class SetParamAction: + """ Set parameter action. """ + + def __init__( self, name, output_name ): + self.name = name + self.output_name = output_name + + @staticmethod + def parse( elt ): + """ Parse action from element. """ + return SetParamAction( elt.get( "name" ), elt.get( "output_name" ) ) + +def get_dataset_job( hda ): + # Get dataset's job. + job = None + for job_output_assoc in hda.creating_job_associations: + job = job_output_assoc.job + break + return job + +def get_tool_def( trans, hda ): + """ Returns definition of an interactive tool for an HDA. """ + + job = get_dataset_job( hda ) + # TODO: could use this assertion to provide more information. + # assert job is not None, 'Requested job has not been loaded.' + if not job: + return None + tool = trans.app.toolbox.get_tool( job.tool_id ) + # TODO: could use this assertion to provide more information. + # assert tool is not None, 'Requested tool has not been loaded.' + if not tool: + return None + + # Tool must have a Trackster configuration. + if not tool.trackster_conf: + return None + + # Get list of tool parameters that can be interactively modified. + tool_params = [] + tool_param_values = dict( [ ( p.name, p.value ) for p in job.parameters ] ) + tool_param_values = tool.params_from_strings( tool_param_values, trans.app, ignore_errors=True ) + for name, input in tool.inputs.items(): + if type( input ) == IntegerToolParameter or type( input ) == FloatToolParameter: + param_dict = { 'name' : name, 'label' : input.label, \ + 'value' : tool_param_values.get( name, input.value ), \ + 'type' : 'number', 'init_value' : input.value, + 'html' : urllib.quote( input.get_html() ) } + if input.min: + param_dict['min'] = input.min + if input.max: + param_dict['max'] = input.max + tool_params.append( param_dict ) + elif type( input ) == SelectToolParameter and type( input.options ) != DynamicOptions: + tool_params.append( { 'name' : name, 'label' : input.label, 'type' : 'select', \ + 'value' : tool_param_values.get( name, None ), \ + 'html' : urllib.quote( input.get_html() ) } ) + + # If tool has parameters that can be interactively modified, return tool. + if len( tool_params ) != 0: + return { 'name' : tool.name, 'params' : tool_params } + return None \ No newline at end of file diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/visualization/tracks/__init__.py --- a/lib/galaxy/visualization/tracks/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Package for track style visualization using the trackster UI. -""" \ No newline at end of file diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/visualization/tracks/data_providers.py --- a/lib/galaxy/visualization/tracks/data_providers.py +++ /dev/null @@ -1,1557 +0,0 @@ -""" -Data providers for genome visualizations. -""" - -import os, sys -from math import ceil, log -import pkg_resources -pkg_resources.require( "bx-python" ) -if sys.version_info[:2] == (2, 4): - pkg_resources.require( "ctypes" ) -pkg_resources.require( "pysam" ) -pkg_resources.require( "numpy" ) -import numpy -from galaxy.datatypes.util.gff_util import * -from galaxy.util.json import from_json_string -from bx.interval_index_file import Indexes -from bx.bbi.bigwig_file import BigWigFile -from galaxy.util.lrucache import LRUCache -from galaxy.visualization.tracks.summary import * -from galaxy.visualization.data_providers import BaseDataProvider -import galaxy_utils.sequence.vcf -from galaxy.datatypes.tabular import Tabular, Vcf -from galaxy.datatypes.interval import Interval, Bed, Gff, Gtf, ENCODEPeak, ChromatinInteractions - -from pysam import csamtools, ctabix - -# -# Utility functions. -# - -def float_nan(n): - ''' - Return None instead of NaN to pass jQuery 1.4's strict JSON - ''' - if n != n: # NaN != NaN - return None - else: - return float(n) - -def get_bounds( reads, start_pos_index, end_pos_index ): - ''' - Returns the minimum and maximum position for a set of reads. - ''' - max_low = sys.maxint - max_high = -sys.maxint - for read in reads: - if read[ start_pos_index ] < max_low: - max_low = read[ start_pos_index ] - if read[ end_pos_index ] > max_high: - max_high = read[ end_pos_index ] - return max_low, max_high - -def _convert_between_ucsc_and_ensemble_naming( chrom ): - ''' - Convert between UCSC chromosome ('chr1') naming conventions and Ensembl - naming conventions ('1') - ''' - if chrom.startswith( 'chr' ): - # Convert from UCSC to Ensembl - return chrom[ 3: ] - else: - # Convert from Ensembl to UCSC - return 'chr' + chrom - -def _chrom_naming_matches( chrom1, chrom2 ): - return ( chrom1.startswith( 'chr' ) and chrom2.startswith( 'chr' ) ) or ( not chrom1.startswith( 'chr' ) and not chrom2.startswith( 'chr' ) ) - -class FeatureLocationIndexDataProvider( BaseDataProvider ): - """ - Reads/writes/queries feature location index (FLI) datasets. - """ - - def __init__( self, converted_dataset ): - self.converted_dataset = converted_dataset - - def get_data( self, query ): - # Init. - textloc_file = open( self.converted_dataset.file_name, 'r' ) - line_len = int( textloc_file.readline() ) - file_len = os.path.getsize( self.converted_dataset.file_name ) - query = query.lower() - - # Find query in file using binary search. - low = 0 - high = file_len / line_len - while low < high: - mid = ( low + high ) // 2 - position = mid * line_len - textloc_file.seek( position ) - - # Compare line with query and update low, high. - line = textloc_file.readline() - if line < query: - low = mid + 1 - else: - high = mid - - position = low * line_len - - # At right point in file, generate hits. - result = [] - while True: - line = textloc_file.readline() - if not line.startswith( query ): - break - if line[ -1: ] == '\n': - line = line[ :-1 ] - result.append( line.split()[1:] ) - - textloc_file.close() - return result - -class TracksDataProvider( BaseDataProvider ): - """ Base class for tracks data providers. """ - - """ - Mapping from column name to payload data; this mapping is used to create - filters. Key is column name, value is a dict with mandatory key 'index' and - optional key 'name'. E.g. this defines column 4 - - col_name_data_attr_mapping = {4 : { index: 5, name: 'Score' } } - """ - col_name_data_attr_mapping = {} - - def __init__( self, converted_dataset=None, original_dataset=None, dependencies=None, - error_max_vals="Only the first %i %s in this region are displayed." ): - super( TracksDataProvider, self ).__init__( converted_dataset=converted_dataset, - original_dataset=original_dataset, - dependencies=dependencies, - error_max_vals=error_max_vals ) - - def write_data_to_file( self, regions, filename ): - """ - Write data in region defined by chrom, start, and end to a file. - """ - raise Exception( "Unimplemented Function" ) - - def valid_chroms( self ): - """ - Returns chroms/contigs that the dataset contains - """ - return None # by default - - def has_data( self, chrom, start, end, **kwargs ): - """ - Returns true if dataset has data in the specified genome window, false - otherwise. - """ - raise Exception( "Unimplemented Function" ) - - def get_iterator( self, chrom, start, end ): - """ - Returns an iterator that provides data in the region chrom:start-end - """ - raise Exception( "Unimplemented Function" ) - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - """ - Process data from an iterator to a format that can be provided to client. - """ - raise Exception( "Unimplemented Function" ) - - def get_data( self, chrom, start, end, start_val=0, max_vals=sys.maxint, **kwargs ): - """ - Returns data in region defined by chrom, start, and end. start_val and - max_vals are used to denote the data to return: start_val is the first element to - return and max_vals indicates the number of values to return. - - Return value must be a dictionary with the following attributes: - dataset_type, data - """ - iterator = self.get_iterator( chrom, start, end ) - return self.process_data( iterator, start_val, max_vals, **kwargs ) - - def get_genome_data( self, chroms_info, **kwargs ): - """ - Returns data for complete genome. - """ - dataset_summary = [] - for chrom_info in chroms_info[ 'chrom_info' ]: - summary = self.get_data( chrom_info[ 'chrom' ], 0, chrom_info[ 'len' ], **kwargs ) - dataset_summary.append( summary ) - - return dataset_summary - - def get_filters( self ): - """ - Returns filters for provider's data. Return value is a list of - filters; each filter is a dictionary with the keys 'name', 'index', 'type'. - NOTE: This method uses the original dataset's datatype and metadata to - create the filters. - """ - # Get column names. - try: - column_names = self.original_dataset.datatype.column_names - except AttributeError: - try: - column_names = range( self.original_dataset.metadata.columns ) - except: # Give up - return [] - - # Dataset must have column types; if not, cannot create filters. - try: - column_types = self.original_dataset.metadata.column_types - except AttributeError: - return [] - - # Create and return filters. - filters = [] - if self.original_dataset.metadata.viz_filter_cols: - for viz_col_index in self.original_dataset.metadata.viz_filter_cols: - # Some columns are optional, so can't assume that a filter - # column is in dataset. - if viz_col_index >= len( column_names ): - continue; - col_name = column_names[ viz_col_index ] - # Make sure that column has a mapped index. If not, do not add filter. - try: - attrs = self.col_name_data_attr_mapping[ col_name ] - except KeyError: - continue - filters.append( - { 'name' : attrs[ 'name' ], 'type' : column_types[viz_col_index], \ - 'index' : attrs[ 'index' ] } ) - return filters - - def get_default_max_vals( self ): - return 5000 - -# -# -- Base mixins and providers -- -# - -class FilterableMixin: - def get_filters( self ): - """ Returns a dataset's filters. """ - - # is_ functions taken from Tabular.set_meta - def is_int( column_text ): - try: - int( column_text ) - return True - except: - return False - def is_float( column_text ): - try: - float( column_text ) - return True - except: - if column_text.strip().lower() == 'na': - return True #na is special cased to be a float - return False - - # - # Get filters. - # TODOs: - # (a) might be useful to move this into each datatype's set_meta method; - # (b) could look at first N lines to ensure GTF attribute types are consistent. - # - filters = [] - # HACK: first 8 fields are for drawing, so start filter column index at 9. - filter_col = 8 - if isinstance( self.original_dataset.datatype, Gff ): - # Can filter by score and GTF attributes. - filters = [ { 'name': 'Score', - 'type': 'number', - 'index': filter_col, - 'tool_id': 'Filter1', - 'tool_exp_name': 'c6' } ] - filter_col += 1 - if isinstance( self.original_dataset.datatype, Gtf ): - # Create filters based on dataset metadata. - for name, a_type in self.original_dataset.metadata.attribute_types.items(): - if a_type in [ 'int', 'float' ]: - filters.append( - { 'name': name, - 'type': 'number', - 'index': filter_col, - 'tool_id': 'gff_filter_by_attribute', - 'tool_exp_name': name } ) - filter_col += 1 - - ''' - # Old code: use first line in dataset to find attributes. - for i, line in enumerate( open(self.original_dataset.file_name) ): - if not line.startswith('#'): - # Look at first line for attributes and types. - attributes = parse_gff_attributes( line.split('\t')[8] ) - for attr, value in attributes.items(): - # Get attribute type. - if is_int( value ): - attr_type = 'int' - elif is_float( value ): - attr_type = 'float' - else: - attr_type = 'str' - # Add to filters. - if attr_type is not 'str': - filters.append( { 'name': attr, 'type': attr_type, 'index': filter_col } ) - filter_col += 1 - break - ''' - elif isinstance( self.original_dataset.datatype, Bed ): - # Can filter by score column only. - filters = [ { 'name': 'Score', - 'type': 'number', - 'index': filter_col, - 'tool_id': 'Filter1', - 'tool_exp_name': 'c5' - } ] - - return filters - - -class TabixDataProvider( FilterableMixin, TracksDataProvider ): - """ - Tabix index data provider for the Galaxy track browser. - """ - - col_name_data_attr_mapping = { 4 : { 'index': 4 , 'name' : 'Score' } } - - def get_iterator( self, chrom, start, end ): - start, end = int(start), int(end) - if end >= (2<<29): - end = (2<<29 - 1) # Tabix-enforced maximum - - bgzip_fname = self.dependencies['bgzip'].file_name - - tabix = ctabix.Tabixfile(bgzip_fname, index_filename=self.converted_dataset.file_name) - - # If chrom not in data, try alternative. - if chrom not in tabix.contigs: - chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) - - return tabix.fetch(reference=chrom, start=start, end=end) - - def write_data_to_file( self, regions, filename ): - out = open( filename, "w" ) - - for region in regions: - # Write data in region. - chrom = region.chrom - start = region.start - end = region.end - iterator = self.get_iterator( chrom, start, end ) - for line in iterator: - out.write( "%s\n" % line ) - - out.close() - -# -# -- Interval data providers -- -# - -class IntervalDataProvider( TracksDataProvider ): - """ - Processes BED data from native format to payload format. - - Payload format: [ uid (offset), start, end, name, strand, thick_start, thick_end, blocks ] - """ - - def get_iterator( self, chrom, start, end ): - raise Exception( "Unimplemented Function" ) - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - """ - Provides - """ - # Build data to return. Payload format is: - # [ <guid/offset>, <start>, <end>, <name>, <strand> ] - # - # First three entries are mandatory, others are optional. - # - filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) - no_detail = ( "no_detail" in kwargs ) - rval = [] - message = None - # Subtract one b/c columns are 1-based but indices are 0-based. - col_fn = lambda col: None if col is None else col - 1 - start_col = self.original_dataset.metadata.startCol - 1 - end_col = self.original_dataset.metadata.endCol - 1 - strand_col = col_fn( self.original_dataset.metadata.strandCol ) - name_col = col_fn( self.original_dataset.metadata.nameCol ) - for count, line in enumerate( iterator ): - if count < start_val: - continue - if max_vals and count-start_val >= max_vals: - message = self.error_max_vals % ( max_vals, "features" ) - break - - feature = line.split() - length = len(feature) - # Unique id is just a hash of the line - payload = [ hash(line), int( feature[start_col] ), int( feature [end_col] ) ] - - if no_detail: - rval.append( payload ) - continue - - # Name, strand. - if name_col: - payload.append( feature[name_col] ) - if strand_col: - # Put empty name as placeholder. - if not name_col: payload.append( "" ) - payload.append( feature[strand_col] ) - - # Score (filter data) - if length >= 5 and filter_cols and filter_cols[0] == "Score": - try: - payload.append( float( feature[4] ) ) - except: - payload.append( feature[4] ) - - rval.append( payload ) - - return { 'data': rval, 'message': message } - - def write_data_to_file( self, regions, filename ): - raise Exception( "Unimplemented Function" ) - -class IntervalTabixDataProvider( TabixDataProvider, IntervalDataProvider ): - """ - Provides data from a BED file indexed via tabix. - """ - pass - - -# -# -- BED data providers -- -# - -class BedDataProvider( TracksDataProvider ): - """ - Processes BED data from native format to payload format. - - Payload format: [ uid (offset), start, end, name, strand, thick_start, thick_end, blocks ] - """ - - def get_iterator( self, chrom, start, end ): - raise Exception( "Unimplemented Method" ) - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - """ - Provides - """ - # Build data to return. Payload format is: - # [ <guid/offset>, <start>, <end>, <name>, <strand>, <thick_start>, - # <thick_end>, <blocks> ] - # - # First three entries are mandatory, others are optional. - # - filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) - no_detail = ( "no_detail" in kwargs ) - rval = [] - message = None - for count, line in enumerate( iterator ): - if count < start_val: - continue - if max_vals and count-start_val >= max_vals: - message = self.error_max_vals % ( max_vals, "features" ) - break - # TODO: can we use column metadata to fill out payload? - # TODO: use function to set payload data - - feature = line.split() - length = len(feature) - # Unique id is just a hash of the line - payload = [ hash(line), int(feature[1]), int(feature[2]) ] - - if no_detail: - rval.append( payload ) - continue - - # Name, strand, thick start, thick end. - if length >= 4: - payload.append(feature[3]) - if length >= 6: - payload.append(feature[5]) - if length >= 8: - payload.append(int(feature[6])) - payload.append(int(feature[7])) - - # Blocks. - if length >= 12: - block_sizes = [ int(n) for n in feature[10].split(',') if n != ''] - block_starts = [ int(n) for n in feature[11].split(',') if n != '' ] - blocks = zip( block_sizes, block_starts ) - payload.append( [ ( int(feature[1]) + block[1], int(feature[1]) + block[1] + block[0] ) for block in blocks ] ) - - # Score (filter data) - if length >= 5 and filter_cols and filter_cols[0] == "Score": - # If dataset doesn't have name/strand/thick start/thick end/blocks, - # add placeholders. There should be 8 entries if all attributes - # are present. - payload.extend( [ None for i in range( 8 - len( payload ) ) ] ) - - try: - payload.append( float( feature[4] ) ) - except: - payload.append( feature[4] ) - - rval.append( payload ) - - return { 'data': rval, 'message': message } - - def write_data_to_file( self, regions, filename ): - out = open( filename, "w" ) - - for region in regions: - # Write data in region. - chrom = region.chrom - start = region.start - end = region.end - iterator = self.get_iterator( chrom, start, end ) - for line in iterator: - out.write( "%s\n" % line ) - - out.close() - -class BedTabixDataProvider( TabixDataProvider, BedDataProvider ): - """ - Provides data from a BED file indexed via tabix. - """ - pass - -class RawBedDataProvider( BedDataProvider ): - """ - Provide data from BED file. - - NOTE: this data provider does not use indices, and hence will be very slow - for large datasets. - """ - - def get_iterator( self, chrom=None, start=None, end=None ): - # Read first line in order to match chrom naming format. - line = source.readline() - dataset_chrom = line.split()[0] - if not _chrom_naming_matches( chrom, dataset_chrom ): - chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) - # Undo read. - source.seek( 0 ) - - def line_filter_iter(): - for line in open( self.original_dataset.file_name ): - if line.startswith( "track" ) or line.startswith( "browser" ): - continue - feature = line.split() - feature_chrom = feature[0] - feature_start = int( feature[1] ) - feature_end = int( feature[2] ) - if ( chrom is not None and feature_chrom != chrom ) \ - or ( start is not None and feature_start > end ) \ - or ( end is not None and feature_end < start ): - continue - yield line - - return line_filter_iter() - -# -# -- VCF data providers -- -# - -class VcfDataProvider( TracksDataProvider ): - """ - Abstract class that processes VCF data from native format to payload format. - - Payload format: TODO - """ - - col_name_data_attr_mapping = { 'Qual' : { 'index': 6 , 'name' : 'Qual' } } - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - """ - Returns a dict with the following attributes: - data - a list of variants with the format - [<guid>, <start>, <end>, <name>, cigar, seq] - - message - error/informative message - """ - rval = [] - message = None - - def get_mapping( ref, alt ): - """ - Returns ( offset, new_seq, cigar ) tuple that defines mapping of - alt to ref. Cigar format is an array of [ op_index, length ] pairs - where op_index is the 0-based index into the string "MIDNSHP=X" - """ - - cig_ops = "MIDNSHP=X" - - ref_len = len( ref ) - alt_len = len( alt ) - - # Substitutions? - if ref_len == alt_len: - return 0, alt, [ [ cig_ops.find( "M" ), ref_len ] ] - - # Deletions? - alt_in_ref_index = ref.find( alt ) - if alt_in_ref_index != -1: - return alt_in_ref_index, ref[ alt_in_ref_index + 1: ], [ [ cig_ops.find( "D" ), ref_len - alt_len ] ] - - # Insertions? - ref_in_alt_index = alt.find( ref ) - if ref_in_alt_index != -1: - return ref_in_alt_index, alt[ ref_in_alt_index + 1: ], [ [ cig_ops.find( "I" ), alt_len - ref_len ] ] - - # Pack data. - for count, line in enumerate( iterator ): - if count < start_val: - continue - if max_vals and count-start_val >= max_vals: - message = self.error_max_vals % ( max_vals, "features" ) - break - - feature = line.split() - start = int( feature[1] ) - 1 - ref = feature[3] - alts = feature[4] - - # HACK? alts == '.' --> monomorphism. - if alts == '.': - alts = ref - - # Pack variants. - for alt in alts.split(","): - offset, new_seq, cigar = get_mapping( ref, alt ) - start += offset - end = start + len( new_seq ) - - # Pack line. - payload = [ - hash( line ), - start, - end, - # ID: - feature[2], - cigar, - # TODO? VCF does not have strand, so default to positive. - "+", - new_seq, - None if feature[5] == '.' else float( feature[5] ) - ] - rval.append(payload) - - return { 'data': rval, 'message': message } - - def write_data_to_file( self, regions, filename ): - out = open( filename, "w" ) - - for region in regions: - # Write data in region. - chrom = region.chrom - start = region.start - end = region.end - iterator = self.get_iterator( chrom, start, end ) - for line in iterator: - out.write( "%s\n" % line ) - out.close() - -class VcfTabixDataProvider( TabixDataProvider, VcfDataProvider ): - """ - Provides data from a VCF file indexed via tabix. - """ - pass - -class RawVcfDataProvider( VcfDataProvider ): - """ - Provide data from VCF file. - - NOTE: this data provider does not use indices, and hence will be very slow - for large datasets. - """ - - def get_iterator( self, chrom, start, end ): - # Read first line in order to match chrom naming format. - line = source.readline() - dataset_chrom = line.split()[0] - if not _chrom_naming_matches( chrom, dataset_chrom ): - chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) - # Undo read. - source.seek( 0 ) - - def line_filter_iter(): - for line in open( self.original_dataset.file_name ): - if line.startswith("#"): - continue - variant = line.split() - variant_chrom, variant_start, id, ref, alts = variant[ 0:5 ] - variant_start = int( variant_start ) - longest_alt = -1 - for alt in alts: - if len( alt ) > longest_alt: - longest_alt = len( alt ) - variant_end = variant_start + abs( len( ref ) - longest_alt ) - if variant_chrom != chrom or variant_start > end or variant_end < start: - continue - yield line - - return line_filter_iter() - -class SummaryTreeDataProvider( TracksDataProvider ): - """ - Summary tree data provider for the Galaxy track browser. - """ - - CACHE = LRUCache( 20 ) # Store 20 recently accessed indices for performance - - def valid_chroms( self ): - st = summary_tree_from_file( self.converted_dataset.file_name ) - return st.chrom_blocks.keys() - - def get_data( self, chrom, start, end, level=None, resolution=None, detail_cutoff=None, draw_cutoff=None ): - """ - Returns summary tree data for a given genomic region. - """ - filename = self.converted_dataset.file_name - st = self.CACHE[filename] - if st is None: - st = summary_tree_from_file( self.converted_dataset.file_name ) - self.CACHE[filename] = st - - # Look for chrom in tree using both naming conventions. - if chrom not in st.chrom_blocks: - chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) - if chrom not in st.chrom_blocks: - return None - - # Get or compute level. - if level: - level = int( level ) - elif resolution: - resolution = max( 1, ceil( float( resolution ) ) ) - level = ceil( log( resolution, st.block_size ) ) - 1 - level = int( max( level, 0 ) ) - else: - # Either level or resolution is required. - return None - - if level <= 1: - return "detail" - - # Use level to get results. - stats = st.chrom_stats[ chrom ] - results = st.query( chrom, int(start), int(end), level, detail_cutoff=detail_cutoff, draw_cutoff=draw_cutoff ) - if results == "detail" or results == "draw": - return results - else: - return results, stats[ level ][ "max" ], stats[ level ]["avg" ], stats[ level ][ "delta" ] - - def has_data( self, chrom ): - """ - Returns true if dataset has data for this chrom - """ - - # Get summary tree. - filename = self.converted_dataset.file_name - st = self.CACHE[filename] - if st is None: - st = summary_tree_from_file( self.converted_dataset.file_name ) - self.CACHE[filename] = st - - # Check for data. - return st.chrom_blocks.get(chrom, None) or st.chrom_blocks.get(_convert_between_ucsc_and_ensemble_naming(chrom), None) - -class BamDataProvider( TracksDataProvider, FilterableMixin ): - """ - Provides access to intervals from a sorted indexed BAM file. Position data - is reported in 1-based, closed format, i.e. SAM/BAM format. - """ - - def get_filters( self ): - """ - Returns filters for dataset. - """ - # HACK: first 7 fields are for drawing, so start filter column index at 7. - filter_col = 7 - filters = [] - filters.append( { 'name': 'Mapping Quality', - 'type': 'number', - 'index': filter_col - } ) - return filters - - - def write_data_to_file( self, regions, filename ): - """ - Write reads in regions to file. - """ - - # Open current BAM file using index. - bamfile = csamtools.Samfile( filename=self.original_dataset.file_name, mode='rb', \ - index_filename=self.converted_dataset.file_name ) - - # TODO: write headers as well? - new_bamfile = csamtools.Samfile( template=bamfile, filename=filename, mode='wb' ) - - for region in regions: - # Write data from region. - chrom = region.chrom - start = region.start - end = region.end - - try: - data = bamfile.fetch(start=start, end=end, reference=chrom) - except ValueError, e: - # Try alternative chrom naming. - chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) - try: - data = bamfile.fetch( start=start, end=end, reference=chrom ) - except ValueError: - return None - - # Write reads in region. - for i, read in enumerate( data ): - new_bamfile.write( read ) - - # Cleanup. - new_bamfile.close() - bamfile.close() - - def get_iterator( self, chrom, start, end ): - """ - Returns an iterator that provides data in the region chrom:start-end - """ - start, end = int(start), int(end) - orig_data_filename = self.original_dataset.file_name - index_filename = self.converted_dataset.file_name - - # Attempt to open the BAM file with index - bamfile = csamtools.Samfile( filename=orig_data_filename, mode='rb', index_filename=index_filename ) - try: - data = bamfile.fetch(start=start, end=end, reference=chrom) - except ValueError, e: - # Try alternative chrom naming. - chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) - try: - data = bamfile.fetch( start=start, end=end, reference=chrom ) - except ValueError: - return None - return data - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - """ - Returns a dict with the following attributes: - data - a list of reads with the format - [<guid>, <start>, <end>, <name>, <read_1>, <read_2>, [empty], <mapq_scores>] - where <read_1> has the format - [<start>, <end>, <cigar>, <strand>, <read_seq>] - and <read_2> has the format - [<start>, <end>, <cigar>, <strand>, <read_seq>] - Field 7 is empty so that mapq scores' location matches that in single-end reads. - For single-end reads, read has format: - [<guid>, <start>, <end>, <name>, <cigar>, <strand>, <seq>, <mapq_score>] - - NOTE: read end and sequence data are not valid for reads outside of - requested region and should not be used. - - max_low - lowest coordinate for the returned reads - max_high - highest coordinate for the returned reads - message - error/informative message - """ - # No iterator indicates no reads. - if iterator is None: - return { 'data': [], 'message': None } - - # Decode strand from read flag. - def decode_strand( read_flag, mask ): - strand_flag = ( read_flag & mask == 0 ) - if strand_flag: - return "+" - else: - return "-" - - # Encode reads as list of lists. - results = [] - paired_pending = {} - unmapped = 0 - message = None - for count, read in enumerate( iterator ): - if count < start_val: - continue - if ( count - start_val - unmapped ) >= max_vals: - message = self.error_max_vals % ( max_vals, "reads" ) - break - - # If not mapped, skip read. - is_mapped = ( read.flag & 0x0004 == 0 ) - if not is_mapped: - unmapped += 1 - continue - - qname = read.qname - seq = read.seq - strand = decode_strand( read.flag, 0x0010 ) - if read.cigar is not None: - read_len = sum( [cig[1] for cig in read.cigar] ) # Use cigar to determine length - else: - read_len = len(seq) # If no cigar, just use sequence length - - if read.is_proper_pair: - if qname in paired_pending: # one in dict is always first - pair = paired_pending[qname] - results.append( [ "%i_%s" % ( pair['start'], qname ), - pair['start'], - read.pos + read_len, - qname, - [ pair['start'], pair['end'], pair['cigar'], pair['strand'], pair['seq'] ], - [ read.pos, read.pos + read_len, read.cigar, strand, seq ], - None, [ pair['mapq'], read.mapq ] - ] ) - del paired_pending[qname] - else: - paired_pending[qname] = { 'start': read.pos, 'end': read.pos + read_len, 'seq': seq, 'mate_start': read.mpos, - 'rlen': read_len, 'strand': strand, 'cigar': read.cigar, 'mapq': read.mapq } - else: - results.append( [ "%i_%s" % ( read.pos, qname ), - read.pos, read.pos + read_len, qname, - read.cigar, strand, read.seq, read.mapq ] ) - - # Take care of reads whose mates are out of range. - # TODO: count paired reads when adhering to max_vals? - for qname, read in paired_pending.iteritems(): - if read['mate_start'] < read['start']: - # Mate is before read. - read_start = read['mate_start'] - read_end = read['end'] - # Make read_1 start=end so that length is 0 b/c we don't know - # read length. - r1 = [ read['mate_start'], read['mate_start'] ] - r2 = [ read['start'], read['end'], read['cigar'], read['strand'], read['seq'] ] - else: - # Mate is after read. - read_start = read['start'] - # Make read_2 start=end so that length is 0 b/c we don't know - # read length. Hence, end of read is start of read_2. - read_end = read['mate_start'] - r1 = [ read['start'], read['end'], read['cigar'], read['strand'], read['seq'] ] - r2 = [ read['mate_start'], read['mate_start'] ] - - results.append( [ "%i_%s" % ( read_start, qname ), read_start, read_end, qname, r1, r2, [read[ 'mapq' ], 125] ] ) - - # Clean up. TODO: is this needed? If so, we'll need a cleanup function after processing the data. - # bamfile.close() - - max_low, max_high = get_bounds( results, 1, 2 ) - - return { 'data': results, 'message': message, 'max_low': max_low, 'max_high': max_high } - -class SamDataProvider( BamDataProvider ): - - def __init__( self, converted_dataset=None, original_dataset=None, dependencies=None ): - """ Create SamDataProvider. """ - - # HACK: to use BamDataProvider, original dataset must be BAM and - # converted dataset must be BAI. Use BAI from BAM metadata. - if converted_dataset: - self.converted_dataset = converted_dataset.metadata.bam_index - self.original_dataset = converted_dataset - self.dependencies = dependencies - -class BBIDataProvider( TracksDataProvider ): - """ - BBI data provider for the Galaxy track browser. - """ - def valid_chroms( self ): - # No way to return this info as of now - return None - - def has_data( self, chrom ): - f, bbi = self._get_dataset() - all_dat = bbi.query(chrom, 0, 2147483647, 1) - f.close() - return all_dat is not None - - def get_data( self, chrom, start, end, start_val=0, max_vals=None, **kwargs ): - # Bigwig can be a standalone bigwig file, in which case we use - # original_dataset, or coming from wig->bigwig conversion in - # which we use converted_dataset - f, bbi = self._get_dataset() - - # If stats requested, compute overall summary data for the range - # start:endbut no reduced data. This is currently used by client - # to determine the default range. - if 'stats' in kwargs: - summary = bbi.summarize( chrom, start, end, 1 ) - f.close() - - min = 0 - max = 0 - mean = 0 - sd = 0 - if summary is not None: - # Does the summary contain any defined values? - valid_count = summary.valid_count[0] - if summary.valid_count > 0: - # Compute $\mu \pm 2\sigma$ to provide an estimate for upper and lower - # bounds that contain ~95% of the data. - mean = summary.sum_data[0] / valid_count - var = summary.sum_squares[0] - mean - if valid_count > 1: - var /= valid_count - 1 - sd = numpy.sqrt( var ) - min = summary.min_val[0] - max = summary.max_val[0] - - return dict( data=dict( min=min, max=max, mean=mean, sd=sd ) ) - - # Sample from region using approximately this many samples. - N = 1000 - - def summarize_region( bbi, chrom, start, end, num_points ): - ''' - Returns results from summarizing a region using num_points. - NOTE: num_points cannot be greater than end - start or BBI - will return None for all positions.s - ''' - result = [] - - # Get summary; this samples at intervals of length - # (end - start)/num_points -- i.e. drops any fractional component - # of interval length. - summary = bbi.summarize( chrom, start, end, num_points ) - if summary: - #mean = summary.sum_data / summary.valid_count - - ## Standard deviation by bin, not yet used - ## var = summary.sum_squares - mean - ## var /= minimum( valid_count - 1, 1 ) - ## sd = sqrt( var ) - - pos = start - step_size = (end - start) / num_points - - for i in range( num_points ): - result.append( (pos, float_nan( summary.sum_data[i] / summary.valid_count[i] ) ) ) - pos += step_size - - return result - - # Approach is different depending on region size. - if end - start < N: - # Get values for individual bases in region, including start and end. - # To do this, need to increase end to next base and request number of points. - num_points = end - start + 1 - end += 1 - else: - # - # The goal is to sample the region between start and end uniformly - # using ~N data points. The challenge is that the size of sampled - # intervals rarely is full bases, so sampling using N points will - # leave the end of the region unsampled due to remainders for each - # interval. To recitify this, a new N is calculated based on the - # step size that covers as much of the region as possible. - # - # However, this still leaves some of the region unsampled. This - # could be addressed by repeatedly sampling remainder using a - # smaller and smaller step_size, but that would require iteratively - # going to BBI, which could be time consuming. - # - - # Start with N samples. - num_points = N - step_size = ( end - start ) / num_points - # Add additional points to sample in the remainder not covered by - # the initial N samples. - remainder_start = start + step_size * num_points - additional_points = ( end - remainder_start ) / step_size - num_points += additional_points - - result = summarize_region( bbi, chrom, start, end, num_points ) - - # Cleanup and return. - f.close() - return { 'data': result } - -class BigBedDataProvider( BBIDataProvider ): - def _get_dataset( self ): - # Nothing converts to bigBed so we don't consider converted dataset - f = open( self.original_dataset.file_name ) - return f, BigBedFile(file=f) - -class BigWigDataProvider ( BBIDataProvider ): - """ - Provides data from BigWig files; position data is reported in 1-based - coordinate system, i.e. wiggle format. - """ - def _get_dataset( self ): - if self.converted_dataset is not None: - f = open( self.converted_dataset.file_name ) - else: - f = open( self.original_dataset.file_name ) - return f, BigWigFile(file=f) - -class IntervalIndexDataProvider( FilterableMixin, TracksDataProvider ): - """ - Interval index files used only for GFF files. - """ - col_name_data_attr_mapping = { 4 : { 'index': 4 , 'name' : 'Score' } } - - def write_data_to_file( self, regions, filename ): - source = open( self.original_dataset.file_name ) - index = Indexes( self.converted_dataset.file_name ) - out = open( filename, 'w' ) - - for region in regions: - # Write data from region. - chrom = region.chrom - start = region.start - end = region.end - for start, end, offset in index.find(chrom, start, end): - source.seek( offset ) - - reader = GFFReaderWrapper( source, fix_strand=True ) - feature = reader.next() - for interval in feature.intervals: - out.write( '\t'.join( interval.fields ) + '\n' ) - - out.close() - - def get_iterator( self, chrom, start, end ): - """ - Returns an array with values: (a) source file and (b) an iterator that - provides data in the region chrom:start-end - """ - start, end = int(start), int(end) - source = open( self.original_dataset.file_name ) - index = Indexes( self.converted_dataset.file_name ) - - if chrom not in index.indexes: - # Try alternative naming. - chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) - - return index.find(chrom, start, end) - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - results = [] - message = None - source = open( self.original_dataset.file_name ) - - # - # Build data to return. Payload format is: - # [ <guid/offset>, <start>, <end>, <name>, <score>, <strand>, <thick_start>, - # <thick_end>, <blocks> ] - # - # First three entries are mandatory, others are optional. - # - filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) - no_detail = ( "no_detail" in kwargs ) - for count, val in enumerate( iterator ): - start, end, offset = val[0], val[1], val[2] - if count < start_val: - continue - if count-start_val >= max_vals: - message = self.error_max_vals % ( max_vals, "features" ) - break - source.seek( offset ) - # TODO: can we use column metadata to fill out payload? - - # GFF dataset. - reader = GFFReaderWrapper( source, fix_strand=True ) - feature = reader.next() - payload = package_gff_feature( feature, no_detail, filter_cols ) - payload.insert( 0, offset ) - - results.append( payload ) - - return { 'data': results, 'message': message } - -class RawGFFDataProvider( TracksDataProvider ): - """ - Provide data from GFF file that has not been indexed. - - NOTE: this data provider does not use indices, and hence will be very slow - for large datasets. - """ - - def get_iterator( self, chrom, start, end ): - """ - Returns an iterator that provides data in the region chrom:start-end as well as - a file offset. - """ - source = open( self.original_dataset.file_name ) - - # Read first line in order to match chrom naming format. - line = source.readline() - dataset_chrom = line.split()[0] - if not _chrom_naming_matches( chrom, dataset_chrom ): - chrom = _convert_between_ucsc_and_ensemble_naming( chrom ) - # Undo read. - source.seek( 0 ) - - def features_in_region_iter(): - offset = 0 - for feature in GFFReaderWrapper( source, fix_strand=True ): - # Only provide features that are in region. - feature_start, feature_end = convert_gff_coords_to_bed( [ feature.start, feature.end ] ) - if feature.chrom == chrom and feature_end > start and feature_start < end: - yield feature, offset - offset += feature.raw_size - - return features_in_region_iter() - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - """ - Process data from an iterator to a format that can be provided to client. - """ - filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) - no_detail = ( "no_detail" in kwargs ) - results = [] - message = None - - for count, ( feature, offset ) in enumerate( iterator ): - if count < start_val: - continue - if count-start_val >= max_vals: - message = self.error_max_vals % ( max_vals, "reads" ) - break - - payload = package_gff_feature( feature, no_detail=no_detail, filter_cols=filter_cols ) - payload.insert( 0, offset ) - results.append( payload ) - - - return { 'data': results, 'message': message } - -class GtfTabixDataProvider( TabixDataProvider ): - """ - Returns data from GTF datasets that are indexed via tabix. - """ - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - # Loop through lines and group by transcript_id; each group is a feature. - - # TODO: extend this code or use code in gff_util to process GFF/3 as well - # and then create a generic GFFDataProvider that can be used with both - # raw and tabix datasets. - features = {} - for count, line in enumerate( iterator ): - line_attrs = parse_gff_attributes( line.split('\t')[8] ) - transcript_id = line_attrs[ 'transcript_id' ] - if transcript_id in features: - feature = features[ transcript_id ] - else: - feature = [] - features[ transcript_id ] = feature - feature.append( GFFInterval( None, line.split( '\t') ) ) - - # Process data. - filter_cols = from_json_string( kwargs.get( "filter_cols", "[]" ) ) - no_detail = ( "no_detail" in kwargs ) - results = [] - message = None - - for count, intervals in enumerate( features.values() ): - if count < start_val: - continue - if count-start_val >= max_vals: - message = self.error_max_vals % ( max_vals, "reads" ) - break - - feature = GFFFeature( None, intervals=intervals ) - payload = package_gff_feature( feature, no_detail=no_detail, filter_cols=filter_cols ) - payload.insert( 0, feature.intervals[ 0 ].attributes[ 'transcript_id' ] ) - results.append( payload ) - - return { 'data': results, 'message': message } - -# -# -- ENCODE Peak data providers. -# - -class ENCODEPeakDataProvider( TracksDataProvider ): - """ - Abstract class that processes ENCODEPeak data from native format to payload format. - - Payload format: [ uid (offset), start, end, name, strand, thick_start, thick_end, blocks ] - """ - - def get_iterator( self, chrom, start, end ): - raise "Unimplemented Method" - - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - """ - Provides - """ - - ## FIXMEs: - # (1) should be able to unify some of this code with BedDataProvider.process_data - # (2) are optional number of parameters supported? - - # Build data to return. Payload format is: - # [ <guid/offset>, <start>, <end>, <name>, <strand>, <thick_start>, - # <thick_end>, <blocks> ] - # - # First three entries are mandatory, others are optional. - # - no_detail = ( "no_detail" in kwargs ) - rval = [] - message = None - for count, line in enumerate( iterator ): - if count < start_val: - continue - if max_vals and count-start_val >= max_vals: - message = self.error_max_vals % ( max_vals, "features" ) - break - - feature = line.split() - length = len( feature ) - - # Feature initialization. - payload = [ - # GUID is just a hash of the line - hash( line ), - # Add start, end. - int( feature[1] ), - int( feature[2] ) - ] - - if no_detail: - rval.append( payload ) - continue - - # Extend with additional data. - payload.extend( [ - # Add name, strand. - feature[3], - feature[5], - # Thick start, end are feature start, end for now. - int( feature[1] ), - int( feature[2] ), - # No blocks. - None, - # Filtering data: Score, signalValue, pValue, qValue. - float( feature[4] ), - float( feature[6] ), - float( feature[7] ), - float( feature[8] ) - ] ) - - rval.append( payload ) - - return { 'data': rval, 'message': message } - -class ENCODEPeakTabixDataProvider( TabixDataProvider, ENCODEPeakDataProvider ): - """ - Provides data from an ENCODEPeak dataset indexed via tabix. - """ - - def get_filters( self ): - """ - Returns filters for dataset. - """ - # HACK: first 8 fields are for drawing, so start filter column index at 9. - filter_col = 8 - filters = [] - filters.append( { 'name': 'Score', - 'type': 'number', - 'index': filter_col, - 'tool_id': 'Filter1', - 'tool_exp_name': 'c6' } ) - filter_col += 1 - filters.append( { 'name': 'Signal Value', - 'type': 'number', - 'index': filter_col, - 'tool_id': 'Filter1', - 'tool_exp_name': 'c7' } ) - filter_col += 1 - filters.append( { 'name': 'pValue', - 'type': 'number', - 'index': filter_col, - 'tool_id': 'Filter1', - 'tool_exp_name': 'c8' } ) - filter_col += 1 - filters.append( { 'name': 'qValue', - 'type': 'number', - 'index': filter_col, - 'tool_id': 'Filter1', - 'tool_exp_name': 'c9' } ) - return filters - -# -# -- ChromatinInteraction data providers -- -# -class ChromatinInteractionsDataProvider( TracksDataProvider ): - def process_data( self, iterator, start_val=0, max_vals=None, **kwargs ): - """ - Provides - """ - - rval = [] - message = None - for count, line in enumerate( iterator ): - if count < start_val: - continue - if max_vals and count-start_val >= max_vals: - message = self.error_max_vals % ( max_vals, "interactions" ) - break - - feature = line.split() - length = len( feature ) - - s1 = int( feature[1] ), - e1 = int( feature[2] ), - c = feature[3], - s2 = int( feature[4] ), - e2 = int( feature[5] ), - v = float( feature[6] ) - - # Feature initialization. - payload = [ - # GUID is just a hash of the line - hash( line ), - # Add start1, end1, chr2, start2, end2, value. - s1, e1, c, s2, e2, v - ] - - rval.append( payload ) - - return { 'data': rval, 'message': message } - - def get_default_max_vals( self ): - return 50000; - -class ChromatinInteractionsTabixDataProvider( TabixDataProvider, ChromatinInteractionsDataProvider ): - def get_iterator( self, chrom, start, end ): - """ - """ - # Modify start as needed to get earlier interactions with start region. - start = max( 0, int( start) - 1000000 ) - def filter( iter ): - for line in iter: - feature = line.split() - s1 = int( feature[1] ), - e1 = int( feature[2] ), - c = feature[3] - s2 = int( feature[4] ), - e2 = int( feature[5] ), - if ( ( c == chrom ) and ( s1 < end and e1 > start ) and ( s2 < end and e2 > start ) ): - yield line - return filter( TabixDataProvider.get_iterator( self, chrom, start, end ) ) - -# -# -- Helper methods. -- -# - -# Mapping from dataset type name to a class that can fetch data from a file of that -# type. First key is converted dataset type; if result is another dict, second key -# is original dataset type. TODO: This needs to be more flexible. -dataset_type_name_to_data_provider = { - "tabix": { - Vcf: VcfTabixDataProvider, - Bed: BedTabixDataProvider, - Gtf: GtfTabixDataProvider, - ENCODEPeak: ENCODEPeakTabixDataProvider, - Interval: IntervalTabixDataProvider, - ChromatinInteractions: ChromatinInteractionsTabixDataProvider, - "default" : TabixDataProvider - }, - "interval_index": IntervalIndexDataProvider, - "bai": BamDataProvider, - "bam": SamDataProvider, - "summary_tree": SummaryTreeDataProvider, - "bigwig": BigWigDataProvider, - "bigbed": BigBedDataProvider -} - -def get_data_provider( name=None, original_dataset=None ): - """ - Returns data provider class by name and/or original dataset. - """ - data_provider = None - if name: - value = dataset_type_name_to_data_provider[ name ] - if isinstance( value, dict ): - # Get converter by dataset extension; if there is no data provider, - # get the default. - data_provider = value.get( original_dataset.datatype.__class__, value.get( "default" ) ) - else: - data_provider = value - elif original_dataset: - # Look up data provider from datatype's informaton. - try: - # Get data provider mapping and data provider for 'data'. If - # provider available, use it; otherwise use generic provider. - _ , data_provider_mapping = original_dataset.datatype.get_track_type() - if 'data_standalone' in data_provider_mapping: - data_provider_name = data_provider_mapping[ 'data_standalone' ] - else: - data_provider_name = data_provider_mapping[ 'data' ] - if data_provider_name: - data_provider = get_data_provider( name=data_provider_name, original_dataset=original_dataset ) - else: - data_provider = TracksDataProvider - except: - pass - return data_provider - -def package_gff_feature( feature, no_detail=False, filter_cols=[] ): - """ Package a GFF feature in an array for data providers. """ - feature = convert_gff_coords_to_bed( feature ) - - # No detail means only start, end. - if no_detail: - return [ feature.start, feature.end ] - - # Return full feature. - payload = [ feature.start, - feature.end, - feature.name(), - feature.strand, - # No notion of thick start, end in GFF, so make everything - # thick. - feature.start, - feature.end - ] - - # HACK: ignore interval with name 'transcript' from feature. - # Cufflinks puts this interval in each of its transcripts, - # and they mess up trackster by covering the feature's blocks. - # This interval will always be a feature's first interval, - # and the GFF's third column is its feature name. - feature_intervals = feature.intervals - if feature.intervals[0].fields[2] == 'transcript': - feature_intervals = feature.intervals[1:] - # Add blocks. - block_sizes = [ (interval.end - interval.start ) for interval in feature_intervals ] - block_starts = [ ( interval.start - feature.start ) for interval in feature_intervals ] - blocks = zip( block_sizes, block_starts ) - payload.append( [ ( feature.start + block[1], feature.start + block[1] + block[0] ) for block in blocks ] ) - - # Add filter data to payload. - for col in filter_cols: - if col == "Score": - if feature.score == 'nan': - payload.append( feature.score ) - else: - try: - f = float( feature.score ) - payload.append( f ) - except: - payload.append( feature.score ) - elif col in feature.attributes: - if feature.attributes[col] == 'nan': - payload.append( feature.attributes[col] ) - else: - try: - f = float( feature.attributes[col] ) - payload.append( f ) - except: - payload.append( feature.attributes[col] ) - else: - # Dummy value. - payload.append( 0 ) - return payload diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/visualization/tracks/summary.py --- a/lib/galaxy/visualization/tracks/summary.py +++ /dev/null @@ -1,111 +0,0 @@ -''' -Summary tree data structure for feature aggregation across large genomic regions. -''' - -import sys, os -import cPickle - -# TODO: What are the performance implications of setting min level to 1? Data -# structure size and/or query speed? It would be nice to have level 1 data -# so that client does not have to compute it. -MIN_LEVEL = 2 - -class SummaryTree: - def __init__( self, block_size=25, levels=6, draw_cutoff=150, detail_cutoff=30 ): - self.chrom_blocks = {} - self.levels = levels - self.draw_cutoff = draw_cutoff - self.detail_cutoff = detail_cutoff - self.block_size = block_size - self.chrom_stats = {} - - def find_block( self, num, level ): - """ Returns block that num is in for level. """ - return ( num / self.block_size ** level ) - - def insert_range( self, chrom, start, end ): - """ Inserts a feature at chrom:start-end into the tree. """ - - # Get or set up chrom blocks. - if chrom in self.chrom_blocks: - blocks = self.chrom_blocks[ chrom ] - else: - blocks = self.chrom_blocks[ chrom ] = {} - self.chrom_stats[ chrom ] = {} - for level in range( MIN_LEVEL, self.levels + 1 ): - blocks[ level ] = {} - - # Insert feature into all matching blocks at all levels. - for level in range( MIN_LEVEL, self.levels + 1 ): - block_level = blocks[ level ] - starting_block = self.find_block( start, level ) - ending_block = self.find_block( end, level ) - for block in range( starting_block, ending_block + 1 ): - if block in block_level: - block_level[ block ] += 1 - else: - block_level[ block ] = 1 - - def finish( self ): - """ Compute stats for levels. """ - - for chrom, blocks in self.chrom_blocks.iteritems(): - for level in range( self.levels, MIN_LEVEL - 1, -1 ): - # Set level's stats. - max_val = max( blocks[ level ].values() ) - self.chrom_stats[ chrom ][ level ] = {} - self.chrom_stats[ chrom ][ level ][ "delta" ] = self.block_size ** level - self.chrom_stats[ chrom ][ level ][ "max" ] = max_val - self.chrom_stats[ chrom ][ level ][ "avg" ] = float( max_val ) / len( blocks[ level ] ) - - self.chrom_blocks[ chrom ] = dict( [ ( key, value ) for key, value in blocks.iteritems() ] ) - - def query( self, chrom, start, end, level, draw_cutoff=None, detail_cutoff=None ): - """ Queries tree for data. """ - - # Set cutoffs to self's attributes if not defined. - if draw_cutoff != 0: - draw_cutoff = self.draw_cutoff - if detail_cutoff != 0: - detail_cutoff = self.detail_cutoff - - # Get data. - if chrom in self.chrom_blocks: - stats = self.chrom_stats[ chrom ] - - # For backwards compatibility: - if "detail_level" in stats and level <= stats[ "detail_level" ]: - return "detail" - elif "draw_level" in stats and level <= stats[ "draw_level" ]: - return "draw" - - # If below draw, detail level, return string to denote this. - max = stats[ level ][ "max" ] - if max < detail_cutoff: - return "detail" - if max < draw_cutoff: - return "draw" - - # Return block data. - blocks = self.chrom_blocks[ chrom ] - results = [] - multiplier = self.block_size ** level - starting_block = self.find_block( start, level ) - ending_block = self.find_block( end, level ) - for block in range( starting_block, ending_block + 1 ): - val = 0 - if block in blocks[ level ]: - val = blocks[ level ][ block ] - results.append( ( block * multiplier, val ) ) - return results - - return None - - def write( self, filename ): - """ Writes tree to file. """ - self.finish() - cPickle.dump( self, open( filename, 'wb' ), 2 ) - -def summary_tree_from_file( filename ): - return cPickle.load( open( filename, "rb" ) ) - diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/visualization/tracks/visual_analytics.py --- a/lib/galaxy/visualization/tracks/visual_analytics.py +++ /dev/null @@ -1,80 +0,0 @@ -import urllib - -from galaxy.tools.parameters.basic import IntegerToolParameter, FloatToolParameter, SelectToolParameter -from galaxy.tools.parameters.dynamic_options import DynamicOptions - -class TracksterConfig: - """ Trackster configuration encapsulation. """ - - def __init__( self, actions ): - self.actions = actions - - @staticmethod - def parse( root ): - actions = [] - for action_elt in root.findall( "action" ): - actions.append( SetParamAction.parse( action_elt ) ) - return TracksterConfig( actions ) - -class SetParamAction: - """ Set parameter action. """ - - def __init__( self, name, output_name ): - self.name = name - self.output_name = output_name - - @staticmethod - def parse( elt ): - """ Parse action from element. """ - return SetParamAction( elt.get( "name" ), elt.get( "output_name" ) ) - -def get_dataset_job( hda ): - # Get dataset's job. - job = None - for job_output_assoc in hda.creating_job_associations: - job = job_output_assoc.job - break - return job - -def get_tool_def( trans, hda ): - """ Returns definition of an interactive tool for an HDA. """ - - job = get_dataset_job( hda ) - # TODO: could use this assertion to provide more information. - # assert job is not None, 'Requested job has not been loaded.' - if not job: - return None - tool = trans.app.toolbox.get_tool( job.tool_id ) - # TODO: could use this assertion to provide more information. - # assert tool is not None, 'Requested tool has not been loaded.' - if not tool: - return None - - # Tool must have a Trackster configuration. - if not tool.trackster_conf: - return None - - # Get list of tool parameters that can be interactively modified. - tool_params = [] - tool_param_values = dict( [ ( p.name, p.value ) for p in job.parameters ] ) - tool_param_values = tool.params_from_strings( tool_param_values, trans.app, ignore_errors=True ) - for name, input in tool.inputs.items(): - if type( input ) == IntegerToolParameter or type( input ) == FloatToolParameter: - param_dict = { 'name' : name, 'label' : input.label, \ - 'value' : tool_param_values.get( name, input.value ), \ - 'type' : 'number', 'init_value' : input.value, - 'html' : urllib.quote( input.get_html() ) } - if input.min: - param_dict['min'] = input.min - if input.max: - param_dict['max'] = input.max - tool_params.append( param_dict ) - elif type( input ) == SelectToolParameter and type( input.options ) != DynamicOptions: - tool_params.append( { 'name' : name, 'label' : input.label, 'type' : 'select', \ - 'value' : tool_param_values.get( name, None ), \ - 'html' : urllib.quote( input.get_html() ) } ) - - # If tool has parameters that can be interactively modified, return tool. - if len( tool_params ) != 0: - return { 'name' : tool.name, 'params' : tool_params } - return None \ No newline at end of file diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/web/api/tools.py --- a/lib/galaxy/web/api/tools.py +++ b/lib/galaxy/web/api/tools.py @@ -1,9 +1,9 @@ from galaxy import web, util from galaxy.web.base.controller import BaseAPIController, UsesHistoryDatasetAssociationMixin, UsesVisualizationMixin, messages, get_highest_priority_msg -from galaxy.visualization.tracks.visual_analytics import get_dataset_job +from galaxy.visualization.genome.visual_analytics import get_dataset_job from galaxy.visualization.genomes import GenomeRegion from galaxy.util.json import to_json_string, from_json_string -from galaxy.visualization.tracks.data_providers import * +from galaxy.visualization.genome.data_providers import * class ToolsController( BaseAPIController, UsesHistoryDatasetAssociationMixin, UsesVisualizationMixin ): """ diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -14,8 +14,8 @@ from galaxy.web.framework import simplejson from galaxy.web.form_builder import AddressField, CheckboxField, SelectField, TextArea, TextField from galaxy.web.form_builder import WorkflowField, WorkflowMappingField, HistoryField, PasswordField, build_select_field -from galaxy.visualization.tracks.data_providers import get_data_provider -from galaxy.visualization.tracks.visual_analytics import get_tool_def +from galaxy.visualization.genome.data_providers import get_data_provider +from galaxy.visualization.genome.visual_analytics import get_tool_def from galaxy.security.validate_user_input import validate_publicname from paste.httpexceptions import * from galaxy.exceptions import * diff -r 586506caaad452c533493e5db8f26a362fb61280 -r 6805c477d61601ad304577ad6603dab71b22df24 lib/galaxy/web/controllers/tracks.py --- a/lib/galaxy/web/controllers/tracks.py +++ b/lib/galaxy/web/controllers/tracks.py @@ -14,9 +14,9 @@ from galaxy.util.bunch import Bunch from galaxy.datatypes.interval import Gff, Bed from galaxy.model import NoConverterException, ConverterDependencyException -from galaxy.visualization.tracks.data_providers import * +from galaxy.visualization.genome.data_providers import * from galaxy.visualization.genomes import decode_dbkey, Genomes -from galaxy.visualization.tracks.visual_analytics import get_dataset_job +from galaxy.visualization.genome.visual_analytics import get_dataset_job class NameColumn( grids.TextColumn ): https://bitbucket.org/galaxy/galaxy-central/changeset/40f6d9738623/ changeset: 40f6d9738623 user: jgoecks date: 2012-09-14 18:35:20 summary: Begin process of migrating Phyloviz data provider to data provider framework. affected #: 2 files diff -r 6805c477d61601ad304577ad6603dab71b22df24 -r 40f6d9738623ee2b2c7ff1f5a82fe09c7628d766 lib/galaxy/visualization/phyloviz/phyloviz_dataprovider.py --- a/lib/galaxy/visualization/phyloviz/phyloviz_dataprovider.py +++ b/lib/galaxy/visualization/phyloviz/phyloviz_dataprovider.py @@ -1,13 +1,17 @@ from newickparser import Newick_Parser from nexusparser import Nexus_Parser from phyloxmlparser import Phyloxml_Parser +from galaxy.visualization.data_providers import BaseDataProvider -class Phyloviz_DataProvider(object): +# TODO: bring this class into line with BaseDataProvider by +# using BaseDataProvider.init() and providing original dataset +# and then reading from dataset rather than filepath. +class Phyloviz_DataProvider( BaseDataProvider ): - def __init__(self): + def __init__( self ): pass - def parseFile(self, filepath, fileExt): + def get_data( self, filepath, fileExt ): """returns [trees], meta Trees are actually an array of JsonDicts. It's usually one tree, except in the case of Nexus """ diff -r 6805c477d61601ad304577ad6603dab71b22df24 -r 40f6d9738623ee2b2c7ff1f5a82fe09c7628d766 lib/galaxy/web/controllers/phyloviz.py --- a/lib/galaxy/web/controllers/phyloviz.py +++ b/lib/galaxy/web/controllers/phyloviz.py @@ -84,7 +84,7 @@ else: try: pd = Phyloviz_DataProvider() - json, config = pd.parseFile(filepath, fileExt) + json, config = pd.get_data(filepath, fileExt) json = json[treeIndex] except Exception: pass Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.