tol-sdk 1.8.6__py3-none-any.whl → 1.8.8__py3-none-any.whl

tol/api_client/api_datasource.py

@@ -134,28 +134,17 @@ class ApiDataSource(
             for k, v in transfer.items()
         }
 
+    @requested_fields_to_tree
     @validate('detailGet')
     def get_by_id(
         self,
         object_type: str,
         object_ids: Iterable[str],
         session: Optional[OperableSession] = None,
-        requested_fields: list[str] | None = None,
         requested_tree: ReqFieldsTree | None = None,
     ) -> Iterable[Optional[DataObject]]:
 
         client = self.__client_factory()
-        # This would be better handled in the decorator but there is a slight
-        # difference in handling here with the requested_tree when requested_fields is None
-        requested_tree = (
-            ReqFieldsTree(
-                object_type,
-                self,
-                requested_fields=requested_fields,
-            )
-            if object_type
-            else None
-        )
 
         json_responses = (
             client.get_detail(
@@ -182,7 +171,6 @@ class ApiDataSource(
         object_filters: Optional[DataSourceFilter] = None,
         sort_by: Optional[str] = None,
         session: Optional[OperableSession] = None,
-        requested_fields: list[str] | None = None,
         requested_tree: ReqFieldsTree | None = None,
     ) -> tuple[Iterable[DataObject], int]:
 
@@ -204,7 +192,6 @@ class ApiDataSource(
         object_type: str,
         object_filters: Optional[DataSourceFilter] = None,
         session: Optional[OperableSession] = None,
-        requested_fields: list[str] | None = None,
         requested_tree: ReqFieldsTree | None = None,
     ) -> Iterable[DataObject]:
         if self.__can_cursor(object_type, object_filters):

tol/api_client/client.py

@@ -54,11 +54,13 @@ class JsonApiClient(HttpClient):
         url = self.__detail_url(object_type, object_id)
         headers = self._merge_headers()
 
+        params = {}
+        if requested_tree:
+            params['requested_fields'] = requested_tree.to_paths()
+
         return self.__fetch_detail(
             url,
-            params={
-                'requested_fields': requested_tree.to_paths() if requested_tree else None,
-            },
+            params=params,
             headers=headers,
         )
 

tol/api_client/factory.py

@@ -64,6 +64,14 @@ class _ConverterFactory:
         """
         Returns an instantiated `JsonApiConverter`.
         """
+
+        # If we're going to parse a JSON:API data object (i.e. we have been
+        # passed an `object_type`), we need to add a ReqFieldsTree so that
+        # DataSources with default loading of to-one objects correctly
+        # process the to-ones from the `included` array.
+        if object_type and not requested_tree:
+            requested_tree = ReqFieldsTree(object_type, self.__data_source)
+
         parser = DefaultParser(self.__ds_dict, requested_tree)
         return JsonApiConverter(parser)
 

tol/benchling/benchling_warehouse_datasource.py

@@ -45,6 +45,7 @@ class BenchlingWarehouseDataSource(DataSource, ListGetter):
             'sample': 'sts_id',
             'sequencing_request': 'sanger_sample_id',
             'extraction': 'extraction_id',
+            'extraction_container': 'fluidx_container_id',
             'tissue_prep': 'eln_tissue_prep_id'
         }
 
@@ -70,7 +71,7 @@ class BenchlingWarehouseDataSource(DataSource, ListGetter):
             yield self.data_object_factory(
                 object_type,
                 id_=obj[id_col],
-                attributes=obj
+                attributes={k: v for k, v in obj.items() if k != id_col}
             )
 
     def get_list(
@@ -82,7 +83,9 @@ class BenchlingWarehouseDataSource(DataSource, ListGetter):
         file_suffix = ''
         if object_filters is not None:
             if isinstance(object_filters.and_, dict):
-                for field_name in ['sequencing_platform', 'extraction_type']:
+                for field_name in [
+                    'sequencing_platform', 'extraction_type', 'extraction.extraction_type'
+                ]:
                     if field_name in object_filters.and_:
                         # For an in_list, treat as multiple eq
                         if 'in_list' in object_filters.and_[field_name]:
@@ -101,7 +104,7 @@ class BenchlingWarehouseDataSource(DataSource, ListGetter):
                                 ) for val in object_filters.and_[field_name]['in_list']['value']
                             )
                         elif 'eq' in object_filters.and_[field_name]:
-                            file_suffix = '_' + field_name + '_' \
+                            file_suffix = '_' + field_name.replace('.', '_') + '_' \
                                           + object_filters.and_[field_name]['eq']['value']
             else:
                 raise DataSourceError('Filtering only on sequencing platform and extraction '

tol/benchling/sql/{extraction_containers_dna.sql → extraction_container_extraction_extraction_type_dna.sql}

@@ -9,28 +9,29 @@ Output: Table with columns:
 
 1) taxon_id: [character] Tissue metadata. Origin: STS
 2) eln_tissue_id: [character] Benchling ID for the tissue the extraction is derived from.
