Release 0.13.0 (#123)

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.13.0] - 2023-11-11
+
 ### Added
 
 - Allow a `requests.Session` object to be passed to `WsiDicomWebClient.create_client()`.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wsidicom"
-version = "0.12.0"
+version = "0.13.0"
 description = "Tools for handling DICOM based whole scan images"
 authors = ["Erik O Gabrielsson <[email protected]>"]
 license = "Apache-2.0"

wsidicom/__init__.py

@@ -12,7 +12,6 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from wsidicom.wsidicom import WsiDicom
 from wsidicom.config import settings
 from wsidicom.graphical_annotations import (
     Annotation,
@@ -29,5 +28,6 @@
 from wsidicom.instance import ImageData, WsiDataset, WsiInstance
 from wsidicom.series import Labels, Levels, Overviews
 from wsidicom.web import WsiDicomWebClient
+from wsidicom.wsidicom import WsiDicom
 
-__version__ = "0.12.0"
+__version__ = "0.13.0"

wsidicom/web/wsidicom_web_client.py

@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from typing import Any, Dict, Iterator, Optional, Sequence, Tuple, Union
+from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
 
-from dicomweb_client.api import DICOMwebClient
+from dicomweb_client.api import DICOMwebClient, DICOMfileClient
 from dicomweb_client.session_utils import create_session_from_auth
 from pydicom import Dataset
 from pydicom.uid import (
@@ -34,13 +34,13 @@
 
 
 class WsiDicomWebClient:
-    def __init__(self, client: DICOMwebClient):
+    def __init__(self, client: Union[DICOMwebClient, DICOMfileClient]):
         """Create a WsiDicomWebClient.
 
         Parameters
         ----------
-        client: DICOMwebClient
-            The DICOMwebClient to use
+        client: Union[DICOMwebClient, DICOMfileClient]
+            The client to use
         """
         self._client = client
 
@@ -68,10 +68,10 @@ def create_client(
             inherits from requests.auth.AuthBase, or by passing a
             requests.Session object.
         """
-        if isinstance(auth, Session) or auth is None:
-            session = auth
-        else:
+        if isinstance(auth, AuthBase):
             session = create_session_from_auth(auth)
+        else:
+            session = auth
 
         client = DICOMwebClient(
             hostname,
@@ -102,7 +102,7 @@ def get_frames(
         study_uid: UID,
         series_uid: UID,
         instance_uid: UID,
-        frame_indices: Sequence[int],
+        frame_indices: List[int],
         transfer_syntax: UID,
     ) -> Iterator[bytes]:
         return self._client.iter_instance_frames(

wsidicom/web/wsidicom_web_source.py

@@ -100,7 +100,7 @@ def __init__(
             )
         except StopIteration:
             WsiDicomNotFoundError(
-                "No level instances found", f"{study_uid}, {series_uid}"
+                "No level instances found", f"{study_uid}, {series_uids}"
             )
 
     @property