benchling-sdk 1.14.0a0__tar.gz → 1.14.0a1__tar.gz

{benchling_sdk-1.14.0a0 → benchling_sdk-1.14.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: benchling-sdk
-Version: 1.14.0a0
+Version: 1.14.0a1
 Summary: SDK for interacting with the Benchling Platform.
 License: Apache-2.0
 Author: Benchling Support

{benchling_sdk-1.14.0a0 → benchling_sdk-1.14.0a1}/benchling_sdk/benchling.py

@@ -1,6 +1,7 @@
 """Provides the Benchling class, which is the main interface for accessing Benchling's API functionality."""
 from __future__ import annotations
 
+from functools import cached_property
 import re
 from typing import Optional, Protocol, TYPE_CHECKING
 import urllib.parse
@@ -154,19 +155,16 @@ class Benchling(object):
         """
         return self._client
 
-    @property
+    @cached_property
     def v2(self) -> V2Service:
         """
         V2.
 
         Namespace containing support for the V2 Benchling API.
         """
-        if self._v2_service is None:
-            from benchling_sdk.services.v2_service import V2Service
-
-            self._v2_service = V2Service(self._client, retry_strategy=self._retry_strategy)
+        from benchling_sdk.services.v2_service import V2Service
 
-        return self._v2_service
+        return V2Service(self._client, retry_strategy=self._retry_strategy)
 
     # ------------------------------------------------------------------------------------
     # Kept for compatibility and ease of access. New services should be added in services.v2.stable and

{benchling_sdk-1.14.0a0 → benchling_sdk-1.14.0a1}/benchling_sdk/services/v2/base_service.py

@@ -30,3 +30,10 @@ class BaseService(ABC):
     def retry_strategy(self) -> RetryStrategy:
         """Provide access to the underlying user-specified RetryStrategy."""
         return self._retry_strategy
+
+    def _create_service(self, cls):
+        """Instantiate a service that derives from BaseService, with the same properties as this service.
+
+        Override this in alpha and beta services that use a client other than self._client.
+        """
+        return cls(self._client, self._retry_strategy)

{benchling_sdk-1.14.0a0 → benchling_sdk-1.14.0a1}/benchling_sdk/services/v2/v2_alpha_service.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Optional, TYPE_CHECKING
+from functools import cached_property
+from typing import TYPE_CHECKING
 
 from benchling_api_client.v2.stable.client import Client
 
@@ -22,7 +23,6 @@ class V2AlphaService(BaseService):
     See https://benchling.com/api/v2-alpha/reference
     """
 
-    _app_service: Optional[V2AlphaAppService]
     _alpha_client: Client
 
     def __init__(self, client: Client, retry_strategy: RetryStrategy = RetryStrategy()):
@@ -34,10 +34,8 @@ class V2AlphaService(BaseService):
         """
         super().__init__(client, retry_strategy)
         self._alpha_client = v2_alpha_client(self.client)
-        self._app_service = None
-        self._dna_sequence_service = None
 
-    @property
+    @cached_property
     def apps(self) -> V2AlphaAppService:
         """
         V2-Alpha Apps.
@@ -46,8 +44,10 @@ class V2AlphaService(BaseService):
 
         https://benchling.com/api/v2-alpha/reference?stability=not-available#/Apps
         """
-        if self._app_service is None:
-            from benchling_sdk.services.v2.alpha.v2_alpha_app_service import V2AlphaAppService
+        from .alpha.v2_alpha_app_service import V2AlphaAppService
 
-            self._app_service = V2AlphaAppService(self._alpha_client, self._retry_strategy)
-        return self._app_service
+        return self._create_service(V2AlphaAppService)
+
+    def _create_service(self, cls):
+        """Instantiate a service using the alpha client."""
+        return cls(self._alpha_client, self._retry_strategy)

{benchling_sdk-1.14.0a0 → benchling_sdk-1.14.0a1}/benchling_sdk/services/v2/v2_beta_service.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import Optional, TYPE_CHECKING
+from functools import cached_property
+from typing import TYPE_CHECKING
 
 from benchling_api_client.v2.stable.client import Client
 
@@ -27,13 +28,6 @@ class V2BetaService(BaseService):
     See https://benchling.com/api/v2-beta/reference
     """
 
-    _app_service: Optional[V2BetaAppService]
-    _collaboration_service: Optional[V2BetaCollaborationService]
-    _data_frame_service: Optional[V2BetaDataFrameService]
-    _entry_service: Optional[V2BetaEntryService]
-    _folder_service: Optional[V2BetaFolderService]
-    _project_service: Optional[V2BetaProjectService]
-    _worklist_service: Optional[V2BetaWorklistService]
     _beta_client: Client
 
     def __init__(self, client: Client, retry_strategy: RetryStrategy = RetryStrategy()):
@@ -45,16 +39,8 @@ class V2BetaService(BaseService):
         """
         super().__init__(client, retry_strategy)
         self._beta_client = v2_beta_client(self.client)
-        self._aa_sequence_service = None
-        self._app_service = None
-        self._collaboration_service = None
-        self._data_frame_service = None
-        self._entry_service = None
-        self._folder_service = None
-        self._project_service = None
-        self._worklist_service = None
-
-    @property
+
+    @cached_property
     def apps(self) -> V2BetaAppService:
         """
         V2-Beta Apps.
@@ -63,13 +49,11 @@ class V2BetaService(BaseService):
 
         https://benchling.com/api/v2-beta/reference?stability=not-available#/Apps
         """
-        if self._app_service is None:
-            from benchling_sdk.services.v2.beta.v2_beta_app_service import V2BetaAppService
+        from .beta.v2_beta_app_service import V2BetaAppService
 
-            self._app_service = V2BetaAppService(self._beta_client, self.retry_strategy)
-        return self._app_service
+        return self._create_service(V2BetaAppService)
 
-    @property
+    @cached_property
     def collaborations(self) -> V2BetaCollaborationService:
         """
         V2-Beta Collaborations.
@@ -78,15 +62,11 @@ class V2BetaService(BaseService):
 
         See https://benchling.com/api/v2-beta/reference?showLA=true#/Collaborations
         """
-        if self._collaboration_service is None:
-            from benchling_sdk.services.v2.beta.v2_beta_collaboration_service import (
-                V2BetaCollaborationService,
-            )
+        from .beta.v2_beta_collaboration_service import V2BetaCollaborationService
 
-            self._collaboration_service = V2BetaCollaborationService(self._beta_client, self.retry_strategy)
-        return self._collaboration_service
+        return self._create_service(V2BetaCollaborationService)
 
-    @property
+    @cached_property
     def data_frames(self) -> V2BetaDataFrameService:
         """
         V2-Beta DataFrames.
@@ -95,13 +75,11 @@ class V2BetaService(BaseService):
 
         See https://benchling.com/api/v2-beta/reference#/Data%20Frames
         """
-        if self._data_frame_service is None:
-            from benchling_sdk.services.v2.beta.v2_beta_data_frame_service import V2BetaDataFrameService
+        from .beta.v2_beta_data_frame_service import V2BetaDataFrameService
 
-            self._data_frame_service = V2BetaDataFrameService(self._beta_client, self.retry_strategy)
-        return self._data_frame_service
+        return self._create_service(V2BetaDataFrameService)
 
-    @property
+    @cached_property
     def entries(self) -> V2BetaEntryService:
         """
         V2-Beta Entries.
@@ -110,13 +88,11 @@ class V2BetaService(BaseService):
 
         https://benchling.com/api/v2-beta/reference#/Entries
         """
-        if self._entry_service is None:
-            from benchling_sdk.services.v2.beta.v2_beta_entry_service import V2BetaEntryService
+        from .beta.v2_beta_entry_service import V2BetaEntryService
 
-            self._entry_service = V2BetaEntryService(self._beta_client, self.retry_strategy)
-        return self._entry_service
+        return self._create_service(V2BetaEntryService)
 
-    @property
+    @cached_property
     def folders(self) -> V2BetaFolderService:
         """
         V2-Beta Folders.
@@ -125,13 +101,11 @@ class V2BetaService(BaseService):
 
         https://benchling.com/api/v2-beta/reference?showLA=true#/Folders
         """
-        if self._folder_service is None:
-            from benchling_sdk.services.v2.beta.v2_beta_folder_service import V2BetaFolderService
+        from .beta.v2_beta_folder_service import V2BetaFolderService
 
-            self._folder_service = V2BetaFolderService(self._beta_client, self.retry_strategy)
-        return self._folder_service
+        return self._create_service(V2BetaFolderService)
 
-    @property
+    @cached_property
     def projects(self) -> V2BetaProjectService:
         """
         V2-Beta Projects.
@@ -140,13 +114,11 @@ class V2BetaService(BaseService):
 
         See https://benchling.com/api/v2-beta/reference?#/Projects
         """
-        if self._project_service is None:
-            from benchling_sdk.services.v2.beta.v2_beta_project_service import V2BetaProjectService
+        from .beta.v2_beta_project_service import V2BetaProjectService
 
-            self._project_service = V2BetaProjectService(self._beta_client, self.retry_strategy)
-        return self._project_service
+        return self._create_service(V2BetaProjectService)
 
-    @property
+    @cached_property
     def worklists(self) -> V2BetaWorklistService:
         """
         V2-Beta Worklists.
@@ -156,8 +128,10 @@ class V2BetaService(BaseService):
 
         See https://benchling.com/api/v2-beta/reference#/Worklists
         """
-        if self._worklist_service is None:
-            from benchling_sdk.services.v2.beta.v2_beta_worklist_service import V2BetaWorklistService
+        from .beta.v2_beta_worklist_service import V2BetaWorklistService
+
+        return self._create_service(V2BetaWorklistService)
 
-            self._worklist_service = V2BetaWorklistService(self._beta_client, self.retry_strategy)
-        return self._worklist_service
+    def _create_service(self, cls):
+        """Instantiate a service using the beta client."""
+        return cls(self._beta_client, self._retry_strategy)