-3) eln_tissue_prep_id: [character] Benchling ID for the tissue prep the extraction is derived from.
-4) extraction_id: [character] DNA extraction entity ID (Benchling).
-5) programme_id: [character] ToLID. Origin: BWH.
-6) specimen_id: [character] Specimen ID. Origin: STS.
-7) creation_date: [date] Date the container was created.
-8) fluidx_container_id: [character] Primary key for the FluidX container.
-9) fluidx_id: [character] FluidX barcode.
-10) tube_type: [character] Type of tube/container.
-11) volume_ul: [numeric] Volume in microliters (0 if archived as 'Retired' or 'Expended').
-12) location: [character] Storage location name.
-13) rack: [character] Box/rack barcode.
-14) archive_purpose: [character] Reason for archiving the DNA extraction.
-15) nanodrop_concentration_ngul: [numeric] Latest Nanodrop concentration (ng/µL).
-16) dna_260_280_ratio: [numeric] Latest Nanodrop 260/280 ratio.
-17) dna_260_230_ratio: [numeric] Latest Nanodrop 260/230 ratio.
-18) qubit_concentration_ngul: [numeric] Latest Qubit concentration (ng/µL).
-19) yield_ng: [numeric] Latest yield (ng).
-20) femto_date_code: [character] Latest Femto date code.
-21) femto_description: [character] Latest Femto profile description.
-22) gqn_index: [numeric] Latest GQN index from Femto.
-23) next_step: [character] Latest decision making next step.
-24) extraction_qc_result: [character] Latest extraction QC result.
+3) tissue_sts_id: [character] STS ID for the tissue the extraction is derived from.
+4) eln_tissue_prep_id: [character] Benchling ID for the tissue prep the extraction is derived from.
+5) extraction_id: [character] DNA extraction entity ID (Benchling).
+6) programme_id: [character] ToLID. Origin: BWH.
+7) specimen_id: [character] Specimen ID. Origin: STS.
+8) creation_date: [date] Date the container was created.
+9) fluidx_container_id: [character] Primary key for the FluidX container.
+10) fluidx_id: [character] FluidX barcode.
+11) tube_type: [character] Type of tube/container.
+12) volume_ul: [numeric] Volume in microliters (0 if archived as 'Retired' or 'Expended').
+13) location: [character] Storage location name.
+14) rack: [character] Box/rack barcode.
+15) archive_purpose: [character] Reason for archiving the DNA extraction.
+16) nanodrop_concentration_ngul: [numeric] Latest Nanodrop concentration (ng/µL).
+17) dna_260_280_ratio: [numeric] Latest Nanodrop 260/280 ratio.
+18) dna_260_230_ratio: [numeric] Latest Nanodrop 260/230 ratio.
+19) qubit_concentration_ngul: [numeric] Latest Qubit concentration (ng/µL).
+20) yield_ng: [numeric] Latest yield (ng).
+21) femto_date_code: [character] Latest Femto date code.
+22) femto_description: [character] Latest Femto profile description.
+23) gqn_index: [numeric] Latest GQN index from Femto.
+24) next_step: [character] Latest decision making next step.
+25) extraction_qc_result: [character] Latest extraction QC result.
 
 NOTES:
 1) Only extractions from the 'ToL Core Lab' project and relevant folders are included.
@@ -109,6 +110,7 @@ latest_decision_making AS (
 SELECT DISTINCT
     t.taxon_id,
     t.id AS eln_tissue_id,
+    t.sts_id AS tissue_sts_id,
     tp.id AS eln_tissue_prep_id,
     dna.id AS extraction_id,
     t.programme_id,
@@ -170,4 +172,4 @@ LEFT JOIN entry$raw AS ent
 WHERE proj.name = 'ToL Core Lab'
     AND  (f.name IN ('Routine Throughput', 'DNA', 'Core Lab Entities', 'Benchling MS Project Move') OR f.name IS NULL)
     AND (con.archive_purpose$ != ('Made in error') OR con.archive_purpose$ IS NULL)
-    AND ent.name NOT LIKE '%Nuclei isolation and tagmentation%'
+    AND COALESCE(ent.name, '') NOT LIKE '%Nuclei isolation and tagmentation%'

tol/benchling/sql/sequencing_request_sequencing_platform_pacbio.sql

@@ -24,7 +24,7 @@ Output: Table with cols:
 4) eln_file_registry_id: [character] id in Benchling Registry. Origin: BWH
 5) extraction_id: [character] Original DNA extract entity name. For pooled samples, the first DNA extract pooled. Origin: BWH
 6) submission_sample_name: [character] Entity name. Origin: BWH
-7) fluidx_id: [character] Container barcode of the DNA fluidx tube. Origin: BWH
+7) fluidx_container_id: [character] Container id of the DNA fluidx tube. Origin: BWH
 8) programme_id: [character] ToLID. Origin: BWH
 9) specimen_id: [character] Specimen ID. Origin: STS
 10) tube_name: [character] Name of the submission tube/container.
