Skip to content

Implement S3 client for accessing data stored in cloud storage buckets #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Implement S3 client for accessing data stored in cloud storage buckets #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
912d086
Refactor file access by DICOMfileClient
hackermd Aug 9, 2022
c5c2e9b
Fix coding style issues
hackermd Aug 9, 2022
8a6c830
Unify attributes of web and file clients
hackermd Aug 11, 2022
0ca6955
Check scheme and protocol of client instances
hackermd Aug 11, 2022
18ab4d1
Reset inventories when inserting metadata into db
hackermd Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dicomweb_client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '0.56.3'
__version__ = '0.56.4'

from dicomweb_client.api import DICOMwebClient, DICOMfileClient
from dicomweb_client.protocol import DICOMClient
Expand Down
42 changes: 22 additions & 20 deletions src/dicomweb_client/ext/gcp/uri.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

@dataclasses.dataclass(eq=True, frozen=True)
class GoogleCloudHealthcareURL:
"""Base URL container for DICOM Stores under the `Google Cloud Healthcare API`_.
"""URL container for DICOM Stores under the `Google Cloud Healthcare API`_.

This class facilitates the parsing and creation of :py:attr:`URI.base_url`
corresponding to DICOMweb API Service URLs under the v1_ API. The URLs are
Expand All @@ -37,24 +37,26 @@ class GoogleCloudHealthcareURL:
.. _Google Cloud Healthcare API: https://cloud.google.com/healthcare
.. _v1: https://cloud.google.com/healthcare/docs/how-tos/transition-guide

Attributes:
project_id: str
The ID of the `GCP Project
<https://cloud.google.com/healthcare/docs/concepts/projects-datasets-data-stores#projects>`_
that contains the DICOM Store.
location: str
The `Region name
<https://cloud.google.com/healthcare/docs/concepts/regions>`_ of the
geographic location configured for the Dataset that contains the
DICOM Store.
dataset_id: str
The ID of the `Dataset
<https://cloud.google.com/healthcare/docs/concepts/projects-datasets-data-stores#datasets_and_data_stores>`_
that contains the DICOM Store.
dicom_store_id: str
The ID of the `DICOM Store
<https://cloud.google.com/healthcare/docs/concepts/dicom#dicom_stores>`_.
"""
Attributes
----------
project_id: str
The ID of the `GCP Project
<https://cloud.google.com/healthcare/docs/concepts/projects-datasets-data-stores#projects>`_
that contains the DICOM Store.
location: str
The `Region name
<https://cloud.google.com/healthcare/docs/concepts/regions>`_ of the
geographic location configured for the Dataset that contains the
DICOM Store.
dataset_id: str
The ID of the `Dataset
<https://cloud.google.com/healthcare/docs/concepts/projects-datasets-data-stores#datasets_and_data_stores>`_
that contains the DICOM Store.
dicom_store_id: str
The ID of the `DICOM Store
<https://cloud.google.com/healthcare/docs/concepts/dicom#dicom_stores>`_.

""" # noqa: E501
project_id: str
location: str
dataset_id: str
Expand Down Expand Up @@ -84,7 +86,7 @@ def __str__(self) -> str:

@classmethod
def from_string(cls, base_url: str) -> 'GoogleCloudHealthcareURL':
"""Creates an instance from ``base_url``.
"""Create an instance from `base_url`.

Parameters
----------
Expand Down
Loading