tol-sdk 1.7.5b2__py3-none-any.whl → 1.7.5b3__py3-none-any.whl

tol/core/operator/detail_getter.py

@@ -82,7 +82,7 @@ class DetailGetter(ABC):
         for id_ in object_ids:
             seekable_objects.seek(0)
             for obj in seekable_objects:
-                if obj.id == id_:
+                if str(obj.id) == str(id_):
                     yield obj
                     break
             else:

tol/sql/auth/models.py

@@ -19,6 +19,7 @@ from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import (
     Mapped,
     Session,
+    joinedload,
     mapped_column,
     relationship
 )
@@ -184,7 +185,7 @@ def create_models(
 
         id: Mapped[str] = mapped_column(  # noqa A003
             primary_key=True,
-            name=None if not prefix_with_name else 'state_id'
+            name='state_id' if prefix_with_name else None
         )
 
         created_at: Mapped[datetime] = mapped_column(
@@ -257,13 +258,13 @@ def create_models(
         id: Mapped[int] = mapped_column(  # noqa A003
             primary_key=True,
             autoincrement=True,
-            name=None if not prefix_with_name else 'user_id'
+            name='user_id' if prefix_with_name else None
         )
 
-        _tokens: Mapped[list['Token']] = relationship(
+        _tokens: Mapped[list[Token]] = relationship(
             back_populates='user'
         )
-        _role_bindings: Mapped[list['RoleBinding']] = relationship(
+        _role_bindings: Mapped[list[RoleBinding]] = relationship(
             back_populates='user'
         )
 
@@ -340,7 +341,7 @@ def create_models(
 
     class _TokenPKMixin:
         """
-        Has an integer has a primary key.
+        Has an integer as a primary key.
 
         This is all that is needed in most apps,
         and is the default.
@@ -403,11 +404,19 @@ def create_models(
             token: str
         ) -> Optional[Token]:
 
-            return sess.query(
-                cls
-            ).filter_by(
-                token=token
-            ).one_or_none()
+            return (
+                sess.query(cls)
+                .filter_by(token=token)
+                .options(
+                    # Join through to the Role table when fetching a Token so
+                    # that SQLAlchemy only fires one SELECT query instead of
+                    # four to get `token.user._role_bindings.role.name`
+                    joinedload(cls.user)
+                    .joinedload(User._role_bindings)
+                    .joinedload(RoleBinding.role)
+                )
+                .one_or_none()
+            )
 
         @classmethod
         def get_or_create(
@@ -475,14 +484,14 @@ def create_models(
         id: Mapped[int] = mapped_column(  # noqa A003
             primary_key=True,
             autoincrement=True,
-            name=None if not prefix_with_name else 'role_id'
+            name='role_id' if prefix_with_name else None
         )
 
         name: Mapped[str] = mapped_column(
             unique=True
         )
 
-        _role_bindings: Mapped[list['RoleBinding']] = relationship(
+        _role_bindings: Mapped[list[RoleBinding]] = relationship(
             back_populates='role'
         )
 

tol/validators/__init__.py

@@ -6,6 +6,7 @@ from .allowed_keys import AllowedKeysValidator  # noqa
 from .allowed_values import AllowedValuesValidator  # noqa
 from .allowed_values_from_datasource import AllowedValuesFromDataSourceValidator  # noqa
 from .assert_on_condition import AssertOnConditionValidator  # noqa
+from .converter_and_validate import ConverterAndValidateValidator  # noqa
 from .ena_checklist import EnaChecklistValidator # noqa
 from .mutually_exclusive import MutuallyExclusiveValidator  # noqa
 from .ena_submittable import EnaSubmittableValidator  # noqa

tol/validators/allowed_keys.py

@@ -26,7 +26,8 @@ class AllowedKeysValidator(Validator):
 
     def __init__(
         self,
-        config: Config
+        config: Config,
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/allowed_values.py

@@ -27,7 +27,8 @@ class AllowedValuesValidator(Validator):
 
     def __init__(
         self,
-        config: Config
+        config: Config,
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/allowed_values_from_datasource.py

@@ -29,7 +29,8 @@ class AllowedValuesFromDataSourceValidator(Validator):
     def __init__(
         self,
         config: Config,
-        allowed_values: List[str | int | float] | None = None  # For testing
+        allowed_values: List[str | int | float] | None = None,  # For testing
+        **kwargs
     ) -> None:
 
         super().__init__()
@@ -40,7 +41,7 @@ class AllowedValuesFromDataSourceValidator(Validator):
 
     def __initialize_list_from_datasource(self) -> List[str | int | float]:
         dsi = portaldb().get_one('data_source_instance', self.__config.datasource_instance_id)
-        ds = DataSourceUtils.get_data_source_by_data_source_instance(dsi)
+        ds = DataSourceUtils.get_datasource_by_datasource_instance(dsi)
         return [
             obj.get_field_by_name(
                 self.__config.datasource_field_name

tol/validators/assert_on_condition.py

@@ -25,7 +25,7 @@ class AssertOnConditionValidator(Validator, ConditionEvaluator):
     __slots__ = ['__config']
     __config: Config
 
-    def __init__(self, config: Config) -> None:
+    def __init__(self, config: Config, **kwargs) -> None:
         super().__init__()
 
         self.__config = config

tol/validators/converter_and_validate.py

@@ -0,0 +1,93 @@
+# SPDX-FileCopyrightText: 2025 Genome Research Ltd.
+#
+# SPDX-License-Identifier: MIT
+
+import importlib
+from dataclasses import dataclass
+
+from tol.core import DataObject
+from tol.core.factory import DataObjectFactory
+from tol.core.validate import ValidationResult, Validator
+
+
+class ConverterAndValidateValidator(Validator):
+    """
+    Convert DataObjects, validate the converted ones, and return the original
+    input unchanged. Inner validator results are not merged here.
+
+    {
+        "converters": [{
+            "module": "<path.to.module>",
+            "class_name": "<path.to.ConverterClass>",
+            "config": { ... }
+        }],
+        "validators": [{
+            "module": "<path.to.module>",
+            "class_name": "<path.to.ValidatorClass>",
+            "config": { ... }
+        }]
+    }
+
+    """
+    @dataclass(slots=True, frozen=True, kw_only=True)
+    class Config:
+        converters: list[dict]
+        validators: list[dict]
+
+    __slots__ = [
+        '__converters',
+        '__validators'
+    ]
+
+    def __init__(
+        self,
+        config: Config,
+        data_object_factory: DataObjectFactory,
+        **kwargs
+    ) -> None:
+        super().__init__()
+        self.__converters = []
+        self.__validators = []
+
+        for conv in config.converters:
+            __module = importlib.import_module(conv.get('module'))
+            converter_class = getattr(__module, conv.get('class_name'))
+
+            converter_conf = converter_class.Config(
+                **conv.get('config')
+            )
+            self.__converters.append(converter_class(
+                data_object_factory=data_object_factory,
+                config=converter_conf,
+            ))
+        for val in config.validators:
+            __module = importlib.import_module(val.get('module'))
+            validator_class = getattr(__module, val.get('class_name'))
+
+            validator_conf = validator_class.Config(
+                **val.get('config')
+            )
+            self.__validators.append(validator_class(
+                data_object_factory=data_object_factory,
+                config=validator_conf,
+            ))
+
+    def _validate_data_object(self, obj: DataObject) -> None:
+        converted_objs = [obj]
+        for converter in self.__converters:
+            converted_objs = converter.convert_iterable(converted_objs)
+        for obj in converted_objs:
+            for validator in self.__validators:
+                validator._validate_data_object(obj)
+
+    @property
+    def results(self) -> list[ValidationResult]:
+        return [result for validator in self.__validators for result in validator.results]
+
+    @property
+    def warnings(self) -> list[ValidationResult]:
+        return [warning for validator in self.__validators for warning in validator.warnings]
+
+    @property
+    def errors(self) -> list[ValidationResult]:
+        return [error for validator in self.__validators for error in validator.errors]

tol/validators/ena_checklist.py

@@ -23,7 +23,7 @@ class EnaChecklistValidator(Validator):
     __slots__ = ['__config']
     __config: Config
 
-    def __init__(self, config: Config, datasource: DataSource = ena()) -> None:
+    def __init__(self, config: Config, datasource: DataSource = ena(), **kwargs) -> None:
         super().__init__()
         self.__config = config
         self._datasource = datasource

tol/validators/ena_submittable.py

@@ -28,6 +28,7 @@ class EnaSubmittableValidator(Validator):
         self,
         config: Config,
         ena_datasource: DataSource | None = ena(),  # For testing
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/min_one_valid_value.py

@@ -24,6 +24,7 @@ class MinOneValidValueValidator(Validator):
     def __init__(
         self,
         config: Config,
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/mutually_exclusive.py

@@ -62,7 +62,7 @@ class MutuallyExclusiveValidator(Validator, ConditionEvaluator):
     __first_list: List[Any]
     __second_list: List[Any]
 
-    def __init__(self, config: Config) -> None:
+    def __init__(self, config: Config, **kwargs) -> None:
         super().__init__()
 
         self.__config = config

tol/validators/regex.py

@@ -26,7 +26,10 @@ class Regex:
 
     def is_allowed(self, __v: Any) -> bool:
         # Check regex
-        return re.search(self.regex, str(__v or ''))
+        return bool(re.search(
+            self.regex,
+            str(__v) if __v is not None else ''
+        ))
 
 
 class RegexValidator(Validator):
@@ -44,7 +47,8 @@ class RegexValidator(Validator):
 
     def __init__(
         self,
-        config: Config
+        config: Config,
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/regex_by_value.py

@@ -27,7 +27,8 @@ class RegexByValueValidator(Validator):
 
     def __init__(
         self,
-        config: Config
+        config: Config,
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/specimens_have_same_taxon.py

@@ -25,7 +25,7 @@ class SpecimensHaveSameTaxonValidator(Validator):
     __config: Config
     __seen: Dict[str, str]
 
-    def __init__(self, config: Config) -> None:
+    def __init__(self, config: Config, **kwargs) -> None:
         super().__init__()
         self.__seen = {}
         self.__config = config

tol/validators/sts_fields.py

@@ -28,6 +28,7 @@ class StsFieldsValidator(Validator):
         self,
         config: Config,
         datasource: DataSource = sts(),  # For testing
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/tolid.py

@@ -34,6 +34,7 @@ class TolidValidator(Validator):
         self,
         config: Config,
         datasource=tolid(),
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/unique_values.py

@@ -27,7 +27,8 @@ class UniqueValuesValidator(Validator):
 
     def __init__(
         self,
-        config: Config
+        config: Config,
+        **kwargs
     ) -> None:
 
         super().__init__()

tol/validators/unique_whole_organisms.py

@@ -28,7 +28,7 @@ class UniqueWholeOrganismsValidator(Validator):
     __whole_organisms: List[str]
     __part_organisms: List[str]
 
-    def __init__(self, config: Config) -> None:
+    def __init__(self, config: Config, **kwargs) -> None:
         super().__init__()
         self.__whole_organisms = []
         self.__part_organisms = []

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tol-sdk
-Version: 1.7.5b2
+Version: 1.7.5b3
 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.7.5b2.dist-info → tol_sdk-1.7.5b3.dist-info}/RECORD

@@ -110,7 +110,7 @@ tol/core/operator/counter.py,sha256=aD7CRcSfHUfH-ASivJhUSncbLc8gvwdbQUDONjHp4oo,
 tol/core/operator/cursor.py,sha256=G8RkuLpQS6vDAXhE2D1WXLSEuGDkqv3YwSrW_QhGTlc,3960
 tol/core/operator/declare.py,sha256=W1jngGKNy-5D8T8nt_-6lpfOFTa-ilVr9YalRdJNG3w,333
 tol/core/operator/deleter.py,sha256=v8C6aBSQGwVCYmZ_PIeGVQExSyilQi5C-6G-wuACCBg,755
-tol/core/operator/detail_getter.py,sha256=0O4VXWqupSuAtVrrib0dWZ2B78IVGokm1b3hzwE3VQI,2785
+tol/core/operator/detail_getter.py,sha256=EG7EuVh73ZzHjXh4fmIy0WtTJii5bHgqzoqbT8OuHqk,2795
 tol/core/operator/enricher.py,sha256=ijJvE8aYCIVsOpmU2EHiTB8NPGwnGucebcDccm5o7qg,4079
 tol/core/operator/enum.py,sha256=JsJkj7LIMLoCnx2n1rdSX9LxGK9bbfoloXVie4rR_3M,1651
 tol/core/operator/group_statter.py,sha256=jZ45J3OGtypOfosWChWAwe05POpBejaoDNAO2qJP1GM,897
@@ -304,7 +304,7 @@ tol/sql/action/__init__.py,sha256=T1zAsCza_lvsNtXF1ecSLt9OFGup8tGnIs68YylBmXI,14
 tol/sql/action/factory.py,sha256=HkareJp_57ud0_Bdd9Kwz3_Rnq2l211sGJgftohFAHg,3589
 tol/sql/auth/__init__.py,sha256=e3JuwugXmXobklqZ1Mt1w03qPgb1WdUaJVM7oblzHyk,202
 tol/sql/auth/blueprint.py,sha256=u0vT_TC9IMKrg08QFa9W29_83mT0y0jzLj3DvXy1BBw,25906
-tol/sql/auth/models.py,sha256=4xNWBvyGiI3mwRyDY5ty48Bv9178ApQXPR-YjIdCsvk,11879
+tol/sql/auth/models.py,sha256=U4CsKMMyzGMg6hj4tp_iRenr3_Q--64WJmHWvxQ2--Q,12297
 tol/sql/pipeline_step/__init__.py,sha256=O7u4RrLfuoB0mwLcPxFoUrdTBZGB_4bE1vWCn5ho-qw,147
 tol/sql/pipeline_step/factory.py,sha256=E5_Bs1379UGlRajKnb77iPmqhXBMemQR1C53SSPjXB4,5134
 tol/sql/standard/__init__.py,sha256=2NbLXFk0rneGZosZ2ESIRcT0WMK0KncmPWaLPqvX-i4,142
@@ -320,27 +320,28 @@ 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=CcamQvWpywu5aXWc1D9CoZAZcbioRBlNUuTX-XOKqQE,1060
-tol/validators/allowed_keys.py,sha256=fX4KqpxOJNmmVNqQq215MtX27v4dbKSjCM1laXuXfZE,1488
-tol/validators/allowed_values.py,sha256=Sxsb6EhiR8Ey90sfPoyGqkehkJN0hHSNXlLYSL_k5f4,1518
-tol/validators/allowed_values_from_datasource.py,sha256=EqHfaTk8VAMQAra7SfkpZYjFUJm9bee_i73vFwwGG_Y,3169
-tol/validators/assert_on_condition.py,sha256=FCzmN2Crhku0bdEpXuKEbDaoU6RbAZCUDUxQ8OHK92M,2017
-tol/validators/ena_checklist.py,sha256=nxoiJWHKDk2HzeJMKgME_KGNYUBSaCx5jbp4yXQMf00,2875
-tol/validators/ena_submittable.py,sha256=ruryfVcQtRJ5JsAFBcVZ_3hzTDwRWGXpdPUAfdrYmWg,1948
-tol/validators/min_one_valid_value.py,sha256=3Fv-b-fojvPLpiWwUqrFfO0YMGtV40KEp15zTmdOlyI,1425
-tol/validators/mutually_exclusive.py,sha256=76AqX4G_syKAbFyDgydbcMHvNAroENazrcWbR5vAN30,4482
-tol/validators/regex.py,sha256=L8ap5oxn_54DoE7Tnqo1VjQ-dr5-fJAe7cCHYg8cBzw,2523
-tol/validators/regex_by_value.py,sha256=bSPloXfeOUMuiSQH-_GkvQ6IiD3Q1fojT0iydlkLanI,2564
-tol/validators/specimens_have_same_taxon.py,sha256=BrkYXhr1KVnJcDe-PrKXf0AF9740BbFV2XVMrtu98CQ,2167
-tol/validators/sts_fields.py,sha256=piHqdzuGepIEv-ZSSwdkYE6ybQpqc4hBN8hN8UrN4Vg,3442
-tol/validators/tolid.py,sha256=gHiaNQGWHos4I6Rz7aKCOATbv0ff8qL4LdObnZ_Lgt8,3876
-tol/validators/unique_values.py,sha256=CZvIdg7GC2VmVAGuPToxJ_r-2YCwy2xkQKp2qwVwbzU,3096
-tol/validators/unique_whole_organisms.py,sha256=Z-PUjlCcn-WHDKMYDyt_WhalXzQFfqLWItM6qywVt_Y,5725
+tol/validators/__init__.py,sha256=mJDlsI_W2y5jxazwOlyf-COl_Vlj1Xk1yC5xASouGH8,1134
+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/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_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/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.5b2.dist-info/licenses/LICENSE,sha256=RF9Jacy-9BpUAQQ20INhTgtaNBkmdTolYCHtrrkM2-8,1077
-tol_sdk-1.7.5b2.dist-info/METADATA,sha256=FxtTjGw1IxkHprv89dW071kyQ68kiR9sxu-QdfLaF1g,3081
-tol_sdk-1.7.5b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tol_sdk-1.7.5b2.dist-info/entry_points.txt,sha256=jH3HfTwxjzog7E3lq8CKpUWGIRY9FSXbyL6CpUmv6D0,36
-tol_sdk-1.7.5b2.dist-info/top_level.txt,sha256=PwKMQLphyZNvagBoriVbl8uwHXQl8IC1niawVG0iXMM,10
-tol_sdk-1.7.5b2.dist-info/RECORD,,
+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,,