tol-sdk 1.7.5b3__py3-none-any.whl → 1.8.0__py3-none-any.whl

tol/core/data_object_converter.py

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 from abc import ABC, abstractmethod
+from dataclasses import dataclass
 from typing import Iterable
 
 from more_itertools import flatten
@@ -95,9 +96,15 @@ class DefaultDataObjectToDataObjectConverter(DataObjectToDataObjectOrUpdateConve
 
 class SanitisingConverter(DataObjectToDataObjectOrUpdateConverter):
 
+    @dataclass(slots=True, frozen=True, kw_only=True)
+    class Config:
+        pass
+
     def __init__(
         self,
-        data_object_factory: DataObjectFactory
+        data_object_factory: DataObjectFactory,
+        config: Config,
+        **kwargs
     ):
         super().__init__(data_object_factory)
 

tol/excel/excel_datasource.py

@@ -65,7 +65,7 @@ class ExcelDataSource(
     ) -> Iterable[DataObject]:
 
         return (
-            self.__marshal_row(row_index + 1, row)
+            self.__marshal_row(row_index + 2, row)  # Add 1 for header, 1 for 1-based ID
             for row_index, row
             in self.__df.iterrows()
         )
@@ -115,6 +115,10 @@ class ExcelDataSource(
         __v: Any,
     ) -> Any:
 
+        # Convert pandas Timestamp to Python datetime
+        if isinstance(__v, pd.Timestamp):
+            __v = datetime.fromtimestamp(__v.timestamp())
+
         if __k not in self.__mappings:
             return __v
 

tol/flows/converters/__init__.py

@@ -55,3 +55,4 @@ from .tolqc_species_to_elastic_species_converter import TolqcSpeciesToElasticSpe
 from .sts_sample_to_casm_benchling_converter import StsSampleToCasmBenchlingConverterFactory # noqa F401
 from .treeofsex_species_to_treeofsexwh_species_converter import TreeofsexSpeciesToTreeofsexwhSpeciesConverter  # noqa F401
 from .treeofsex_upload_to_treeofsex_attribute_converter import TreeofsexUploadToTreeofsexAttributeConverter  # noqa F401
+from .skip_null_fields_converter import SkipNullFieldsConverter  # noqa F401

tol/flows/converters/incoming_sample_to_ena_sample_converter.py

@@ -3,6 +3,7 @@
 
 import re
 from dataclasses import dataclass
+from datetime import datetime
 from typing import Iterable
 
 from tol.core import DataObject, DataObjectToDataObjectOrUpdateConverter
@@ -30,8 +31,10 @@ class IncomingSampleToEnaSampleConverter(DataObjectToDataObjectOrUpdateConverter
         s = data_object
         attributes = {
             'ENA-CHECKLIST': self.__config.ena_checklist_id,
-            'organism part': self.__replace_underscores(
-                s.attributes.get('ORGANISM_PART')),
+            'organism part': self.__join_list([
+                self.__replace_underscores(v)
+                for v in s.attributes.get('ORGANISM_PART', [])
+            ]),
             'lifestage': (
                 'spore-bearing structure'
                 if s.attributes.get('LIFESTAGE') == 'SPORE_BEARING_STRUCTURE'
@@ -40,35 +43,38 @@ class IncomingSampleToEnaSampleConverter(DataObjectToDataObjectOrUpdateConverter
             ),
             'project name':
                 self.__config.project_name,
-            'collected by':
-                self.__replace_underscores(
-                    s.attributes.get('COLLECTED_BY')),
+            'collected_by': self.__join_list([
+                self.__replace_underscores(v)
+                for v in s.attributes.get('COLLECTED_BY', [])
+            ]),
             'collection date':
-                self.__replace_underscores(
-                    s.attributes.get('DATE_OF_COLLECTION')).lower(),
+                self.__format_date(
+                    s.attributes.get('DATE_OF_COLLECTION')),
             'geographic location (country and/or sea)':
                 self.__collection_country(s).replace('_', ' '),
             'geographic location (latitude)':
                 self.__replace_underscores(
-                    s.attributes.get('DECIMAL_LATITUDE')).lower(),
+                    str(s.attributes.get('DECIMAL_LATITUDE'))).lower(),
             'geographic location (latitude) units':
                 'DD',
             'geographic location (longitude)':
                 self.__replace_underscores(
-                    s.attributes.get('DECIMAL_LONGITUDE')).lower(),
+                    str(s.attributes.get('DECIMAL_LONGITUDE'))).lower(),
             'geographic location (longitude) units':
                 'DD',
             'geographic location (region and locality)':
                 self.__collection_region(s).replace('_', ' '),
-            'identified_by':
-                self.__replace_underscores(
-                    s.attributes.get('IDENTIFIED_BY')),
+            'identified_by': self.__join_list([
+                self.__replace_underscores(v)
+                for v in s.attributes.get('IDENTIFIED_BY', [])
+            ]),
             'habitat':
                 self.__replace_underscores(
                     s.attributes.get('HABITAT')),
-            'identifier_affiliation':
-                self.__replace_underscores(
-                    s.attributes.get('IDENTIFIER_AFFILIATION')),
+            'identifier_affiliation': self.__join_list([
+                self.__replace_underscores(v)
+                for v in s.attributes.get('IDENTIFIER_AFFILIATION', [])
+            ]),
             'sex':
                 self.__replace_underscores(
                     s.attributes.get('SEX')),
@@ -77,9 +83,10 @@ class IncomingSampleToEnaSampleConverter(DataObjectToDataObjectOrUpdateConverter
                     s.attributes.get('RELATIONSHIP')),
             'SYMBIONT':
                 'Y' if s.attributes.get('SYMBIONT') == 'SYMBIONT' else 'N',
-            'collecting institution':
-                self.__replace_underscores(
-                    s.attributes.get('COLLECTOR_AFFILIATION'))
+            'collecting institution': self.__join_list([
+                self.__replace_underscores(v)
+                for v in s.attributes.get('COLLECTOR_AFFILIATION', [])
+            ]),
         }
         if self.__sanitise(s.attributes.get('DEPTH')) != '':
             attributes['geographic location (depth)'] = s.attributes.get('DEPTH')
@@ -88,9 +95,11 @@ class IncomingSampleToEnaSampleConverter(DataObjectToDataObjectOrUpdateConverter
             attributes['geographic location (elevation)'] = s.attributes.get('ELEVATION')
             attributes['geographic location (elevation) units'] = 'm'
         if self.__sanitise(s.attributes.get('ORIGINAL_COLLECTION_DATE')) != '':
-            attributes['original collection date'] = s.attributes.get('ORIGINAL_COLLECTION_DATE')
+            attributes['original collection date'] = \
+                self.__format_date(s.attributes.get('ORIGINAL_COLLECTION_DATE'))
         if self.__sanitise(s.attributes.get('ORIGINAL_GEOGRAPHIC_LOCATION')) != '':
-            attributes['original geographic location'] = self.__replace_underscores(s.attributes.get('ORIGINAL_GEOGRAPHIC_LOCATION'))  # noqa
+            attributes['original geographic location'] = \
+                self.__replace_underscores(s.attributes.get('ORIGINAL_GEOGRAPHIC_LOCATION'))
         if s.attributes.get('GAL') is not None:
             attributes['GAL'] = s.attributes.get('GAL')
         if s.attributes.get('VOUCHER_ID') is not None:
@@ -103,7 +112,7 @@ class IncomingSampleToEnaSampleConverter(DataObjectToDataObjectOrUpdateConverter
             attributes['culture_or_strain_id'] = s.attributes.get('CULTURE_OR_STRAIN_ID')
 
         ret = self._data_object_factory(
-            'sample',
+            data_object.type,
             s.id,
             attributes=attributes,
         )
@@ -128,3 +137,19 @@ class IncomingSampleToEnaSampleConverter(DataObjectToDataObjectOrUpdateConverter
         if value is None:
             return default_value
         return value
+
+    def __join_list(self, value_list):
+        if value_list is None:
+            return ''
+        if not isinstance(value_list, list):
+            return str(value_list)
+        return ' | '.join(str(v) for v in value_list)
+
+    def __format_date(self, value):
+        """Format date to YYYY-mm-dd format"""
+        if value is None:
+            return ''
+        if isinstance(value, datetime):
+            return value.strftime('%Y-%m-%d')
+
+        return str(value)

tol/flows/converters/skip_null_fields_converter.py

@@ -0,0 +1,42 @@
+# SPDX-FileCopyrightText: 2025 Genome Research Ltd.
+# SPDX-License-Identifier: MIT
+
+from dataclasses import dataclass
+from typing import Iterable
+
+from tol.core import DataObject, DataObjectToDataObjectOrUpdateConverter
+
+
+class SkipNullFieldsConverter(DataObjectToDataObjectOrUpdateConverter):
+
+    @dataclass(slots=True, frozen=True, kw_only=True)
+    class Config:
+        field_names: list[str]
+
+    __slots__ = ['__config']
+    __config: Config
+
+    def __init__(self, data_object_factory, config: Config) -> None:
+        super().__init__(data_object_factory)
+        self.__config = config
+        self._data_object_factory = data_object_factory
+
+    def convert(self, data_object: DataObject) -> Iterable[DataObject]:
+        """
+        removing null fields from the DataObject
+        """
+
+        passes = True
+        for field in self.__config.field_names:
+            value = data_object.get_field_by_name(field)
+            if value is None:
+                passes = False
+                break
+
+        if passes:
+            ret = self._data_object_factory(
+                data_object.type,
+                data_object.id,
+                attributes=data_object.attributes
+            )
+            yield ret

tol/validators/__init__.py

@@ -15,6 +15,7 @@ from .regex_by_value import RegexByValueValidator  # noqa
 from .specimens_have_same_taxon import SpecimensHaveSameTaxonValidator # noqa
 from .sts_fields import StsFieldsValidator  # noqa
 from .tolid import TolidValidator  # noqa
+from .types import TypesValidator  # noqa
 from .unique_values import UniqueValuesValidator  # noqa
 from .unique_whole_organisms import UniqueWholeOrganismsValidator  # noqa
 from .interfaces import Condition  # noqa

tol/validators/converter_and_validate.py

@@ -19,12 +19,12 @@ class ConverterAndValidateValidator(Validator):
         "converters": [{
             "module": "<path.to.module>",
             "class_name": "<path.to.ConverterClass>",
-            "config": { ... }
+            "config_details": { ... }
         }],
         "validators": [{
             "module": "<path.to.module>",
             "class_name": "<path.to.ValidatorClass>",
-            "config": { ... }
+            "config_details": { ... }
         }]
     }
 
@@ -54,7 +54,7 @@ class ConverterAndValidateValidator(Validator):
             converter_class = getattr(__module, conv.get('class_name'))
 
             converter_conf = converter_class.Config(
-                **conv.get('config')
+                **conv.get('config_details')
             )
             self.__converters.append(converter_class(
                 data_object_factory=data_object_factory,
@@ -65,7 +65,7 @@ class ConverterAndValidateValidator(Validator):
             validator_class = getattr(__module, val.get('class_name'))
 
             validator_conf = validator_class.Config(
-                **val.get('config')
+                **val.get('config_details')
             )
             self.__validators.append(validator_class(
                 data_object_factory=data_object_factory,

tol/validators/ena_checklist.py

@@ -27,31 +27,31 @@ class EnaChecklistValidator(Validator):
         super().__init__()
         self.__config = config
         self._datasource = datasource
+        self.__ena_checklist = datasource.get_one(
+            'checklist',
+            self.__config.ena_checklist_id
+        ).checklist
 
     def _validate_data_object(self, obj: DataObject) -> None:
-        ena_datasource = self._datasource
-        ena_checklist = ena_datasource.get_one('checklist', self.__config.ena_checklist_id)
-
-        validations = ena_checklist.attributes['checklist']
-        for key in validations:
+        for key, validation in self.__ena_checklist.items():
             field_name = key
-            if 'field' in validations[key]:
-                field_name = validations[key]['field']
-            if 'mandatory' in validations[key] and key not in obj.attributes:
+            if 'field' in validation:
+                field_name = validation['field']
+            if 'mandatory' in validation and key not in obj.attributes:
                 self.add_error(object_id=obj.id, detail='Must be given', field=[field_name])
                 continue
-            if 'mandatory' in validations[key] and obj.attributes[key] is None:
+            if 'mandatory' in validation and obj.attributes[key] is None:
                 self.add_error(object_id=obj.id, detail='Must be given', field=[field_name])
                 continue
-            if 'mandatory' in validations[key] and obj.attributes.get(key) == '':
+            if 'mandatory' in validation and obj.attributes.get(key) == '':
                 self.add_error(
                     object_id=obj.id,
                     detail='Must not be empty', field=[field_name]
                 )
 
-            if 'restricted text' in validations[key] and key in obj.attributes:
-                for condition in validations[key]:
-                    if type(condition) == str and '(' in condition:
+            if 'restricted text' in validation and key in obj.attributes:
+                for condition in validation:
+                    if isinstance(condition, str) and '(' in condition:
                         regex = condition
                 compiled_re = re.compile(regex)
                 if not compiled_re.search(obj.attributes.get(key)):
@@ -61,9 +61,9 @@ class EnaChecklistValidator(Validator):
                     )
 
             # Check against allowed values
-            if 'text choice' in validations[key] and key in obj.attributes:
-                for condition in validations[key]:
-                    if type(condition) == list:
+            if 'text choice' in validation and key in obj.attributes:
+                for condition in validation:
+                    if isinstance(condition, list):
                         allowed_values = condition
                 if obj.attributes.get(key).lower() not in \
                         [x.lower() for x in allowed_values]:

tol/validators/regex.py

@@ -26,9 +26,9 @@ class Regex:
 
     def is_allowed(self, __v: Any) -> bool:
         # Check regex
-        return bool(re.search(
+        return __v is None or __v == '' or bool(re.search(
             self.regex,
-            str(__v) if __v is not None else ''
+            str(__v)
         ))
 
 
@@ -90,7 +90,6 @@ class RegexValidator(Validator):
         obj: DataObject,
         c: Regex,
     ) -> None:
-
         if c.is_error:
             self.add_error(
                 object_id=obj.id,

tol/validators/sts_fields.py

@@ -53,36 +53,42 @@ class StsFieldsValidator(Validator):
         for field in self.__fields.values():
             # Get the value from the data object
             field_value = obj.get_field_by_name(field.get('data_input_key'))
-            if field.get('mandatory_input') and (field_value is None or field_value == ''):
+            if field.get('mandatory_validation') and (field_value is None or field_value == ''):
                 self.add_error(
                     object_id=obj.id,
                     detail=f'Field {field.get("data_input_key")} is required '
                            f'for project {self.__config.project_code}',
                     field=field.get('data_input_key'),
                 )
-            elif field.get('allowed_values') and field_value not in field.get('allowed_values'):
+            elif field.get('allowed_values'):
+                allowed_values = [
+                    value.get('value') for value in field.get('allowed_values', [])
+                ]
+                if field_value not in allowed_values:
+                    self.add_error(
+                        object_id=obj.id,
+                        detail=f'Field {field.get("data_input_key")} value '
+                               f'"{field_value}" not found in allowed values '
+                               f'{allowed_values} for project '
+                               f'{self.__config.project_code}',
+                        field=field.get('data_input_key'),
+                    )
+            elif field.get('min') and field.get('type') == 'String' \
+                    and field_value is not None and len(field_value) < field.get('min'):
                 self.add_error(
                     object_id=obj.id,
                     detail=f'Field {field.get("data_input_key")} value '
-                           f'"{field_value}" not found in allowed values '
-                           f'{field.get("allowed_values")} for project '
-                           f'{self.__config.project_code}',
-                    field=field.get('data_input_key'),
-                )
-            elif field.get('min') and field_value < field.get('min'):
-                self.add_error(
-                    object_id=obj.id,
-                    detail=f'Field {field.get("data_input_key")} value '
-                           f'"{field_value}" is less than minimum value '
+                           f'"{field_value}" is shorter than minimum length '
                            f'"{field.get("min")}" for project '
                            f'{self.__config.project_code}',
                     field=field.get('data_input_key'),
                 )
-            elif field.get('max') and field_value > field.get('max'):
+            elif field.get('max') and field.get('type') == 'String' \
+                    and field_value is not None and len(field_value) > field.get('max'):
                 self.add_error(
                     object_id=obj.id,
                     detail=f'Field {field.get("data_input_key")} value '
-                           f'"{field_value}" is greater than maximum value '
+                           f'"{field_value}" is longer than maximum length '
                            f'"{field.get("max")}" for project '
                            f'{self.__config.project_code}',
                     field=field.get('data_input_key'),

tol/validators/tolid.py

@@ -103,7 +103,7 @@ class TolidValidator(Validator):
 
                 if str(obj.get_field_by_name(self.__config.species_id_field)) not in taxons:
                     self.add_error(
-                        object_id=obj.id,
+                        object_id=obj.id + 1,
                         detail=f'Specimen ID {specimen_id} does not match Taxon ID '
                                f'{obj.get_field_by_name(self.__config.species_id_field)}'
                                'in TolID source',

tol/validators/types.py

@@ -0,0 +1,87 @@
+# SPDX-FileCopyrightText: 2025 Genome Research Ltd.
+#
+# SPDX-License-Identifier: MIT
+
+from dataclasses import dataclass
+from datetime import datetime, time
+
+from tol.core import DataObject
+from tol.core.validate import Validator
+
+
+class TypesValidator(Validator):
+    """
+    Validates an incoming stream of `DataObject` instances,
+    ensuring that they only have attributes of the given
+    allowed keys.
+    """
+    @dataclass(slots=True, frozen=True, kw_only=True)
+    class Config:
+        allowed_types: dict[str, str]
+        is_error: bool = True
+        detail: str = 'Value is of incorrect type'
+
+    __slots__ = ['__config']
+    __config: Config
+
+    def __init__(
+        self,
+        config: Config,
+        **kwargs
+    ) -> None:
+
+        super().__init__()
+        self.__config = config
+
+    def _validate_data_object(
+        self,
+        obj: DataObject
+    ) -> None:
+
+        type_map = {
+            'str': str,
+            'int': int,
+            'float': float,
+            'bool': bool,
+            'list': list,
+            'dict': dict,
+            'datetime': datetime,
+            'time': time
+        }
+        for key, expected_type in self.__config.allowed_types.items():
+            if key in obj.attributes:
+                actual_value = obj.get_field_by_name(key)
+                if actual_value is None:
+                    continue
+                type_class = type_map.get(expected_type)
+                if type_class and not isinstance(actual_value, type_class):
+                    self.__add_result(
+                        obj,
+                        key,
+                    )
+                if type_class and isinstance(actual_value, type_class):
+                    # Special case for bool since isinstance(True, int) is True
+                    if expected_type == 'int' and isinstance(actual_value, bool):
+                        self.__add_result(
+                            obj,
+                            key,
+                        )
+
+    def __add_result(
+        self,
+        obj: DataObject,
+        key: str,
+    ) -> None:
+
+        if self.__config.is_error:
+            self.add_error(
+                object_id=obj.id,
+                detail=self.__config.detail,
+                field=key,
+            )
+        else:
+            self.add_warning(
+                object_id=obj.id,
+                detail=self.__config.detail,
+                field=key,
+            )

{tol_sdk-1.7.5b3.dist-info → tol_sdk-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tol-sdk
-Version: 1.7.5b3
+Version: 1.8.0
 Summary: SDK for interaction with ToL, Sanger and external services
 Author-email: ToL Platforms Team <tol-platforms@sanger.ac.uk>
 License: MIT
@@ -50,6 +50,8 @@ Requires-Dist: openpyxl>=3.0.10; extra == "sheets"
 Requires-Dist: XlsxWriter==3.1.9; extra == "sheets"
 Requires-Dist: xlrd==2.0.1; extra == "sheets"
 Requires-Dist: gspread>=5.12.0; extra == "sheets"
+Provides-Extra: s3
+Requires-Dist: minio==7.2.15; extra == "s3"
 Provides-Extra: all
 Requires-Dist: tol-sdk[api-base]; extra == "all"
 Requires-Dist: tol-sdk[benchling]; extra == "all"

{tol_sdk-1.7.5b3.dist-info → tol_sdk-1.8.0.dist-info}/RECORD

@@ -89,7 +89,7 @@ tol/core/attribute_metadata.py,sha256=wYD3NXDdStrpkUZoyTUiEpp7c14f7MLIcyooT1G4GE
 tol/core/core_converter.py,sha256=Gn4J507BtqDjnOWV2MFRYGz8YElJAKQItmnCrD72s7k,4504
 tol/core/data_loader.py,sha256=k-ET1nIohIz6PcADbEn9Y7k9TupoiBYxKDkcAl_9pGY,14710
 tol/core/data_object.py,sha256=GxG04JMcICaiHU1rufkhoD8jb9YQLhE0QWlFU2ZkQsM,4241
-tol/core/data_object_converter.py,sha256=zIGcin3jcoswBfsuUe74C2nxpyzvhHkP4_ZwKZWxh_Y,3765
+tol/core/data_object_converter.py,sha256=GESpLvwrAEwmCfBwy3GxcSCuHz0xt7ECCBPE2stxBdI,3927
 tol/core/data_source_attribute_metadata.py,sha256=NHvJ_Gmw7-Oej1MoFCohvq4f6emDJ2HF483UmW2Qd_c,4407
 tol/core/data_source_dict.py,sha256=d-hSmoWTwG6IOc0cQTLap1EBslsxYIWGUd3ScSoeH_Q,1705
 tol/core/datasource.py,sha256=e9GaeDPfO_Gs7cgQhmNxCiSDlRNf64reegzFebcMNkA,6303
@@ -142,13 +142,13 @@ tol/ena/filter.py,sha256=UzOx5ivXvA0TY2QuNzFmS-zDPVNnaAx07DMVkAwVsAE,3370
 tol/ena/parser.py,sha256=Z4YmUnpfLKng4QwmZkLEj1hUfwYb_bqr-DWgF1Gw-EY,3253
 tol/excel/__init__.py,sha256=M0xL9w9Au8kYOLWzFGuijJ7WoZENOMkZ1XV1ephhlDY,229
 tol/excel/excel.py,sha256=rcA-wfXY9R14OfNKS-NX2sn__9gmQ_G8LoUgWseF1Gk,2124
-tol/excel/excel_datasource.py,sha256=nIMvkCZ1edx8djqsVsPTRi6yCfyKc_dIokTpLy16rwY,3091
+tol/excel/excel_datasource.py,sha256=9dRvpfIaolYbXrXUb7EHOWkROIBlAsYYlsNQuGel_gU,3284
 tol/excel/s3_factory.py,sha256=4lGyKrSvarPXWndyvm7K-tel0FoM0My8wnz-Mzwt0yQ,1245
 tol/flows/__init__.py,sha256=M7iSvnBJs6fJ8M38cW0bYQa9WW0TN8FHAMjIHPDNAJ4,166
 tol/flows/logger.py,sha256=rWXbaknGcPEZRFvC1CiB1qkhFRZsQk435w7VyJ3cpyw,170
 tol/flows/secrets.py,sha256=1mlbsxaahzYRfVAx3XdztHOmUCtDMSJDzHysdbaCtj0,352
 tol/flows/sequencing_submissions.py,sha256=ukz_y5be-BCBN2y3JPQ2EK6b3jwOCh-187j-jnw3EUY,11027
-tol/flows/converters/__init__.py,sha256=Ee1yMFWwsRoG71ZFCsqtNwF45AR8farmV9h3ERrK994,6154
+tol/flows/converters/__init__.py,sha256=ZSF9i-32mVsV4-rNYjA6TrIEPrgku5svCF8lz6HEqf8,6231
 tol/flows/converters/benchling_entity_to_benchling_worklist_item_converter_factory.py,sha256=PN27fcvN4JLBnLrtPPAot1cWjAwPQHVcIDoMfPDeKzU,1210
 tol/flows/converters/benchling_extraction_to_elastic_extraction_converter.py,sha256=S8pbmIeKlcXrLPRJHYBUGP0-Q7jTOV2QQk2TeA2naWo,1966
 tol/flows/converters/benchling_extraction_to_elastic_sequencing_request_converter.py,sha256=2RiyRvGRSWzpUwEI4p-s0afshJpFUUxPqv2z-nyDSVg,1992
@@ -180,7 +180,7 @@ tol/flows/converters/gap_assembly_to_elastic_assembly_converter.py,sha256=XK-es-
 tol/flows/converters/genome_notes_genome_note_to_elastic_genome_note_converter.py,sha256=AaUWbVTaWU-NXnUQPaPwI41TE7a-nC4zlg-jrWpPT2s,1166
 tol/flows/converters/goat_taxon_to_elastic_species_converter.py,sha256=1NGs9427OdXGsBaMB467nOF7aTlJsUKYCuoSoABw9L4,1074
 tol/flows/converters/grit_issue_to_elastic_curation_converter.py,sha256=XpRpoRn589MxTqEk6zPWGn6tamJiqY9Ctxk8v0q-dvA,3953
-tol/flows/converters/incoming_sample_to_ena_sample_converter.py,sha256=HmGsg-VCE4W9Dl3lAlcNhWfkVYp1d22DZlFoTaFzeqA,5560
+tol/flows/converters/incoming_sample_to_ena_sample_converter.py,sha256=SAVYWENG3GS7B1rM6rYwxfLQH75nZl7mEzphH5CBxRw,6353
 tol/flows/converters/incoming_sample_to_incoming_sample_with_lists_converter.py,sha256=5Fp1_ojsYqvRcKTgXJbyWqetPisi_vtWFcWr6RtGZoA,1504
 tol/flows/converters/informatics_tolid_to_elastic_tolid_converter.py,sha256=VrvtsDTPlc5Xa3K4rcAMHwV4n71zOH7q5EfALLLQ1tI,587
 tol/flows/converters/labwhere_location_to_elastic_sample_update_converter.py,sha256=NJNmG9sCc2WXc-2J5XfCKXhb2sDH82nZUBekd16PHcw,656
@@ -188,6 +188,7 @@ tol/flows/converters/labwhere_location_to_sts_tray_converter.py,sha256=dSBP5Hfdv
 tol/flows/converters/mlwh_extraction_to_elastic_extraction_converter.py,sha256=047eU_3Zb3ZlJ8utrk3o_VW7jifv5VO0WxgmFg-QkaE,1195
 tol/flows/converters/mlwh_run_data_to_elastic_run_data_converter.py,sha256=f0I_N8DH_9Kom4Fpl_O7hKTUPPiURWeyhxWN3XFLmLk,1313
 tol/flows/converters/mlwh_sequencing_request_to_elastic_sequencing_request_converter.py,sha256=zXYkq37qsvHEY7O1zh2vOoMBdt8hE7T1SuFIOR2DQrM,1209
+tol/flows/converters/skip_null_fields_converter.py,sha256=IlLrX31XWpQ58indW-hk9eApMunu2HGFhMConYDmxtU,1226
 tol/flows/converters/sts_banked_sample_to_elastic_sample_converter.py,sha256=HK_3Q60E6CKCT8YSWbZXu0Wqs2mmBLYhcD0OEwXM4Qs,688
 tol/flows/converters/sts_manifest_to_elastic_manifest_converter.py,sha256=Ko3ulOFXXYaZB1YUiwu_HPlP5oPZeI65hViAZ05cioQ,1806
 tol/flows/converters/sts_project_to_elastic_sample_update_converter.py,sha256=b-hdbusSgbWDg7KwPXOVsaxzznZg0kGJcYpvvs4LDHU,623
@@ -320,28 +321,29 @@ tol/treeval/treeval_datasource.py,sha256=GzY6JwH67b5QdV-UVdCFJfgGAIuZ96J2nl53YxZ
 tol/utils/__init__.py,sha256=764-Na1OaNGUDWpMIu51ZtXG7n_nB5MccUFK6LmkWRI,138
 tol/utils/csv.py,sha256=mihww25fSn72c4h-RFeqD_pFIG6KHZP4v1_C0rx81ws,421
 tol/utils/s3.py,sha256=aoYCwJ-qcMqFrpxmViFqPa0O1jgp0phtztO3-0CSNjw,491
-tol/validators/__init__.py,sha256=mJDlsI_W2y5jxazwOlyf-COl_Vlj1Xk1yC5xASouGH8,1134
+tol/validators/__init__.py,sha256=QI5ykFzsTLsIQXcL4vF_aaVGdSr2l0X0Qkssbnxumss,1176
 tol/validators/allowed_keys.py,sha256=RJcHBiguL84B8hjSRaXLNES21yZqaKFwJNp2Tz9zvh0,1506
 tol/validators/allowed_values.py,sha256=-Yy3Sqo1WYacGKlot_dn3M2o7Oj5MXOioJrJmrWCCxs,1536
 tol/validators/allowed_values_from_datasource.py,sha256=ICFO6FcYXDN7M2Cv1OwpyN38CdhmY7oU-njzIatA3-w,3185
 tol/validators/assert_on_condition.py,sha256=eBGgSVfIQ6e45SheM-ZDg7daXJjyZxRVS5L8AWvbXag,2027
-tol/validators/converter_and_validate.py,sha256=YjhLsh0qMcyZEnHK2GJFotJfZssOtr8qU4uszcPQmrg,2960
-tol/validators/ena_checklist.py,sha256=VGJeDrHH-XzueforuyyCEgEi6y9NurhvuOSL-gSDoOE,2885
+tol/validators/converter_and_validate.py,sha256=O1uYdrU4YDZ8eZjb7Koots4-8fMVOkJFXESg-LVw2o8,2992
+tol/validators/ena_checklist.py,sha256=M10VAFGpaxnm7rWO4jmFhTWkYRlCmU0Ox2IUEDFGKbo,2812
 tol/validators/ena_submittable.py,sha256=CujF9t4mA4N3Wm_5rA5MRp401aW19kbioOZpfWVXg6I,1965
 tol/validators/min_one_valid_value.py,sha256=gZUHtfRA-Lvpw0d1FJoAA31cRJpLbbxAJCC9DCt5lCY,1442
 tol/validators/mutually_exclusive.py,sha256=6blZK-2IY4Eq79fHKKrm-pxsQ6B5DNH5ldtxOFVCPhU,4492
-tol/validators/regex.py,sha256=YdFHPcvEo6jNbXxDPTnpAQeOv3kSX4OUZUKfWmFFWl0,2602
+tol/validators/regex.py,sha256=dLAi_vQt9_DsT6wQZmbYC7X5-Wp15l0leUE6XkPaItg,2602
 tol/validators/regex_by_value.py,sha256=XM5EnT4vgD17rfpR3bUE9I56IemSw26BI9MZtMakd4E,2582
 tol/validators/specimens_have_same_taxon.py,sha256=m2LLRIZMdhPj1fzyioDJOraI6UHXgy1l963xhezgk7E,2177
-tol/validators/sts_fields.py,sha256=A_NkQFn2TMNFv2yU_ercs7CXlh-oib33ZmDZtc6SuKQ,3459
-tol/validators/tolid.py,sha256=kgo-OWW3at6jK4DQtdgVFjO06sDvqG4QulGkI-jjVRU,3893
+tol/validators/sts_fields.py,sha256=IUWeqqNpSLZJVfhGewLHuClZMnxoaIOzg9bGnprxXzo,3805
+tol/validators/tolid.py,sha256=yODebLYbKtlem3IpVcv8XImvq90r-AK68asH9JEawqo,3897
+tol/validators/types.py,sha256=hZ8Iz47kKvmqv-UuOz5oj6D8RjjPDfpMEKw0m5t5BaI,2436
 tol/validators/unique_values.py,sha256=o5IrfUNLEmlEp8kpInTtFnTq-FqiHSC9TItKdf-LI1o,3114
 tol/validators/unique_whole_organisms.py,sha256=RdqA1GzIf3LTdrmNGGdxv0aW2udDY2P9EaqZb40hhik,5735
 tol/validators/interfaces/__init__.py,sha256=jtOxnwnwqV_29xjmmMcS_kvlt-pQiWwQYJn2YRP07_w,172
 tol/validators/interfaces/condition_evaluator.py,sha256=nj8Cb8hi47OBy6OVNfeLhF-Pjwtr8MiOSymYL6hfVes,3766
-tol_sdk-1.7.5b3.dist-info/licenses/LICENSE,sha256=RF9Jacy-9BpUAQQ20INhTgtaNBkmdTolYCHtrrkM2-8,1077
-tol_sdk-1.7.5b3.dist-info/METADATA,sha256=EJao_K6Vaa6nFKvIM8iw1vx73RocSQXiK4KkuFfQRVM,3081
-tol_sdk-1.7.5b3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tol_sdk-1.7.5b3.dist-info/entry_points.txt,sha256=jH3HfTwxjzog7E3lq8CKpUWGIRY9FSXbyL6CpUmv6D0,36
-tol_sdk-1.7.5b3.dist-info/top_level.txt,sha256=PwKMQLphyZNvagBoriVbl8uwHXQl8IC1niawVG0iXMM,10
-tol_sdk-1.7.5b3.dist-info/RECORD,,
+tol_sdk-1.8.0.dist-info/licenses/LICENSE,sha256=RF9Jacy-9BpUAQQ20INhTgtaNBkmdTolYCHtrrkM2-8,1077
+tol_sdk-1.8.0.dist-info/METADATA,sha256=Sz6ELtecqM1ndqoLPi2pa7JN6urXSDCv4mFS_RK5Gz4,3142
+tol_sdk-1.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tol_sdk-1.8.0.dist-info/entry_points.txt,sha256=jH3HfTwxjzog7E3lq8CKpUWGIRY9FSXbyL6CpUmv6D0,36
+tol_sdk-1.8.0.dist-info/top_level.txt,sha256=PwKMQLphyZNvagBoriVbl8uwHXQl8IC1niawVG0iXMM,10
+tol_sdk-1.8.0.dist-info/RECORD,,