@@ -73,7 +73,7 @@ pacbio_submissions_container_routine AS (
 		subsam.file_registry_id$ AS eln_file_registry_id,
 		subsam.original_dna_extract AS extraction_id,
 		subsam.name$ AS submission_sample_name,
-		c_dna.barcode AS fluidx_id,
+		c_dna.id AS fluidx_container_id,
 		t.programme_id, 
 		t.specimen_id, 
 		con.name AS tube_name,
@@ -145,7 +145,7 @@ pacbio_submissions_container_pooled AS (
 		subsam.file_registry_id$ AS eln_file_registry_id,
 		subsam.pooled_sample  AS extraction_id,
 		subsam.name$ AS eln_submission_sample_name,
-		c_pool.barcode AS fluidx_id,
+		c_pool.id AS fluidx_container_id,
 		t.programme_id, 
 		t.specimen_id,
 		con.name AS tube_name,
@@ -219,7 +219,7 @@ pacbio_submissions_container_legacy_deprecated AS (
 		subsam.file_registry_id$ AS eln_file_registry_id,
 		subsam.original_dna_extract AS extraction_id,
 		subsam.name$ AS submission_sample_name,
-		c_dna.barcode AS fluidx_id,
+		c_dna.id AS fluidx_container_id,
 		t.programme_id,
 		t.specimen_id,
 		con.name AS tube_name,
@@ -283,7 +283,7 @@ pacbio_submissions_plate_automated_manifest AS (
 		subsam.file_registry_id$ AS eln_file_registry_id,
 		subsam.originaL_dna_extract AS extraction_id,
 		subsam.name$ AS submission_sample_name,
-		c_dna.barcode AS fluidx_id,
+		c_dna.id AS fluidx_container_id,
 		t.programme_id,
 		t.specimen_id,
 		con.name AS tube_name,
@@ -350,7 +350,7 @@ pacbio_submissions_plate_automated_manifest_pooled AS (
 		subsam.file_registry_id$ AS eln_file_registry_id,
 		subsam.pooled_sample AS extraction_id,
 		subsam.name$ AS submission_sample_name,
-		c_pool.barcode AS fluidx_id,
+		c_pool.id AS fluidx_container_id,
 		t.programme_id,
 		t.specimen_id,
 		con.name AS tube_name,
@@ -415,7 +415,7 @@ pacbio_submissions_plate_routine AS (
 		subsam.file_registry_id$ AS eln_file_registry_id,
 		subsam.original_dna_extract AS extraction_id,
 		subsam.name$ AS submission_sample_name,
-		c_dna.barcode AS fluidx_id,
+		c_dna.id AS fluidx_container_id,
 		t.programme_id,
 		t.specimen_id,
 		c_subsam.name AS tube_name,
@@ -485,7 +485,7 @@ pacbio_submissions_plate_routine_pooled AS (
 		subsam.file_registry_id$ AS eln_file_registry_id,
 		subsam.pooled_sample AS extraction_id,
 		subsam.name$ AS submission_sample_name,
-		c_pool.barcode AS fluidx_id,
+		c_pool.id AS fluidx_container_id,
 		t.programme_id,
 		t.specimen_id,
 		c_subsam.name AS tube_name,

tol/core/factory.py

@@ -189,7 +189,7 @@ def core_data_object(
                 if object_from_datasource is not None:
                     self.__type = object_from_datasource.type
                     self.__attributes = object_from_datasource.attributes
-                    self.__to_one_objects = object_from_datasource.to_one_objects
+                    self.__to_one_objects = object_from_datasource._to_one_objects
                     break
 
         @property

tol/core/requested_fields.py

@@ -17,17 +17,17 @@ def requested_fields_to_tree(func):
     `requested_tree` object has not been given.
     """
 
-    def wrapper(self, tablename, *args, **kwargs):
+    def wrapper(self, object_type, *args, **kwargs):
         if 'requested_fields' in kwargs:
             if 'requested_tree' in kwargs:
                 msg = 'Both requested_fields and requested_tree arguments given'
                 raise TypeError(msg)
             flds = kwargs.pop('requested_fields')
-            kwargs['requested_tree'] = ReqFieldsTree(
-                tablename, self, requested_fields=flds
-            )
-        return func(self, tablename, *args, **kwargs)
-
+            if flds and object_type:
+                kwargs['requested_tree'] = ReqFieldsTree(
+                    object_type, self, requested_fields=flds
+                )
+        return func(self, object_type, *args, **kwargs)
     return wrapper
 
 

tol/flows/converters/__init__.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+from .benchling_extraction_container_to_elastic_extraction_container_converter import BenchlingExtractionContainerToElasticExtractionContainerConverter  # noqa F401
 from .benchling_extraction_to_elastic_extraction_converter import BenchlingExtractionToElasticExtractionConverter  # noqa F401
 from .benchling_extraction_to_elastic_sequencing_request_converter import BenchlingExtractionToElasticSequencingRequestConverter  # noqa F401
 from .benchling_sequencing_request_to_elastic_sequencing_request_converter import (  # noqa F401

tol/flows/converters/benchling_extraction_container_to_elastic_extraction_container_converter.py

@@ -0,0 +1,53 @@
+# SPDX-FileCopyrightText: 2026 Genome Research Ltd.
+#
+# SPDX-License-Identifier: MIT
+
+from typing import Iterable
+
+from ...core import (
+    DataObject,
+    DataObjectToDataObjectOrUpdateConverter
+)
+
+
+class BenchlingExtractionContainerToElasticExtractionContainerConverter(
+        DataObjectToDataObjectOrUpdateConverter):
+    def convert(self, data_object: DataObject) -> Iterable[DataObject]:
+        if data_object.tissue_sts_id is not None:
+            ret = self._data_object_factory(
+                'extraction_container',
+                data_object.id,
+                attributes={
+                    **{k: v
+                       for k, v in data_object.attributes.items()
+                       if k not in ['tissue_sts_id', 'specimen_id', 'taxon_id',
+                                    'programme_id', 'eln_tissue_prep_id', 'extraction_id']}
+                },
+                to_one={
+                    'sample': self._data_object_factory(
+                        'sample',
+                        data_object.tissue_sts_id
+                    ) if data_object.tissue_sts_id is not None else None,
+                    'species': self._data_object_factory(
+                        'species',
+                        data_object.taxon_id
+                    ) if data_object.taxon_id is not None else None,
+                    'specimen': self._data_object_factory(
+                        'specimen',
+                        data_object.specimen_id
+                    ) if data_object.specimen_id is not None else None,
+                    'tolid': self._data_object_factory(
+                        'tolid',
+                        data_object.programme_id
+                    ) if data_object.programme_id is not None else None,
+                    'tissue_prep': self._data_object_factory(
+                        'tissue_prep',
+                        data_object.eln_tissue_prep_id
+                    ) if data_object.eln_tissue_prep_id is not None else None,
+                    'extraction': self._data_object_factory(
+                        'extraction',
+                        data_object.extraction_id
+                    ) if data_object.extraction_id is not None else None,
+                }
+            )
+            yield ret

tol/flows/converters/benchling_sequencing_request_to_elastic_sequencing_request_converter.py

@@ -15,12 +15,18 @@ class BenchlingSequencingRequestToElasticSequencingRequestConverter(
     def convert(self, data_object: DataObject) -> Iterable[DataObject]:
         if data_object.sts_id is not None:
             extraction = None
+            extraction_container = None
             tissue_prep = None
             if 'extraction_id' in data_object.attributes:
                 extraction = self._data_object_factory(
                     'extraction',
                     data_object.extraction_id
                 )
+            if 'fluidx_container_id' in data_object.attributes:
+                extraction_container = self._data_object_factory(
+                    'extraction_container',
+                    data_object.fluidx_container_id
+                )
             if 'tissue_prep_id' in data_object.attributes:
                 tissue_prep = self._data_object_factory(
                     'tissue_prep',
@@ -34,7 +40,7 @@ class BenchlingSequencingRequestToElasticSequencingRequestConverter(
                        for k, v in data_object.attributes.items()
                        if k not in ['sanger_sample_id', 'sts_id',
                                     'specimen_id', 'taxon_id', 'extraction_id',
-                                    'programme_id', 'tissue_prep_id']}
+                                    'programme_id', 'tissue_prep_id', 'fluidx_container_id']}
                 },
                 to_one={
                     'sample': self._data_object_factory(
@@ -54,6 +60,7 @@ class BenchlingSequencingRequestToElasticSequencingRequestConverter(
                         data_object.programme_id
                     ) if data_object.programme_id is not None else None,
                     'extraction': extraction,
+                    'extraction_container': extraction_container,
                     'tissue_prep': tissue_prep,
                 })
             yield ret

tol/flows/converters/elastic_sequencing_request_to_elastic_run_data_update_converter.py

@@ -29,5 +29,13 @@ class ElasticSequencingRequestToElasticRunDataUpdateConverter(
                     'extraction',
                     extraction.id
                 )
+        if 'benchling_extraction_container' in data_object.to_one_relationships:
+            extraction_container = \
+                data_object.to_one_relationships['benchling_extraction_container']
+            if extraction_container is not None:
+                to_ones['benchling_extraction_container'] = self._data_object_factory(
+                    'extraction_container',
+                    extraction_container.id
+                )
         yield (None, to_ones | {
             'mlwh_sequencing_request.id': data_object.id})  # The candidate key

tol/flows/converters/time_string_to_time.py

@@ -3,33 +3,42 @@
 # SPDX-License-Identifier: MIT
 
 import re
+from dataclasses import dataclass
 from datetime import time
+from typing import Iterable
 
-from tol.core import DataObject
-
-
-class Converter:
-    def convert(self, obj):
-        raise NotImplementedError()
-
-
-class TimeStringToTimeConverter(Converter):
-    """
-    Converts string fields representing time in HH:MM (24-hour) format to Python time objects.
-    If the string is not in HH:MM, tries to append ':00' and parse as HH:MM:SS.
-    """
-    def __init__(self, field: str):
-        self.field = field
-
-    def convert(self, obj: DataObject) -> DataObject:
-        value = obj.attributes.get(self.field)
-        if isinstance(value, str):
-            match = re.match(r'^(\d{1,2}):(\d{2})(?::(\d{2}))?$', value)
-            if match:
-                h, m = int(match.group(1)), int(match.group(2))
-                s = int(match.group(3)) if match.group(3) else 0
-                try:
-                    obj.attributes[self.field] = time(h, m, s)
-                except ValueError:
-                    pass
-        return obj
+from tol.core import DataObject, DataObjectToDataObjectOrUpdateConverter
+
+
+class TimeStringToTimeConverter(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]:
+        """
+        Converts string fields representing time in HH:MM (24-hour) format to Python time objects.
+        If the string is not in HH:MM, tries to append ':00' and parse as HH:MM:SS.
+        """
+
+        for field_name in self.__config.field_names:
+            value = data_object.attributes.get(field_name)
+            if isinstance(value, str):
+                match = re.match(r'^(\d{1,2}):(\d{2})(?::(\d{2}))?$', value)
+                if match:
+                    h, m = int(match.group(1)), int(match.group(2))
+                    s = int(match.group(3)) if match.group(3) else 0
+                    try:
+                        data_object.attributes[field_name] = time(h, m, s)
+                    except ValueError:
+                        pass
+        yield data_object

tol/validators/allowed_values_from_datasource.py

@@ -46,7 +46,7 @@ class AllowedValuesFromDataSourceValidator(Validator):
             obj.get_field_by_name(
                 self.__config.datasource_field_name
             ) for obj in ds.get_list(
-                object_type=self.__config.datasource_object_type
+                self.__config.datasource_object_type
             )
         ]
 

tol/validators/tolid.py

@@ -90,7 +90,7 @@ class TolidValidator(Validator):
                 f = DataSourceFilter()
                 f.and_ = {'specimen_id': {'eq': {'value': specimen_id}}}
                 self.__cached_tolids[specimen_id] = list(self.__datasource.get_list(
-                    object_type='specimen',
+                    'specimen',
                     object_filters=f
                 ))
 

{tol_sdk-1.8.6.dist-info → tol_sdk-1.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tol-sdk
-Version: 1.8.6
+Version: 1.8.8
 Summary: SDK for interaction with ToL, Sanger and external services
 Author-email: ToL Platforms Team <tol-platforms@sanger.ac.uk>
 License: MIT

{tol_sdk-1.8.6.dist-info → tol_sdk-1.8.8.dist-info}/RECORD

@@ -31,11 +31,11 @@ tol/api_base/misc/list_get_parameters.py,sha256=6DtUgfKPTok3utKPOxceJdwV_ZnJ5nis
 tol/api_base/misc/relation_url.py,sha256=qfo-okp8Gv9-PEDghMfGZ2pHdYbHRhohvA9v3Govtlo,1127
 tol/api_base/misc/stats_parameters.py,sha256=IVpHqUeGQyjuih59jwqT-fIQMCBeESi2T9b4r9i4J28,1721
 tol/api_client/__init__.py,sha256=58SAywuMrIUCBAY9us_d_RLTMnaUTYWWts0LRQC5wLo,187
-tol/api_client/api_datasource.py,sha256=AYvaOqsrTuBu8CTRSmm9Fo-VHReJAQjpZUSZc63dLXQ,15161
-tol/api_client/client.py,sha256=H4X5_Jj-JmnaeAN85ghCWGtQUhYprOZqJXNmCJq_Vz0,14216
+tol/api_client/api_datasource.py,sha256=B27MWyptuIfZzCjiETv-sdjVKs0aluMCtyKUmptSKXY,14639
+tol/api_client/client.py,sha256=vCcnnDjvDlrf5i_idAwpN9oWtguY9_4_nK_k1k0HKIw,14231
 tol/api_client/converter.py,sha256=g32fjqga4mC923n95HmQImPuawMfeb9rQcl3ZxUWP2s,4463
 tol/api_client/exception.py,sha256=MkvJaIyRVCzQ2rKOYnCOcT747mpOeQwGJJl3Kkb1BsQ,3999
-tol/api_client/factory.py,sha256=PHRMpCJwBcgaEU_9x_9hNM__RI0udTN7Q7xzAxfVcNk,3492
+tol/api_client/factory.py,sha256=fMeqIomKZXrpt7qq1vZAdQH19lErgUqc_G1-kRqw-TY,3896
 tol/api_client/filter.py,sha256=D49RIai5Yj4CiQvIkgaEIXdw_oSU7CD5cn9SdXWRYXU,1474
 tol/api_client/parser.py,sha256=88Q2RlPwn9JJsSIukC2_yxfaM2AaXjsGuDOESqY7se4,8351
 tol/api_client/validate.py,sha256=9wFZotTJ4fI21BdO5AuMZok0rDQ4s8zM_WojLdVvA0A,3071
@@ -45,9 +45,9 @@ tol/barcodes/main.py,sha256=QxueF2AdrclIaQuu7W4lb4eF5tU_l-p3UMsDFIYgCfo,6213
 tol/benchling/__init__.py,sha256=9VIL6PBxvZRaBrN1j2Di75MdEY261kEHs_D-lUutIlg,229
 tol/benchling/benchling_converter.py,sha256=CO7BMvMAM52uIFjQWZFedRve0XNSmC9YtumJVAZrYac,30809
 tol/benchling/benchling_datasource.py,sha256=aHoGOJYX_dsL3G-9lXlY0bQQl4pMXf4a852sAkl-sKs,35112
-tol/benchling/benchling_warehouse_datasource.py,sha256=opsdvHz8l06NTmt84HrIgUJxV_DsurVgFtGs3_5PMoM,4635
+tol/benchling/benchling_warehouse_datasource.py,sha256=r3FcEknQmdO5kAChbClOyuCk1_vGncpUvjAa-UepmGs,4822
 tol/benchling/sql/__init__.py,sha256=4LbvDIZOOG7p-ebbvivP7NvrJeApUvGEIcDL58ahQJE,85
-tol/benchling/sql/extraction_containers_dna.sql,sha256=YRQ0W1d-BjXB9gcMpf5ZyjHbPVp2VU0KkYi4e0JvYtA,6680
+tol/benchling/sql/extraction_container_extraction_extraction_type_dna.sql,sha256=Qk6vHhTFQzSiDFzEVtr0sfyiyThNxx1VAAUgp4yNn8E,6810
 tol/benchling/sql/extraction_extraction_type_dna.sql,sha256=UvxboWBoXXp7RHUdRKNiQTS-AXdLdz8bFEXCS6q9SoE,3094
 tol/benchling/sql/extraction_extraction_type_lres.sql,sha256=7Y6a8v0V-jjU5Kg3czuZjcPLvGSfrnUDekpHo2mUgnc,1556
 tol/benchling/sql/extraction_extraction_type_pooled_dna.sql,sha256=fNjCJPaViGrR6D8sLwZK2Zg5LqQqh16HB0s7ZeqTqdg,4480
@@ -61,7 +61,7 @@ tol/benchling/sql/results_pacbio_prep.sql,sha256=a1tGu9irtsyPlCA0_FxBrqYj_uFiYPM
 tol/benchling/sql/results_pacbio_prep_pooled.sql,sha256=WZfMZbOeOfD55iDQQEwPNc7mF0gSJfMj94A1m9whLtw,6291
 tol/benchling/sql/sample.sql,sha256=ZFRXWabV9jjivAECCJz-zi05a5oSzTUQSbT2ssy4sGU,4174
 tol/benchling/sql/sequencing_request_sequencing_platform_hic.sql,sha256=W5VCnWvR16CJHnljzqdcQKJ8GWoci9QQhYVA2SbNyKk,3044
-tol/benchling/sql/sequencing_request_sequencing_platform_pacbio.sql,sha256=ecJvV_qvZwnWKvr5tS0kZVHySNTEgU0irbklsE6tUfQ,22958
+tol/benchling/sql/sequencing_request_sequencing_platform_pacbio.sql,sha256=B4cVlU--Z8E6-7hCt1k5WVB1qCJZSd4qVSd66YHiu2w,22998
 tol/benchling/sql/sequencing_request_sequencing_platform_rnaseq.sql,sha256=zZ3d_VLXMHAp3n6agX-Y-Oj6HIzk32IDq5UssJuYPMs,3420
 tol/benchling/sql/sequencing_request_sequencing_platform_wgs.sql,sha256=RVSR2y_ZYT0j-NDYYAzGSkLwofXy6A_9AfI0RFuztbQ,7062
 tol/benchling/sql/tissue_prep.sql,sha256=8JAOUaXDc0nu0qJeIYLdTXY5APklSighDoESHtzZ8vw,6141
@@ -97,10 +97,10 @@ tol/core/datasource.py,sha256=e9GaeDPfO_Gs7cgQhmNxCiSDlRNf64reegzFebcMNkA,6303
 tol/core/datasource_error.py,sha256=TqfqaPANG0gishadhA7myCmTO1Fg9u7hVZOvsY6BdAo,1660
 tol/core/datasource_filter.py,sha256=RY2S9kTx0XwdrFRSE2n2GohB9__fKGzFVsZrkN5hzQk,726
 tol/core/datasource_utils.py,sha256=18mwvFmtJL73_mxtFb56rKXZCGCtZFoEb8sWFKn3Yf0,6232
-tol/core/factory.py,sha256=pLLu8l-yK8QaLTt52izMhKZ2VlFHqRQlUHwMaLL6DI4,9156
+tol/core/factory.py,sha256=qbLvp5mLTcHbxOjopqtnK-wbZrlskgXjRIREszZjSyE,9157
 tol/core/http_client.py,sha256=QyZarplEHVYIrqEfrySeHbawfbnBU4nN62TLt41x4tY,2242
 tol/core/relationship.py,sha256=etdyCjLbfi2tgkaqzE6cntpNtTzgT_jOPGeNKmPu5yc,4624
-tol/core/requested_fields.py,sha256=-UXBnalzK1Fd-6zaYbZxlvlQOqIndOW0Zjvr4Z5UgaQ,7397
+tol/core/requested_fields.py,sha256=YH3i3VCCPGDJGntMNxRu9JmeBGYBFwywivhyl2bdTww,7451
 tol/core/session.py,sha256=6AohamIEfB8oV3Z414ishKqmlTgVfUaGYWzvxLgZgM4,3803
 tol/core/validate.py,sha256=kFRPhgYyeZisGbSXR7S1pmD8jvz_aZ7RX40bT-gD_iA,4083
 tol/core/operator/__init__.py,sha256=ircyLdj45IlaL5k0cDzWHjEr-_66BAx7YRbuEvWF30k,1826
@@ -155,14 +155,15 @@ 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=m2q04EXBdG5SZ3ieMsm_ork9eUuj-g8z6ulMOlVHs4U,6641
+tol/flows/converters/__init__.py,sha256=Fcq-w2MwBjbnfXaNITgNubFfPqtyMgoM7lAkqwc7LHw,6806
 tol/flows/converters/auto_detect_manifest_type_converter.py,sha256=uHakTmVHMbm2kFQOWaAv8ynD9ueh7p-kq6wmfEGnmEw,1361
 tol/flows/converters/benchling_entity_to_benchling_worklist_item_converter_factory.py,sha256=PN27fcvN4JLBnLrtPPAot1cWjAwPQHVcIDoMfPDeKzU,1210
+tol/flows/converters/benchling_extraction_container_to_elastic_extraction_container_converter.py,sha256=QThTQkawm_fmHnPUuVpljexH4aCAi3BcaCW7ci70l0I,2262
 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
 tol/flows/converters/benchling_sample_casm_to_sts_sample_converter.py,sha256=AIfuLpeSLN1OEAxPxr89C6zS8rXrvo4MBSnwzK27Rgo,1252
 tol/flows/converters/benchling_sample_to_elastic_sample_converter.py,sha256=mGeNBiUI8xWMVjyfVbs2ywpjbJx2-WhbLLnAPfmsWac,1503
-tol/flows/converters/benchling_sequencing_request_to_elastic_sequencing_request_converter.py,sha256=IOytX0vHW0Ittd5XCLfcNeMtOuMg7LN20VJLzeg51xw,2406
+tol/flows/converters/benchling_sequencing_request_to_elastic_sequencing_request_converter.py,sha256=zBd9QcfdqAfJ-LrxuSddLiefr7hNqOVqnjNIRe_hhP4,2779
 tol/flows/converters/benchling_tissue_prep_to_elastic_tissue_prep_converter.py,sha256=0hcypPlef4xTBC1wLyGUTrXsNHea2aMSzBun3F45fRo,1448
 tol/flows/converters/benchling_tissue_to_sts_sample_converter.py,sha256=DM9JFeqrjkH27GagYGStn5HDOw6ynbv3FM9GpNiAMIg,1194
 tol/flows/converters/bioscan_extra_pantheon_species_to_elastic_sample_update_converter.py,sha256=qaLyHVpOItM7DoOPera8-DHbylY9Ppx-2CjPyqvPUko,611
@@ -179,7 +180,7 @@ tol/flows/converters/elastic_sample_to_benchling_tissue_update_converter.py,sha2
 tol/flows/converters/elastic_sample_to_bold_sample_converter.py,sha256=eyowTZ-iNzI4aj7VgV6hBmmnAOhQ8AXdshnhNrM7vOE,3148
 tol/flows/converters/elastic_sample_to_elastic_sequencing_request_update_converter.py,sha256=nKYcLgZ2LV7A-uCeqfTm2AYFNRwcHpH5X6uxrcsYbgc,776
 tol/flows/converters/elastic_sample_to_sts_sample_converter.py,sha256=X1_unJoxUYmZH8Yu1WbFoTQEdU9ZPngxF109PHJBWFI,1071
-tol/flows/converters/elastic_sequencing_request_to_elastic_run_data_update_converter.py,sha256=NRpfnAOIbHB8g3bX-80XzJGGjl1v34UVUDkPAanP6nE,1262
+tol/flows/converters/elastic_sequencing_request_to_elastic_run_data_update_converter.py,sha256=GDtBD0jw1Xd4UOnSwR4SpNvDuJ-BUVHo9nlkLtFCS4E,1705
 tol/flows/converters/elastic_sequencing_request_to_sts_sequencing_request_converter.py,sha256=Ur0_lqH-kepHw16BjQBkvzyEWMJxm4rwea7G7BlVHMU,1038
 tol/flows/converters/elastic_species_to_sts_species_converter.py,sha256=f2MIKncCmldAp6Dmy8OCf13yKubC6GK2DuFasUBM9KE,1433
 tol/flows/converters/elastic_tolid_to_elastic_curation_update_converter.py,sha256=9Sn_QBp-1QfAuBmoRhTrib17vgve4oS0T7AdpH9T7xI,668
@@ -207,7 +208,7 @@ tol/flows/converters/sts_sample_project_to_elastic_sample_converter.py,sha256=YE
 tol/flows/converters/sts_sample_to_casm_benchling_converter.py,sha256=Zo577u2v5_Fela2uQVtZsGZmHq4bLecTCC4Ewvq61Xo,39414
 tol/flows/converters/sts_sampleset_to_elastic_sampleset_converter.py,sha256=PUP0Qjy9wTmqp5GHNEd9fukqtWdoMvDfs4rJisfLzcc,3197
 tol/flows/converters/sts_species_to_elastic_species_converter.py,sha256=ELZ_ML8vPlLkfXrx0B_wxUWiPyxkI8UXgSPQZCKknXU,1164
-tol/flows/converters/time_string_to_time.py,sha256=myo9K9pRMT6GtT5vXf3c0UDK5n8bMVbvW7ewhSPkecU,1062
+tol/flows/converters/time_string_to_time.py,sha256=7kIo6YhcHqFTygsTWzE_BRV8bg92MMoDOLV8hz75x7w,1558
 tol/flows/converters/tolid_specimen_to_elastic_tolid_converter.py,sha256=4Ird6ATYjsjSFZ1AGsxpuWdQ6QtQTvKJ-rF-_TCC_rg,1072
 tol/flows/converters/tolqc_data_to_elastic_run_data_converter.py,sha256=f9PYnsswikskvXpnSlrfYN7wXfyn8iXQpg996ZsQHbw,3799
 tol/flows/converters/tolqc_sample_to_elastic_sequencing_request_converter.py,sha256=MzPcO75Z_3-6nsWC8X0kmmmxJTurV_HOZhseC-tWdFo,1397
@@ -337,7 +338,7 @@ tol/utils/s3.py,sha256=aoYCwJ-qcMqFrpxmViFqPa0O1jgp0phtztO3-0CSNjw,491
 tol/validators/__init__.py,sha256=_ETv6oGQ2bTH_6-foYFy9T5wP5OG3cl96zEjvrIS7zk,1399
 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/allowed_values_from_datasource.py,sha256=9cVwllBbzfCls8UsojazfCInt9_AakA0_H9pBO1wSL4,3173
 tol/validators/assert_on_condition.py,sha256=eBGgSVfIQ6e45SheM-ZDg7daXJjyZxRVS5L8AWvbXag,2027
 tol/validators/branching.py,sha256=7YFjHNjrrTmy4hZ3E7JKDT6MEsBMhrc3P3p3ykv4wKI,5720
 tol/validators/converter_and_validate.py,sha256=O1uYdrU4YDZ8eZjb7Koots4-8fMVOkJFXESg-LVw2o8,2992
@@ -350,7 +351,7 @@ 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=BaJcZ38ZprPcuGTIorSxxC9uGN0_lj6HS6B54EObcuY,2183
 tol/validators/sts_fields.py,sha256=aYbzy15btEg4-ocDT1qrspe7-atoWRrOJ_KmuPU6J14,8936
-tol/validators/tolid.py,sha256=yODebLYbKtlem3IpVcv8XImvq90r-AK68asH9JEawqo,3897
+tol/validators/tolid.py,sha256=VOb6lNFz11H_0KaWX8_nvsw8xJEa6KrjB0p-5lkcqog,3885
 tol/validators/types.py,sha256=jMVpckRp8RS93f7usf58YH_K-5rKWgZIYs7bO9dHhQc,2914
 tol/validators/unique_value_check.py,sha256=sFvDooYkKeORvULGEOTsgIcxlbe0AXDWxY3Gbr3j0KI,1282
 tol/validators/unique_values.py,sha256=o5IrfUNLEmlEp8kpInTtFnTq-FqiHSC9TItKdf-LI1o,3114
@@ -358,9 +359,9 @@ tol/validators/unique_whole_organisms.py,sha256=RdqA1GzIf3LTdrmNGGdxv0aW2udDY2P9
 tol/validators/value_check.py,sha256=DdNx_B1gns01zgBg5N6Bwia46Aukw6MAteM-M37Kv1k,1122
 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.8.6.dist-info/licenses/LICENSE,sha256=RF9Jacy-9BpUAQQ20INhTgtaNBkmdTolYCHtrrkM2-8,1077
-tol_sdk-1.8.6.dist-info/METADATA,sha256=drjwvfHHt_dIUvdywaSjXVuTa0wNCbdMHsLPuONx92o,3142
-tol_sdk-1.8.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tol_sdk-1.8.6.dist-info/entry_points.txt,sha256=jH3HfTwxjzog7E3lq8CKpUWGIRY9FSXbyL6CpUmv6D0,36
-tol_sdk-1.8.6.dist-info/top_level.txt,sha256=PwKMQLphyZNvagBoriVbl8uwHXQl8IC1niawVG0iXMM,10
-tol_sdk-1.8.6.dist-info/RECORD,,
+tol_sdk-1.8.8.dist-info/licenses/LICENSE,sha256=RF9Jacy-9BpUAQQ20INhTgtaNBkmdTolYCHtrrkM2-8,1077
+tol_sdk-1.8.8.dist-info/METADATA,sha256=iyFf12GxWPRsRVPQgR5mrGzLDhAH-OrJ58-4T6CROLA,3142
+tol_sdk-1.8.8.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+tol_sdk-1.8.8.dist-info/entry_points.txt,sha256=jH3HfTwxjzog7E3lq8CKpUWGIRY9FSXbyL6CpUmv6D0,36
+tol_sdk-1.8.8.dist-info/top_level.txt,sha256=PwKMQLphyZNvagBoriVbl8uwHXQl8IC1niawVG0iXMM,10
+tol_sdk-1.8.8.dist-info/RECORD,,

{tol_sdk-1.8.6.dist-info → tol_sdk-1.8.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any