Skip to content
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

[MRG] Add support for repository query #886

Merged
merged 3 commits into from
Nov 14, 2023
Merged

[MRG] Add support for repository query #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f60c68
Add support for repository query
scaramallion Nov 14, 2023
7d9e2df
Blacken
scaramallion Nov 14, 2023
a7f2c07
Update codecov to point to main
scaramallion Nov 14, 2023
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
4 changes: 2 additions & 2 deletions .codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ comment:
require_base: yes # [yes :: must have a base report to post]
require_head: yes # [yes :: must have a head report to post]
branches: # branch names that can post comment
- "master"
- "main"

coverage:
status:
Expand All @@ -22,4 +22,4 @@ ignore:
- "pynetdicom/tests"
- "pynetdicom/apps"
- "pynetdicom/benchmarks"
- "pydicom-master"
- "pydicom-main"
3 changes: 3 additions & 0 deletions docs/changelog/v2.1.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ Enhancements

* Added :func:`~pynetdicom.sop_class.register_uid` to make registering new
private and public SOP Classes easier (:issue:`799`)
* Added support for *Repository Query* to
:meth:`~pynetdicom.association.Association.send_c_find` and
:class:`~pynetdicom.service_class.QueryRetrieveServiceClass` (:issue:`878`)

Changes
.......
Expand Down
61 changes: 34 additions & 27 deletions docs/service_classes/query_retrieve_service_class.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,35 @@ Supported SOP Classes

.. _qr_find_sops:

+-----------------------------+---------------------------------------------------+
| UID | SOP Class |
+=============================+===================================================+
| 1.2.840.10008.5.1.4.1.2.1.1 | PatientRootQueryRetrieveInformationModelFind |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.2.1 | StudyRootQueryRetrieveInformationModelFind |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.3.1 | PatientStudyOnlyQueryRetrieveInformationModelFind |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.1.2 | PatientRootQueryRetrieveInformationModelMove |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.2.2 | StudyRootQueryRetrieveInformationModelMove |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.3.2 | PatientStudyOnlyQueryRetrieveInformationModelMove |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.4.2 | CompositeInstanceRootRetrieveMove |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.1.3 | PatientRootQueryRetrieveInformationModelGet |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.2.3 | StudyRootQueryRetrieveInformationModelGet |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.3.3 | PatientStudyOnlyQueryRetrieveInformationModelGet |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.5.3 | CompositeInstanceRetrieveWithoutBulkDataGet |
+-----------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.4.3 | CompositeInstanceRootRetrieveGet |
+-----------------------------+---------------------------------------------------+
+-------------------------------+---------------------------------------------------+
| UID | SOP Class |
+===============================+===================================================+
| 1.2.840.10008.5.1.4.1.2.1.1 | PatientRootQueryRetrieveInformationModelFind |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.2.1 | StudyRootQueryRetrieveInformationModelFind |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.3.1 | PatientStudyOnlyQueryRetrieveInformationModelFind |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.1.2 | PatientRootQueryRetrieveInformationModelMove |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.2.2 | StudyRootQueryRetrieveInformationModelMove |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.3.2 | PatientStudyOnlyQueryRetrieveInformationModelMove |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.4.2 | CompositeInstanceRootRetrieveMove |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.1.3 | PatientRootQueryRetrieveInformationModelGet |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.2.3 | StudyRootQueryRetrieveInformationModelGet |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.3.3 | PatientStudyOnlyQueryRetrieveInformationModelGet |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.5.3 | CompositeInstanceRetrieveWithoutBulkDataGet |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.2.4.3 | CompositeInstanceRootRetrieveGet |
+-------------------------------+---------------------------------------------------+
| 1.2.840.10008.5.1.4.1.1.201.6 | RepositoryQuery |
+-------------------------------+---------------------------------------------------+

DIMSE Services
--------------
Expand Down Expand Up @@ -111,8 +113,13 @@ Query/Retrieve (Find) Service Statuses
+==================+==========+==============================================+
| 0xA700 | Failure | Out of resources |
+------------------+----------+----------------------------------------------+
| 0xA710 | Failure | Invalid prior record key |
+------------------+----------+----------------------------------------------+
| 0xA900 | Failure | Dataset does not match SOP Class |
+------------------+----------+----------------------------------------------+
| 0xB001 | Warning | Matching reached response limit, subsequent |
| | | request may return additional matches |
+------------------+----------+----------------------------------------------+
| 0xC000 to 0xCFFF | Failure | Unable to process |
+------------------+----------+----------------------------------------------+
| 0xFF00 | Pending | Matches are continuing |
Expand Down
Loading