Add support for Inventory QR (#887)

pydicom · Nov 17, 2023 · 37388d1 · 37388d1
1 parent 081392d
commit 37388d1
Show file tree

Hide file tree

Showing 14 changed files with 356 additions and 27 deletions.
diff --git a/.github/workflows/merge-pytest.yml b/.github/workflows/merge-pytest.yml
@@ -69,7 +69,8 @@ jobs:
  env:
  PYTHON_VERSION: ${{ matrix.python-version }}
  run: |
- poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
+ poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
+ poetry run coverage xml
  - name: Send coverage results
  if: ${{ success() }}
  uses: codecov/codecov-action@v3
@@ -113,7 +114,8 @@ jobs:
  env:
  PYTHON_VERSION: ${{ matrix.python-version }}
  run: |
- poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
+ poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
+ poetry run coverage xml
  - name: Send coverage results
  if: ${{ success() }}
  uses: codecov/codecov-action@v3
@@ -156,7 +158,8 @@ jobs:
  env:
  PYTHON_VERSION: ${{ matrix.python-version }}
  run: |
- poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
+ poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
+ poetry run coverage xml
  - name: Send coverage results
  if: ${{ success() }}
  uses: codecov/codecov-action@v3
diff --git a/.github/workflows/pr-pytest.yml b/.github/workflows/pr-pytest.yml
@@ -69,7 +69,8 @@ jobs:
  env:
  PYTHON_VERSION: ${{ matrix.python-version }}
  run: |
- poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
+ poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
+ poetry run coverage xml
  - name: Send coverage results
  if: ${{ success() }}
  uses: codecov/codecov-action@v3
@@ -113,7 +114,8 @@ jobs:
  env:
  PYTHON_VERSION: ${{ matrix.python-version }}
  run: |
- poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
+ poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
+ poetry run coverage xml
  - name: Send coverage results
  if: ${{ success() }}
  uses: codecov/codecov-action@v3
@@ -156,7 +158,8 @@ jobs:
  env:
  PYTHON_VERSION: ${{ matrix.python-version }}
  run: |
- poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
+ poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
+ poetry run coverage xml
  - name: Send coverage results
  if: ${{ success() }}
  uses: codecov/codecov-action@v3
diff --git a/docs/changelog/v2.1.0.rst b/docs/changelog/v2.1.0.rst
@@ -21,6 +21,8 @@ Enhancements
 * Added support for *Repository Query* to
  :meth:`~pynetdicom.association.Association.send_c_find` and
  :class:`~pynetdicom.service_class.QueryRetrieveServiceClass` (:issue:`878`)
+* Added support for :class:`Inventory Query/Retrieve Service Class
+ <pynetdicom.service_class.InventoryQueryRetrieveServiceClass>` (:issue:`879`)
 
 Changes
 .......

diff --git a/docs/index.rst b/docs/index.rst
@@ -77,6 +77,7 @@ Supported Service Classes
 * :doc:`Hanging Protocol Query/Retrieve <service_classes/hanging_protocol_service_class>`
 * :doc:`Implant Template Query/Retrieve <service_classes/implant_template_service_class>`
 * :doc:`Instance Availability Notification <service_classes/instance_availability>`
+* :doc:`Inventory Query/Retrieve <service_classes/inventory_service_class>`
 * :doc:`Media Creation Management <service_classes/media_creation>`
 * :doc:`Non-Patient Object Storage <service_classes/non_patient_service_class>`
 * :doc:`Print Management <service_classes/print_management>`

diff --git a/docs/reference/service_classes.rst b/docs/reference/service_classes.rst
@@ -17,6 +17,7 @@ pynetdicom supports the following Service Classes
  DefinedProcedureProtocolQueryRetrieveServiceClass
  HangingProtocolQueryRetrieveServiceClass
  ImplantTemplateQueryRetrieveServiceClass
+ InventoryQueryRetrieveServiceClass
  NonPatientObjectStorageServiceClass
  ProtocolApprovalQueryRetrieveServiceClass
  QueryRetrieveServiceClass

diff --git a/docs/service_classes/basic_worklist_service_class.rst b/docs/service_classes/basic_worklist_service_class.rst
@@ -54,7 +54,7 @@ Basic Worklist Management Service Statuses
 +==================+==========+==============================================+
 | 0xA700 | Failure | Out of resources |
 +------------------+----------+----------------------------------------------+
-| 0xA900 | Failure | Identifier does not match SOP Class |
+| 0xA900 | Failure | Data Set does not match SOP Class  |
 +------------------+----------+----------------------------------------------+
 | 0xC000 to 0xCFFF | Failure | Unable to process |
 +------------------+----------+----------------------------------------------+

diff --git a/docs/service_classes/index.rst b/docs/service_classes/index.rst
@@ -13,6 +13,7 @@ Supported Service Classes
  display_system_service_class
  hanging_protocol_service_class
  implant_template_service_class
+ inventory_service_class
  instance_availability
  media_creation
  modality_performed_procedure_step