Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6e9ed11
adding pseudonym to wador views
chinacat567 May 16, 2025
cd86735
using pydicomweb-client
chinacat567 May 16, 2025
fd6c6b5
Merge branch 'main' into adit-pseudonym
chinacat567 May 16, 2025
32a21bb
lint fix, lockfile update
chinacat567 May 16, 2025
3ec96a7
fixing formatting
chinacat567 May 18, 2025
0524510
fixing merge conflicts
chinacat567 May 18, 2025
1c24d03
fixing formatting errors
chinacat567 May 18, 2025
1932e62
more formatting fixes
chinacat567 May 18, 2025
0cf5bff
parsing pseudonym
chinacat567 May 19, 2025
325470d
Merge branch 'main' into adit-pseudonym
chinacat567 May 19, 2025
83e29ea
adding char limit, wildcard validation and tests
chinacat567 May 20, 2025
3caa6ef
validator and test refac
chinacat567 May 21, 2025
c3ad5a4
shared pseudnymizer, test changes
chinacat567 May 23, 2025
aaf8340
bug fix
chinacat567 May 23, 2025
0e219c3
adit client deadcode removal
chinacat567 May 23, 2025
4daa0b5
pseudonymizer changes
chinacat567 May 23, 2025
7f2136e
refac validate_pseudonym -> _get_pseudonym
chinacat567 May 24, 2025
ba3e6ee
passing pseudonym through adit client and changing acceptance tests t…
chinacat567 May 24, 2025
0928602
reorg validator directory
chinacat567 May 25, 2025
8f4456d
adding metadata functions to adit_client
chinacat567 May 25, 2025
b40a44a
unit test fix
chinacat567 May 25, 2025
5bca9eb
Merge branch 'main' into adit-pseudonym
chinacat567 May 25, 2025
22a9d74
pydicomweb-client => dicomweb-client
chinacat567 May 25, 2025
9bd49c3
<broken> : pseduonymizer changes, pytest changes
chinacat567 May 27, 2025
2631705
bug fix
chinacat567 May 27, 2025
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 adit-client/adit_client/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

from dicognito.anonymizer import Anonymizer
from dicognito.value_keeper import ValueKeeper
from dicomweb_client import DICOMwebClient, session_utils
from pydicom import Dataset
from pydicomweb_client import DICOMwebClient, session_utils

DEFAULT_SKIP_ELEMENTS_ANONYMIZATION = [
"AcquisitionDate",
Expand Down
2 changes: 1 addition & 1 deletion adit/core/utils/dicom_web_connector.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from pathlib import Path
from typing import Callable, Iterator, NoReturn

from dicomweb_client import DICOMwebClient
from pydicom import Dataset
from pydicom.errors import InvalidDicomError
from pydicomweb_client import DICOMwebClient
from requests import HTTPError

from ..errors import DicomError, RetriableDicomError
Expand Down
2 changes: 1 addition & 1 deletion adit/core/utils/testing_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import pandas as pd
from adit_radis_shared.accounts.factories import GroupFactory
from adit_radis_shared.common.utils.testing_helpers import add_permission
from dicomweb_client import DICOMwebClient
from django.conf import settings
from django.core.management import call_command
from playwright.sync_api import FilePayload
from pydicom import Dataset
from pydicomweb_client import DICOMwebClient
from pynetdicom.association import Association
from pynetdicom.status import Status

Expand Down
4 changes: 4 additions & 0 deletions adit/core/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
inverse_match=True,
)

char_limit_validator = RegexValidator(
regex=r".{0,64}", message="String too long (max 64 characters)."
)

uid_chars_validator = RegexValidator(regex=r"^[\d\.]+$", message="Invalid character in UID.")


Expand Down
Loading