From 1123d70e2190e4694c64b0003a3120a064d5092c Mon Sep 17 00:00:00 2001 From: gacou54 Date: Tue, 12 Sep 2023 11:33:51 -0400 Subject: [PATCH] Fix type annotation and bump version --- pyorthanc/_find.py | 12 ++++++------ pyproject.toml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyorthanc/_find.py b/pyorthanc/_find.py index 024d3f2..c1b322e 100644 --- a/pyorthanc/_find.py +++ b/pyorthanc/_find.py @@ -1,18 +1,18 @@ from typing import Dict, List, Union -from .client import Orthanc from ._resources.instance import Instance from ._resources.patient import Patient from ._resources.resource import Resource from ._resources.series import Series from ._resources.study import Study +from .client import Orthanc DEFAULT_RESOURCES_LIMIT = 1_000 def find_patients(client: Orthanc, query: Dict[str, str] = None, - labels: Union[list[str], str] = None, + labels: Union[List[str], str] = None, labels_constraint: str = 'All') -> List[Patient]: """Finds patients in Orthanc according to queries and labels @@ -56,7 +56,7 @@ def find_patients(client: Orthanc, def find_studies(client: Orthanc, query: Dict[str, str] = None, - labels: Union[list[str], str] = None, + labels: Union[List[str], str] = None, labels_constraint: str = 'All') -> List[Study]: """Finds studies in Orthanc according to queries and labels @@ -101,7 +101,7 @@ def find_studies(client: Orthanc, def find_series(client: Orthanc, query: Dict[str, str] = None, - labels: Union[list[str], str] = None, + labels: Union[List[str], str] = None, labels_constraint: str = 'All') -> List[Series]: """Finds series in Orthanc according to queries and labels @@ -145,7 +145,7 @@ def find_series(client: Orthanc, def find_instances(client: Orthanc, query: Dict[str, str] = None, - labels: Union[list[str], str] = None, + labels: Union[List[str], str] = None, labels_constraint: str = 'All') -> List[Instance]: """Finds instances in Orthanc according to queries and labels @@ -190,7 +190,7 @@ def find_instances(client: Orthanc, def query_orthanc(client: Orthanc, level: str, query: Dict[str, str] = None, - labels: Union[list[str], str] = None, + labels: Union[List[str], str] = None, labels_constraint: str = 'All', limit: int = DEFAULT_RESOURCES_LIMIT, since: int = 0, diff --git a/pyproject.toml b/pyproject.toml index f7471e7..95bb481 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pyorthanc" -version = "1.12.1" +version = "1.12.2" description = "Orthanc REST API python wrapper with additional utilities" authors = [ "Gabriel Couture ", @@ -10,7 +10,7 @@ license = "MIT" readme = 'README.md' homepage = "https://gacou54.github.io/pyorthanc/" repository = "https://github.com/gacou54/pyorthanc" -keywords = ["Orthanc", "DICOM", "Medical Imaging"] +keywords = ["Orthanc", "DICOM", "Medical-Imaging"] [tool.poetry.dependencies]