tol-sdk 1.8.10__py3-none-any.whl → 1.8.11__py3-none-any.whl

tol/goat/client.py

@@ -57,7 +57,7 @@ class GoatApiClient:
         r.raise_for_status()
         return r.json()['results'] if 'results' in r.json() else [], r.json()['status']['hits']
 
-    def __detail_url(self, object_type: str, object_ids: str) -> Tuple[str, Dict]:
+    def __detail_url(self, object_type: str, object_ids: list[str]) -> Tuple[str, Dict]:
         obj_ids_str = ','.join(object_ids)
         return self.__page_url(object_type, 1, len(object_ids), f'tax_name({obj_ids_str})')
 

tol/goat/goat_datasource.py

@@ -8,8 +8,6 @@ import typing
 from functools import cache
 from typing import Callable, Iterable, List, Optional
 
-from more_itertools import seekable
-
 from .client import GoatApiClient
 from .converter import (
     GoatApiConverter
@@ -113,27 +111,20 @@ class GoatDataSource(
     def get_by_id(
         self,
         object_type: str,
-        object_ids: Iterable[str],
+        object_ids: Iterable[str | int],
         **kwargs,
     ) -> Iterable[Optional[DataObject]]:
         if object_type not in self.supported_types:
             raise DataSourceError(f'{object_type} is not supported')
 
+        object_ids_str = [str(object_id) for object_id in object_ids]
         client = self.__client_factory()
-        goat_response, _ = client.get_detail(object_type, object_ids)
+        goat_response, _ = client.get_detail(object_type, object_ids_str)
         goat_converter = self.__gc_factory()
 
         converted_objects, _ = goat_converter.convert_list(goat_response) \
             if goat_response is not None else ([], 0)
-        seekable_objects = seekable(converted_objects)
-        for id_ in object_ids:
-            seekable_objects.seek(0)
-            for obj in seekable_objects:
-                if obj.id == id_:
-                    yield obj
-                    break
-            else:
-                yield None
+        return self.sort_by_id(converted_objects, object_ids_str)
 
     def get_list_page(
         self,

{tol_sdk-1.8.10.dist-info → tol_sdk-1.8.11.dist-info}/METADATA

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

@@ -218,11 +218,11 @@ tol/flows/converters/treeofsex_upload_to_treeofsex_attribute_converter.py,sha256
 tol/gap/__init__.py,sha256=aI9h4IEKAd_qCqJayj0fpUDgAYQxy0d8xyBtiABP0xY,134
 tol/gap/gap_datasource.py,sha256=SfBfJh1-2W5Kb5ABNRX7FBJVR8VuD096UQgZ2SKjI6A,3527
 tol/goat/__init__.py,sha256=6e_Wss7QPo5LY0YhlZz9iXsFAD5txMhSlhT5APWqr6Q,190
-tol/goat/client.py,sha256=_bjPkftZf6jMhJZErVOSbnf6ytIpSw9CbTEY21YM3Tg,3680
+tol/goat/client.py,sha256=q8nqpqlkVplPqpN6EfnzkMXbOE_GJEZU4ImJKcrl6ko,3686
 tol/goat/converter.py,sha256=jHUWoJxZOHKp63S45FZA5DbU0rdvoKDkF0hUtedqnvE,1114
 tol/goat/factory.py,sha256=-SOz8VIb_Nljvx7VrLWAg-1CXel9w7wVKQnz9vyZSQo,2639
 tol/goat/filter.py,sha256=J-Fj8O7MSp1O1pIQGMhcMuIQycjYAEx_0ecXYZ9WSqI,3013
-tol/goat/goat_datasource.py,sha256=XEEjMwWxGV92vk1hkOEwYLhRjt2de77PZNMAT2scMdI,6107
+tol/goat/goat_datasource.py,sha256=rADBYKiyteM8cW0RbG6s7vR5xnxF36NJ_Ogkou2VBZQ,5917
 tol/goat/parser.py,sha256=552e0p4rFXBnL7FpJ4AAf2kpnPYsh2PfzmZ95-YOSX8,4039
 tol/google_sheets/__init__.py,sha256=SDrDFfqkLFll0Y6MNFh2yuyyeIfDtFwK1XSnEpsLNgg,133
 tol/google_sheets/google_sheet_datasource.py,sha256=UPhcOZv5IJ2s91M_2wPcL00hl5Bou6qCLNWMjXdNNiQ,6501
@@ -361,9 +361,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.10.dist-info/licenses/LICENSE,sha256=RF9Jacy-9BpUAQQ20INhTgtaNBkmdTolYCHtrrkM2-8,1077
-tol_sdk-1.8.10.dist-info/METADATA,sha256=8VkqLVdpb45ixAI3mGjagWB0lDmyJYxfrSp6tTr-NFg,3143
-tol_sdk-1.8.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-tol_sdk-1.8.10.dist-info/entry_points.txt,sha256=jH3HfTwxjzog7E3lq8CKpUWGIRY9FSXbyL6CpUmv6D0,36
-tol_sdk-1.8.10.dist-info/top_level.txt,sha256=PwKMQLphyZNvagBoriVbl8uwHXQl8IC1niawVG0iXMM,10
-tol_sdk-1.8.10.dist-info/RECORD,,
+tol_sdk-1.8.11.dist-info/licenses/LICENSE,sha256=RF9Jacy-9BpUAQQ20INhTgtaNBkmdTolYCHtrrkM2-8,1077
+tol_sdk-1.8.11.dist-info/METADATA,sha256=qwTqwgW3IHEgw2e6nNAwg6uXKrYh4Doo3ZkLVlWFaT8,3143
+tol_sdk-1.8.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+tol_sdk-1.8.11.dist-info/entry_points.txt,sha256=jH3HfTwxjzog7E3lq8CKpUWGIRY9FSXbyL6CpUmv6D0,36
+tol_sdk-1.8.11.dist-info/top_level.txt,sha256=PwKMQLphyZNvagBoriVbl8uwHXQl8IC1niawVG0iXMM,10
+tol_sdk-1.8.11.dist-info/RECORD,,