From 0d01a6deab82f22cf98883c9170df7707cbcc3a0 Mon Sep 17 00:00:00 2001 From: hujambo-dunia Date: Wed, 17 Jul 2024 07:43:37 -0400 Subject: [PATCH] Fix for not-null in 'column_list' object Co-authored-by: Nicola Soranzo --- lib/galaxy/datatypes/tabular.py | 3 +-- lib/galaxy/tools/parameters/basic.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py index fab0b5893334..68e64fcce99a 100644 --- a/lib/galaxy/datatypes/tabular.py +++ b/lib/galaxy/datatypes/tabular.py @@ -1814,7 +1814,7 @@ def set_meta( with open(dataset.get_file_name()) as dataset_fh: comment_lines = 0 column_headers = None - cleaned_column_types = None + cleaned_column_types = [] number_of_columns = 0 for i, line in enumerate(dataset_fh): line = line.strip("\n") @@ -1822,7 +1822,6 @@ def set_meta( if line.startswith("#h"): column_headers = line.split("\t")[1:] elif line.startswith("#f"): - cleaned_column_types = [] for column_type in line.split("\t")[1:]: if column_type == "Hex": cleaned_column_types.append("str") diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 9b5a8f5fde9c..ae6b10e0001a 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1517,7 +1517,7 @@ def get_options(self, trans, other_values): except Exception: column_list = self.get_column_list(trans, other_values) if self.numerical: # If numerical was requested, filter columns based on metadata - if hasattr(dataset, "metadata") and hasattr(dataset.metadata, "column_types"): + if hasattr(dataset, "metadata") and getattr(dataset.metadata, "column_types", None) is not None: if len(dataset.metadata.column_types) >= len(column_list): numerics = [i for i, x in enumerate(dataset.metadata.column_types) if x in ["int", "float"]] column_list = [column_list[i] for i in numerics]