diff --git a/.env.example b/.env.example index ff738bf0f4..31f34d5ab7 100644 --- a/.env.example +++ b/.env.example @@ -23,6 +23,10 @@ CONTACT_EMAIL='PhysioNet Contact ' SERVER_EMAIL='PhysioNet System ' ERROR_EMAIL='contact@physionet.org' +# Contact address for project editors. This address may be viewable by authors. +# Optionally, add "PROJECT-SLUG" to include the project slug. +PROJECT_EDITOR_EMAIL='editor+PROJECT-SLUG@dev.physionet.org' + # Admins ADMINS_NAME=PhysioNet Technical ADMINS_MAIL=technical@dev.physionet.org @@ -60,6 +64,18 @@ AWS_VALUE=secret AWS_VALUE2=secret AWS_CLOUD_FORMATION=url +# AWS credentials (Access Key and Secret Key): Configure AWS credentials in the AWS CLI profile using the 'aws configure' command. +AWS_PROFILE= +# AWS account ID +AWS_ACCOUNT_ID= +# Path to the file containing credentials for AWS +# (https://boto3.amazonaws.com/v1/documentation/api/latest/guide/credentials.html#shared-credentials-file) +AWS_SHARED_CREDENTIALS_FILE= +# The default bucket name to store projects with an 'OPEN' access policy. +S3_OPEN_ACCESS_BUCKET= +# The default bucket name to store logs and metrics related to project usage. +S3_SERVER_ACCESS_LOG_BUCKET= + # Datacite # Used to assign the DOIs # Changing the password can be done at the settings tab in DataCite website @@ -98,8 +114,6 @@ GCS_SIGNED_URL_LIFETIME_IN_MINUTES=1440 # GCP Research Environments ENABLE_CLOUD_RESEARCH_ENVIRONMENTS="False" CLOUD_RESEARCH_ENVIRONMENTS_API_URL="https://example.api" -CLOUD_RESEARCH_ENVIRONMENTS_API_JWT_SERVICE_ACCOUNT_PATH="environment/api/tests/service_account.json" -CLOUD_RESEARCH_ENVIRONMENTS_API_JWT_AUDIENCE="https://example.com" # Site-specific content SITE_NAME="DataShare" @@ -160,6 +174,10 @@ GRADIENT_85 = 'rgba(42, 47, 52, 0.85)' # maximum number of emails that can be associated to a user model MAX_EMAILS_PER_USER = 10 +# maximum number of active projects that can be created by a submitting author at any time. +# if MAX_SUBMITTABLE_PROJECTS is reached, the user must wait for a project to be archived or published before starting another. +MAX_SUBMITTABLE_PROJECTS = 10 + # Max training report size in bytes MAX_TRAINING_REPORT_UPLOAD_SIZE = 1048576 ENABLE_LIGHTWAVE=True @@ -187,7 +205,7 @@ MIN_WORDS_RESEARCH_SUMMARY_CREDENTIALING = 20 # CITISOAPService API # This is the WebServices username and password to access the CITI SOAP Service to obtain users training report details # The account can be created at https://webservices.citiprogram.org/login/CreateAccount.aspx -# The SOAP Service Access can be tested at https://webservices.citiprogram.org/Client/CITISOAPClient_Simple.aspx +# The SOAP Service Access can be tested at https://webservices.citiprogram.org/Client/CITISOAPClient_Simple.aspx CITI_USERNAME= CITI_PASSWORD= CITI_SOAP_URL="https://webservices.citiprogram.org/SOAP/CITISOAPService.asmx" diff --git a/.github/workflows/physionet-build-test.yml b/.github/workflows/physionet-build-test.yml index a690cb846d..8f0bc193b5 100644 --- a/.github/workflows/physionet-build-test.yml +++ b/.github/workflows/physionet-build-test.yml @@ -14,7 +14,7 @@ jobs: test: name: Test runs-on: ubuntu-latest - container: debian:11 + container: ${{ matrix.container }} env: DJANGO_SETTINGS_MODULE: physionet.settings.settings TEST_GCS_INTEGRATION: false @@ -26,6 +26,7 @@ jobs: fail-fast: false matrix: pip3: ['poetry', 'requirements.txt'] + container: ['debian:11', 'debian:12'] steps: - name: Update packages @@ -96,7 +97,7 @@ jobs: - name: Install and setup lightwave run: | - wget https://github.com/bemoody/lightwave/archive/0.71.tar.gz -O lightwave.tar.gz + wget https://github.com/bemoody/lightwave/archive/0.72.tar.gz -O lightwave.tar.gz tar -xf lightwave.tar.gz (cd lightwave-* && make CGIDIR=/usr/local/bin sandboxed-server) diff --git a/.github/workflows/physionet-upgrade-test.yml b/.github/workflows/physionet-upgrade-test.yml index 88aeba6308..3fbca0fc3e 100644 --- a/.github/workflows/physionet-upgrade-test.yml +++ b/.github/workflows/physionet-upgrade-test.yml @@ -12,7 +12,10 @@ jobs: testupgrade: name: Upgrade Test runs-on: ubuntu-latest - container: debian:11 + container: ${{ matrix.container }} + strategy: + matrix: + container: ['debian:11', 'debian:12'] steps: - name: Install dependencies run: | @@ -53,7 +56,7 @@ jobs: - name: Install lightwave run: | - wget https://github.com/bemoody/lightwave/archive/0.71.tar.gz \ + wget https://github.com/bemoody/lightwave/archive/0.72.tar.gz \ -O lightwave.tar.gz tar -xf lightwave.tar.gz (cd lightwave-* && make CGIDIR=/usr/local/bin sandboxed-server) diff --git a/Dockerfile b/Dockerfile index e902f5b7be..49b3bec166 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN wget https://github.com/bemoody/wfdb/archive/10.7.0.tar.gz -O wfdb.tar.gz \ && ldconfig \ && rm -rf wfdb* -RUN wget https://github.com/bemoody/lightwave/archive/0.71.tar.gz -O lightwave.tar.gz \ +RUN wget https://github.com/bemoody/lightwave/archive/0.72.tar.gz -O lightwave.tar.gz \ && tar -xf lightwave.tar.gz \ && (cd lightwave-* && make sandboxed-lightwave && mkdir -p /usr/local/bin && install -m 4755 sandboxed-lightwave /usr/local/bin) \ && rm -rf lightwave* diff --git a/README.md b/README.md index a8222726fc..1a9c3328e7 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,12 @@ The code should dynamically reload in development, however, if there are any iss Docker-compose uses volumes to persist the database contents and data directories (media and static files). To clean up the created containers, networks and volumes stop `docker-compose up` and run `docker-compose down -v`. Do not run `docker-compose down -v` if you want to retain current database contents. +## Background tasks + +Background tasks are managed by [Django Q2](https://django-q2.readthedocs.io/en/master/), "a native Django task queue, scheduler and worker application using Python multiprocessing". + +If you would like to run background tasks on your development server, you will need to start the task manager with `python manage.py qcluster` + ## Using a debugger with Docker To access a debug prompt raised using `breakpoint()`: diff --git a/demo-files/aws_credentials b/demo-files/aws_credentials new file mode 100644 index 0000000000..5c0206fd22 --- /dev/null +++ b/demo-files/aws_credentials @@ -0,0 +1,3 @@ +[default] +aws_access_key_id = AKIAZZZZZZZZZZZZZZZZ +aws_secret_access_key = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/deploy/README.md b/deploy/README.md index 3860114ab6..c381fc3dd2 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -100,8 +100,8 @@ cd /physionet # Copy over the .env file into /physionet/physionet-build scp /.env /physionet/physionet-build/ # The software folder should be owned by the dedicated user. The socket file directory should be accessible by nginx. -chown -R pn.pn /physionet -chown pn.www-data /physionet/deploy +chown -R pn:pn /physionet +chown pn:www-data /physionet/deploy chmod g+w /physionet/deploy # Make the static and media roots mkdir /data @@ -109,7 +109,7 @@ mkdir /data/pn-static mkdir /data/pn-static/published-projects mkdir /data/pn-media mkdir /data/pn-media/{active-projects,archived-projects,credential-applications,published-projects,users} -chown -R pn.pn /data/{pn-media,pn-static} +chown -R pn:pn /data/{pn-media,pn-static} ``` The directory structure for the site's software and files will be: diff --git a/deploy/common/etc/sudoers.d/physionet b/deploy/common/etc/sudoers.d/physionet index fd522bcee2..3a0260ec37 100644 --- a/deploy/common/etc/sudoers.d/physionet +++ b/deploy/common/etc/sudoers.d/physionet @@ -16,3 +16,7 @@ pn ALL=(root:root) NOPASSWD: \ # Restart django-background-tasks.service (if it is running) pn ALL=(root:root) NOPASSWD: \ /bin/systemctl try-restart django-background-tasks.service + +# Restart django-q2-tasks.service (if it is running) +pn ALL=(root:root) NOPASSWD: \ + /bin/systemctl try-restart django-q2-tasks.service diff --git a/deploy/post-receive b/deploy/post-receive index f4edc973cf..aec4db3227 100755 --- a/deploy/post-receive +++ b/deploy/post-receive @@ -112,6 +112,7 @@ else fi # Restart the django-background-tasks server +# Background tasks will soon be migrated to Django Q2 ( cd $working_dir/physionet-django if cmp -s OLD-TARGETS LATE-TARGETS; then @@ -130,6 +131,25 @@ fi fi ) +# Restart the Django Q2 server +( + cd $working_dir/physionet-django + if cmp -s OLD-TARGETS LATE-TARGETS; then + # assume that if there are no migrations, no need to restart + # background tasks (and don't even bother showing a message) + : + elif [ -n "$no_bgtasks" ]; then + echo "- SKIPPING restarting django-q2-tasks due to" + echo " --push-option=no-bgtasks" + elif [ -n "$no_install" ]; then + echo "- SKIPPING restarting django-q2-tasks due to" + echo " --push-option=no-install" + else + echo "* Restarting django-q2-tasks..." + sudo systemctl try-restart django-q2-tasks.service + fi +) + # Run late migrations (as well as early migrations, if they were # skipped before) ( diff --git a/deploy/production/etc/rsyslog.d/django_q.conf b/deploy/production/etc/rsyslog.d/django_q.conf new file mode 100644 index 0000000000..e440311714 --- /dev/null +++ b/deploy/production/etc/rsyslog.d/django_q.conf @@ -0,0 +1,3 @@ +# Filter to get all background tasks and send them to a custom location +:programname, isequal, "django-q2-tasks" -/data/log/background_tasks/django_q_tasks.log +& stop diff --git a/deploy/production/etc/systemd/system/django-q2-tasks.service b/deploy/production/etc/systemd/system/django-q2-tasks.service new file mode 100644 index 0000000000..facb33eee3 --- /dev/null +++ b/deploy/production/etc/systemd/system/django-q2-tasks.service @@ -0,0 +1,18 @@ +[Unit] +Description=Command that runs Django Q2 tasks +After=emperor.uwsgi.service + +[Service] +Environment=DJANGO_SETTINGS_MODULE=physionet.settings.production +ExecStart=/physionet/python-env/physionet/bin/python /physionet/physionet-build/physionet-django/manage.py qcluster +StandardError=syslog +SyslogIdentifier=django-q2-tasks +Restart=always +KillSignal=SIGINT +Type=simple +NotifyAccess=all +User=www-data +Group=www-data + +[Install] +WantedBy=multi-user.target diff --git a/deploy/staging/etc/rsyslog.d/django_q.conf b/deploy/staging/etc/rsyslog.d/django_q.conf new file mode 100644 index 0000000000..e440311714 --- /dev/null +++ b/deploy/staging/etc/rsyslog.d/django_q.conf @@ -0,0 +1,3 @@ +# Filter to get all background tasks and send them to a custom location +:programname, isequal, "django-q2-tasks" -/data/log/background_tasks/django_q_tasks.log +& stop diff --git a/deploy/staging/etc/systemd/system/django-q2-tasks.service b/deploy/staging/etc/systemd/system/django-q2-tasks.service new file mode 100644 index 0000000000..6cfbfc233f --- /dev/null +++ b/deploy/staging/etc/systemd/system/django-q2-tasks.service @@ -0,0 +1,18 @@ +[Unit] +Description=Command that runs Django Q2 tasks +After=emperor.uwsgi.service + +[Service] +Environment=DJANGO_SETTINGS_MODULE=physionet.settings.staging +ExecStart=/physionet/python-env/physionet/bin/python /physionet/physionet-build/physionet-django/manage.py qcluster +StandardError=syslog +SyslogIdentifier=django-q2-tasks +Restart=always +KillSignal=SIGINT +Type=simple +NotifyAccess=all +User=www-data +Group=www-data + +[Install] +WantedBy=multi-user.target diff --git a/deploy/test-server/install-pn-test-server b/deploy/test-server/install-pn-test-server index 87a43ac253..a48652a0cf 100755 --- a/deploy/test-server/install-pn-test-server +++ b/deploy/test-server/install-pn-test-server @@ -90,7 +90,7 @@ printf '%s\n%s\n' "$DBPASSWORD" "$DBPASSWORD" | su postgres -c 'createdb physionet -O physionet' mkdir -p /physionet /data/pn-static /data/pn-media -chown pn.pn /physionet /data/pn-static /data/pn-media +chown pn:pn /physionet /data/pn-static /data/pn-media su pn -c ' set -e umask 0002 @@ -153,17 +153,17 @@ su pn -c ' yes | python3 manage.py loaddemo ' -chown www-data.www-data -R /physionet/deploy -chown www-data.www-data -R /data/pn-media -chown www-data.www-data -R /data/pn-static/published-projects +chown www-data:www-data -R /physionet/deploy +chown www-data:www-data -R /data/pn-media +chown www-data:www-data -R /data/pn-static/published-projects rm /etc/nginx/sites-enabled/default ln -s ../sites-available/physionet_nginx.conf \ /etc/nginx/sites-enabled/physionet_nginx.conf mkdir /data/log /data/log/nginx /data/log/uwsgi /data/log/pn -chown www-data.root /data/log/uwsgi -chown pn.root /data/log/pn +chown www-data:root /data/log/uwsgi +chown pn:root /data/log/pn ( cd /physionet/physionet-build/deploy/common @@ -234,9 +234,14 @@ systemctl daemon-reload systemctl enable emperor.uwsgi systemctl restart emperor.uwsgi systemctl restart nginx + +# django-background-tasks will be replaced with Django Q2 soon systemctl enable django-background-tasks systemctl restart django-background-tasks +systemctl enable django-q2-tasks +systemctl restart django-q2-tasks + su pn -c ' cd /physionet/physionet-build.git echo diff --git a/physionet-django/.coveragerc b/physionet-django/.coveragerc new file mode 100644 index 0000000000..4f8710d568 --- /dev/null +++ b/physionet-django/.coveragerc @@ -0,0 +1,5 @@ +[run] +plugins = django_coverage_plugin + +[django_coverage_plugin] +template_extensions = html, txt, json, xml diff --git a/physionet-django/console/forms.py b/physionet-django/console/forms.py index 74f86d7923..943bd5c33f 100644 --- a/physionet-django/console/forms.py +++ b/physionet-django/console/forms.py @@ -1,10 +1,5 @@ -import pdb import re -from django.forms.widgets import RadioSelect - -from django.forms.widgets import RadioSelect - from console.utility import generate_doi_payload, register_doi from dal import autocomplete from django import forms @@ -27,9 +22,10 @@ PublishedAffiliation, PublishedAuthor, PublishedProject, + PublishedPublication, + SubmissionStatus, exists_project_slug, ) -from project.projectfiles import ProjectFiles from project.validators import MAX_PROJECT_SLUG_LENGTH, validate_doi, validate_slug from user.models import CodeOfConduct, CredentialApplication, CredentialReview, User, TrainingQuestion @@ -91,10 +87,12 @@ def __init__(self, *args, **kwargs): .order_by('username') def clean_project(self): - pid = self.cleaned_data['project'] + pid = self.cleaned_data["project"] validate_integer(pid) - if ActiveProject.objects.get(id=pid) not in ActiveProject.objects.filter(submission_status=10): - raise forms.ValidationError('Incorrect project selected.') + if ActiveProject.objects.get(id=pid) not in ActiveProject.objects.filter( + submission_status=SubmissionStatus.NEEDS_ASSIGNMENT + ): + raise forms.ValidationError("Incorrect project selected.") return pid @@ -225,18 +223,15 @@ def save(self): # Reject if edit_log.decision == 0: project.reject() - # Have to reload this object which is changed by the reject - # function - edit_log = EditLog.objects.get(id=edit_log.id) # Resubmit with revisions elif edit_log.decision == 1: - project.submission_status = 30 + project.submission_status = SubmissionStatus.NEEDS_RESUBMISSION project.revision_request_datetime = now project.latest_reminder = now project.save() # Accept else: - project.submission_status = 40 + project.submission_status = SubmissionStatus.NEEDS_COPYEDIT project.editor_accept_datetime = now project.latest_reminder = now @@ -289,7 +284,7 @@ def save(self): project = copyedit_log.project now = timezone.now() copyedit_log.complete_datetime = now - project.submission_status = 50 + project.submission_status = SubmissionStatus.NEEDS_APPROVAL project.copyedit_completion_datetime = now project.latest_reminder = now copyedit_log.save() @@ -310,12 +305,12 @@ def __init__(self, project, *args, **kwargs): super().__init__(*args, **kwargs) self.project = project # No option to set slug if publishing new version - if self.project.version_order: + if self.project.is_new_version: del(self.fields['slug']) else: self.fields['slug'].initial = project.slug - if not ProjectFiles().can_make_zip(): + if not project.files.can_make_zip(): self.fields['make_zip'].disabled = True self.fields['make_zip'].required = False self.fields['make_zip'].initial = 0 @@ -637,7 +632,7 @@ class NewsForm(forms.ModelForm): class Meta: model = News - fields = ('title', 'content', 'url', 'project', 'front_page_banner') + fields = ('slug', 'title', 'content', 'url', 'project', 'link_all_versions', 'front_page_banner') class FeaturedForm(forms.Form): @@ -705,6 +700,32 @@ def save(self): return contact +class AddPublishedPublicationForm(forms.ModelForm): + class Meta: + model = PublishedPublication + fields = ('citation', 'url') + + def __init__(self, project, *args, **kwargs): + super().__init__(*args, **kwargs) + self.project = project + + def clean(self): + cleaned_data = super().clean() + existing_publication = PublishedPublication.objects.filter(project=self.project).first() + + if existing_publication: + raise forms.ValidationError("A publication already exists for this project.") + + return cleaned_data + + def save(self, commit=True): + publication = super().save(commit=False) + publication.project = self.project + if commit: + publication.save() + return publication + + class CreateLegacyAuthorForm(forms.ModelForm): """ Create an author for a legacy project. diff --git a/physionet-django/console/navbar.py b/physionet-django/console/navbar.py new file mode 100644 index 0000000000..1a06ec823d --- /dev/null +++ b/physionet-django/console/navbar.py @@ -0,0 +1,220 @@ +import functools + +from django.conf import settings +from django.urls import get_resolver, reverse +from django.utils.translation import gettext_lazy as _ + +from physionet.settings.base import StorageTypes + + +class NavLink: + """ + A link to be displayed in the navigation menu. + + The exact URL of the link is determined by reversing the view + name. + + The use of view_args is deprecated, and provided for compatibility + with existing views that require a static URL argument. Don't use + view_args for newly added items. + + The link will only be displayed in the menu if the logged-in user + has permission to access that URL. This means that the + corresponding view function must be decorated with the + console_permission_required decorator. + + The link will appear as "active" if the request URL matches the + link URL or a descendant. + """ + def __init__(self, title, view_name, icon=None, *, + enabled=True, view_args=()): + self.title = title + self.icon = icon + self.enabled = enabled + self.view_name = view_name + self.view_args = view_args + if self.view_args: + self.name = self.view_name + '__' + '_'.join(self.view_args) + else: + self.name = self.view_name + + @functools.cached_property + def url(self): + return reverse(self.view_name, args=self.view_args) + + @functools.cached_property + def required_permission(self): + view = get_resolver().resolve(self.url).func + return view.required_permission + + def is_visible(self, request): + return self.enabled and request.user.has_perm(self.required_permission) + + def is_active(self, request): + return request.path.startswith(self.url) + + +class NavHomeLink(NavLink): + """ + Variant of NavLink that does not include sub-pages. + """ + def is_active(self, request): + return request.path == self.url + + +class NavSubmenu: + """ + A collection of links to be displayed as a submenu. + """ + def __init__(self, title, name, icon=None, items=[]): + self.title = title + self.name = name + self.icon = icon + self.items = items + + +class NavMenu: + """ + A collection of links and submenus for navigation. + """ + def __init__(self, items): + self.items = items + + def get_menu_items(self, request): + """ + Return the navigation menu items for an HTTP request. + + This returns a list of dictionaries, each of which represents + either a page link or a submenu. + + For a page link, the dictionary contains: + - 'title': human readable title + - 'name': unique name (corresponding to the view name) + - 'icon': icon name + - 'url': page URL + - 'active': true if this page is currently active + + For a submenu, the dictionary contains: + - 'title': human readable title + - 'name': unique name + - 'icon': icon name + - 'subitems': list of page links + - 'active': true if this submenu is currently active + """ + visible_items = [] + + for item in self.items: + if isinstance(item, NavSubmenu): + subitems = item.items + elif isinstance(item, NavLink): + subitems = [item] + else: + raise TypeError(item) + + visible_subitems = [] + active = False + for subitem in subitems: + if subitem.is_visible(request): + subitem_active = subitem.is_active(request) + active = active or subitem_active + visible_subitems.append({ + 'title': subitem.title, + 'name': subitem.name, + 'icon': subitem.icon, + 'url': subitem.url, + 'active': subitem_active, + }) + + if visible_subitems: + if isinstance(item, NavSubmenu): + visible_items.append({ + 'title': item.title, + 'name': item.name, + 'icon': item.icon, + 'subitems': visible_subitems, + 'active': active, + }) + else: + visible_items += visible_subitems + + return visible_items + + +CONSOLE_NAV_MENU = NavMenu([ + NavHomeLink(_('Home'), 'console_home', 'book-open'), + + NavLink(_('Editor Home'), 'editor_home', 'book-open'), + + NavSubmenu(_('Projects'), 'projects', 'clipboard-list', [ + NavLink(_('Unsubmitted'), 'unsubmitted_projects'), + NavLink(_('Submitted'), 'submitted_projects'), + NavLink(_('Published'), 'published_projects'), + NavLink(_('Archived'), 'archived_submissions'), + ]), + + NavLink(_('Storage'), 'storage_requests', 'cube'), + + NavSubmenu(_('Cloud'), 'cloud', 'cloud', [ + NavLink(_('Mirrors'), 'cloud_mirrors'), + ]), + + NavSubmenu(_('Identity check'), 'identity', 'hand-paper', [ + NavLink(_('Processing'), 'credential_processing'), + NavLink(_('All Applications'), 'credential_applications', + view_args=['successful']), + NavLink(_('Known References'), 'known_references'), + ]), + + NavLink(_('Training check'), 'training_list', 'school', + view_args=['review']), + + NavLink(_('Courses'), 'courses', 'chalkboard-teacher'), + + NavSubmenu(_('Events'), 'events', 'clipboard-list', [ + NavLink(_('Active'), 'event_active'), + NavLink(_('Archived'), 'event_archive'), + ]), + + NavSubmenu(_('Legal'), 'legal', 'handshake', [ + NavLink(_('Licenses'), 'license_list'), + NavLink(_('DUAs'), 'dua_list'), + NavLink(_('Code of Conduct'), 'code_of_conduct_list'), + NavLink(_('Event Agreements'), 'event_agreement_list'), + ]), + + NavSubmenu(_('Logs'), 'logs', 'fingerprint', [ + NavLink(_('Project Logs'), 'project_access_logs'), + NavLink(_('Access Requests'), 'project_access_requests_list'), + NavLink(_('User Logs'), 'user_access_logs'), + NavLink(_('GCP Logs'), 'gcp_signed_urls_logs', + enabled=(settings.STORAGE_TYPE == StorageTypes.GCP)), + ]), + + NavSubmenu(_('Users'), 'users', 'user-check', [ + NavLink(_('Active Users'), 'users', view_args=['active']), + NavLink(_('Inactive Users'), 'users', view_args=['inactive']), + NavLink(_('All Users'), 'users', view_args=['all']), + NavLink(_('User Groups'), 'user_groups'), + NavLink(_('Administrators'), 'users', view_args=['admin']), + ]), + + NavLink(_('Featured Content'), 'featured_content', 'star'), + + NavSubmenu(_('Guidelines'), 'guidelines', 'book', [ + NavLink(_('Project review'), 'guidelines_review'), + ]), + + NavSubmenu(_('Usage Stats'), 'stats', 'chart-area', [ + NavLink(_('Editorial'), 'editorial_stats'), + NavLink(_('Credentialing'), 'credentialing_stats'), + NavLink(_('Submissions'), 'submission_stats'), + ]), + + NavSubmenu(_('Pages'), 'pages', 'window-maximize', [ + NavLink(_('Static Pages'), 'static_pages'), + NavLink(_('Frontpage Buttons'), 'frontpage_buttons'), + NavLink(_('Redirects'), 'redirects'), + ]), + + NavLink(_('News'), 'news_console', 'newspaper'), +]) diff --git a/physionet-django/console/services.py b/physionet-django/console/services.py index 18218cc088..9edcf9651e 100644 --- a/physionet-django/console/services.py +++ b/physionet-django/console/services.py @@ -4,7 +4,7 @@ from typing import Optional from pdfminer.high_level import extract_text -from pdfminer.pdfparser import PDFSyntaxError +from pdfminer.pdfparser import PDFException from django.conf import settings from user.models import Training @@ -29,7 +29,7 @@ def _get_regex_value_from_text(text: str, regex: str) -> Optional[str]: def _parse_pdf_to_string(training_path: str) -> str: try: text = extract_text(training_path) - except PDFSyntaxError: + except PDFException: text = '' logging.error(f'Failed to extract text from {training_path}') return ' '.join(text.split()) diff --git a/physionet-django/console/static/console/css/cloud-mirrors.css b/physionet-django/console/static/console/css/cloud-mirrors.css new file mode 100644 index 0000000000..d01bc8fc12 --- /dev/null +++ b/physionet-django/console/static/console/css/cloud-mirrors.css @@ -0,0 +1,91 @@ +.table-cloud-status { + table-layout: fixed; + width: 100%; +} + +.table-cloud-status .col-project-version { + width: 7rem; +} +.table-cloud-status .col-project-site-status, +.table-cloud-status .col-project-cloud-status { + width: 3rem; + text-align: center; + overflow-x: hidden; +} + +.project-site-status-title, +.project-cloud-status-title { + font-size: 0; +} +.project-site-status-title::before, +.project-cloud-status-title::before { + font-size: 1rem; + display: inline-block; + width: 1.25em; + font-family: "Font Awesome 5 Free"; + font-weight: 900; +} +.project-site-status-title::before { + content: "\f019"; /* download */ +} +.project-cloud-status-title::before { + content: "\f381"; /* cloud-download-alt */ +} +.col-gcp .project-cloud-status-title::before { + font-family: "Font Awesome 5 Brands"; + font-weight: 400; + content: "\f1a0"; /* google */ +} +.col-aws .project-cloud-status-title::before { + font-family: "Font Awesome 5 Brands"; + font-weight: 400; + content: "\f375"; /* aws */ +} + +.project-site-status-open, +.project-site-status-restricted, +.project-site-status-embargo, +.project-site-status-forbidden, +.project-cloud-status-public, +.project-cloud-status-private, +.project-cloud-status-pending, +.project-cloud-status-none { + font-size: 0; +} +.project-site-status-open::before, +.project-site-status-restricted::before, +.project-site-status-embargo::before, +.project-site-status-forbidden::before, +.project-cloud-status-public::before, +.project-cloud-status-private::before, +.project-cloud-status-pending::before, +.project-cloud-status-none::before { + font-size: 1rem; + display: inline-block; + width: 1.25em; + font-family: "Font Awesome 5 Free"; + font-weight: 900; +} +.project-site-status-open::before, +.project-cloud-status-public::before { + content: "\f058"; /* check-circle */ + color: #0a0; +} +.project-site-status-restricted::before, +.project-cloud-status-private::before { + content: "\f2bd"; /* user-circle */ + color: #50f; +} +.project-site-status-embargo::before { + content: "\f28b"; /* pause-circle */ + color: #fa0; +} +.project-site-status-forbidden::before { + content: "\f057"; /* times-circle */ + color: #c00; +} +.project-cloud-status-pending::before { + content: "\f017"; /* clock */ + font-weight: 400; + color: #888; +} diff --git a/physionet-django/console/static/console/css/console-noscript.css b/physionet-django/console/static/console/css/console-noscript.css new file mode 100644 index 0000000000..ea7eb868d6 --- /dev/null +++ b/physionet-django/console/static/console/css/console-noscript.css @@ -0,0 +1,8 @@ +.navbar-sidenav .nav-item:focus-within .collapse, +.navbar-sidenav .nav-link-collapse:focus + .collapse { + display: block; +} + +#mainNav .navbar-collapse .navbar-sidenav .nav-item:focus-within .nav-link-collapse.collapsed::after { + content: "\f107"; /* angle-down */ +} diff --git a/physionet-django/console/templates/console/base_console.html b/physionet-django/console/templates/console/base_console.html index 9cef68aa44..8207ecbe77 100644 --- a/physionet-django/console/templates/console/base_console.html +++ b/physionet-django/console/templates/console/base_console.html @@ -7,6 +7,7 @@ {% include "base_css.html" %} + {% block local_css %}{% endblock %} {% include "base_js_top.html" %} {% block local_js_top %}{% endblock %} diff --git a/physionet-django/console/templates/console/cloud_mirrors.html b/physionet-django/console/templates/console/cloud_mirrors.html new file mode 100644 index 0000000000..eafa471146 --- /dev/null +++ b/physionet-django/console/templates/console/cloud_mirrors.html @@ -0,0 +1,96 @@ +{% extends "console/base_console.html" %} + +{% load static %} + +{% block title %}Cloud Mirrors{% endblock %} + +{% block local_css %} + +{% endblock %} + +{% block content %} +
+
+ +
+
+ + + + + + + {% for platform in cloud_platforms %} + + {% endfor %} + + + + {% for project, mirrors in project_mirrors.items %} + + + + + {% for platform_mirror in mirrors %} + + {% endfor %} + + {% endfor %} + +
ProjectVersion + + {{ SITE_NAME }} + + + + {{ platform.name }} + +
+ + {{ project.title }} + + {{ project.version }} + {% if project.deprecated_files %} + Deprecated + {% elif not project.allow_file_downloads %} + Forbidden + {% elif project.embargo_active %} + Embargo + {% elif project.access_policy != AccessPolicy.OPEN %} + Restricted + {% else %} + Open + {% endif %} + + {% if not platform_mirror %} + + {% elif not platform_mirror.sent_files %} + Pending + {% elif platform_mirror.is_private %} + Private + {% else %} + Public + {% endif %} +
+
+
+{% endblock %} diff --git a/physionet-django/console/templates/console/console_navbar.html b/physionet-django/console/templates/console/console_navbar.html index c6667885b8..61f96aceaf 100644 --- a/physionet-django/console/templates/console/console_navbar.html +++ b/physionet-django/console/templates/console/console_navbar.html @@ -1,4 +1,5 @@ {% load static %} +{% load console_templatetags %} diff --git a/physionet-django/console/templates/console/copyedit_submission.html b/physionet-django/console/templates/console/copyedit_submission.html index 419df43f76..afbf06822c 100644 --- a/physionet-django/console/templates/console/copyedit_submission.html +++ b/physionet-django/console/templates/console/copyedit_submission.html @@ -94,7 +94,7 @@

Discovery

-{% if project.has_other_versions or project.version_order %} +{% if project.is_new_version %} {% endif %} diff --git a/physionet-django/console/templates/console/event.html b/physionet-django/console/templates/console/event_active.html similarity index 92% rename from physionet-django/console/templates/console/event.html rename to physionet-django/console/templates/console/event_active.html index 2c07f7512f..9f7add0068 100644 --- a/physionet-django/console/templates/console/event.html +++ b/physionet-django/console/templates/console/event_active.html @@ -13,7 +13,7 @@ {% block content %}
- Events {{ events.paginator.count }} + Active Events {{ event_active.paginator.count }}
@@ -32,7 +32,7 @@ - {% for event in events %} + {% for event in event_active %} {{ event.title }} {{ event.get_category_display|title }} diff --git a/physionet-django/console/templates/console/event_archive.html b/physionet-django/console/templates/console/event_archive.html new file mode 100644 index 0000000000..178dc045d0 --- /dev/null +++ b/physionet-django/console/templates/console/event_archive.html @@ -0,0 +1,55 @@ +{% extends "console/base_console.html" %} + +{% load static %} + +{% block title %}Archived Events{% endblock %} + +{% block local_css %} + +{% endblock %} + +{% load console_templatetags %} + +{% block content %} +
+
+ Archived Events {{ event_archive.paginator.count }} +
+
+
+ + + + + + + + + + + + + + + + {% for event in event_archive %} + + + + + + + + + + + + {% endfor %} + +
EventEvent TypeHostCreatedStartedEndedCredentialingTrainingManage
{{ event.title }}{{ event.get_category_display|title }}{{ event.host }}{{ event.added_datetime|date }}{{ event.start_date }}{{ event.end_date }}View listView listManage
+ {% include "console/pagination.html" with pagination=events %} +
+
+
+{% endblock %} + diff --git a/physionet-django/console/templates/console/event_management.html b/physionet-django/console/templates/console/event_management.html index 1ec760e079..2e97085ae4 100644 --- a/physionet-django/console/templates/console/event_management.html +++ b/physionet-django/console/templates/console/event_management.html @@ -38,42 +38,53 @@

{{ event.title }}

{% endif %}
+ + {% for info in applicant_info %}
-
Total participants:
+
{{ info.title }}
-
{{ event.participants.count }}
+ data-target="#{{ info.id }}">{{ info.count }} - View
+ {% endfor %} +
Description:
-
{{ event.description }}
+
{{ event.description|striptags }}
+
{% include 'console/event_management_manage_dataset.html' %} + + {% for info in applicant_info %} + {% endfor %} + {% endblock %} diff --git a/physionet-django/console/templates/console/guidelines_course.html b/physionet-django/console/templates/console/guidelines_course.html index a094894c17..12737f25b9 100644 --- a/physionet-django/console/templates/console/guidelines_course.html +++ b/physionet-django/console/templates/console/guidelines_course.html @@ -24,7 +24,7 @@

General Schema Explanation

"description": "string", "valid_duration": "string", "courses": [{ - "version": "float", + "version": "string", "modules": [ { "contents": [ @@ -74,7 +74,8 @@

General Schema Explanation

    -
  1. Modules: A course may have one or more modules that contain the contents,quizzes for each +
  2. Modules: A course may have one or more modules. Each module contains the course content and quizzes. + Modules must include: section of the course. Each module should include:
      3. @@ -86,7 +87,7 @@

      General Schema Explanation

    -
  1. Content: A module may have one or more content. Each content should include:
    2. +
  2. Content: A module may have one or more content blocks. Each content block should include:
    3. diff --git a/physionet-django/console/templates/console/news_list.html b/physionet-django/console/templates/console/news_list.html index 64e1348268..c20b0360ae 100644 --- a/physionet-django/console/templates/console/news_list.html +++ b/physionet-django/console/templates/console/news_list.html @@ -4,6 +4,6 @@ {{ news.publish_datetime }} {% if news.url %}{{ news.url }}{% else %}None{% endif %} {% if news.front_page_banner %}{% endif %} - Edit + Edit {% endfor %} diff --git a/physionet-django/console/templates/console/submission_info_card.html b/physionet-django/console/templates/console/submission_info_card.html index d82dac8b2e..561899bea2 100644 --- a/physionet-django/console/templates/console/submission_info_card.html +++ b/physionet-django/console/templates/console/submission_info_card.html @@ -22,7 +22,7 @@ Embargo {% endif %} - {% if project.submission_status >= 40 %} + {% if project.submission_status >= SubmissionStatus.NEEDS_COPYEDIT %}
  3. DOIs
    4. @@ -40,7 +40,7 @@

    {{ project.title }}

    Created: {{ project.creation_datetime|date }}. Submitted: {{ project.submission_datetime|date }}.
    Storage Used: {{ storage_info.readable_used }} / {{ storage_info.readable_allowance }}
    Version: {{ project.version }} - {% if project.version_order %}
    Latest Published Version: {{ latest_version.version }}{% endif %} + {% if project.is_new_version %}
    Latest Published Version: {{ latest_version.version }}{% endif %} {% if project.latest_reminder %}
    Latest reminder email sent on: {{ project.latest_reminder }} {% endif %} diff --git a/physionet-django/console/templates/console/training_type/course_details.html b/physionet-django/console/templates/console/training_type/course_details.html new file mode 100644 index 0000000000..67ca59d067 --- /dev/null +++ b/physionet-django/console/templates/console/training_type/course_details.html @@ -0,0 +1,126 @@ +{% extends "console/base_console.html" %} + +{% load static %} + +{% block title %}{{ training_type }}{% endblock %} + +{% block content %} + + +
    +
    + {{ training_type }} +
    + +
    +
    +
    + +
    +
    + +
    +

    Active Versions

    +
    + + + + + + + + + + + {% for course in active_course_versions %} + + + + + + + + {% endfor %} + +
    NameVersionDownloadExpire
    {{ training_type.name|title }}{{ course.version }} + Download + +
    + {% csrf_token %} + + +
    +
    +

    Note: Users that have taken the particular version of the course that is getting expired, + will need to retake the course or else they will loose credentialing after the number of + days specified above while expiring the course.

    +
    +

    Archived Versions

    +
    + + + + + + + + + + {% for course in inactive_course_versions %} + + + + + + + {% endfor %} + +
    NameVersionAction
    {{ training_type.name|title }}{{ course.version }} + Download +
    +
    +
    +{% endblock %} + + \ No newline at end of file diff --git a/physionet-django/console/templates/console/training_type/index.html b/physionet-django/console/templates/console/training_type/index.html index 0935bead76..76f43e176c 100644 --- a/physionet-django/console/templates/console/training_type/index.html +++ b/physionet-django/console/templates/console/training_type/index.html @@ -5,12 +5,26 @@ {% block title %}{{ SITE_NAME }} Courses{% endblock %} {% block content %} -
    + + + +
    Courses {{ training_types|length }}
    -
    +
    @@ -21,51 +35,46 @@ - {% for training in training_types %} + {% for training in training_types %} - - - - - - {% endfor %} + + + + + + {% endfor %}
    {{ training.name|title }} {% for course in training.courses.all %}{{ course.version }}{% if not forloop.last %} , {% endif %}{% endfor %}{{ training.valid_duration.days }} days{{ training.courses.last.version }}
    {{ training.name|title }}{{ training.valid_duration.days }} days{{ training.courses.last.version }}
    - - {% endblock %} diff --git a/physionet-django/console/templates/console/user_management.html b/physionet-django/console/templates/console/user_management.html index 64900684ae..f82f3863ea 100644 --- a/physionet-django/console/templates/console/user_management.html +++ b/physionet-django/console/templates/console/user_management.html @@ -111,21 +111,27 @@

    Profile

    {% endfor %} - {% if groups %} -
    -
    - User Groups: -
    -
    - {% for group in groups %} - {{ group.name }} - {% empty %} - N/A - {% endfor %} -
    +
    +

    Permission groups

    +
    +
    + {% if groups %} +
    + The user is a member of the following groups:
    - - {% endif %} +
    + +
    + {% else %} +
    + The user does not belong to a permission group. +
    + {% endif %} +

    Projects

    diff --git a/physionet-django/console/templatetags/console_templatetags.py b/physionet-django/console/templatetags/console_templatetags.py index d61424db7e..09d44f46a1 100644 --- a/physionet-django/console/templatetags/console_templatetags.py +++ b/physionet-django/console/templatetags/console_templatetags.py @@ -1,10 +1,33 @@ from django import template +from console.navbar import CONSOLE_NAV_MENU import notification.utility as notification register = template.Library() +@register.simple_tag +def console_nav_menu_items(request): + """ + Get a list of menu items to be shown in the navigation bar. + + Each menu item is a dictionary, representing either a link or a + submenu that contains one or more links. The argument should be + the original HTTP request object; request.user determines which + menu items are visible, and request.path determines which menu + items are marked as "active". + + Typically the return value of this tag will be assigned to a + template variable, e.g.: + + {% console_nav_menu_items request as nav_menu_items %} + {% for item in nav_menu_items %} + ... + {% endfor %} + """ + return CONSOLE_NAV_MENU.get_menu_items(request) + + @register.filter(name='task_count_badge') def task_count_badge(item): """ diff --git a/physionet-django/console/test_views.py b/physionet-django/console/test_views.py index cdbe89679c..a1f41a7ac1 100644 --- a/physionet-django/console/test_views.py +++ b/physionet-django/console/test_views.py @@ -11,12 +11,12 @@ from events.models import EventAgreement from project.models import ( ActiveProject, - ArchivedProject, Author, AuthorInvitation, License, PublishedProject, StorageRequest, + SubmissionStatus, ) from user.models import User from physionet.models import FrontPageButton, StaticPage @@ -55,7 +55,7 @@ def test_assign_editor(self): 'editor':editor.id}) project = ActiveProject.objects.get(title='MIT-BIH Arrhythmia Database') self.assertTrue(project.editor, editor) - self.assertEqual(project.submission_status, 20) + self.assertEqual(project.submission_status, SubmissionStatus.NEEDS_DECISION) def test_reassign_editor(self): """ @@ -71,7 +71,7 @@ def test_reassign_editor(self): 'project': project.id, 'editor': editor.id}) project = ActiveProject.objects.get(title='MIT-BIH Arrhythmia Database') self.assertTrue(project.editor, editor) - self.assertEqual(project.submission_status, 20) + self.assertEqual(project.submission_status, SubmissionStatus.NEEDS_DECISION) # Reassign editor editor = User.objects.get(username='amitupreti') @@ -96,8 +96,10 @@ def test_edit_reject(self): 'data_machine_readable':0, 'reusable':1, 'no_phi':0, 'pn_suitable':1, 'editor_comments':'Just bad.', 'decision':0 }) - self.assertTrue(ArchivedProject.objects.filter(slug=project.slug)) - self.assertFalse(ActiveProject.objects.filter(slug=project.slug)) + self.assertTrue(ActiveProject.objects.filter(slug=project.slug, + submission_status=SubmissionStatus.ARCHIVED)) + self.assertFalse(ActiveProject.objects.filter(slug=project.slug, + submission_status=SubmissionStatus.NEEDS_DECISION)) def test_edit(self): """ diff --git a/physionet-django/console/urls.py b/physionet-django/console/urls.py index 43d5b3f513..59f93f1692 100644 --- a/physionet-django/console/urls.py +++ b/physionet-django/console/urls.py @@ -20,6 +20,8 @@ path('published-projects///', views.manage_published_project, name='manage_published_project'), path('data-access-request//', views.access_request, name='access_request'), + path('cloud/mirrors/', views.cloud_mirrors, + name='cloud_mirrors'), # Logs path('data-access-logs/', views.project_access_requests_list, name='project_access_requests_list'), @@ -80,15 +82,13 @@ path('users/groups/', views.user_groups, name='user_groups'), path('users/groups//', views.user_group, name='user_group'), path('users//', views.users, name='users'), - path('users/aws-access-list.json', views.users_aws_access_list_json, - name='users_aws_access_list_json'), path('user/manage//', views.user_management, name='user_management'), path('news/', views.news_console, name='news_console'), path('news/add/', views.news_add, name='news_add'), path('news/search/', views.news_search, name='news_search'), - path('news/edit//', views.news_edit, name='news_edit'), + path('news/edit//', views.news_edit, name='news_edit'), path('featured/', views.featured_content, name='featured_content'), path('featured/add', views.add_featured, name='add_featured'), @@ -149,8 +149,10 @@ ), path('code-of-conducts//activate/', views.code_of_conduct_activate, name='code_of_conduct_activate'), # Lists of event components - path('event/', views.event, - name='event'), + path('event/active/', views.event_active, + name='event_active'), + path('event/archived/', views.event_archive, + name='event_archive'), path('event/manage/', views.event_management, name='event_management'), path('event_agreements/', views.event_agreement_list, name='event_agreement_list'), path('event_agreements//', views.event_agreement_detail, name='event_agreement_detail'), @@ -160,5 +162,115 @@ # Courses/On Platform Training path('courses/', training_views.courses, name='courses'), - path('courses//download/', training_views.download_course, name='download_course'), + path('courses//', training_views.course_details, name='course_details'), + path('courses//download/', + training_views.download_course, name='download_course_version'), + path('courses//expire/', + training_views.expire_course, name='expire_course_version'), ] + +# Parameters for testing URLs (see physionet/test_urls.py) +TEST_DEFAULTS = { + '_user_': 'admin', + 'button_pk': 1, + 'event_slug': 'iLII4L9jSDFh', + 'page_pk': 2, + 'pk': 1, + 'pid': 1, + 'section_pk': 1, + 'news_id': 1, + 'username': 'rgmark', + 'news_slug': 'cloud-migration', + 'version': '1.0', + 'training_slug': 'world-101-introduction-to-continents-and-countries', +} +TEST_CASES = { + 'manage_published_project': { + 'project_slug': 'demoeicu', + 'version': '2.0.0', + }, + + 'project_access_requests_detail': { + # id of a PublishedProject with access_policy=CONTRIBUTOR_REVIEW + 'pk': 4, + }, + + 'submission_info_redirect': { + 'project_slug': 'p7TCIMkltNswuOB9FZH1', + }, + 'submission_info': { + 'project_slug': 'p7TCIMkltNswuOB9FZH1', + }, + # Missing demo data (projects in appropriate submission states) + 'edit_submission': { + 'project_slug': 'xxxxxxxxxxxxxxxxxxxx', + '_skip_': True, + }, + 'copyedit_submission': { + 'project_slug': 'xxxxxxxxxxxxxxxxxxxx', + '_skip_': True, + }, + 'awaiting_authors': { + 'project_slug': 'xxxxxxxxxxxxxxxxxxxx', + '_skip_': True, + }, + 'publish_submission': { + 'project_slug': 'xxxxxxxxxxxxxxxxxxxx', + '_skip_': True, + }, + 'publish_slug_available': { + '_user_': 'tompollard', + 'project_slug': 'p7TCIMkltNswuOB9FZH1', + '_query_': {'desired_slug': 'note-parser'}, + }, + + 'credential_applications': [ + # categories defined in views.credential_applications() + {'status': 'successful'}, + {'status': 'unsucccessful'}, + {'status': 'pending'}, + ], + + 'view_credential_application': { + # slug of a CredentialApplication with any status + 'application_slug': '5rDeC8Om9dBJTeJN91y2', + }, + 'process_credential_application': { + # slug of a CredentialApplication with status=PENDING + 'application_slug': '5rDeC8Om9dBJTeJN91y2', + }, + + 'training_list': [ + # categories defined in views.training_list() + {'status': 'review'}, + {'status': 'valid'}, + {'status': 'expired'}, + {'status': 'rejected'}, + ], + 'training_process': { + # id of a Training with status=REVIEW + 'pk': 2, + }, + + 'user_group': { + # name of a Group + 'group': 'Managing%20Editor', + }, + 'users': [ + # categories defined in views.users() + {'group': 'all'}, + {'group': 'admin'}, + {'group': 'active'}, + {'group': 'inactive'}, + ], + + # Missing demo data + 'event_agreement_detail': {'_skip_': True}, + 'event_agreement_delete': {'_skip_': True}, + 'event_agreement_new_version': {'_skip_': True}, + + # Broken views: POST required for no reason + 'users_list_search': {'group': 'all', '_skip_': True}, + 'known_references_search': {'_skip_': True}, + 'news_search': {'_skip_': True}, +} diff --git a/physionet-django/console/utility.py b/physionet-django/console/utility.py index 0d789f0944..e6b703db6c 100644 --- a/physionet-django/console/utility.py +++ b/physionet-django/console/utility.py @@ -13,7 +13,6 @@ from django.contrib.sites.models import Site from django.conf import settings from django.urls import reverse - from project.validators import validate_doi import logging @@ -31,6 +30,7 @@ class DOIExistsError(Exception): class DOICreationError(Exception): pass +# Manage GCP buckets def check_bucket_exists(project, version): """ @@ -42,7 +42,6 @@ def check_bucket_exists(project, version): return True return False - def create_bucket(project, version, title, protected=True): """ Create a bucket with either public or private permissions. @@ -53,10 +52,14 @@ def create_bucket(project, version, title, protected=True): """ storage_client = storage.Client() bucket_name, email = bucket_info(project, version) - storage_client.create_bucket(bucket_name) + bucket = storage_client.bucket(bucket_name) - bucket.iam_configuration.bucket_policy_only_enabled = True - bucket.patch() + # Only bucket-level permissions are enforced; there are no per-file ACLs. + bucket.iam_configuration.uniform_bucket_level_access_enabled = True + # Clients accessing this bucket will be billed for download costs. + bucket.requester_pays = True + storage_client.create_bucket(bucket) + LOGGER.info("Created bucket {0} for project {1}".format( bucket_name.lower(), project)) if protected: @@ -485,6 +488,7 @@ def generate_doi_payload(project, core_project=False, event="draft"): author_metadata = {"givenName": author.first_names, "familyName": author.last_name, "name": author.get_full_name(reverse=True)} + author_metadata["affiliation"] = [{"name": a.name} for a in author.affiliations.all()] if author.user.has_orcid(): author_metadata["nameIdentifiers"] = [{ "nameIdentifier": f'https://orcid.org/{author.user.get_orcid_id()}', @@ -512,6 +516,24 @@ def generate_doi_payload(project, core_project=False, event="draft"): else: relation = [] + # projects from which this project is derived + for parent_project in project.parent_projects.all(): + if parent_project.doi: + relation.append({ + "relationType": "IsDerivedFrom", + "relatedIdentifier": parent_project.doi, + "relatedIdentifierType": "DOI", + }) + else: + url = "https://{0}{1}".format(current_site, reverse( + 'published_project', + args=(parent_project.slug, parent_project.version))) + relation.append({ + "relationType": "IsDerivedFrom", + "relatedIdentifier": url, + "relatedIdentifierType": "URL", + }) + resource_type = 'Dataset' if project.resource_type.name == 'Software': resource_type = 'Software' diff --git a/physionet-django/console/views.py b/physionet-django/console/views.py index d278099148..f7cd7f4868 100644 --- a/physionet-django/console/views.py +++ b/physionet-django/console/views.py @@ -1,7 +1,6 @@ import csv import logging import os -import re from collections import OrderedDict from datetime import datetime from itertools import chain @@ -28,7 +27,7 @@ from django.utils import timezone from django.core.exceptions import PermissionDenied from events.forms import EventAgreementForm, EventDatasetForm -from events.models import Event, EventAgreement, EventDataset +from events.models import Event, EventAgreement, EventDataset, EventApplication from notification.models import News from physionet.forms import set_saved_fields_cookie from physionet.middleware.maintenance import ServiceUnavailable @@ -38,10 +37,10 @@ from project.models import ( GCP, GCPLog, + AWS, AccessLog, AccessPolicy, ActiveProject, - ArchivedProject, DataAccess, DUA, DataAccessRequest, @@ -52,11 +51,11 @@ PublishedProject, Reference, StorageRequest, + SubmissionStatus, Topic, exists_project_slug, ) from project.authorization.access import can_view_project_files -from project.projectfiles import ProjectFiles from project.utility import readable_size from project.validators import MAX_PROJECT_SLUG_LENGTH from project.views import get_file_forms, get_project_file_info, process_files_post @@ -75,7 +74,14 @@ from physionet.enums import LogCategory from console import forms, utility, services from console.forms import ProjectFilterForm, UserFilterForm - +from project.cloud.s3 import ( + create_s3_bucket, + upload_project_to_S3, + get_bucket_name, + check_s3_bucket_exists, + update_bucket_policy, + has_s3_credentials, +) LOGGER = logging.getLogger(__name__) @@ -121,16 +127,35 @@ def handling_view(request, *args, **kwargs): raise Http404('Unable to access page') return handling_view + +def console_permission_required(perm): + """ + Decorator for a view that requires user permissions. + + If the client is not logged in, or the user doesn't have the + specified permission, the view raises PermissionDenied. + + The required permission name is also stored as an attribute for + introspection purposes. + """ + def wrapper(view): + view = permission_required(perm, raise_exception=True)(view) + view.required_permission = perm + return view + return wrapper + + # ------------------------- Views begin ------------------------- # +@console_permission_required('user.can_view_admin_console') def console_home(request): if not request.user.is_authenticated or not request.user.has_access_to_admin_console(): raise PermissionDenied - return render(request, 'console/console_home.html', {'console_home_nav': True}) + return render(request, 'console/console_home.html') -@permission_required('project.change_activeproject', raise_exception=True) +@console_permission_required('project.change_activeproject') def submitted_projects(request): """ List of active submissions. Editors are assigned here. @@ -147,21 +172,21 @@ def submitted_projects(request): messages.success(request, 'The editor has been assigned') # Submitted projects - projects = ActiveProject.objects.filter(submission_status__gt=0).order_by( + projects = ActiveProject.objects.filter(submission_status__gt=SubmissionStatus.ARCHIVED).order_by( 'submission_datetime') # Separate projects by submission status # Awaiting editor assignment - assignment_projects = projects.filter(submission_status=10) + assignment_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_ASSIGNMENT) # Awaiting editor decision - decision_projects = projects.filter(submission_status=20) + decision_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_DECISION) # Awaiting author revisions - revision_projects = projects.filter(submission_status=30) + revision_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_RESUBMISSION) # Awaiting editor copyedit - copyedit_projects = projects.filter(submission_status=40) + copyedit_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_COPYEDIT) # Awaiting author approval - approval_projects = projects.filter(submission_status=50) + approval_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_APPROVAL) # Awaiting editor publish - publish_projects = projects.filter(submission_status=60) + publish_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_PUBLICATION) assign_editor_form = forms.AssignEditorForm() @@ -196,11 +221,10 @@ def submitted_projects(request): 'copyedit_projects': copyedit_projects, 'approval_projects': approval_projects, 'publish_projects': publish_projects, - 'submitted_projects_nav': True, 'yesterday': yesterday}) -@permission_required('project.change_activeproject', raise_exception=True) +@console_permission_required('project.change_activeproject') def editor_home(request): """ List of submissions the editor is responsible for @@ -209,15 +233,15 @@ def editor_home(request): 'submission_datetime') # Awaiting editor decision - decision_projects = projects.filter(submission_status=20) + decision_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_DECISION) # Awaiting author revisions - revision_projects = projects.filter(submission_status=30) + revision_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_RESUBMISSION) # Awaiting editor copyedit - copyedit_projects = projects.filter(submission_status=40) + copyedit_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_COPYEDIT) # Awaiting author approval - approval_projects = projects.filter(submission_status=50) + approval_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_APPROVAL) # Awaiting editor publish - publish_projects = projects.filter(submission_status=60) + publish_projects = projects.filter(submission_status=SubmissionStatus.NEEDS_PUBLICATION) # Time to check if the reminder email can be sent yesterday = timezone.now() + timezone.timedelta(days=-1) @@ -246,7 +270,7 @@ def submission_info_redirect(request, project_slug): return redirect('submission_info', project_slug=project_slug) -@permission_required('project.change_activeproject', raise_exception=True) +@console_permission_required('project.change_activeproject') def submission_info(request, project_slug): """ View information about a project under submission @@ -300,8 +324,7 @@ def submission_info(request, project_slug): 'anonymous_url': anonymous_url, 'url_prefix': url_prefix, 'bulk_url_prefix': bulk_url_prefix, 'reassign_editor_form': reassign_editor_form, - 'embargo_form': embargo_form, - 'project_info_nav': True}) + 'embargo_form': embargo_form}) @handling_editor @@ -320,7 +343,7 @@ def edit_submission(request, project_slug, *args, **kwargs): embargo_form = forms.EmbargoFilesDaysForm() # The user must be the editor - if project.submission_status not in [20, 30]: + if project.submission_status not in [SubmissionStatus.NEEDS_DECISION, SubmissionStatus.NEEDS_RESUBMISSION]: return redirect('editor_home') if request.method == 'POST': @@ -334,7 +357,8 @@ def edit_submission(request, project_slug, *args, **kwargs): edit_log.set_quality_assurance_results() # The original object will be deleted if the decision is reject if edit_log.decision == 0: - project = ArchivedProject.objects.get(slug=project_slug) + project = ActiveProject.objects.get(slug=project_slug, + submission_status=SubmissionStatus.ARCHIVED) # Notify the authors notification.edit_decision_notify(request, project, edit_log) return render(request, 'console/edit_complete.html', @@ -365,7 +389,7 @@ def copyedit_submission(request, project_slug, *args, **kwargs): Page to copyedit the submission """ project = kwargs['project'] - if project.submission_status != 40: + if project.submission_status != SubmissionStatus.NEEDS_COPYEDIT: return redirect('editor_home') copyedit_log = project.copyedit_logs.get(complete_datetime=None) @@ -551,7 +575,7 @@ def awaiting_authors(request, project_slug, *args, **kwargs): """ project = kwargs['project'] - if project.submission_status != 50: + if project.submission_status != SubmissionStatus.NEEDS_APPROVAL: return redirect('editor_home') authors, author_emails, storage_info, edit_logs, copyedit_logs, latest_version = project.info_card() @@ -613,7 +637,7 @@ def publish_submission(request, project_slug, *args, **kwargs): """ project = kwargs['project'] - if project.submission_status != 60: + if project.submission_status != SubmissionStatus.NEEDS_PUBLICATION: return redirect('editor_home') if settings.SYSTEM_MAINTENANCE_NO_UPLOAD: raise ServiceUnavailable() @@ -624,7 +648,7 @@ def publish_submission(request, project_slug, *args, **kwargs): if request.method == 'POST': publish_form = forms.PublishForm(project=project, data=request.POST) if project.is_publishable() and publish_form.is_valid(): - if project.version_order: + if project.is_new_version: slug = project.get_previous_slug() else: slug = publish_form.cleaned_data['slug'] @@ -670,7 +694,7 @@ def publish_submission(request, project_slug, *args, **kwargs): 'embargo_form': embargo_form}) -@permission_required('project.change_storagerequest', raise_exception=True) +@console_permission_required('project.change_storagerequest') def process_storage_response(request, storage_response_formset): """ Implement the response to a storage request. @@ -699,7 +723,7 @@ def process_storage_response(request, storage_response_formset): f"{notification.RESPONSE_ACTIONS[storage_request.response]}")) -@permission_required('project.change_storagerequest', raise_exception=True) +@console_permission_required('project.change_storagerequest') def storage_requests(request): """ Page for listing and responding to project storage requests @@ -718,23 +742,22 @@ def storage_requests(request): queryset=StorageRequest.objects.filter(is_active=True)) return render(request, 'console/storage_requests.html', - {'storage_response_formset': storage_response_formset, - 'storage_requests_nav': True}) + {'storage_response_formset': storage_response_formset}) -@permission_required('project.change_activeproject', raise_exception=True) +@console_permission_required('project.change_activeproject') def unsubmitted_projects(request): """ List of unsubmitted projects """ - projects = ActiveProject.objects.filter(submission_status=0).order_by( + projects = ActiveProject.objects.filter(submission_status=SubmissionStatus.UNSUBMITTED).order_by( 'creation_datetime') projects = paginate(request, projects, 50) return render(request, 'console/unsubmitted_projects.html', - {'projects': projects, 'unsubmitted_projects_nav': True}) + {'projects': projects}) -@permission_required('project.change_publishedproject', raise_exception=True) +@console_permission_required('project.change_publishedproject') def published_projects(request): """ List of published projects @@ -742,7 +765,7 @@ def published_projects(request): projects = PublishedProject.objects.all().order_by('-publish_datetime') projects = paginate(request, projects, 50) return render(request, 'console/published_projects.html', - {'projects': projects, 'published_projects_nav': True}) + {'projects': projects}) @associated_task(PublishedProject, 'pid', read_only=True) @@ -764,7 +787,74 @@ def send_files_to_gcp(pid): project.gcp.save() -@permission_required('project.change_publishedproject', raise_exception=True) +@associated_task(PublishedProject, "pid", read_only=True) +@background() +def send_files_to_aws(pid): + """ + Upload project files to AWS S3 buckets. + + This function retrieves the project identified by 'pid' and uploads + its files to the appropriate AWS S3 bucket. It utilizes the + 'upload_project_to_S3' function from the 'utility' module. + + Args: + pid (int): The unique identifier (ID) of the project to upload. + + Returns: + None + + Note: + - Verify that AWS credentials and configurations are correctly set + up for the S3 client. + """ + project = PublishedProject.objects.get(id=pid) + upload_project_to_S3(project) + project.aws.sent_files = True + project.aws.finished_datetime = timezone.now() + if project.compressed_storage_size: + project.aws.sent_zip = True + project.aws.save() + + +@associated_task(PublishedProject, "pid", read_only=True) +@background() +def update_aws_bucket_policy(pid): + """ + Update the AWS S3 bucket's access policy based on the + project's access policy. + + This function determines the access policy of the project identified + by 'pid' and updates the AWS S3 bucket's access policy accordingly. + It checks if the bucket exists, retrieves its name, and uses the + 'utility.update_bucket_policy' function for the update. + + Args: + pid (int): The unique identifier (ID) of the project for which to + update the bucket policy. + + Returns: + bool: True if the bucket policy was updated successfully, + False otherwise. + + Note: + - Verify that AWS credentials and configurations are correctly set up + for the S3 client. + - The 'updated_policy' variable indicates whether the policy was + updated successfully. + """ + updated_policy = False + project = PublishedProject.objects.get(id=pid) + exists = check_s3_bucket_exists(project) + if exists: + bucket_name = get_bucket_name(project) + update_bucket_policy(project, bucket_name) + updated_policy = True + else: + updated_policy = False + return updated_policy + + +@console_permission_required('project.change_publishedproject') def manage_doi_request(request, project): """ Manage a request to register or update a Digital Object Identifier (DOI). @@ -809,7 +899,7 @@ def manage_doi_request(request, project): return message -@permission_required('project.change_publishedproject', raise_exception=True) +@console_permission_required('project.change_publishedproject') def manage_published_project(request, project_slug, version): """ Manage a published project @@ -833,6 +923,7 @@ def manage_published_project(request, project_slug, version): contact_form = forms.PublishedProjectContactForm(project=project, instance=project.contact) legacy_author_form = forms.CreateLegacyAuthorForm(project=project) + publication_form = forms.AddPublishedPublicationForm(project=project) if request.method == 'POST': if any(x in request.POST for x in ['create_doi_core', @@ -891,6 +982,11 @@ def manage_published_project(request, project_slug, version): messages.error(request, 'Project has tasks pending.') else: gcp_bucket_management(request, project, user) + elif 'aws-bucket' in request.POST and has_s3_credentials(): + if any(get_associated_tasks(project, read_only=False)): + messages.error(request, 'Project has tasks pending.') + else: + aws_bucket_management(request, project, user) elif 'platform' in request.POST: data_access_form = forms.DataAccessForm(project=project, data=request.POST) if data_access_form.is_valid(): @@ -914,6 +1010,12 @@ def manage_published_project(request, project_slug, version): if contact_form.is_valid(): contact_form.save() messages.success(request, 'The contact information has been updated') + elif 'set_publication' in request.POST: + publication_form = forms.AddPublishedPublicationForm( + project=project, data=request.POST) + if publication_form.is_valid(): + publication_form.save() + messages.success(request, 'The associated publication has been added') elif 'set_legacy_author' in request.POST: legacy_author_form = forms.CreateLegacyAuthorForm(project=project, data=request.POST) @@ -946,24 +1048,27 @@ def manage_published_project(request, project_slug, version): 'topic_form': topic_form, 'deprecate_form': deprecate_form, 'has_credentials': has_credentials, + 'has_s3_credentials': has_s3_credentials(), + # 'aws_bucket_exists': s3_bucket_exists, + # 's3_bucket_name': s3_bucket_name, 'data_access_form': data_access_form, 'data_access': data_access, 'rw_tasks': rw_tasks, 'ro_tasks': ro_tasks, 'anonymous_url': anonymous_url, 'passphrase': passphrase, - 'published_projects_nav': True, 'url_prefix': url_prefix, 'bulk_url_prefix': bulk_url_prefix, 'contact_form': contact_form, 'legacy_author_form': legacy_author_form, - 'can_make_zip': ProjectFiles().can_make_zip(), - 'can_make_checksum': ProjectFiles().can_make_checksum(), + 'publication_form': publication_form, + 'can_make_zip': project.files.can_make_zip(), + 'can_make_checksum': project.files.can_make_checksum(), }, ) -@permission_required('project.change_publishedproject', raise_exception=True) +@console_permission_required('project.change_publishedproject') def gcp_bucket_management(request, project, user): """ Create the database object and cloud bucket if they do not exist, and send @@ -1005,18 +1110,109 @@ def gcp_bucket_management(request, project, user): send_files_to_gcp(project.id, verbose_name='GCP - {}'.format(project), creator=user) -@permission_required('project.change_archivedproject', raise_exception=True) +@console_permission_required('project.change_publishedproject') +def aws_bucket_management(request, project, user): + """ + Manage AWS S3 bucket for a project. + + This function is responsible for sending the project's files + to that bucket. It orchestrates the necessary steps to set up + the bucket and populate it with the project's data. + + Args: + project (PublishedProject): The project for which to create and + populate the AWS S3 bucket. + + Returns: + None + + Note: + - Ensure that AWS credentials and configurations are correctly set + up for the S3 client. + """ + is_private = True + + if project.access_policy == AccessPolicy.OPEN: + is_private = False + + bucket_name = get_bucket_name(project) + + if not AWS.objects.filter(project=project).exists(): + AWS.objects.create( + project=project, bucket_name=bucket_name, is_private=is_private + ) + + send_files_to_aws(project.id, verbose_name='AWS - {}'.format(project), creator=user) + + +@console_permission_required('project.change_publishedproject') +def cloud_mirrors(request): + """ + Page for viewing the status of cloud mirrors. + """ + projects = PublishedProject.objects.order_by('-publish_datetime') + + group = request.GET.get('group', 'open') + if group == 'open': + projects = projects.filter(access_policy=AccessPolicy.OPEN) + else: + projects = projects.exclude(access_policy=AccessPolicy.OPEN) + + cloud_platforms = [] + if settings.GOOGLE_APPLICATION_CREDENTIALS: + cloud_platforms.append({ + 'field_name': 'gcp', + 'name': 'GCP', + 'long_name': 'Google Cloud Platform', + }) + if has_s3_credentials(): + cloud_platforms.append({ + 'field_name': 'aws', + 'name': 'AWS', + 'long_name': 'Amazon Web Services', + }) + + # Relevant fields for the status table (see + # templates/console/cloud_mirrors.html) + field_names = [platform['field_name'] for platform in cloud_platforms] + projects = projects.select_related(*field_names).only( + 'slug', + 'title', + 'version', + 'access_policy', + 'allow_file_downloads', + 'deprecated_files', + 'embargo_files_days', + *(f'{field}__is_private' for field in field_names), + *(f'{field}__sent_files' for field in field_names), + ) + + project_mirrors = { + project: [ + getattr(project, field, None) for field in field_names + ] for project in projects + } + + return render(request, 'console/cloud_mirrors.html', { + 'group': group, + 'cloud_platforms': cloud_platforms, + 'project_mirrors': project_mirrors, + }) + + +@console_permission_required('project.change_activeproject') def archived_submissions(request): """ List of archived submissions """ - projects = ArchivedProject.objects.all().order_by('archive_datetime') + projects = ActiveProject.objects.filter(submission_status=SubmissionStatus.ARCHIVED + ).order_by('creation_datetime') projects = paginate(request, projects, 50) return render(request, 'console/archived_submissions.html', - {'projects': projects, 'archived_projects_nav': True}) + {'projects': projects}) -@permission_required('user.view_user', raise_exception=True) +@console_permission_required('user.view_user') def users(request, group='all'): """ List of users @@ -1029,7 +1225,6 @@ def users(request, group='all'): return render(request, 'console/users_admin.html', { 'admin_users': admin_users, 'group': group, - 'user_nav': True, }) elif group == 'active': user_list = user_list.filter(is_active=True) @@ -1038,10 +1233,10 @@ def users(request, group='all'): users = paginate(request, user_list, 50) - return render(request, 'console/users.html', {'users': users, 'group': group, 'user_nav': True}) + return render(request, 'console/users.html', {'users': users, 'group': group}) -@permission_required('user.view_user', raise_exception=True) +@console_permission_required('user.view_user') def user_groups(request): """ List of all user groups @@ -1049,10 +1244,10 @@ def user_groups(request): groups = Group.objects.all().order_by('name') for group in groups: group.user_count = User.objects.filter(groups=group).count() - return render(request, 'console/user_groups.html', {'groups': groups, 'user_nav': True, 'user_groups_nav': True}) + return render(request, 'console/user_groups.html', {'groups': groups}) -@permission_required('user.view_user', raise_exception=True) +@console_permission_required('user.view_user') def user_group(request, group): """ Shows details of a user group, lists users in the group, lists permissions for the group @@ -1063,11 +1258,11 @@ def user_group(request, group): return render( request, 'console/user_group.html', - {'group': group, 'users': users, 'permissions': permissions, 'user_nav': True, 'user_groups_nav': True} + {'group': group, 'users': users, 'permissions': permissions} ) -@permission_required('user.view_user', raise_exception=True) +@console_permission_required('user.view_user') def user_management(request, username): """ Admin page for managing an individual user account. @@ -1101,11 +1296,15 @@ def user_management(request, username): is_verified=False) projects = {} - projects['Unsubmitted'] = ActiveProject.objects.filter(authors__user=user, - submission_status=0).order_by('-creation_datetime') - projects['Submitted'] = ActiveProject.objects.filter(authors__user=user, - submission_status__gt=0).order_by('-submission_datetime') - projects['Archived'] = ArchivedProject.objects.filter(authors__user=user).order_by('-archive_datetime') + projects["Unsubmitted"] = ActiveProject.objects.filter( + authors__user=user, submission_status=SubmissionStatus.UNSUBMITTED + ).order_by("-creation_datetime") + projects["Submitted"] = ActiveProject.objects.filter( + authors__user=user, submission_status__gt=SubmissionStatus.ARCHIVED + ).order_by("-submission_datetime") + projects['Archived'] = ActiveProject.objects.filter(authors__user=user, + submission_status=SubmissionStatus.ARCHIVED + ).order_by('-creation_datetime') projects['Published'] = PublishedProject.objects.filter(authors__user=user).order_by('-publish_datetime') credentialing_app = CredentialApplication.objects.filter(user=user).order_by("application_datetime") @@ -1123,7 +1322,7 @@ def user_management(request, username): 'gcp_info': gcp_info}) -@permission_required('user.view_user', raise_exception=True) +@console_permission_required('user.view_user') def users_search(request, group): """ Search user list. @@ -1159,39 +1358,7 @@ def users_search(request, group): raise Http404() -@permission_required('user.view_user', raise_exception=True) -def users_aws_access_list_json(request): - """ - Generate JSON list of currently authorized AWS accounts. - - This is a temporary kludge to support an upcoming event (November - 2022). Don't rely on this function; it will go away. - """ - projects_datathon = [ - "mimiciv-2.2" - ] - published_projects = PublishedProject.objects.all() - users_with_awsid = User.objects.filter(cloud_information__aws_id__isnull=False) - datasets = {} - datasets['datasets'] = [] - aws_id_pattern = r"\b\d{12}\b" - - for project in published_projects: - dataset = {} - project_name = project.slug + "-" + project.version - if project_name in projects_datathon: - dataset['name'] = project_name - dataset['accounts'] = [] - for user in users_with_awsid: - if can_view_project_files(project, user): - if re.search(aws_id_pattern, user.cloud_information.aws_id): - dataset['accounts'].append(user.cloud_information.aws_id) - datasets['datasets'].append(dataset) - - return JsonResponse(datasets) - - -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def known_references_search(request): """ Search credential applications and user list. @@ -1219,7 +1386,7 @@ def known_references_search(request): raise Http404() -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def complete_credential_applications(request): """ Legacy page for processing credentialing applications. @@ -1227,7 +1394,7 @@ def complete_credential_applications(request): return redirect(credential_processing) -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def complete_list_credentialed_people(request): """ Legacy page that displayed a list of all approved MIMIC users. @@ -1235,7 +1402,7 @@ def complete_list_credentialed_people(request): return redirect(credential_applications, "successful") -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def process_credential_application(request, application_slug): """ Process a credential application. View details, advance to next stage, @@ -1376,12 +1543,12 @@ def process_credential_application(request, application_slug): {'application': application, 'app_user': application.user, 'intermediate_credential_form': intermediate_credential_form, 'credential_review_form': credential_review_form, - 'processing_credentials_nav': True, 'page_title': page_title, + 'page_title': page_title, 'contact_cred_ref_form': contact_cred_ref_form, 'training_list': training}) -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def credential_processing(request): """ Process applications for credentialed access. @@ -1425,11 +1592,10 @@ def credential_processing(request): 'personal_applications': personal_applications, 'reference_applications': reference_applications, 'response_applications': response_applications, - 'final_applications': final_applications, - 'processing_credentials_nav': True}) + 'final_applications': final_applications}) -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def view_credential_application(request, application_slug): """ View a credential application in any status. @@ -1449,10 +1615,10 @@ def view_credential_application(request, application_slug): return render(request, 'console/view_credential_application.html', {'application': application, 'app_user': application.user, - 'form': form, 'past_credentials_nav': True, 'CredentialApplication': CredentialApplication}) + 'form': form, 'CredentialApplication': CredentialApplication}) -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def credential_applications(request, status): """ Inactive credential applications. Split into successful and @@ -1526,12 +1692,12 @@ def credential_applications(request, status): pending_apps = paginate(request, pending_apps, 50) return render(request, 'console/credential_applications.html', - {'applications': all_successful_apps, 'past_credentials_nav': True, + {'applications': all_successful_apps, 'u_applications': unsuccessful_apps, 'p_applications': pending_apps}) -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def search_credential_applications(request): """ Search past credentialing applications. @@ -1583,7 +1749,7 @@ def search_credential_applications(request): return all_successful_apps, unsuccessful_apps, pending_apps -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def credentialed_user_info(request, username): try: c_user = User.objects.get(username__iexact=username) @@ -1595,7 +1761,7 @@ def credentialed_user_info(request, username): 'CredentialApplication': CredentialApplication}) -@permission_required('user.can_review_training', raise_exception=True) +@console_permission_required('user.can_review_training') def training_list(request, status): """ List all training applications. @@ -1647,7 +1813,6 @@ def training_list(request, status): 'valid_count': valid_training.count(), 'expired_count': expired_training.count(), 'rejected_count': rejected_training.count(), - 'training_nav': True, }, ) @@ -1675,7 +1840,7 @@ def search_training_applications(request, display_training): return display_training -@permission_required('user.can_review_training', raise_exception=True) +@console_permission_required('user.can_review_training') def training_process(request, pk): training = get_object_or_404(Training.objects.select_related('training_type', 'user__profile').get_review(), pk=pk) @@ -1751,14 +1916,14 @@ def training_process(request, pk): ) -@permission_required('user.can_review_training', raise_exception=True) +@console_permission_required('user.can_review_training') def training_detail(request, pk): training = get_object_or_404(Training.objects.prefetch_related('training_type'), pk=pk) return render(request, 'console/training_detail.html', {'training': training}) -@permission_required('notification.change_news', raise_exception=True) +@console_permission_required('notification.change_news') def news_console(request): """ List of news items @@ -1766,10 +1931,10 @@ def news_console(request): news_items = News.objects.all().order_by('-publish_datetime') news_items = paginate(request, news_items, 50) return render(request, 'console/news_console.html', - {'news_items': news_items, 'news_nav': True}) + {'news_items': news_items}) -@permission_required('notification.change_news', raise_exception=True) +@console_permission_required('notification.change_news') def news_add(request): if request.method == 'POST': form = forms.NewsForm(data=request.POST) @@ -1781,11 +1946,10 @@ def news_add(request): else: form = forms.NewsForm() - return render(request, 'console/news_add.html', {'form': form, - 'news_nav': True}) + return render(request, 'console/news_add.html', {'form': form}) -@permission_required('notification.change_news', raise_exception=True) +@console_permission_required('notification.change_news') def news_search(request): """ Filtered list of news items @@ -1800,10 +1964,10 @@ def news_search(request): raise Http404() -@permission_required('notification.change_news', raise_exception=True) -def news_edit(request, news_id): +@console_permission_required('notification.change_news') +def news_edit(request, news_slug): try: - news = News.objects.get(id=news_id) + news = News.objects.get(slug=news_slug) except News.DoesNotExist: raise Http404() saved = False @@ -1822,13 +1986,13 @@ def news_edit(request, news_id): form = forms.NewsForm(instance=news) response = render(request, 'console/news_edit.html', {'news': news, - 'form': form, 'news_nav': True}) + 'form': form}) if saved: set_saved_fields_cookie(form, request.path, response) return response -@permission_required('project.can_edit_featured_content', raise_exception=True) +@console_permission_required('project.can_edit_featured_content') def featured_content(request): """ List of news items @@ -1872,10 +2036,10 @@ def featured_content(request): ).order_by('featured') return render(request, 'console/featured_content.html', - {'featured_content': featured_content, 'featured_content_nav': True}) + {'featured_content': featured_content}) -@permission_required('project.can_edit_featured_content', raise_exception=True) +@console_permission_required('project.can_edit_featured_content') def add_featured(request): """ List of news items @@ -1904,11 +2068,10 @@ def add_featured(request): return render(request, 'console/add_featured.html', {'title': title, 'projects': projects, 'form': form, - 'valid_search': valid_search, - 'featured_content_nav': True}) + 'valid_search': valid_search}) -@permission_required('project.can_view_project_guidelines', raise_exception=True) +@console_permission_required('project.can_view_project_guidelines') def guidelines_review(request): """ Guidelines for reviewers. @@ -1926,7 +2089,7 @@ def guidelines_course(request): {'guidelines_course_nav': True}) -@permission_required('project.can_view_stats', raise_exception=True) +@console_permission_required('project.can_view_stats') def editorial_stats(request): """ Editorial stats for reviewers. @@ -1965,11 +2128,11 @@ def editorial_stats(request): except StatisticsError: stats[y].append(None) - return render(request, 'console/editorial_stats.html', {'stats_nav': True, + return render(request, 'console/editorial_stats.html', { 'submenu': 'editorial', 'stats': stats}) -@permission_required('project.can_view_stats', raise_exception=True) +@console_permission_required('project.can_view_stats') def credentialing_stats(request): """ Credentialing metrics. @@ -1990,7 +2153,10 @@ def credentialing_stats(request): a = acc_and_rej.filter(status=CredentialApplication.Status.ACCEPTED).count() r = acc_and_rej.filter(status=CredentialApplication.Status.REJECTED).count() stats[y]['processed'] = a + r - stats[y]['approved'] = round((100 * a) / (a + r)) + try: + stats[y]['approved'] = round((100 * a) / (a + r)) + except ZeroDivisionError: + stats[y]['approved'] = None # Time taken to contact the reference time_to_ref = apps.annotate(tm=Cast(F('reference_contact_datetime') @@ -2029,16 +2195,15 @@ def credentialing_stats(request): stats[y]['time_to_decision'] = None return render(request, 'console/credentialing_stats.html', - {'stats_nav': True, 'submenu': 'credential', + {'submenu': 'credential', 'stats': stats}) -@permission_required('project.can_view_stats', raise_exception=True) +@console_permission_required('project.can_view_stats') def submission_stats(request): stats = OrderedDict() todays_date = datetime.today() - all_projects = [PublishedProject.objects.filter(is_legacy=False), ActiveProject.objects.all(), - ArchivedProject.objects.all()] + all_projects = [PublishedProject.objects.filter(is_legacy=False), ActiveProject.objects.all()] cur_year = todays_date.year cur_month = todays_date.month @@ -2084,10 +2249,10 @@ def submission_stats(request): pass return render(request, 'console/submission_stats.html', - {'stats_nav': True, 'submenu': 'submission', 'stats': stats}) + {'submenu': 'submission', 'stats': stats}) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def download_credentialed_users(request): """ CSV create and download for database access. @@ -2149,17 +2314,17 @@ def download_credentialed_users(request): return response -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def project_access_manage(request, pid): projects = PublishedProject.objects.prefetch_related('duasignature_set__user__profile') c_project = get_object_or_404(projects, id=pid, access_policy=AccessPolicy.CREDENTIALED) return render(request, 'console/project_access_manage.html', { 'c_project': c_project, 'project_members': c_project.duasignature_set.all(), - 'project_access_logs_nav': True}) + }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def project_access_requests_list(request): projects = PublishedProject.objects.filter(access_policy=AccessPolicy.CONTRIBUTOR_REVIEW).annotate( access_requests_count=Count('data_access_requests') @@ -2172,11 +2337,11 @@ def project_access_requests_list(request): projects = paginate(request, projects, 50) return render(request, 'console/project_access_requests_list.html', { - 'access_requests_nav': True, 'projects': projects + 'projects': projects }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def project_access_requests_detail(request, pk): project = get_object_or_404(PublishedProject, access_policy=AccessPolicy.CONTRIBUTOR_REVIEW, pk=pk) access_requests = DataAccessRequest.objects.filter(project=project) @@ -2189,18 +2354,18 @@ def project_access_requests_detail(request, pk): access_requests = paginate(request, access_requests, 50) return render(request, 'console/project_access_requests_detail.html', { - 'access_requests_nav': True, 'project': project, 'access_requests': access_requests + 'project': project, 'access_requests': access_requests }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def access_request(request, pk): access_request = get_object_or_404(DataAccessRequest, pk=pk) return render(request, 'console/access_request.html', {'access_request': access_request}) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def project_access_logs(request): c_projects = PublishedProject.objects.annotate( log_count=Count('logs', filter=Q(logs__category=LogCategory.ACCESS))) @@ -2216,11 +2381,11 @@ def project_access_logs(request): c_projects = paginate(request, c_projects, 50) return render(request, 'console/project_access_logs.html', { - 'c_projects': c_projects, 'project_access_logs_nav': True, + 'c_projects': c_projects, }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def project_access_logs_detail(request, pid): c_project = get_object_or_404(PublishedProject, id=pid) logs = ( @@ -2245,11 +2410,11 @@ def project_access_logs_detail(request, pid): return render(request, 'console/project_access_logs_detail.html', { 'c_project': c_project, 'logs': logs, - 'project_access_logs_nav': True, 'user_filter_form': user_filter_form + 'user_filter_form': user_filter_form }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def download_project_accesses(request, pk): headers = ['User', 'Email address', 'First access', 'Last access', 'Duration', 'Count'] @@ -2280,7 +2445,7 @@ def download_project_accesses(request, pk): return response -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def user_access_logs(request): users = ( User.objects.filter(is_active=True) @@ -2300,11 +2465,11 @@ def user_access_logs(request): users = paginate(request, users, 50) return render(request, 'console/user_access_logs.html', { - 'users': users, 'user_access_logs_nav': True, + 'users': users, }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def user_access_logs_detail(request, pid): user = get_object_or_404(User, id=pid, is_active=True) logs = ( @@ -2328,12 +2493,12 @@ def user_access_logs_detail(request, pid): project_filter_form = ProjectFilterForm() return render(request, 'console/user_access_logs_detail.html', { - 'user': user, 'logs': logs, 'user_access_logs_nav': True, + 'user': user, 'logs': logs, 'project_filter_form': project_filter_form }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def download_user_accesses(request, pk): headers = ['Project name', 'First access', 'Last access', 'Duration', 'Count'] @@ -2360,7 +2525,7 @@ def download_user_accesses(request, pk): return response -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def gcp_signed_urls_logs(request): projects = ActiveProject.objects.annotate( log_count=Count('logs', filter=Q(logs__category=LogCategory.GCP))) @@ -2372,11 +2537,11 @@ def gcp_signed_urls_logs(request): projects = paginate(request, projects, 50) return render(request, 'console/gcp_logs.html', { - 'projects': projects, 'gcp_logs_nav': True, + 'projects': projects, }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def gcp_signed_urls_logs_detail(request, pk): project = get_object_or_404(ActiveProject, pk=pk) logs = project.logs.order_by('-creation_datetime').prefetch_related('project').annotate( @@ -2386,11 +2551,10 @@ def gcp_signed_urls_logs_detail(request, pk): return render(request, 'console/gcp_logs_detail.html', { 'project': project, 'logs': logs, - 'gcp_logs_nav': True, }) -@permission_required('project.can_view_access_logs', raise_exception=True) +@console_permission_required('project.can_view_access_logs') def download_signed_urls_logs(request, pk): headers = ['User', 'Email address', 'First access', 'Last access', 'Duration', 'Data', 'Count'] @@ -2454,7 +2618,7 @@ def get_queryset(self): return qs -@permission_required('user.change_credentialapplication', raise_exception=True) +@console_permission_required('user.change_credentialapplication') def known_references(request): """ List all known references witht he option of removing the contact date @@ -2480,10 +2644,11 @@ def known_references(request): all_known_ref = paginate(request, all_known_ref, 50) return render(request, 'console/known_references.html', { - 'all_known_ref': all_known_ref, 'known_ref_nav': True}) + 'all_known_ref': all_known_ref, + }) -@permission_required('physionet.view_redirect', raise_exception=True) +@console_permission_required('redirects.view_redirect') def view_redirects(request): """ Display a list of redirected URLs. @@ -2492,10 +2657,10 @@ def view_redirects(request): return render( request, 'console/redirects.html', - {'redirects': redirects, 'redirects_nav': True}) + {'redirects': redirects}) -@permission_required('physionet.change_frontpagebutton', raise_exception=True) +@console_permission_required('physionet.change_frontpagebutton') def frontpage_buttons(request): if request.method == 'POST': @@ -2514,10 +2679,10 @@ def frontpage_buttons(request): return render( request, 'console/frontpage_button/index.html', - {'frontpage_buttons': frontpage_buttons, 'frontpage_buttons_nav': True}) + {'frontpage_buttons': frontpage_buttons}) -@permission_required('physionet.change_frontpagebutton', raise_exception=True) +@console_permission_required('physionet.change_frontpagebutton') def frontpage_button_add(request): if request.method == 'POST': frontpage_button_form = forms.FrontPageButtonForm(data=request.POST) @@ -2535,7 +2700,7 @@ def frontpage_button_add(request): ) -@permission_required('physionet.change_frontpagebutton', raise_exception=True) +@console_permission_required('physionet.change_frontpagebutton') def frontpage_button_edit(request, button_pk): frontpage_button = get_object_or_404(FrontPageButton, pk=button_pk) @@ -2558,7 +2723,7 @@ def frontpage_button_edit(request, button_pk): ) -@permission_required('physionet.change_frontpagebutton', raise_exception=True) +@console_permission_required('physionet.change_frontpagebutton') def frontpage_button_delete(request, button_pk): frontpage_button = get_object_or_404(FrontPageButton, pk=button_pk) if request.method == 'POST': @@ -2568,7 +2733,7 @@ def frontpage_button_delete(request, button_pk): return HttpResponseRedirect(reverse('frontpage_buttons')) -@permission_required('physionet.change_staticpage', raise_exception=True) +@console_permission_required('physionet.change_staticpage') def static_pages(request): if request.method == 'POST': up = request.POST.get('up') @@ -2586,10 +2751,10 @@ def static_pages(request): return render( request, 'console/static_page/index.html', - {'pages': pages, 'static_pages_nav': True}) + {'pages': pages}) -@permission_required('physionet.change_staticpage', raise_exception=True) +@console_permission_required('physionet.change_staticpage') def static_page_add(request): if request.method == 'POST': static_page_form = forms.StaticPageForm(data=request.POST) @@ -2607,7 +2772,7 @@ def static_page_add(request): ) -@permission_required('physionet.change_staticpage', raise_exception=True) +@console_permission_required('physionet.change_staticpage') def static_page_edit(request, page_pk): static_page = get_object_or_404(StaticPage, pk=page_pk) @@ -2627,7 +2792,7 @@ def static_page_edit(request, page_pk): ) -@permission_required('physionet.change_staticpage', raise_exception=True) +@console_permission_required('physionet.change_staticpage') def static_page_delete(request, page_pk): static_page = get_object_or_404(StaticPage, pk=page_pk) if request.method == 'POST': @@ -2637,7 +2802,7 @@ def static_page_delete(request, page_pk): return HttpResponseRedirect(reverse('static_pages')) -@permission_required('physionet.change_staticpage', raise_exception=True) +@console_permission_required('physionet.change_staticpage') def static_page_sections(request, page_pk): static_page = get_object_or_404(StaticPage, pk=page_pk) if request.method == 'POST': @@ -2662,11 +2827,11 @@ def static_page_sections(request, page_pk): return render( request, 'console/static_page_sections.html', - {'sections': sections, 'page': static_page, 'section_form': section_form, 'static_pages_nav': True}, + {'sections': sections, 'page': static_page, 'section_form': section_form}, ) -@permission_required('physionet.change_staticpage', raise_exception=True) +@console_permission_required('physionet.change_staticpage') def static_page_sections_delete(request, page_pk, section_pk): static_page = get_object_or_404(StaticPage, pk=page_pk) if request.method == 'POST': @@ -2677,7 +2842,7 @@ def static_page_sections_delete(request, page_pk, section_pk): return redirect('static_page_sections', page_pk=static_page.pk) -@permission_required('physionet.change_staticpage', raise_exception=True) +@console_permission_required('physionet.change_staticpage') def static_page_sections_edit(request, page_pk, section_pk): static_page = get_object_or_404(StaticPage, pk=page_pk) section = get_object_or_404(Section, static_page=static_page, pk=section_pk) @@ -2692,11 +2857,11 @@ def static_page_sections_edit(request, page_pk, section_pk): return render( request, 'console/static_page_sections_edit.html', - {'section_form': section_form, 'static_pages_nav': True, 'page': static_page, 'section': section}, + {'section_form': section_form, 'page': static_page, 'section': section}, ) -@permission_required('project.add_license', raise_exception=True) +@console_permission_required('project.add_license') def license_list(request): if request.method == 'POST': license_form = forms.LicenseForm(data=request.POST) @@ -2715,11 +2880,11 @@ def license_list(request): return render( request, 'console/license_list.html', - {'license_nav': True, 'licenses': licenses, 'license_form': license_form} + {'licenses': licenses, 'license_form': license_form} ) -@permission_required('project.add_license', raise_exception=True) +@console_permission_required('project.add_license') def license_detail(request, pk): license = get_object_or_404(License, pk=pk) @@ -2737,11 +2902,11 @@ def license_detail(request, pk): return render( request, 'console/license_detail.html', - {'license_nav': True, 'license': license, 'license_form': license_form} + {'license': license, 'license_form': license_form} ) -@permission_required('project.add_license', raise_exception=True) +@console_permission_required('project.add_license') def license_delete(request, pk): if request.method == 'POST': license = get_object_or_404(License, pk=pk) @@ -2750,7 +2915,7 @@ def license_delete(request, pk): return redirect('license_list') -@permission_required('project.add_license', raise_exception=True) +@console_permission_required('project.add_license') def license_new_version(request, pk): license = get_object_or_404(License, pk=pk) @@ -2771,11 +2936,11 @@ def license_new_version(request, pk): return render( request, 'console/license_new_version.html', - {'license_nav': True, 'license': license, 'license_form': license_form} + {'license': license, 'license_form': license_form} ) -@permission_required('project.add_dua', raise_exception=True) +@console_permission_required('project.add_dua') def dua_list(request): if request.method == 'POST': dua_form = forms.DUAForm(data=request.POST) @@ -2791,10 +2956,10 @@ def dua_list(request): duas = DUA.objects.order_by('access_policy', 'name') duas = paginate(request, duas, 20) - return render(request, 'console/dua_list.html', {'dua_nav': True, 'duas': duas, 'dua_form': dua_form}) + return render(request, 'console/dua_list.html', {'duas': duas, 'dua_form': dua_form}) -@permission_required('project.add_dua', raise_exception=True) +@console_permission_required('project.add_dua') def dua_detail(request, pk): dua = get_object_or_404(DUA, pk=pk) @@ -2809,10 +2974,10 @@ def dua_detail(request, pk): else: dua_form = forms.DUAForm(instance=dua) - return render(request, 'console/dua_detail.html', {'dua_nav': True, 'dua': dua, 'dua_form': dua_form}) + return render(request, 'console/dua_detail.html', {'dua': dua, 'dua_form': dua_form}) -@permission_required('project.add_dua', raise_exception=True) +@console_permission_required('project.add_dua') def dua_delete(request, pk): if request.method == 'POST': dua = get_object_or_404(DUA, pk=pk) @@ -2821,7 +2986,7 @@ def dua_delete(request, pk): return redirect("dua_list") -@permission_required('project.add_dua', raise_exception=True) +@console_permission_required('project.add_dua') def dua_new_version(request, pk): dua = get_object_or_404(DUA, pk=pk) @@ -2839,10 +3004,10 @@ def dua_new_version(request, pk): dua_data['version'] = None dua_form = forms.DUAForm(initial=dua_data) - return render(request, 'console/dua_new_version.html', {'dua_nav': True, 'dua': dua, 'dua_form': dua_form}) + return render(request, 'console/dua_new_version.html', {'dua': dua, 'dua_form': dua_form}) -@permission_required('project.add_codeofconduct', raise_exception=True) +@console_permission_required('project.add_codeofconduct') def code_of_conduct_list(request): if request.method == 'POST': code_of_conduct_form = forms.CodeOfConductForm(data=request.POST) @@ -2862,14 +3027,13 @@ def code_of_conduct_list(request): request, 'console/code_of_conduct_list.html', { - 'code_of_conduct_nav': True, 'code_of_conducts': code_of_conducts, 'code_of_conduct_form': code_of_conduct_form, }, ) -@permission_required('project.add_codeofconduct', raise_exception=True) +@console_permission_required('project.add_codeofconduct') def code_of_conduct_detail(request, pk): code_of_conduct = get_object_or_404(CodeOfConduct, pk=pk) if request.method == 'POST': @@ -2887,14 +3051,13 @@ def code_of_conduct_detail(request, pk): request, 'console/code_of_conduct_detail.html', { - 'code_of_conduct_nav': True, 'code_of_conduct': code_of_conduct, 'code_of_conduct_form': code_of_conduct_form, }, ) -@permission_required('project.add_codeofconduct', raise_exception=True) +@console_permission_required('project.add_codeofconduct') def code_of_conduct_delete(request, pk): if request.method == 'POST': code_of_conduct = get_object_or_404(CodeOfConduct, pk=pk) @@ -2903,7 +3066,7 @@ def code_of_conduct_delete(request, pk): return redirect("code_of_conduct_list") -@permission_required('project.add_codeofconduct', raise_exception=True) +@console_permission_required('project.add_codeofconduct') def code_of_conduct_new_version(request, pk): code_of_conduct = get_object_or_404(CodeOfConduct, pk=pk) if request.method == 'POST': @@ -2924,14 +3087,13 @@ def code_of_conduct_new_version(request, pk): request, 'console/code_of_conduct_new_version.html', { - 'code_of_conduct_nav': True, 'code_of_conduct': code_of_conduct, 'code_of_conduct_form': code_of_conduct_form, }, ) -@permission_required('project.add_codeofconduct', raise_exception=True) +@console_permission_required('project.add_codeofconduct') def code_of_conduct_activate(request, pk): CodeOfConduct.objects.filter(is_active=True).update(is_active=False) @@ -2944,21 +3106,35 @@ def code_of_conduct_activate(request, pk): return redirect("code_of_conduct_list") -@permission_required('user.view_all_events', raise_exception=True) -def event(request): +@console_permission_required('user.view_all_events') +def event_active(request): """ List of events """ - events = Event.objects.all() - events = paginate(request, events, 50) + event_active = Event.objects.filter(end_date__gte=timezone.now()) + event_active = paginate(request, event_active, 50) - return render(request, 'console/event.html', - {'events': events, - 'events_nav': True + return render(request, 'console/event_active.html', + {'event_active': event_active, + 'nav_event_active': True }) -@permission_required('user.view_all_events', raise_exception=True) +@console_permission_required('user.view_all_events') +def event_archive(request): + """ + List of archived events + """ + event_archive = Event.objects.filter(end_date__lte=timezone.now()) + event_archive = paginate(request, event_archive, 50) + + return render(request, 'console/event_archive.html', + {'event_archive': event_archive, + 'nav_event_archive': True + }) + + +@console_permission_required('user.view_all_events') def event_management(request, event_slug): """ Admin page for managing an individual Event. @@ -2967,44 +3143,90 @@ def event_management(request, event_slug): # handle the add dataset form(s) if request.method == "POST": - if 'add-event-dataset' in request.POST.keys(): + if "add-event-dataset" in request.POST.keys(): event_dataset_form = EventDatasetForm(request.POST) if event_dataset_form.is_valid(): - if selected_event.datasets.filter( - dataset=event_dataset_form.cleaned_data['dataset'], - access_type=event_dataset_form.cleaned_data['access_type'], - is_active=True).count() == 0: + active_datasets = selected_event.datasets.filter( + dataset=event_dataset_form.cleaned_data["dataset"], + access_type=event_dataset_form.cleaned_data["access_type"], + is_active=True) + if active_datasets.count() == 0: event_dataset_form.instance.event = selected_event event_dataset_form.save() - messages.success(request, "The dataset has been added to the event.") + messages.success( + request, "The dataset has been added to the event." + ) else: - messages.error(request, "The dataset has already been added to the event.") + messages.error( + request, "The dataset has already been added to the event." + ) else: messages.error(request, event_dataset_form.errors) - return redirect('event_management', event_slug=event_slug) - elif 'remove-event-dataset' in request.POST.keys(): - event_dataset_id = request.POST['remove-event-dataset'] + return redirect("event_management", event_slug=event_slug) + elif "remove-event-dataset" in request.POST.keys(): + event_dataset_id = request.POST["remove-event-dataset"] event_dataset = get_object_or_404(EventDataset, pk=event_dataset_id) event_dataset.revoke_dataset_access() messages.success(request, "The dataset has been removed from the event.") - return redirect('event_management', event_slug=event_slug) + return redirect("event_management", event_slug=event_slug) else: event_dataset_form = EventDatasetForm() + participants = selected_event.participants.all() + pending_applications = selected_event.applications.filter( + status=EventApplication.EventApplicationStatus.WAITLISTED + ) + rejected_applications = selected_event.applications.filter( + status=EventApplication.EventApplicationStatus.NOT_APPROVED + ) + withdrawn_applications = selected_event.applications.filter( + status=EventApplication.EventApplicationStatus.WITHDRAWN + ) + event_datasets = selected_event.datasets.filter(is_active=True) + applicant_info = [ + { + "id": "participants", + "title": "Total participants:", + "count": len(participants), + "objects": participants, + }, + { + "id": "pending_applications", + "title": "Pending applications:", + "count": len(pending_applications), + "objects": pending_applications, + }, + { + "id": "rejected_applications", + "title": "Rejected applications:", + "count": len(rejected_applications), + "objects": rejected_applications, + }, + { + "id": "withdrawn_applications", + "title": "Withdrawn applications:", + "count": len(withdrawn_applications), + "objects": withdrawn_applications, + }, + ] + return render( request, - 'console/event_management.html', + "console/event_management.html", { - 'event': selected_event, - 'event_dataset_form': event_dataset_form, - 'event_datasets': event_datasets, - }) + "event": selected_event, + "event_dataset_form": event_dataset_form, + "event_datasets": event_datasets, + "applicant_info": applicant_info, + "participants": participants, + }, + ) -@permission_required('events.add_eventagreement', raise_exception=True) +@console_permission_required('events.add_eventagreement') def event_agreement_list(request): if request.method == 'POST': event_agreement_form = EventAgreementForm(data=request.POST) @@ -3025,14 +3247,13 @@ def event_agreement_list(request): request, 'console/event_agreement_list.html', { - 'event_agreement_nav': True, 'event_agreements': event_agreements, 'event_agreement_form': event_agreement_form } ) -@permission_required('events.add_eventagreement', raise_exception=True) +@console_permission_required('events.add_eventagreement') def event_agreement_new_version(request, pk): event_agreement = get_object_or_404(EventAgreement, pk=pk) @@ -3055,14 +3276,13 @@ def event_agreement_new_version(request, pk): request, 'console/event_agreement_new_version.html', { - 'event_agreement_nav': True, 'event_agreement': event_agreement, 'event_agreement_form': event_agreement_form } ) -@permission_required('events.add_eventagreement', raise_exception=True) +@console_permission_required('events.add_eventagreement') def event_agreement_detail(request, pk): event_agreement = get_object_or_404(EventAgreement, pk=pk) @@ -3081,14 +3301,13 @@ def event_agreement_detail(request, pk): request, 'console/event_agreement_detail.html', { - 'event_agreement_nav': True, 'event_agreement': event_agreement, 'event_agreement_form': event_agreement_form } ) -@permission_required('events.add_eventagreement', raise_exception=True) +@console_permission_required('events.add_eventagreement') def event_agreement_delete(request, pk): if request.method == 'POST': event_agreement = get_object_or_404(EventAgreement, pk=pk) diff --git a/physionet-django/events/templates/events/event_applications.html b/physionet-django/events/templates/events/event_applications.html new file mode 100644 index 0000000000..e501081eb2 --- /dev/null +++ b/physionet-django/events/templates/events/event_applications.html @@ -0,0 +1,27 @@ +{% load participation_status %} +
    +
    +
    + + + + + + + + + + + {% for application in info.objects %} + + + + + + + {% endfor %} + +
    UsernameFull nameEmailCredentialed
    {{ application.user.username }}{{ application.user.get_full_name }}{{ application.user.email }}{{ application.user.is_credentialed }}
    +
    +
    +
    diff --git a/physionet-django/events/templates/events/event_entries.html b/physionet-django/events/templates/events/event_entries.html index 60d0135bd0..3fc91e2ce1 100644 --- a/physionet-django/events/templates/events/event_entries.html +++ b/physionet-django/events/templates/events/event_entries.html @@ -1,30 +1,35 @@ -
    - - - - - - - - - - - - {% for participant in event.participants.all %} - - - - - - - - {% endfor %} - -
    UsernameFull nameEmailCredentialedCohost
    {{ participant.user.username }}{{ participant.user.get_full_name }}{{ participant.user.email }}{{ participant.user.get_credentialing_status }} - {% if participant.is_cohost %} - - {% else %} - - {% endif %} -
    -
    +{% load participation_status %} +
    +
    +
    + + + + + + + + + + + + {% for participant in event.participants.all %} + + + + + + + + {% endfor %} + +
    UsernameFull nameEmailCredentialedCohost
    {{ participant.user.username }}{{ participant.user.get_full_name }}{{ participant.user.email }}{{ participant.user.is_credentialed }} + {% if participant.is_cohost %} + + {% else %} + + {% endif %} +
    +
    +
    +
    diff --git a/physionet-django/events/templates/events/event_home.html b/physionet-django/events/templates/events/event_home.html index bd62b980eb..ec33a693d2 100644 --- a/physionet-django/events/templates/events/event_home.html +++ b/physionet-django/events/templates/events/event_home.html @@ -85,7 +85,10 @@

    {{ event.title }}

    {% if event.host == user %} Share the class code: {{ url_prefix }}{% url 'event_detail' event.slug %}

    - + + + + Edit Event {% endif %} @@ -99,23 +102,24 @@

    {{ event.title }}


    - {% if events_active %} - {% for event in events_active %} -
{% endblock %} diff --git a/physionet-django/templates/home.html b/physionet-django/templates/home.html index bc8215ffda..98d4eab2af 100644 --- a/physionet-django/templates/home.html +++ b/physionet-django/templates/home.html @@ -23,7 +23,7 @@ @@ -70,7 +70,7 @@


{% for news in news_pieces %}

- {{ news.title }} + {{ news.title }}

{% include "notification/news_content.html" %}
diff --git a/physionet-django/training/migrations/0002_alter_course_unique_together_and_more.py b/physionet-django/training/migrations/0002_alter_course_unique_together_and_more.py new file mode 100644 index 0000000000..dabf8e8076 --- /dev/null +++ b/physionet-django/training/migrations/0002_alter_course_unique_together_and_more.py @@ -0,0 +1,48 @@ +# Generated by Django 4.1.10 on 2023-07-31 19:27 + +from django.db import migrations, models +import project.validators + + +class Migration(migrations.Migration): + dependencies = [ + ("training", "0001_initial"), + ] + + operations = [ + migrations.AlterUniqueTogether( + name="course", + unique_together=set(), + ), + migrations.AlterUniqueTogether( + name="courseprogress", + unique_together=set(), + ), + migrations.AlterField( + model_name="course", + name="version", + field=models.CharField( + blank=True, + default="", + max_length=15, + validators=[project.validators.validate_version], + ), + ), + migrations.AlterField( + model_name="courseprogress", + name="completed_at", + field=models.DateTimeField(blank=True, null=True), + ), + migrations.AddConstraint( + model_name="course", + constraint=models.UniqueConstraint( + fields=("training_type", "version"), name="unique_course" + ), + ), + migrations.AddConstraint( + model_name="courseprogress", + constraint=models.UniqueConstraint( + fields=("user", "course"), name="unique_course_progress" + ), + ), + ] diff --git a/physionet-django/training/migrations/0003_course_is_active.py b/physionet-django/training/migrations/0003_course_is_active.py new file mode 100644 index 0000000000..2cd2d27f67 --- /dev/null +++ b/physionet-django/training/migrations/0003_course_is_active.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.13 on 2023-11-26 22:34 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('training', '0002_alter_course_unique_together_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='course', + name='is_active', + field=models.BooleanField(default=True), + ), + ] diff --git a/physionet-django/training/migrations/0004_course_description_course_title_and_more.py b/physionet-django/training/migrations/0004_course_description_course_title_and_more.py new file mode 100644 index 0000000000..a397b7c7f4 --- /dev/null +++ b/physionet-django/training/migrations/0004_course_description_course_title_and_more.py @@ -0,0 +1,29 @@ +# Generated by Django 4.1.13 on 2024-02-17 04:19 + +from django.db import migrations, models +import project.modelcomponents.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('training', '0003_course_is_active'), + ] + + operations = [ + migrations.AddField( + model_name='course', + name='description', + field=project.modelcomponents.fields.SafeHTMLField(blank=True, null=True), + ), + migrations.AddField( + model_name='course', + name='title', + field=models.CharField(blank=True, max_length=128, null=True), + ), + migrations.AddField( + model_name='course', + name='valid_duration', + field=models.DurationField(null=True), + ), + ] diff --git a/physionet-django/training/migrations/0005_course_trainings.py b/physionet-django/training/migrations/0005_course_trainings.py new file mode 100644 index 0000000000..3083193132 --- /dev/null +++ b/physionet-django/training/migrations/0005_course_trainings.py @@ -0,0 +1,19 @@ +# Generated by Django 4.1.13 on 2024-03-07 01:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0060_backfill_trainingtype_slugs'), + ('training', '0004_course_description_course_title_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='course', + name='trainings', + field=models.ManyToManyField(to='user.training'), + ), + ] diff --git a/physionet-django/training/models.py b/physionet-django/training/models.py index 6e22d3bea5..cc75b26847 100644 --- a/physionet-django/training/models.py +++ b/physionet-django/training/models.py @@ -1,146 +1,275 @@ +from token import NUMBER from django.db import models from django.utils import timezone from project.modelcomponents.fields import SafeHTMLField -from notification.utility import notify_users_of_training_expiry -from user.models import Training - -NUMBER_OF_DAYS_SET_TO_EXPIRE = 30 +from project.validators import validate_version class Course(models.Model): - training_type = models.ForeignKey('user.TrainingType', - on_delete=models.CASCADE, related_name='courses') - version = models.FloatField(default=1.0) + """ + A model representing a course for a specific training type. + + Attributes: + training_type (ForeignKey): The training type associated with the course. + version (CharField): The version of the course. + """ + + title = models.CharField(max_length=128, null=True, blank=True) + description = SafeHTMLField(null=True, blank=True) + valid_duration = models.DurationField(null=True) + training_type = models.ForeignKey( + "user.TrainingType", on_delete=models.CASCADE, related_name="courses" + ) + trainings = models.ManyToManyField("user.Training") + version = models.CharField( + max_length=15, default="", blank=True, validators=[validate_version] + ) + is_active = models.BooleanField(default=True) class Meta: - default_permissions = ('change',) - unique_together = ('training_type', 'version') + default_permissions = ("change",) + constraints = [ + models.UniqueConstraint( + fields=["training_type", "version"], name="unique_course" + ) + ] permissions = [ - ('can_view_course_guidelines', 'Can view course guidelines'), + ("can_view_course_guidelines", "Can view course guidelines"), ] - def update_course_for_major_version_change(self, instance): + def expire_course_version(self, instance, number_of_days): """ - If it is a major version change, it sets all former user trainings - to a reduced date, and informs them all. + This method expires the course by setting the is_active field to False and expires all + the trainings associated with it. """ - - trainings = Training.objects.filter( - training_type=instance, - process_datetime__gte=timezone.now() - instance.valid_duration) - _ = trainings.update( - process_datetime=( - timezone.now() - (instance.valid_duration - timezone.timedelta( - days=NUMBER_OF_DAYS_SET_TO_EXPIRE)))) - - for training in trainings: - notify_users_of_training_expiry( - training.user, instance.name, NUMBER_OF_DAYS_SET_TO_EXPIRE) + self.is_active = False + # reset the valid_duration to the number of days + self.valid_duration = timezone.timedelta(days=number_of_days) + self.save() def __str__(self): - return f'{self.training_type} v{self.version}' + return f"{self.training_type} v{self.version}" class Module(models.Model): + """ + A module is a unit of teaching within a course, typically covering a single topic or area of knowledge. + + Attributes: + name (str): The name of the module. + course (Course): The course to which the module belongs. + order (int): The order in which the module appears within the course. + description (SafeHTML): The description of the module, in SafeHTML format. + """ + name = models.CharField(max_length=100) - course = models.ForeignKey('training.Course', on_delete=models.CASCADE, related_name='modules') + course = models.ForeignKey( + "training.Course", on_delete=models.CASCADE, related_name="modules" + ) order = models.PositiveIntegerField() description = SafeHTMLField() class Meta: - unique_together = ('course', 'order') + unique_together = ("course", "order") def __str__(self): return self.name class Quiz(models.Model): + """ + A model representing a quiz within a training module. + + Each quiz has a question, belongs to a specific module, and has a designated order within that module. + """ + question = SafeHTMLField() - module = models.ForeignKey('training.Module', - on_delete=models.CASCADE, related_name='quizzes') + module = models.ForeignKey( + "training.Module", on_delete=models.CASCADE, related_name="quizzes" + ) order = models.PositiveIntegerField() class ContentBlock(models.Model): - module = models.ForeignKey('training.Module', - on_delete=models.CASCADE, related_name='contents') + """ + A model representing a block of content within a training module. + + Attributes: + module (ForeignKey): The module to which this content block belongs. + body (SafeHTMLField): The HTML content of the block. + order (PositiveIntegerField): The order in which this block should be displayed within the module. + """ + + module = models.ForeignKey( + "training.Module", on_delete=models.CASCADE, related_name="contents" + ) body = SafeHTMLField() order = models.PositiveIntegerField() class QuizChoice(models.Model): - quiz = models.ForeignKey('training.Quiz', - on_delete=models.CASCADE, related_name='choices') + """ + A quiz choice is a collection of choices, which is a collection of several types of + content. A quiz choice is associated with a quiz, and an order number. + The order number is used to track the order of the quiz choices in a quiz. + """ + + quiz = models.ForeignKey( + "training.Quiz", on_delete=models.CASCADE, related_name="choices" + ) body = models.TextField() - is_correct = models.BooleanField('Correct Choice?', default=False) + is_correct = models.BooleanField("Correct Choice?", default=False) class CourseProgress(models.Model): - class Status(models.TextChoices): - IN_PROGRESS = 'IP', 'In Progress' - COMPLETED = 'C', 'Completed' + """ + Model representing the progress of a user in a course. + + Fields: + - user: ForeignKey to User model + - course: ForeignKey to Course model + - status: CharField with choices of "In Progress" and "Completed" + - started_at: DateTimeField that is automatically added on creation + - completed_at: DateTimeField that is nullable and blankable - user = models.ForeignKey('user.User', on_delete=models.CASCADE) - course = models.ForeignKey('training.Course', on_delete=models.CASCADE) - status = models.CharField(max_length=2, choices=Status.choices, default=Status.IN_PROGRESS) + Methods: + - __str__: Returns a string representation of the CourseProgress object + - get_next_module: Returns the next module that the user should be working on + """ + + class Status(models.TextChoices): + IN_PROGRESS = "IP", "In Progress" + COMPLETED = "C", "Completed" + + user = models.ForeignKey("user.User", on_delete=models.CASCADE) + course = models.ForeignKey("training.Course", on_delete=models.CASCADE) + status = models.CharField( + max_length=2, choices=Status.choices, default=Status.IN_PROGRESS + ) started_at = models.DateTimeField(auto_now_add=True) - completed_at = models.DateTimeField(auto_now=True) + completed_at = models.DateTimeField(null=True, blank=True) class Meta: - unique_together = ('user', 'course') + constraints = [ + models.UniqueConstraint( + fields=["user", "course"], name="unique_course_progress" + ) + ] def __str__(self): - return f'{self.user.username} - {self.course}' + return f"{self.user.username} - {self.course}" def get_next_module(self): if self.status == self.Status.COMPLETED: return None - next_module = self.module_progresses.filter(status=self.module_progresses.model.Status.IN_PROGRESS).first() + next_module = self.module_progresses.filter( + status=self.module_progresses.model.Status.IN_PROGRESS + ).first() if next_module: return next_module.module - last_module = self.module_progresses.filter( - status=self.module_progresses.model.Status.COMPLETED).order_by('-last_completed_order').first() + last_module = ( + self.module_progresses.filter( + status=self.module_progresses.model.Status.COMPLETED + ) + .order_by("-last_completed_order") + .first() + ) if last_module: - return self.course.modules.filter(order__gt=last_module.module.order).order_by('order').first() + return ( + self.course.modules.filter(order__gt=last_module.module.order) + .order_by("order") + .first() + ) return self.course.modules.first() class ModuleProgress(models.Model): - class Status(models.TextChoices): - IN_PROGRESS = 'IP', 'In Progress' - COMPLETED = 'C', 'Completed' + """ + Model representing the progress of a user in a module. - course_progress = models.ForeignKey('training.CourseProgress', on_delete=models.CASCADE, - related_name='module_progresses') - module = models.ForeignKey('training.Module', on_delete=models.CASCADE) - status = models.CharField(max_length=2, choices=Status.choices, default=Status.IN_PROGRESS) + Fields: + - course_progress: ForeignKey to CourseProgress model + - module: ForeignKey to Module model + - status: CharField with choices of "In Progress" and "Completed" + - last_completed_order: PositiveIntegerField with default value of 0 + - started_at: DateTimeField that is nullable and blankable + - updated_at: DateTimeField that is automatically updated on save + + Methods: + - __str__: Returns a string representation of the ModuleProgress object + + """ + + class Status(models.TextChoices): + IN_PROGRESS = "IP", "In Progress" + COMPLETED = "C", "Completed" + + course_progress = models.ForeignKey( + "training.CourseProgress", + on_delete=models.CASCADE, + related_name="module_progresses", + ) + module = models.ForeignKey("training.Module", on_delete=models.CASCADE) + status = models.CharField( + max_length=2, choices=Status.choices, default=Status.IN_PROGRESS + ) last_completed_order = models.PositiveIntegerField(null=True, default=0) started_at = models.DateTimeField(null=True, blank=True) updated_at = models.DateTimeField(auto_now=True) def __str__(self): - return f'{self.course_progress.user.username} - {self.module}' + return f"{self.course_progress.user.username} - {self.module}" class CompletedContent(models.Model): - module_progress = models.ForeignKey('training.ModuleProgress', on_delete=models.CASCADE, - related_name='completed_contents') - content = models.ForeignKey('training.ContentBlock', on_delete=models.CASCADE) + """ + Model representing a completed content block. + + Fields: + - module_progress: ForeignKey to ModuleProgress model + - content: ForeignKey to ContentBlock model + - completed_at: DateTimeField that is nullable and blankable + + Methods: + - __str__: Returns a string representation of the CompletedContent object + """ + + module_progress = models.ForeignKey( + "training.ModuleProgress", + on_delete=models.CASCADE, + related_name="completed_contents", + ) + content = models.ForeignKey("training.ContentBlock", on_delete=models.CASCADE) completed_at = models.DateTimeField(null=True, blank=True) def __str__(self): - return f'{self.module_progress.course_progress.user.username} - {self.content}' + return f"{self.module_progress.course_progress.user.username} - {self.content}" class CompletedQuiz(models.Model): - module_progress = models.ForeignKey('training.ModuleProgress', on_delete=models.CASCADE, - related_name='completed_quizzes') - quiz = models.ForeignKey('training.Quiz', on_delete=models.CASCADE) + """ + Model representing a completed quiz. + + Fields: + - module_progress: ForeignKey to ModuleProgress model + - quiz: ForeignKey to Quiz model + - completed_at: DateTimeField that is nullable and blankable + + Methods: + - __str__: Returns a string representation of the CompletedQuiz object + """ + + module_progress = models.ForeignKey( + "training.ModuleProgress", + on_delete=models.CASCADE, + related_name="completed_quizzes", + ) + quiz = models.ForeignKey("training.Quiz", on_delete=models.CASCADE) completed_at = models.DateTimeField(null=True, blank=True) def __str__(self): - return f'{self.module_progress.course_progress.user.username} - {self.quiz}' + return f"{self.module_progress.course_progress.user.username} - {self.quiz}" diff --git a/physionet-django/training/serializers.py b/physionet-django/training/serializers.py index 641ee441a0..044fdb7b6a 100644 --- a/physionet-django/training/serializers.py +++ b/physionet-django/training/serializers.py @@ -42,15 +42,6 @@ class Meta: read_only_fields = ['id', 'course'] -class CourseSerializer(serializers.ModelSerializer): - modules = ModuleSerializer(many=True) - - class Meta: - model = Course - fields = ['version', 'modules'] - read_only_fields = ['id', 'training_type'] - - def create_quizzes(module_instance, quizzes_data): choice_bulk = [] for quiz in quizzes_data: @@ -87,37 +78,44 @@ def create_modules(course_instance, modules_data): create_contentblocks(module_instance, contents) -class TrainingTypeSerializer(serializers.ModelSerializer): - courses = CourseSerializer(many=True) +class CourseSerializer(serializers.ModelSerializer): + modules = ModuleSerializer(many=True) class Meta: - model = TrainingType - fields = ['name', 'description', 'valid_duration', 'courses'] - read_only_fields = ['id'] + model = Course + fields = ['title', 'description', 'valid_duration', 'version', 'modules'] + read_only_fields = ['id', 'training_type'] def update(self, instance, validated_data): with transaction.atomic(): - course = validated_data.pop('courses')[0] + course = validated_data modules = course.pop('modules') + course['training_type'] = instance.training_type - course['training_type'] = instance course_instance = Course.objects.create(**course) create_modules(course_instance, modules) - for attr, value in validated_data.items(): - setattr(instance, attr, value) - instance.save() return course_instance def create(self, validated_data): with transaction.atomic(): - course = validated_data.pop('courses')[0] + course = validated_data modules = course.pop('modules') - - validated_data['required_field'] = RequiredField.PLATFORM - course['training_type'] = instance = TrainingType.objects.create(**validated_data) + training_type_name = validated_data['title'] + training_type_description = validated_data['description'] + training_type_valid_duration = validated_data['valid_duration'] + training_type_required_field = RequiredField.PLATFORM + + training_type_instance = TrainingType.objects.create( + name=training_type_name, + description=training_type_description, + valid_duration=training_type_valid_duration, + required_field=training_type_required_field + ) + + course['training_type'] = training_type_instance course_instance = Course.objects.create(**course) create_modules(course_instance, modules) - return instance + return course_instance diff --git a/physionet-django/training/templates/training/email/training_expiry_notification.html b/physionet-django/training/templates/training/email/training_expiry_notification.html index c01f26a47a..3155d5d553 100644 --- a/physionet-django/training/templates/training/email/training_expiry_notification.html +++ b/physionet-django/training/templates/training/email/training_expiry_notification.html @@ -1,7 +1,9 @@ {% load i18n %}{% autoescape off %}{% filter wordwrap:70 %} Dear {{ name }}, -Your training {{ training }} on {{ domain }} will be expiring in {{ expiry }} days. To retain the access it provides, kindly login to your account to retake it. +Your {{ training }} training on {{ domain }} will be expiring in {{ expiry }} days. After the expiry date, you may lose +access to certain resources. To retain access, please submit a new training certificate via the training page in your +user profile. Regards diff --git a/physionet-django/training/urls.py b/physionet-django/training/urls.py index 39e5103a98..1e3749899d 100644 --- a/physionet-django/training/urls.py +++ b/physionet-django/training/urls.py @@ -3,10 +3,5 @@ urlpatterns = [ - path('settings/platform-training//', views.take_training, name='platform_training'), - path('settings/platform-training//module//', views.take_module_training, - name='platform_training_module'), - path('settings/platform-training/update-module-progress/', views.update_module_progress, - name='update_module_progress'), - path('settings/platform-training/', views.take_training, name='start_training') + ] diff --git a/physionet-django/training/views.py b/physionet-django/training/views.py index 7d79095349..d63ba9ccee 100644 --- a/physionet-django/training/views.py +++ b/physionet-django/training/views.py @@ -1,6 +1,9 @@ +from calendar import c +from hmac import new import json import operator from itertools import chain +import re from django.contrib import messages from django.contrib.auth.decorators import login_required, permission_required @@ -10,6 +13,7 @@ from django.shortcuts import get_object_or_404, redirect, render from django.utils import timezone from django.utils.crypto import get_random_string +from project.validators import validate_version, is_version_greater from rest_framework.parsers import JSONParser @@ -18,207 +22,62 @@ from training.models import Course, Quiz, QuizChoice, ContentBlock from training.models import CourseProgress, ModuleProgress, CompletedContent, CompletedQuiz -from training.serializers import TrainingTypeSerializer +from training.serializers import CourseSerializer +from console.views import console_permission_required -@login_required -def take_training(request, training_id=None): - - if request.method == 'POST': - if request.POST.get('training_type'): - return redirect('platform_training', request.POST['training_type']) - - return redirect("edit_training") - - course = Course.objects.prefetch_related( - Prefetch("modules__quizzes", queryset=Quiz.objects.order_by("?")), - Prefetch("modules__contents", queryset=ContentBlock.objects.all())).filter( - training_type__id=training_id).order_by('version').last() - modules = sorted(chain(course.modules.all()), key=operator.attrgetter('order')) - # get the progress of the user for the modules, updated_date - course_progress = CourseProgress.objects.filter(user=request.user, course__id=course.id).last() - if not course_progress: - course_progress = CourseProgress.objects.create(user=request.user, course_id=course.id) - - for module in modules: - module_progress = course_progress.module_progresses.filter(module_id=module.id).last() - if module_progress: - module.progress_status = module_progress.get_status_display() - module.progress_updated_date = module_progress.updated_at - else: - module.progress_status = 'Not Started' - module.progress_updated_date = None - return render(request, 'training/course.html', { - 'modules': modules, - 'course': course, - 'ModuleStatus': ModuleProgress.Status, - }) - - -@login_required -def take_module_training(request, training_id, module_id): - course = Course.objects.select_related('training_type').filter( - training_type__id=training_id).last() - module = course.modules.filter(pk=module_id).first() - - course_progress = CourseProgress.objects.filter(user=request.user, course__id=course.id).last() - if not course_progress: - course_progress = CourseProgress.objects.create(user=request.user, course_id=course.id) +@permission_required('training.change_course', raise_exception=True) +@console_permission_required('training.change_course') +def courses(request): + """ + View function for managing courses. + Allows creation and updating of courses for a given training type. + """ + if request.POST: - # mandate the user to complete all the previous modules before starting the requested module - next_module = course_progress.get_next_module() - if next_module and next_module.id < int(module_id): - messages.error(request, 'Please complete the previous modules before starting this module.') - return redirect('platform_training', training_id) + json_file = request.FILES.get("json_file", "") - if request.method == 'POST': + if not json_file.name.endswith('.json'): + messages.warning(request, 'File is not of JSON type') + return redirect("courses") - # check if the questions are answered correctly + # Checking if the content of the JSON file is properly formatted and according to the schema try: - user_question_answers = json.loads(request.POST['question_answers']) - # convert the keys to int(javascript sends them as string) - user_question_answers = {int(k): v for k, v in user_question_answers.items()} - for question in module.quizzes.all(): - correct_answer = question.choices.filter(is_correct=True).first().id - if (question.id not in user_question_answers - or user_question_answers.get(question.id) != correct_answer): - messages.error(request, 'Please answer all questions correctly.') - return redirect('platform_training', course.training_type.id) - - except json.JSONDecodeError: - messages.error(request, 'Please submit the training correctly.') - return redirect('platform_training', course.training_type.id) - - # update the module progress - module_progress = course_progress.module_progresses.filter(module_id=module_id).last() - - if module_progress.status == ModuleProgress.Status.COMPLETED: - messages.info(request, 'You have already completed this module.') - return redirect('platform_training', course.training_type.id) - - module_progress.status = ModuleProgress.Status.COMPLETED - module_progress.save() - - # only save a training object to database in Training if it is the last module - if module == course.modules.last(): - course_progress.status = CourseProgress.Status.COMPLETED - course_progress.save() - training = Training() - slug = get_random_string(20) - while Training.objects.filter(slug=slug).exists(): - slug = get_random_string(20) - - training.slug = slug - training.training_type = course.training_type - training.user = request.user - training.process_datetime = timezone.now() - training.status = TrainingStatus.ACCEPTED - training.save() - - training_questions = [] - for question in course.training_type.questions.all(): - training_questions.append(TrainingQuestion(training=training, question=question)) + file_data = JSONParser().parse(json_file.file) + except json.decoder.JSONDecodeError: + messages.error(request, 'JSON file is not properly formatted.') + return redirect("courses") - TrainingQuestion.objects.bulk_create(training_questions) + serializer = CourseSerializer(data=file_data, partial=True) - messages.success( - request, f'Congratulations! You completed the training {course.training_type.name} successfully.') + if serializer.is_valid(raise_exception=False): + serializer.save() + messages.success(request, 'Course created successfully.') else: - messages.success( - request, f'Congratulations! You completed the module {module.name} successfully.') - return redirect('platform_training', course.training_type.id) - - return redirect('platform_training', course.training_type.id) - - course = Course.objects.prefetch_related( - Prefetch("modules__quizzes", queryset=Quiz.objects.order_by("?")), - Prefetch("modules__contents", queryset=ContentBlock.objects.all())).filter( - training_type__id=training_id).order_by('version').last() - - # we shouldn't use the next_module here as users might request to review a completed module - requested_module = course.modules.get(id=module_id) - - # find the content or quiz to be displayed - resume_content_or_quiz_module = course_progress.module_progresses.filter( - module=requested_module).last() - if not resume_content_or_quiz_module: - resume_content_or_quiz_from = 1 - else: - resume_content_or_quiz_object = resume_content_or_quiz_module.get_next_content_or_quiz() - resume_content_or_quiz_from = resume_content_or_quiz_object.order if resume_content_or_quiz_object else 1 - - # get the ids of the completed contents and quizzes - completed_contents = course_progress.module_progresses.filter( - module=requested_module).values_list('completed_contents__content_id', flat=True) - completed_contents_ids = [content for content in completed_contents if content] - - completed_quizzes = course_progress.module_progresses.filter( - module=requested_module).values_list('completed_quizzes__quiz_id', flat=True) - completed_quizzes_ids = [quiz for quiz in completed_quizzes if quiz] + messages.error(request, serializer.errors) - return render(request, 'training/quiz.html', { - 'quiz_content': sorted(chain( - requested_module.quizzes.all(), requested_module.contents.all()), - key=operator.attrgetter('order')), - 'quiz_answer': requested_module.quizzes.filter(choices__is_correct=True).values_list("id", "choices"), - 'module': requested_module, - 'course': course, - 'resume_content_or_quiz_from': resume_content_or_quiz_from, - 'completed_contents_ids': completed_contents_ids, - 'completed_quizzes_ids': completed_quizzes_ids, - }) - - -@login_required -def update_module_progress(request): - if request.method == 'POST': - course_id = request.POST.get('course_id') - module_id = request.POST.get('module_id') - update_type = request.POST.get('update_type') - update_type_id = request.POST.get('update_type_id') - - if update_type not in ['content', 'quiz']: - return JsonResponse({'detail': 'Unsupported update type'}, status=400) - - course_progress = CourseProgress.objects.filter( - user=request.user, course__id=course_id).last() - module_progress = course_progress.module_progresses.filter(module__id=module_id).last() - - with transaction.atomic(): - if not module_progress: - module_progress = ModuleProgress.objects.create( - course_progress=course_progress, - module_id=module_id) - - if update_type == 'content': - completed_content = CompletedContent.objects.create( - module_progress=module_progress, - content_id=update_type_id) - completed_content.save() - module_progress.last_completed_order = completed_content.content.order - - elif update_type == 'quiz': - completed_quiz = CompletedQuiz.objects.create( - module_progress=module_progress, - quiz_id=update_type_id) - completed_quiz.save() - module_progress.last_completed_order = completed_quiz.quiz.order - module_progress.save() - - return JsonResponse({'detail': 'success'}, status=200) + return redirect("courses") - return JsonResponse({'detail': 'Unsupported request method'}, status=400) + training_types = TrainingType.objects.filter(required_field=RequiredField.PLATFORM) + return render( + request, + 'console/training_type/index.html', + { + 'training_types': training_types, + 'training_type_nav': True, + }) @permission_required('training.change_course', raise_exception=True) -def courses(request): +@console_permission_required('training.change_course') +def course_details(request, training_slug): + """ + View function for managing courses. + Allows managing the version of the courses for a given training type. + Allows expiring the specific version of the course. + """ if request.POST: - - if request.POST.get('training_id') != "-1": - training_type = get_object_or_404(TrainingType, pk=request.POST.get('training_id')) - else: - training_type = None - + training_type = get_object_or_404(TrainingType, slug=training_slug) json_file = request.FILES.get("json_file", "") if not json_file.name.endswith('.json'): @@ -235,52 +94,84 @@ def courses(request): # Checking if the Training type with the same version already exists existing_course = Course.objects.filter(training_type=training_type) if existing_course.exists(): - if not all(map(lambda x: x.isdigit() or x == '.', str(file_data['courses'][0]['version']))): + latest_course = existing_course.order_by('-version').first() + latest_course_version = existing_course.order_by('-version').first().version + new_course_version = file_data['version'] + # checking if the new course file has a valid version + if validate_version(new_course_version) is not None: messages.error(request, 'Version number is not valid.') - elif file_data['courses'][0]['version'] <= existing_course.order_by( - '-version').first().version: # Version Number is greater than the latest version - messages.error(request, 'Version number should be greater than the latest version.') - else: # Checks passed and moving to saving the course - serializer = TrainingTypeSerializer(training_type, data=file_data, partial=True) + # checking if the version number is greater than the existing version + elif not is_version_greater(new_course_version, latest_course_version): + messages.error(request, 'Version number should be greater than the existing version.') + else: + serializer = CourseSerializer(latest_course, data=file_data, partial=True) if serializer.is_valid(raise_exception=False): - # A Major Version change is detected : The First digit of the version number is changed - if int(str(existing_course.order_by('-version').first().version).split('.')[0]) != int(str( - file_data['courses'][0]['version']).split('.')[0]): - # calling the update_course_for_major_version_change method to update the course - existing_course[0].update_course_for_major_version_change(training_type) serializer.save() messages.success(request, 'Course updated successfully.') - else: - serializer = TrainingTypeSerializer(training_type, data=file_data, partial=True) - if serializer.is_valid(raise_exception=False): - serializer.save() - messages.success(request, 'Course created successfully.') - else: - messages.error(request, serializer.errors) - return redirect("courses") + return redirect("course_details", training_slug) - training_types = TrainingType.objects.filter(required_field=RequiredField.PLATFORM) + training_type = get_object_or_404(TrainingType, slug=training_slug) + active_course_versions = Course.objects.filter(training_type=training_type, is_active=True).order_by('-version') + inactive_course_versions = Course.objects.filter(training_type=training_type, is_active=False).order_by('-version') return render( request, - 'console/training_type/index.html', + 'console/training_type/course_details.html', { - 'training_types': training_types, + 'training_type': training_type, + 'active_course_versions': active_course_versions, + 'inactive_course_versions': inactive_course_versions, 'training_type_nav': True, }) @permission_required('training.change_course', raise_exception=True) -def download_course(request, pk, version): - training_type = get_object_or_404(TrainingType, pk=pk) - version = float(version) +@console_permission_required('training.change_course') +def expire_course(request, training_slug, version): + """ + This view takes a primary key and a version number as input parameters, + and expires the course with the specified primary key and version number. + """ + course = Course.objects.filter(training_type__slug=training_slug, version=version).first() + expiry_date = request.POST.get('expiry_date') + if not course: + messages.error(request, 'Course not found') + return redirect('courses') + if not expiry_date: + messages.error(request, 'Expiry Date is required') + return redirect('course_details', training_slug) + # Checking if the expiry date is greater than the current date + expiry_date_tz = timezone.make_aware(timezone.datetime.strptime(expiry_date, '%Y-%m-%d')) + if expiry_date_tz < timezone.now(): + messages.error(request, 'Expiry Date should be greater than the current date') + return redirect('course_details', training_slug) + # Calculating the number of days between the current date and the expiry date + number_of_days = (expiry_date_tz - timezone.now()).days + course.expire_course_version(course.training_type, int(number_of_days)) + messages.success(request, 'Course expired successfully.') + return redirect('course_details', training_slug) + + +@permission_required('training.change_course', raise_exception=True) +@console_permission_required('training.change_course') +def download_course(request, training_slug, version): + """ + This view takes a primary key and a version number as input parameters, + and returns a JSON response containing information about the + training course with the specified primary key and version number. + """ + training_type = get_object_or_404(TrainingType, slug=training_slug) + course = training_type.courses.filter(version=version).first() + if not course: + messages.error(request, 'Course not found') + return redirect('courses') + training_type = course.training_type if training_type.required_field != RequiredField.PLATFORM: messages.error(request, 'Only onplatform course can be downloaded') return redirect('courses') - serializer = TrainingTypeSerializer(training_type) + serializer = CourseSerializer(course) response_data = serializer.data - response_data['courses'] = list(filter(lambda x: x['version'] == version, response_data['courses'])) response = JsonResponse(response_data, safe=False, json_dumps_params={'indent': 2}) response['Content-Disposition'] = f'attachment; filename={training_type.name}--version-{version}.json' return response diff --git a/physionet-django/user/fixtures/demo-training-type.json b/physionet-django/user/fixtures/demo-training-type.json index f91d28e02f..b8ac562adc 100644 --- a/physionet-django/user/fixtures/demo-training-type.json +++ b/physionet-django/user/fixtures/demo-training-type.json @@ -7,6 +7,7 @@ "description": "

The CITI Data or Specimens only course covers important aspects of research with human participant data. Modules covered include:

\n\n
    \n\t
  • Defining Research with Human Subjects
    • \n\t
  • Privacy and Confidentiality
    • \n\t
  • Assessing Risk
    • \n\t
  • Research with Children
    • \n\t
  • International Research
    • \n\t
  • History and Ethical Principles
    • \n\t
  • Regulations and Process
    • \n\t
  • SBR Methodologies in Biomedical Research
    • \n\t
  • Genetics Research
    • \n\t
  • Records-Based Research
    • \n\t
  • Populations in Research Requiring Additional Considerations and/or Protections
    • \n\t
  • HIPAA and Human Subjects Research
    • \n\t
  • Conflicts of Interest in Research Involving Human Subjects
    • \n
", "home_page": "/about/citi-course/", "valid_duration": "1095 00:00:00", + "slug": "citi-data-or-specimens-only-research", "required_field": 0, "questions": [ 1, @@ -22,6 +23,7 @@ "pk": 2, "fields": { "name": "World 101: Introduction to Continents and Countries", + "slug": "world-101-introduction-to-continents-and-countries", "description": "

Join us for an exciting journey around the globe as we explore the continents and countries that make up our world. In this training, you’ll learn about the geography, culture, and history of different regions and gain a deeper understanding of our interconnected world.

\n\n

What You Will Learn:

\n\n
    \n\t
  • The names and locations of the seven continents
    • \n\t
  • Key countries and their capitals on each continent
    • \n\t
  • Basic geographical features and landmarks
    • \n\t
  • Cultural and historical highlights of different regions
    • \n
\n\n

Prerequisites:

\n\n
    \n\t
  • No prior knowledge is required
    • \n\t
  • An interest in geography and world cultures is recommended
    • \n
\n\n

Don’t miss this opportunity to expand your horizons and discover the fascinating world we live in. Our experienced instructors will guide you through this engaging training, providing insights and knowledge along the way. Sign up now to reserve your spot!

\n\n

Contact: For more information or to register for this training, please contact us at training@discoveringtheworld.com or call us at 555-1234.

\n", "home_page": "/", "valid_duration": "1095 00:00:00", diff --git a/physionet-django/user/fixtures/demo-user.json b/physionet-django/user/fixtures/demo-user.json index d970a0460f..fa1eb2cb39 100644 --- a/physionet-django/user/fixtures/demo-user.json +++ b/physionet-django/user/fixtures/demo-user.json @@ -14339,25 +14339,7 @@ "fields": { "application": 109, "status": 30, - "fields_complete": null, - "appears_correct": null, - "lang_understandable": null, - "user_searchable": null, - "user_has_papers": null, - "research_summary_clear": null, - "course_name_provided": null, - "user_understands_privacy": null, - "user_org_known": null, - "user_details_consistent": null, - "ref_appropriate": null, - "ref_searchable": null, - "ref_has_papers": null, - "ref_is_supervisor": null, - "ref_course_list": null, "ref_skipped": null, - "ref_knows_applicant": null, - "ref_approves": null, - "ref_understands_privacy": null, "responder_comments": "" } }, @@ -14398,14 +14380,14 @@ "activeproject" ], [ - "change_activeproject", + "can_edit_activeprojects", "project", "activeproject" ], [ - "change_archivedproject", + "change_activeproject", "project", - "archivedproject" + "activeproject" ], [ "add_dua", @@ -14505,11 +14487,6 @@ "project", "activeproject" ], - [ - "change_archivedproject", - "project", - "archivedproject" - ], [ "can_view_access_logs", "project", diff --git a/physionet-django/user/forms.py b/physionet-django/user/forms.py index e5d144204a..b20aa39d23 100644 --- a/physionet-django/user/forms.py +++ b/physionet-django/user/forms.py @@ -542,7 +542,7 @@ def clean_reference_name(self): def clean_reference_email(self): reference_email = self.cleaned_data.get('reference_email') if reference_email: - if reference_email in self.user.get_emails(): + if reference_email.lower() in [email.lower() for email in self.user.get_emails()]: raise forms.ValidationError("""You can not put yourself as a reference.""") else: diff --git a/physionet-django/user/management/commands/resetdb.py b/physionet-django/user/management/commands/resetdb.py index 96a8ebdfa5..29238248cb 100644 --- a/physionet-django/user/management/commands/resetdb.py +++ b/physionet-django/user/management/commands/resetdb.py @@ -19,7 +19,7 @@ from django.core.management.base import BaseCommand from lightwave.views import DBCAL_FILE -from project.models import ActiveProject, PublishedProject, ArchivedProject +from project.models import ActiveProject, PublishedProject from user.models import User, CredentialApplication diff --git a/physionet-django/user/migrations/0036_training_2.py b/physionet-django/user/migrations/0036_training_2.py index 56023894de..ee0ad6010b 100644 --- a/physionet-django/user/migrations/0036_training_2.py +++ b/physionet-django/user/migrations/0036_training_2.py @@ -5,8 +5,6 @@ from django.core.management import call_command from django.db import migrations -from project.projectfiles import ProjectFiles - def migrate_forward(apps, schema_editor): CredentialReview = apps.get_model('user', 'CredentialReview') diff --git a/physionet-django/user/migrations/0056_remove_credentialreview_appears_correct_and_more.py b/physionet-django/user/migrations/0056_remove_credentialreview_appears_correct_and_more.py new file mode 100644 index 0000000000..fbd9c02a1b --- /dev/null +++ b/physionet-django/user/migrations/0056_remove_credentialreview_appears_correct_and_more.py @@ -0,0 +1,86 @@ +# Generated by Django 4.1.9 on 2023-07-05 16:56 + +from django.db import migrations + + +class Migration(migrations.Migration): + MIGRATE_AFTER_INSTALL = True + + dependencies = [ + ('user', '0055_auto_20230330_1723'), + ] + + operations = [ + migrations.RemoveField( + model_name='credentialreview', + name='appears_correct', + ), + migrations.RemoveField( + model_name='credentialreview', + name='course_name_provided', + ), + migrations.RemoveField( + model_name='credentialreview', + name='fields_complete', + ), + migrations.RemoveField( + model_name='credentialreview', + name='lang_understandable', + ), + migrations.RemoveField( + model_name='credentialreview', + name='ref_appropriate', + ), + migrations.RemoveField( + model_name='credentialreview', + name='ref_approves', + ), + migrations.RemoveField( + model_name='credentialreview', + name='ref_course_list', + ), + migrations.RemoveField( + model_name='credentialreview', + name='ref_has_papers', + ), + migrations.RemoveField( + model_name='credentialreview', + name='ref_is_supervisor', + ), + migrations.RemoveField( + model_name='credentialreview', + name='ref_knows_applicant', + ), + migrations.RemoveField( + model_name='credentialreview', + name='ref_searchable', + ), + migrations.RemoveField( + model_name='credentialreview', + name='ref_understands_privacy', + ), + migrations.RemoveField( + model_name='credentialreview', + name='research_summary_clear', + ), + migrations.RemoveField( + model_name='credentialreview', + name='user_details_consistent', + ), + migrations.RemoveField( + model_name='credentialreview', + name='user_has_papers', + ), + migrations.RemoveField( + model_name='credentialreview', + name='user_org_known', + ), + migrations.RemoveField( + model_name='credentialreview', + name='user_searchable', + ), + migrations.RemoveField( + model_name='credentialreview', + name='user_understands_privacy', + ), + ] diff --git a/physionet-django/user/migrations/0057_alter_cloudinformation_aws_id.py b/physionet-django/user/migrations/0057_alter_cloudinformation_aws_id.py new file mode 100644 index 0000000000..74735b2313 --- /dev/null +++ b/physionet-django/user/migrations/0057_alter_cloudinformation_aws_id.py @@ -0,0 +1,24 @@ +# Generated by Django 4.1.10 on 2023-10-04 21:14 + +from django.db import migrations, models +import user.validators + + +class Migration(migrations.Migration): + dependencies = [ + ("user", "0056_remove_credentialreview_appears_correct_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="cloudinformation", + name="aws_id", + field=models.CharField( + blank=True, + default=None, + max_length=60, + null=True, + validators=[user.validators.validate_aws_id], + ), + ), + ] diff --git a/physionet-django/user/migrations/0057_merge_20230828_1158.py b/physionet-django/user/migrations/0057_merge_20230828_1158.py new file mode 100644 index 0000000000..c1d6e5ce87 --- /dev/null +++ b/physionet-django/user/migrations/0057_merge_20230828_1158.py @@ -0,0 +1,14 @@ +# Generated by Django 4.1.10 on 2023-08-28 15:58 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0056_alter_trainingtype_required_field'), + ('user', '0056_remove_credentialreview_appears_correct_and_more'), + ] + + operations = [ + ] diff --git a/physionet-django/user/migrations/0058_merge_20231127_1642.py b/physionet-django/user/migrations/0058_merge_20231127_1642.py new file mode 100644 index 0000000000..7353589c68 --- /dev/null +++ b/physionet-django/user/migrations/0058_merge_20231127_1642.py @@ -0,0 +1,14 @@ +# Generated by Django 4.1.13 on 2023-11-27 21:42 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0057_alter_cloudinformation_aws_id'), + ('user', '0057_merge_20230828_1158'), + ] + + operations = [ + ] diff --git a/physionet-django/user/migrations/0059_trainingtype_slug.py b/physionet-django/user/migrations/0059_trainingtype_slug.py new file mode 100644 index 0000000000..dc2ec6ab58 --- /dev/null +++ b/physionet-django/user/migrations/0059_trainingtype_slug.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.13 on 2024-03-04 18:14 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("user", "0058_merge_20231127_1642"), + ] + + operations = [ + migrations.AddField( + model_name="trainingtype", + name="slug", + field=models.SlugField(max_length=128, null=True, unique=True), + ), + ] diff --git a/physionet-django/user/migrations/0060_backfill_trainingtype_slugs.py b/physionet-django/user/migrations/0060_backfill_trainingtype_slugs.py new file mode 100644 index 0000000000..e8d2187b68 --- /dev/null +++ b/physionet-django/user/migrations/0060_backfill_trainingtype_slugs.py @@ -0,0 +1,33 @@ +# Generated by Django 4.1.13 on 2024-03-04 18:15 + +from django.db import migrations +from django.utils.text import slugify + + +def generate_slugs(apps, schema_editor): + TrainingType = apps.get_model("user", "TrainingType") + for training_type in TrainingType.objects.all(): + if not training_type.slug: + slug = slugify(training_type.name) + unique_slug = slug + num = 1 + while TrainingType.objects.filter(slug=unique_slug).exists(): + unique_slug = '{}-{}'.format(slug, num) + num += 1 + training_type.slug = unique_slug + training_type.save() + + +def migrate_backward(apps, schema_editor): + pass + + +class Migration(migrations.Migration): + + dependencies = [ + ("user", "0059_trainingtype_slug"), + ] + + operations = [ + migrations.RunPython(generate_slugs, migrate_backward), + ] diff --git a/physionet-django/user/models.py b/physionet-django/user/models.py index 0aaab5aaee..10de5ac0be 100644 --- a/physionet-django/user/models.py +++ b/physionet-django/user/models.py @@ -18,16 +18,18 @@ from django.db.models.signals import post_save from django.dispatch import receiver from django.utils import timezone +from django.utils.text import slugify from django.utils.crypto import constant_time_compare from django.utils.translation import gettext as _ -from project.validators import validate_version from project.modelcomponents.access import AccessPolicy from project.modelcomponents.fields import SafeHTMLField +from project.validators import validate_version from user import validators from user.userfiles import UserFiles from user.enums import TrainingStatus, RequiredField from user.managers import TrainingQuerySet +from training.models import Course logger = logging.getLogger(__name__) @@ -1079,39 +1081,9 @@ class CredentialReview(models.Model): status = models.PositiveSmallIntegerField(default=10, choices=REVIEW_STATUS_LABELS) - # Initial review questions - # No longer checked. Consider removing these. - fields_complete = models.BooleanField(null=True) - appears_correct = models.BooleanField(null=True) - lang_understandable = models.BooleanField(null=True) - - # ID check questions - # No longer checked. Consider removing these. - user_searchable = models.BooleanField(null=True) - user_has_papers = models.BooleanField(null=True) - research_summary_clear = models.BooleanField(null=True) - course_name_provided = models.BooleanField(null=True) - user_understands_privacy = models.BooleanField(null=True) - user_org_known = models.BooleanField(null=True) - user_details_consistent = models.BooleanField(null=True) - - # Reference check questions - # No longer checked. Consider removing these. - ref_appropriate = models.BooleanField(null=True) - ref_searchable = models.BooleanField(null=True) - ref_has_papers = models.BooleanField(null=True) - ref_is_supervisor = models.BooleanField(null=True) - ref_course_list = models.BooleanField(null=True) - # Log skipped reference ref_skipped = models.BooleanField(null=True) - # Reference response check questions - # No longer checked. Consider removing these. - ref_knows_applicant = models.BooleanField(null=True) - ref_approves = models.BooleanField(null=True) - ref_understands_privacy = models.BooleanField(null=True) - # Reference response check questions responder_comments = models.CharField(max_length=500, default='', blank=True) @@ -1131,10 +1103,35 @@ def __str__(self): class TrainingType(models.Model): + """Represents a type of training. For example, CITI training - + which can be on-platform or off-platform. + The training type if off-platform, will have a set of questions that + the admin uses to make sure that the training was properly validated. + If the training type is on-platform, there will be attached + courses. Each Course is a version of the training type, and has modules, + which the user can complete to get the accredition (Training) for + the particular training type. + + Attributes: + name (str): The name of the training type. + description (SafeHTMLField): The description of the training type. + valid_duration (DurationField, optional): The valid duration of the training type. + questions (ManyToManyField): The questions associated with the training type. + required_field (PositiveSmallIntegerField): The required field for the training type. + home_page (URLField, optional): The home page URL for the training type. + + Meta: + default_permissions (tuple): The default permissions for the training type. + permissions (list): The additional permissions for the training type. + + Methods: + __str__(): Returns a string representation of the training type. + """ name = models.CharField(max_length=128) description = SafeHTMLField() valid_duration = models.DurationField(null=True) questions = models.ManyToManyField(Question, related_name='training_types') + slug = models.SlugField(max_length=128, null=True, unique=True) required_field = models.PositiveSmallIntegerField(choices=RequiredField.choices(), default=RequiredField.DOCUMENT) home_page = models.URLField(blank=True) @@ -1147,6 +1144,17 @@ class Meta: def __str__(self): return self.name + def save(self, *args, **kwargs): + if not self.slug: + slug = slugify(self.name) + unique_slug = slug + num = 1 + while TrainingType.objects.filter(slug=unique_slug).exists(): + unique_slug = f'{slug}-{num}' + num += 1 + self.slug = unique_slug + return super().save(*args, **kwargs) + class TrainingRegex(models.Model): name = models.CharField(max_length=48) @@ -1209,20 +1217,28 @@ def is_withdrawn(self): def is_valid(self): if self.status == TrainingStatus.ACCEPTED: - if not self.training_type.valid_duration: - return True + if self.training_type.required_field == RequiredField.PLATFORM: + associated_course = Course.objects.filter(training=self).first() + return self.process_datetime + associated_course.valid_duration >= timezone.now() else: - return self.process_datetime + self.training_type.valid_duration >= timezone.now() + if not self.training_type.valid_duration: + return False + else: + return self.process_datetime + self.training_type.valid_duration >= timezone.now() def is_expired(self): """checks if it has exceeded the valid period (process_time + duration) if no valid duration, its not expired. """ if self.status == TrainingStatus.ACCEPTED: - if not self.training_type.valid_duration: - return False + if self.training_type.required_field == RequiredField.PLATFORM: + associated_course = Course.objects.filter(training=self).first() + return self.process_datetime + associated_course.valid_duration < timezone.now() else: - return self.process_datetime + self.training_type.valid_duration < timezone.now() + if not self.training_type.valid_duration: + return False + else: + return self.process_datetime + self.training_type.valid_duration < timezone.now() def is_rejected(self): return self.status == TrainingStatus.REJECTED @@ -1248,7 +1264,13 @@ class CloudInformation(models.Model): on_delete=models.CASCADE) gcp_email = models.OneToOneField('user.AssociatedEmail', related_name='gcp_email', on_delete=models.SET_NULL, null=True) - aws_id = models.CharField(max_length=60, null=True, blank=True, default=None) + aws_id = models.CharField( + max_length=60, + null=True, + blank=True, + default=None, + validators=[validators.validate_aws_id], + ) class Meta: default_permissions = () diff --git a/physionet-django/user/templates/user/edit_certification.html b/physionet-django/user/templates/user/edit_certification.html new file mode 100644 index 0000000000..715a0cfebb --- /dev/null +++ b/physionet-django/user/templates/user/edit_certification.html @@ -0,0 +1,30 @@ +{% extends "user/settings.html" %} + +{% block title %}{{ SITE_NAME }} Certification{% endblock %} + +{% block main_content %} +

Certification

+
+

To gain access to certain datasets on {{ SITE_NAME }}, you are required to demonstrate that you have completed relevant training. You can find specific training requirements in the "Files" section of the project description.

+
To submit a new completion report, please go to the Training page.
+
+ + {% for status, group in training_by_status.items %} +
+

{{ status|capfirst }}

+
    + {% for course in group %} +
  • +
    + {{ course.training_type.name }} +
    + View +
    • + {% empty %} +

    N/A

    + {% endfor %} +
+
+ {% endfor %} + +{% endblock %} diff --git a/physionet-django/user/templates/user/edit_credentialing.html b/physionet-django/user/templates/user/edit_credentialing.html index 193594d307..706aceabd8 100644 --- a/physionet-django/user/templates/user/edit_credentialing.html +++ b/physionet-django/user/templates/user/edit_credentialing.html @@ -25,7 +25,7 @@

Credentialing

{% elif current_application %}

Your credentialing application was submitted on {{ current_application.application_datetime }}.

Status of your application: {{ current_application.get_review_status }}.

-

We aim to reach a decision within four weeks. If you have not received a decision within this time, it is likely that we are awaiting a response from your reference.

+

We aim to reach a decision within {{ estimated_time_for_credentialing }}. If you have not received a decision within this time, it is likely that we are awaiting a response from your reference.

{% else %}

Your account is not credentialed. diff --git a/physionet-django/user/templates/user/edit_training.html b/physionet-django/user/templates/user/edit_training.html index 3a7cc2ce55..f397848c8d 100644 --- a/physionet-django/user/templates/user/edit_training.html +++ b/physionet-django/user/templates/user/edit_training.html @@ -5,81 +5,11 @@ {% block main_content %}

Training

-

To gain access to certain datasets on {{ SITE_NAME }}, you are required to demonstrate that you have completed relevant training. You can find specific training requirements in the "Files" section of the project description.

- - {% for status, group in training_by_status.items %} - {% if not status == 'under review' %} -
-

{{ status|capfirst }}

-
    - {% for course in group %} -
  • -
    - {{ course.training_type.name }} -
    - View -
    • - {% empty %} -

    N/A

    - {% endfor %} -
-
- {% endif %} - {% endfor %} - +

To gain access to certain datasets on {{ SITE_NAME }}, you are required to demonstrate that you have completed relevant training. You can find specific training requirements in the "Files" section of the project description.

+ +
You can view the status of your training submissions on the Certification page.
-

Complete training course on Platform

- {% if take_course_form %} -
- {% include "descriptive_inline_form_snippet.html" with form=take_course_form %} - - - -
- {% else %} -

N/A

- {% endif %} - -
-

Submit evidence of a completed course

- - {% for status, group in training_by_status.items %} - {% if status == 'under review' and group %} -
-
- The following training is under review: -
    - {% for course in group %} -
  • -
    - {{ course.training_type.name }} -
    - View -
    • - {% endfor %} -
- -
- {% endif %} - {% endfor %} +

Submit evidence of a completed Training

Please use the form below to submit a new completion report.

For CITI training, please refer to our step-by-step instructions and @@ -101,7 +31,7 @@

Submit Training
-

Are you sure you want to submit the training?

+

Are you sure you want to submit the Training?

@@ -119,8 +49,5 @@
Submit Training
$(document).on('change', '#id_training_type', function() { $("#training").load(`{% url 'edit_training' %}?trainingType=${this.value} #training>`); }); - $(document).on('change', '#op_training_type', function() { - $("#on_platform_training").load(`{% url 'edit_training' %}?trainingType=${this.value} #on_platform_training>`); - }); {% endblock %} diff --git a/physionet-django/user/templates/user/email/notify_primary_email.html b/physionet-django/user/templates/user/email/notify_primary_email.html new file mode 100644 index 0000000000..d34907d84e --- /dev/null +++ b/physionet-django/user/templates/user/email/notify_primary_email.html @@ -0,0 +1,8 @@ +{% load i18n %}{% autoescape off %}{% filter wordwrap:70 %} +You are receiving this email because you requested a password reset for your account at {{ SITE_NAME }}. + +Only your primary email address can be used for resetting your password. Your primary email address is {{ primary_email }}. + +Regards +The {{ SITE_NAME }} Team +{% endfilter %}{% endautoescape %} diff --git a/physionet-django/user/templatetags/user_templatetags.py b/physionet-django/user/templatetags/user_templatetags.py index c680e53a27..ff6efa1fe7 100644 --- a/physionet-django/user/templatetags/user_templatetags.py +++ b/physionet-django/user/templatetags/user_templatetags.py @@ -6,7 +6,8 @@ @register.inclusion_tag('user/settings_tabs.html') def settings_tabs(hide_password_settings: bool): - default_tabs = ['Profile', 'Emails', 'Username', 'Cloud', 'ORCID', 'Credentialing', 'Training', 'Agreements'] + default_tabs = ['Profile', 'Emails', 'Username', 'Cloud', 'ORCID', 'Credentialing', 'Training', + 'Certification', 'Agreements'] if not hide_password_settings: default_tabs.insert(1, 'Password') return {'settings_tabs': default_tabs} diff --git a/physionet-django/user/urls.py b/physionet-django/user/urls.py index 7e9dbf832c..8723f37e62 100644 --- a/physionet-django/user/urls.py +++ b/physionet-django/user/urls.py @@ -7,89 +7,132 @@ urlpatterns = [ - path('login/', login_view, name='login'), - - path('logout/', views.logout, name='logout'), - + path("login/", login_view, name="login"), + path("logout/", views.logout, name="logout"), # Settings - path('settings/', views.user_settings, name='user_settings'), - path('settings/profile/', views.edit_profile, name='edit_profile'), - path('settings/emails/', views.edit_emails, name='edit_emails'), - path('settings/username/', views.edit_username, name='edit_username'), - path('settings/cloud/', views.edit_cloud, name='edit_cloud'), - path('settings/orcid/', views.edit_orcid, name='edit_orcid'), - path('authorcid/', views.auth_orcid, name='auth_orcid'), - path('settings/credentialing/', views.edit_credentialing, name='edit_credentialing'), - path('settings/credentialing/applications/', - views.user_credential_applications, name='user_credential_applications'), - path('settings/training/', views.edit_training, name='edit_training'), - path('settings/training//', views.edit_training_detail, name='edit_training_detail'), - path('settings/agreements/', views.view_agreements, name='edit_agreements'), - path('settings/agreements//', views.view_signed_agreement, name='view_signed_agreement'), - + path("settings/", views.user_settings, name="user_settings"), + path("settings/profile/", views.edit_profile, name="edit_profile"), + path("settings/emails/", views.edit_emails, name="edit_emails"), + path("settings/username/", views.edit_username, name="edit_username"), + path("settings/cloud/", views.edit_cloud, name="edit_cloud"), + path("settings/orcid/", views.edit_orcid, name="edit_orcid"), + path("authorcid/", views.auth_orcid, name="auth_orcid"), + path( + "settings/credentialing/", views.edit_credentialing, name="edit_credentialing" + ), + path( + "settings/credentialing/applications/", + views.user_credential_applications, + name="user_credential_applications", + ), + path( + "settings/certification/", views.edit_certification, name="edit_certification" + ), + path("settings/training/", views.edit_training, name="edit_training"), + path( + "settings/training//", + views.edit_training_detail, + name="edit_training_detail", + ), + path("settings/agreements/", views.view_agreements, name="edit_agreements"), + path( + "settings/agreements//", + views.view_signed_agreement, + name="view_signed_agreement", + ), # Current tokens are 20 characters long and consist of 0-9A-Za-z # Obsolete tokens are 34 characters long and also include a hyphen - re_path(r'^verify/(?P[0-9A-Za-z_\-]+)/(?P[-0-9A-Za-z]{1,34})/$', - views.verify_email, name='verify_email'), - - + re_path( + r"^verify/(?P[0-9A-Za-z_\-]+)/(?P[-0-9A-Za-z]{1,34})/$", + views.verify_email, + name="verify_email", + ), # Public user profile - path('users//', views.public_profile, - name='public_profile'), - path('users//profile-photo/', views.profile_photo, - name='profile_photo'), - path('credential-application/', views.credential_application, - name='credential_application'), + path("users//", views.public_profile, name="public_profile"), + path("users//profile-photo/", views.profile_photo, name="profile_photo"), + path( + "credential-application/", + views.credential_application, + name="credential_application", + ), # TODO: remove this after 30 days of commit merge, we want let the old links that was sent to the referees work - path('credential-reference//', - views.credential_reference, name='credential_reference'), - path('credential-reference///', - views.credential_reference_verification, name='credential_reference_verification'), - path('trainings//report/', views.training_report, name='training_report'), + path( + "credential-reference//", + views.credential_reference, + name="credential_reference", + ), + path( + "credential-reference///", + views.credential_reference_verification, + name="credential_reference_verification", + ), + path( + "trainings//report/", + views.training_report, + name="training_report", + ), ] if not settings.ENABLE_SSO: - urlpatterns.extend([ - path('register/', views.register, name='register'), - path('settings/password/', views.edit_password, name='edit_password'), - path('settings/password/changed/', views.edit_password_complete, name='edit_password_complete'), - re_path(r'^activate/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,32})/$', + urlpatterns.extend( + [ + path("register/", views.register, name="register"), + path("settings/password/", views.edit_password, name="edit_password"), + path( + "settings/password/changed/", + views.edit_password_complete, + name="edit_password_complete", + ), + re_path( + r"^activate/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,32})/$", views.activate_user, - name='activate_user'), - # Request password reset - path('reset-password/', views.reset_password_request, - name='reset_password_request'), - # Page shown after reset email has been sent - path('reset-password/sent/', views.reset_password_sent, - name='reset_password_sent'), - # Prompt user to enter new password and carry out password reset (if url is valid) - re_path(r'^reset/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,32})/$', - views.reset_password_confirm, name='reset_password_confirm'), - # Password reset successfully carried out - path('reset/complete/', views.reset_password_complete, - name='reset_password_complete'), - ]) + name="activate_user", + ), + # Request password reset + path( + "reset-password/", + views.reset_password_request, + name="reset_password_request", + ), + # Page shown after reset email has been sent + path( + "reset-password/sent/", + views.reset_password_sent, + name="reset_password_sent", + ), + # Prompt user to enter new password and carry out password reset (if url is valid) + re_path( + r"^reset/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,32})/$", + views.reset_password_confirm, + name="reset_password_confirm", + ), + # Password reset successfully carried out + path( + "reset/complete/", + views.reset_password_complete, + name="reset_password_complete", + ), + ] + ) # Parameters for testing URLs (see physionet/test_urls.py) TEST_DEFAULTS = { - '_user_': 'aewj', - 'training_id': 106, - 'dua_signature_id': 1, - 'application_slug': 'Osm0FMaavviixpsL26v2', - 'verification_token': 'rJ2i7vlzh6AgZ1Wwtcz8zCoI5BqxH0kU', - 'username': 'rgmark', + "_user_": "aewj", + "training_id": 106, + "dua_signature_id": 1, + "application_slug": "Osm0FMaavviixpsL26v2", + "verification_token": "rJ2i7vlzh6AgZ1Wwtcz8zCoI5BqxH0kU", + "username": "rgmark", } TEST_CASES = { - 'verify_email': { - 'uidb64': 'MjEx', - 'token': 'oax3ZcG47GYUhAobbJyp', + "verify_email": { + "uidb64": "MjEx", + "token": "oax3ZcG47GYUhAobbJyp", }, - # Testing activate_user and reset_password_confirm requires a # dynamically-generated token. Skip these URLs for now. - 'activate_user': {'uidb64': 'x', 'token': 'x', '_skip_': True}, - 'reset_password_confirm': {'uidb64': 'x', 'token': 'x', '_skip_': True}, - + "activate_user": {"uidb64": "x", "token": "x", "_skip_": True}, + "reset_password_confirm": {"uidb64": "x", "token": "x", "_skip_": True}, # Testing auth_orcid requires a mock oauth server. Skip this URL. - 'auth_orcid': {'_skip_': True}, + "auth_orcid": {"_skip_": True}, } diff --git a/physionet-django/user/validators.py b/physionet-django/user/validators.py index dbdd4e17cc..455a8619c2 100644 --- a/physionet-django/user/validators.py +++ b/physionet-django/user/validators.py @@ -271,3 +271,14 @@ def is_institutional_email(value): return True except ValidationError: return False + + +def validate_aws_id(value): + """" + Validate an AWS ID. + """ + aws_id_pattern = r"\b\d{12}\b" + if value is not None and not re.search(aws_id_pattern, value): + raise ValidationError( + "Invalid AWS ID. Please provide a valid AWS ID, which should be a 12-digit number." + ) diff --git a/physionet-django/user/views.py b/physionet-django/user/views.py index aca8dfebd1..4607ce8c1c 100644 --- a/physionet-django/user/views.py +++ b/physionet-django/user/views.py @@ -1,7 +1,7 @@ import logging import os import pdb -from datetime import datetime +from datetime import datetime, date, timedelta import django.contrib.auth.views as auth_views import pytz @@ -9,6 +9,7 @@ from django.contrib import messages from django.contrib.auth import login from django.contrib.auth.decorators import login_required +from django.contrib.auth.forms import PasswordResetForm from django.contrib.auth.tokens import default_token_generator from django.contrib.sites.shortcuts import get_current_site from django.core.exceptions import ObjectDoesNotExist, PermissionDenied, ValidationError @@ -29,6 +30,7 @@ credential_application_request, get_url_prefix, notify_account_registration, + notify_primary_email, process_credential_complete, training_application_request, ) @@ -58,8 +60,7 @@ ) from user.userfiles import UserFiles from physionet.models import StaticPage -from training.forms import CourseForm - +from django.db.models import F logger = logging.getLogger(__name__) @@ -96,13 +97,27 @@ class LogoutView(auth_views.LogoutView): pass +class CustomPasswordResetForm(PasswordResetForm): + def clean_email(self): + """ + Override the clean_email method to allow for secondary email checks. + """ + email = self.cleaned_data['email'] + secondary_email = AssociatedEmail.objects.filter(is_verified=True, is_primary_email=False, email=email).first() + + if secondary_email: + notify_primary_email(secondary_email) + + return email + + # Request password reset class PasswordResetView(auth_views.PasswordResetView): template_name = 'user/reset_password_request.html' success_url = reverse_lazy('reset_password_sent') email_template_name = 'user/email/reset_password_email.html' extra_email_context = {'SITE_NAME': settings.SITE_NAME} - + form_class = CustomPasswordResetForm # Page shown after reset email has been sent class PasswordResetDoneView(auth_views.PasswordResetDoneView): @@ -635,6 +650,7 @@ def edit_credentialing(request): applications = CredentialApplication.objects.filter(user=request.user) current_application = applications.filter(status=CredentialApplication.Status.PENDING).first() + estimated_time = 'one week' if request.method == 'POST' and 'withdraw_credentialing' in request.POST: if current_application: @@ -646,6 +662,7 @@ def edit_credentialing(request): return render(request, 'user/edit_credentialing.html', { 'applications': applications, 'pause_applications': pause_applications, + 'estimated_time_for_credentialing': estimated_time, 'pause_message': pause_message, 'current_application': current_application, 'ticket_system_url': ticket_system_url}) @@ -722,51 +739,103 @@ def credential_application(request): @login_required def edit_training(request): """ - Training settings page. + Trainings settings page. """ if settings.TICKET_SYSTEM_URL: ticket_system_url = settings.TICKET_SYSTEM_URL else: ticket_system_url = None - if request.method == 'POST': + if request.method == "POST": + training_form = forms.TrainingForm( + user=request.user, + data=request.POST, + files=request.FILES, + training_type=request.POST.get("training_type"), + ) + if training_form.is_valid(): + training_form.save() + messages.success(request, "The training has been submitted successfully.") + training_application_request(request, training_form) + training_form = forms.TrainingForm(user=request.user) + else: + messages.error(request, "Invalid submission. Check the errors below.") + + else: + training_type = request.GET.get("trainingType") + if training_type: + training_form = forms.TrainingForm( + user=request.user, training_type=training_type + ) + else: + training_form = forms.TrainingForm(user=request.user) + + expiring_trainings = Training.objects.filter( + user=request.user, + process_datetime__lte=date.today() - F('training_type__valid_duration') + timedelta(days=30), + process_datetime__gt=date.today() - F('training_type__valid_duration') + ) + if expiring_trainings: + for training in expiring_trainings: + days_until_expiry = ( + training.process_datetime.date() + training.training_type.valid_duration - date.today() + ).days + message = f"Your {training.training_type.name} training will expire in {days_until_expiry} days." + messages.warning(request, message) + + return render( + request, + "user/edit_training.html", + {"training_form": training_form, "ticket_system_url": ticket_system_url}, + ) + + +@login_required +def edit_certification(request): + """ + Certifications page. + """ + + if request.method == "POST": training_form = forms.TrainingForm( - user=request.user, data=request.POST, files=request.FILES, training_type=request.POST.get('training_type') + user=request.user, + data=request.POST, + files=request.FILES, + training_type=request.POST.get("training_type"), ) - take_course_form = CourseForm( - data=request.POST, training_type=request.POST.get('training_type'), auto_id="op_%s") if training_form.is_valid(): training_form.save() - messages.success(request, 'The training has been submitted successfully.') + messages.success(request, "The training has been submitted successfully.") training_application_request(request, training_form) training_form = forms.TrainingForm(user=request.user) else: - messages.error(request, 'Invalid submission. Check the errors below.') + messages.error(request, "Invalid submission. Check the errors below.") else: - training_type = request.GET.get('trainingType') + training_type = request.GET.get("trainingType") if training_type: - training_form = forms.TrainingForm(user=request.user, training_type=training_type) - take_course_form = CourseForm(training_type=training_type, auto_id="op_%s") + training_form = forms.TrainingForm( + user=request.user, training_type=training_type + ) else: training_form = forms.TrainingForm(user=request.user) - take_course_form = CourseForm(auto_id="op_%s") - training = Training.objects.select_related('training_type').filter(user=request.user).order_by('-status') + training = ( + Training.objects.select_related("training_type") + .filter(user=request.user) + .order_by("-status") + ) training_by_status = { - 'under review': training.get_review(), - 'active': training.get_valid(), - 'expired': training.get_expired(), - 'rejected': training.get_rejected(), + "under review": training.get_review(), + "active": training.get_valid(), + "expired": training.get_expired(), + "rejected": training.get_rejected(), } return render( request, - 'user/edit_training.html', - {'training_form': training_form, - 'take_course_form': take_course_form, - 'training_by_status': training_by_status, - 'ticket_system_url': ticket_system_url}, + "user/edit_certification.html", + {"training_by_status": training_by_status}, ) diff --git a/poetry.lock b/poetry.lock index 4bc3a802b3..28666e3cbc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,16 +1,19 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "asgiref" -version = "3.5.2" +version = "3.7.2" description = "ASGI specs, helper code, and adapters" optional = false python-versions = ">=3.7" files = [ - {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"}, - {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"}, + {file = "asgiref-3.7.2-py3-none-any.whl", hash = "sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e"}, + {file = "asgiref-3.7.2.tar.gz", hash = "sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed"}, ] +[package.dependencies] +typing-extensions = {version = ">=4", markers = "python_version < \"3.11\""} + [package.extras] tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] @@ -30,6 +33,44 @@ packaging = "*" six = ">=1.9.0" webencodings = "*" +[[package]] +name = "boto3" +version = "1.28.53" +description = "The AWS SDK for Python" +optional = false +python-versions = ">= 3.7" +files = [ + {file = "boto3-1.28.53-py3-none-any.whl", hash = "sha256:dc2da9aff7de359774030a243a09b74568664117e2afb77c6e4b90572ae3a6c3"}, + {file = "boto3-1.28.53.tar.gz", hash = "sha256:b95b0cc39f08402029c3a2bb141e1775cfa46576ebe9f9916f79bde90e27f53f"}, +] + +[package.dependencies] +botocore = ">=1.31.53,<1.32.0" +jmespath = ">=0.7.1,<2.0.0" +s3transfer = ">=0.6.0,<0.7.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] + +[[package]] +name = "botocore" +version = "1.31.53" +description = "Low-level, data-driven core of boto 3." +optional = false +python-versions = ">= 3.7" +files = [ + {file = "botocore-1.31.53-py3-none-any.whl", hash = "sha256:aa647f94039d21de97c969df21ce8c5186b68234eb5c53148f0d8bbd708e375d"}, + {file = "botocore-1.31.53.tar.gz", hash = "sha256:905580ea724d74f11652bab63fcec6bf0d32f1cf8b2963f7388efc0ea406b69b"}, +] + +[package.dependencies] +jmespath = ">=0.7.1,<2.0.0" +python-dateutil = ">=2.1,<3.0.0" +urllib3 = ">=1.25.4,<1.27" + +[package.extras] +crt = ["awscrt (==0.16.26)"] + [[package]] name = "cachetools" version = "4.2.2" @@ -43,13 +84,13 @@ files = [ [[package]] name = "certifi" -version = "2022.12.7" +version = "2023.7.22" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.6" files = [ - {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, - {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, + {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"}, + {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, ] [[package]] @@ -218,30 +259,34 @@ toml = ["tomli"] [[package]] name = "cryptography" -version = "40.0.1" +version = "41.0.6" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "cryptography-40.0.1-cp36-abi3-macosx_10_12_universal2.whl", hash = "sha256:918cb89086c7d98b1b86b9fdb70c712e5a9325ba6f7d7cfb509e784e0cfc6917"}, - {file = "cryptography-40.0.1-cp36-abi3-macosx_10_12_x86_64.whl", hash = "sha256:9618a87212cb5200500e304e43691111570e1f10ec3f35569fdfcd17e28fd797"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:0a4e3406cfed6b1f6d6e87ed243363652b2586b2d917b0609ca4f97072994405"}, - {file = "cryptography-40.0.1-cp36-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:1e0af458515d5e4028aad75f3bb3fe7a31e46ad920648cd59b64d3da842e4356"}, - {file = "cryptography-40.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:d8aa3609d337ad85e4eb9bb0f8bcf6e4409bfb86e706efa9a027912169e89122"}, - {file = "cryptography-40.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:cf91e428c51ef692b82ce786583e214f58392399cf65c341bc7301d096fa3ba2"}, - {file = "cryptography-40.0.1-cp36-abi3-win32.whl", hash = "sha256:650883cc064297ef3676b1db1b7b1df6081794c4ada96fa457253c4cc40f97db"}, - {file = "cryptography-40.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:a805a7bce4a77d51696410005b3e85ae2839bad9aa38894afc0aa99d8e0c3160"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:cd033d74067d8928ef00a6b1327c8ea0452523967ca4463666eeba65ca350d4c"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d36bbeb99704aabefdca5aee4eba04455d7a27ceabd16f3b3ba9bdcc31da86c4"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:32057d3d0ab7d4453778367ca43e99ddb711770477c4f072a51b3ca69602780a"}, - {file = "cryptography-40.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:f5d7b79fa56bc29580faafc2ff736ce05ba31feaa9d4735048b0de7d9ceb2b94"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:7c872413353c70e0263a9368c4993710070e70ab3e5318d85510cc91cce77e7c"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:28d63d75bf7ae4045b10de5413fb1d6338616e79015999ad9cf6fc538f772d41"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6f2bbd72f717ce33100e6467572abaedc61f1acb87b8d546001328d7f466b778"}, - {file = "cryptography-40.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:cc3a621076d824d75ab1e1e530e66e7e8564e357dd723f2533225d40fe35c60c"}, - {file = "cryptography-40.0.1.tar.gz", hash = "sha256:2803f2f8b1e95f614419926c7e6f55d828afc614ca5ed61543877ae668cc3472"}, + {file = "cryptography-41.0.6-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:0f27acb55a4e77b9be8d550d762b0513ef3fc658cd3eb15110ebbcbd626db12c"}, + {file = "cryptography-41.0.6-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:ae236bb8760c1e55b7a39b6d4d32d2279bc6c7c8500b7d5a13b6fb9fc97be35b"}, + {file = "cryptography-41.0.6-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afda76d84b053923c27ede5edc1ed7d53e3c9f475ebaf63c68e69f1403c405a8"}, + {file = "cryptography-41.0.6-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da46e2b5df770070412c46f87bac0849b8d685c5f2679771de277a422c7d0b86"}, + {file = "cryptography-41.0.6-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:ff369dd19e8fe0528b02e8df9f2aeb2479f89b1270d90f96a63500afe9af5cae"}, + {file = "cryptography-41.0.6-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:b648fe2a45e426aaee684ddca2632f62ec4613ef362f4d681a9a6283d10e079d"}, + {file = "cryptography-41.0.6-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:5daeb18e7886a358064a68dbcaf441c036cbdb7da52ae744e7b9207b04d3908c"}, + {file = "cryptography-41.0.6-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:068bc551698c234742c40049e46840843f3d98ad7ce265fd2bd4ec0d11306596"}, + {file = "cryptography-41.0.6-cp37-abi3-win32.whl", hash = "sha256:2132d5865eea673fe6712c2ed5fb4fa49dba10768bb4cc798345748380ee3660"}, + {file = "cryptography-41.0.6-cp37-abi3-win_amd64.whl", hash = "sha256:48783b7e2bef51224020efb61b42704207dde583d7e371ef8fc2a5fb6c0aabc7"}, + {file = "cryptography-41.0.6-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:8efb2af8d4ba9dbc9c9dd8f04d19a7abb5b49eab1f3694e7b5a16a5fc2856f5c"}, + {file = "cryptography-41.0.6-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c5a550dc7a3b50b116323e3d376241829fd326ac47bc195e04eb33a8170902a9"}, + {file = "cryptography-41.0.6-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:85abd057699b98fce40b41737afb234fef05c67e116f6f3650782c10862c43da"}, + {file = "cryptography-41.0.6-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:f39812f70fc5c71a15aa3c97b2bbe213c3f2a460b79bd21c40d033bb34a9bf36"}, + {file = "cryptography-41.0.6-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:742ae5e9a2310e9dade7932f9576606836ed174da3c7d26bc3d3ab4bd49b9f65"}, + {file = "cryptography-41.0.6-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:35f3f288e83c3f6f10752467c48919a7a94b7d88cc00b0668372a0d2ad4f8ead"}, + {file = "cryptography-41.0.6-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:4d03186af98b1c01a4eda396b137f29e4e3fb0173e30f885e27acec8823c1b09"}, + {file = "cryptography-41.0.6-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:b27a7fd4229abef715e064269d98a7e2909ebf92eb6912a9603c7e14c181928c"}, + {file = "cryptography-41.0.6-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:398ae1fc711b5eb78e977daa3cbf47cec20f2c08c5da129b7a296055fbb22aed"}, + {file = "cryptography-41.0.6-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:7e00fb556bda398b99b0da289ce7053639d33b572847181d6483ad89835115f6"}, + {file = "cryptography-41.0.6-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:60e746b11b937911dc70d164060d28d273e31853bb359e2b2033c9e93e6f3c43"}, + {file = "cryptography-41.0.6-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3288acccef021e3c3c10d58933f44e8602cf04dba96d9796d70d537bb2f4bbc4"}, + {file = "cryptography-41.0.6.tar.gz", hash = "sha256:422e3e31d63743855e43e5a6fcc8b4acab860f560f9321b0ee6269cc7ed70cc3"}, ] [package.dependencies] @@ -250,44 +295,27 @@ cffi = ">=1.12" [package.extras] docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"] docstest = ["pyenchant (>=1.6.11)", "sphinxcontrib-spelling (>=4.0.1)", "twine (>=1.12.0)"] -pep8test = ["black", "check-manifest", "mypy", "ruff"] -sdist = ["setuptools-rust (>=0.11.4)"] +nox = ["nox"] +pep8test = ["black", "check-sdist", "mypy", "ruff"] +sdist = ["build"] ssh = ["bcrypt (>=3.1.5)"] -test = ["iso8601", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-shard (>=0.1.2)", "pytest-subtests", "pytest-xdist"] +test = ["pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"] test-randomorder = ["pytest-randomly"] -tox = ["tox"] - -[[package]] -name = "deprecated" -version = "1.2.13" -description = "Python @deprecated decorator to deprecate old python classes, functions or methods." -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "Deprecated-1.2.13-py2.py3-none-any.whl", hash = "sha256:64756e3e14c8c5eea9795d93c524551432a0be75629f8f29e67ab8caf076c76d"}, - {file = "Deprecated-1.2.13.tar.gz", hash = "sha256:43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d"}, -] - -[package.dependencies] -wrapt = ">=1.10,<2" - -[package.extras] -dev = ["PyTest", "PyTest (<5)", "PyTest-Cov", "PyTest-Cov (<2.6)", "bump2version (<1)", "configparser (<5)", "importlib-metadata (<3)", "importlib-resources (<4)", "sphinx (<2)", "sphinxcontrib-websupport (<2)", "tox", "zipp (<2)"] [[package]] name = "django" -version = "4.1.10" +version = "4.2.11" description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." optional = false python-versions = ">=3.8" files = [ - {file = "Django-4.1.10-py3-none-any.whl", hash = "sha256:26d0260c2fb8121009e62ffc548b2398dea2522b6454208a852fb0ef264c206c"}, - {file = "Django-4.1.10.tar.gz", hash = "sha256:56343019a9fd839e2e5bf203daf45f25af79d5bffa4c71d56eae4f4404d82ade"}, + {file = "Django-4.2.11-py3-none-any.whl", hash = "sha256:ddc24a0a8280a0430baa37aff11f28574720af05888c62b7cfe71d219f4599d3"}, + {file = "Django-4.2.11.tar.gz", hash = "sha256:6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4"}, ] [package.dependencies] -asgiref = ">=3.5.2,<4" -sqlparse = ">=0.2.2" +asgiref = ">=3.6.0,<4" +sqlparse = ">=0.3.1" tzdata = {version = "*", markers = "sys_platform == \"win32\""} [package.extras] @@ -357,6 +385,20 @@ files = [ [package.dependencies] Django = ">=3.2" +[[package]] +name = "django-coverage-plugin" +version = "3.1.0" +description = "Django template coverage.py plugin" +optional = false +python-versions = "*" +files = [ + {file = "django_coverage_plugin-3.1.0-py3-none-any.whl", hash = "sha256:eb0ea8ffdb0db11a02994fc99be6500550efb496c350d709f418ff3d8e553a67"}, + {file = "django_coverage_plugin-3.1.0.tar.gz", hash = "sha256:223d34bf92bebadcb8b7b89932480e41c7bd98b44a8156934488fbe7f4a71f99"}, +] + +[package.dependencies] +coverage = "*" + [[package]] name = "django-debug-toolbar" version = "3.2.4" @@ -406,6 +448,44 @@ jwcrypto = ">=0.8.0" oauthlib = ">=3.1.0" requests = ">=2.13.0" +[[package]] +name = "django-picklefield" +version = "3.1" +description = "Pickled object field for Django" +optional = false +python-versions = ">=3" +files = [ + {file = "django-picklefield-3.1.tar.gz", hash = "sha256:c786cbeda78d6def2b43bff4840d19787809c8909f7ad683961703060398d356"}, + {file = "django_picklefield-3.1-py3-none-any.whl", hash = "sha256:d77c504df7311e8ec14e8b779f10ca6fec74de6c7f8e2c136e1ef60cf955125d"}, +] + +[package.dependencies] +Django = ">=3.2" + +[package.extras] +tests = ["tox"] + +[[package]] +name = "django-q2" +version = "1.6.2" +description = "A multiprocessing distributed task queue for Django" +optional = false +python-versions = ">=3.8,<4" +files = [ + {file = "django_q2-1.6.2-py3-none-any.whl", hash = "sha256:c2d75552c80b83ca0d8c0b0db7db4f17e9f43ee131a46d0ddd514c5f5fc603cb"}, + {file = "django_q2-1.6.2.tar.gz", hash = "sha256:cd83c16b5791cd99f83a8d106d2447305d73c6c8ed8ec22c7cb954fe0e814284"}, +] + +[package.dependencies] +django = ">=3.2,<6" +django-picklefield = ">=3.1,<4.0" +importlib-metadata = {version = ">=3.6", markers = "python_version < \"3.10\""} + +[package.extras] +rollbar = ["django-q-rollbar (>=0.1)"] +sentry = ["django-q-sentry (>=0.1)"] +testing = ["blessed (>=1.19.1,<2.0.0)", "boto3 (>=1.24.92,<2.0.0)", "croniter (>=2.0.1,<3.0.0)", "django-redis (>=5.2.0,<6.0.0)", "hiredis (>=2.0.0,<3.0.0)", "iron-mq (>=0.9,<0.10)", "psutil (>=5.9.2,<6.0.0)", "pymongo (>=4.2.0,<5.0.0)", "redis (>=4.3.4,<5.0.0)", "setproctitle (>=1.3.2,<2.0.0)"] + [[package]] name = "django-sass" version = "1.1.0" @@ -594,8 +674,8 @@ files = [ [package.dependencies] google-api-core = {version = ">=1.34.0,<2.0.dev0 || >=2.11.dev0,<3.0.0dev", extras = ["grpc"]} proto-plus = [ - {version = ">=1.22.0,<2.0.0dev", markers = "python_version < \"3.11\""}, {version = ">=1.22.2,<2.0.0dev", markers = "python_version >= \"3.11\""}, + {version = ">=1.22.0,<2.0.0dev", markers = "python_version < \"3.11\""}, ] protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0dev" @@ -681,60 +761,60 @@ grpc = ["grpcio (>=1.44.0,<2.0.0dev)"] [[package]] name = "grpcio" -version = "1.51.1" +version = "1.53.2" description = "HTTP/2-based RPC framework" optional = false python-versions = ">=3.7" files = [ - {file = "grpcio-1.51.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:cc2bece1737b44d878cc1510ea04469a8073dbbcdd762175168937ae4742dfb3"}, - {file = "grpcio-1.51.1-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:e223a9793522680beae44671b9ed8f6d25bbe5ddf8887e66aebad5e0686049ef"}, - {file = "grpcio-1.51.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:24ac1154c4b2ab4a0c5326a76161547e70664cd2c39ba75f00fc8a2170964ea2"}, - {file = "grpcio-1.51.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4ef09f8997c4be5f3504cefa6b5c6cc3cf648274ce3cede84d4342a35d76db6"}, - {file = "grpcio-1.51.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8a0b77e992c64880e6efbe0086fe54dfc0bbd56f72a92d9e48264dcd2a3db98"}, - {file = "grpcio-1.51.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:eacad297ea60c72dd280d3353d93fb1dcca952ec11de6bb3c49d12a572ba31dd"}, - {file = "grpcio-1.51.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:16c71740640ba3a882f50b01bf58154681d44b51f09a5728180a8fdc66c67bd5"}, - {file = "grpcio-1.51.1-cp310-cp310-win32.whl", hash = "sha256:29cb97d41a4ead83b7bcad23bdb25bdd170b1e2cba16db6d3acbb090bc2de43c"}, - {file = "grpcio-1.51.1-cp310-cp310-win_amd64.whl", hash = "sha256:9ff42c5620b4e4530609e11afefa4a62ca91fa0abb045a8957e509ef84e54d30"}, - {file = "grpcio-1.51.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:bc59f7ba87972ab236f8669d8ca7400f02a0eadf273ca00e02af64d588046f02"}, - {file = "grpcio-1.51.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:3c2b3842dcf870912da31a503454a33a697392f60c5e2697c91d133130c2c85d"}, - {file = "grpcio-1.51.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22b011674090594f1f3245960ced7386f6af35485a38901f8afee8ad01541dbd"}, - {file = "grpcio-1.51.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49d680356a975d9c66a678eb2dde192d5dc427a7994fb977363634e781614f7c"}, - {file = "grpcio-1.51.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:094e64236253590d9d4075665c77b329d707b6fca864dd62b144255e199b4f87"}, - {file = "grpcio-1.51.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:257478300735ce3c98d65a930bbda3db172bd4e00968ba743e6a1154ea6edf10"}, - {file = "grpcio-1.51.1-cp311-cp311-win32.whl", hash = "sha256:5a6ebcdef0ef12005d56d38be30f5156d1cb3373b52e96f147f4a24b0ddb3a9d"}, - {file = "grpcio-1.51.1-cp311-cp311-win_amd64.whl", hash = "sha256:3f9b0023c2c92bebd1be72cdfca23004ea748be1813a66d684d49d67d836adde"}, - {file = "grpcio-1.51.1-cp37-cp37m-linux_armv7l.whl", hash = "sha256:cd3baccea2bc5c38aeb14e5b00167bd4e2373a373a5e4d8d850bd193edad150c"}, - {file = "grpcio-1.51.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:17ec9b13cec4a286b9e606b48191e560ca2f3bbdf3986f91e480a95d1582e1a7"}, - {file = "grpcio-1.51.1-cp37-cp37m-manylinux_2_17_aarch64.whl", hash = "sha256:fbdbe9a849854fe484c00823f45b7baab159bdd4a46075302281998cb8719df5"}, - {file = "grpcio-1.51.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:31bb6bc7ff145e2771c9baf612f4b9ebbc9605ccdc5f3ff3d5553de7fc0e0d79"}, - {file = "grpcio-1.51.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e473525c28251558337b5c1ad3fa969511e42304524a4e404065e165b084c9e4"}, - {file = "grpcio-1.51.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6f0b89967ee11f2b654c23b27086d88ad7bf08c0b3c2a280362f28c3698b2896"}, - {file = "grpcio-1.51.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7942b32a291421460d6a07883033e392167d30724aa84987e6956cd15f1a21b9"}, - {file = "grpcio-1.51.1-cp37-cp37m-win32.whl", hash = "sha256:f96ace1540223f26fbe7c4ebbf8a98e3929a6aa0290c8033d12526847b291c0f"}, - {file = "grpcio-1.51.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f1fec3abaf274cdb85bf3878167cfde5ad4a4d97c68421afda95174de85ba813"}, - {file = "grpcio-1.51.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:0e1a9e1b4a23808f1132aa35f968cd8e659f60af3ffd6fb00bcf9a65e7db279f"}, - {file = "grpcio-1.51.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:6df3b63538c362312bc5fa95fb965069c65c3ea91d7ce78ad9c47cab57226f54"}, - {file = "grpcio-1.51.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:172405ca6bdfedd6054c74c62085946e45ad4d9cec9f3c42b4c9a02546c4c7e9"}, - {file = "grpcio-1.51.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:506b9b7a4cede87d7219bfb31014d7b471cfc77157da9e820a737ec1ea4b0663"}, - {file = "grpcio-1.51.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0fb93051331acbb75b49a2a0fd9239c6ba9528f6bdc1dd400ad1cb66cf864292"}, - {file = "grpcio-1.51.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:5dca372268c6ab6372d37d6b9f9343e7e5b4bc09779f819f9470cd88b2ece3c3"}, - {file = "grpcio-1.51.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:471d39d3370ca923a316d49c8aac66356cea708a11e647e3bdc3d0b5de4f0a40"}, - {file = "grpcio-1.51.1-cp38-cp38-win32.whl", hash = "sha256:75e29a90dc319f0ad4d87ba6d20083615a00d8276b51512e04ad7452b5c23b04"}, - {file = "grpcio-1.51.1-cp38-cp38-win_amd64.whl", hash = "sha256:f1158bccbb919da42544a4d3af5d9296a3358539ffa01018307337365a9a0c64"}, - {file = "grpcio-1.51.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:59dffade859f157bcc55243714d57b286da6ae16469bf1ac0614d281b5f49b67"}, - {file = "grpcio-1.51.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:dad6533411d033b77f5369eafe87af8583178efd4039c41d7515d3336c53b4f1"}, - {file = "grpcio-1.51.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:4c4423ea38a7825b8fed8934d6d9aeebdf646c97e3c608c3b0bcf23616f33877"}, - {file = "grpcio-1.51.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0dc5354e38e5adf2498312f7241b14c7ce3484eefa0082db4297189dcbe272e6"}, - {file = "grpcio-1.51.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97d67983189e2e45550eac194d6234fc38b8c3b5396c153821f2d906ed46e0ce"}, - {file = "grpcio-1.51.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:538d981818e49b6ed1e9c8d5e5adf29f71c4e334e7d459bf47e9b7abb3c30e09"}, - {file = "grpcio-1.51.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9235dcd5144a83f9ca6f431bd0eccc46b90e2c22fe27b7f7d77cabb2fb515595"}, - {file = "grpcio-1.51.1-cp39-cp39-win32.whl", hash = "sha256:aacb54f7789ede5cbf1d007637f792d3e87f1c9841f57dd51abf89337d1b8472"}, - {file = "grpcio-1.51.1-cp39-cp39-win_amd64.whl", hash = "sha256:2b170eaf51518275c9b6b22ccb59450537c5a8555326fd96ff7391b5dd75303c"}, - {file = "grpcio-1.51.1.tar.gz", hash = "sha256:e6dfc2b6567b1c261739b43d9c59d201c1b89e017afd9e684d85aa7a186c9f7a"}, + {file = "grpcio-1.53.2-cp310-cp310-linux_armv7l.whl", hash = "sha256:18afdda2bbe0c615da4daff754cab0df9bbd859c415d85e7e741a2975b3208b4"}, + {file = "grpcio-1.53.2-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:33f7678287ac330c94e25f96cdb951e0861e206115ba4d8ea66cf6546b1a09d0"}, + {file = "grpcio-1.53.2-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:1af074f28a56425e4f4d99761708981543a27ae963f5b4b0a36ff71f3483479d"}, + {file = "grpcio-1.53.2-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:df07843c8c0dc71a56d3af3dfe19165fb0d3af7d3354a72185f6fa1b4ac05cab"}, + {file = "grpcio-1.53.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5b403c4ad22f3ba37c7720547d8888a1e4b74ad980a94332bbbc50330b623abc"}, + {file = "grpcio-1.53.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6275a54b41d6b1ec539b019bc3affaf6d05b0a0ba36af1a65b8a2810ef69e07d"}, + {file = "grpcio-1.53.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0e92dc6a85cd1de42527812ef1276095e62169d002d86c888b6e889fcda1dd29"}, + {file = "grpcio-1.53.2-cp310-cp310-win32.whl", hash = "sha256:6be86e8d5cf47415968588e5dfbfb92ee8757fb41139584192b67050d1a72c58"}, + {file = "grpcio-1.53.2-cp310-cp310-win_amd64.whl", hash = "sha256:5b49f372df33f5f84865aef5d46cacd23180b586c80e8cbe0ce149b96dfa8c4c"}, + {file = "grpcio-1.53.2-cp311-cp311-linux_armv7l.whl", hash = "sha256:8166ac6671472d172cc0db50323b7a7504bd534de54aa31354465a00ca44409d"}, + {file = "grpcio-1.53.2-cp311-cp311-macosx_10_10_universal2.whl", hash = "sha256:f7e66d8b31ef2bada7029275debbe12c97397ec7ac70a659837a7b8a6a9dc916"}, + {file = "grpcio-1.53.2-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:712113946b303db9ae4245a13de213710367850a6c3c53530b70e87989feb8e0"}, + {file = "grpcio-1.53.2-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f3761f9a6817e32898eaa5aecd0b0ad69d0c68ab45ea7bf206e8dc4548f025f0"}, + {file = "grpcio-1.53.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24c63592103fded38b258f1e520ba8b0a7a0bbc397cddd6520a1f74dc4b5dec0"}, + {file = "grpcio-1.53.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:53d34cbf212f03634d74ba366d595b4a06a3b60fcc731eddbd6fd7ebe4acf981"}, + {file = "grpcio-1.53.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3b789472e9ef75d179295d0c6a1f7f0aefd08189cd1c822b068b0523365a1dbe"}, + {file = "grpcio-1.53.2-cp311-cp311-win32.whl", hash = "sha256:7b44ed75b9d67d17e5a098a0f99a8fd3e5861fd3c4eb54212277a0acdf298434"}, + {file = "grpcio-1.53.2-cp311-cp311-win_amd64.whl", hash = "sha256:1d1a320230e0d020880178b8eb453300bd57700b44c3744268370502e7376a9b"}, + {file = "grpcio-1.53.2-cp37-cp37m-linux_armv7l.whl", hash = "sha256:69e99fe6bdc2cdacd04cef6b6585b00630d958c98e36d825de3eea406e15fb31"}, + {file = "grpcio-1.53.2-cp37-cp37m-macosx_10_10_universal2.whl", hash = "sha256:590c7206f764cfe37a65003a75977358e20919ed488f970935f54efa2741b497"}, + {file = "grpcio-1.53.2-cp37-cp37m-manylinux_2_17_aarch64.whl", hash = "sha256:1fcced1abb13cdb6a5d8b105765d30212a6cb29ab0dfb01eedecf2ff6c84371b"}, + {file = "grpcio-1.53.2-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07b83c06e7d113044cf3da15ca52f578c5f3dca299af711e9a589c1b71eb8be5"}, + {file = "grpcio-1.53.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bee217bda6b2c81d9e2866f523217135a03a007a89043eee074e93d76706b0"}, + {file = "grpcio-1.53.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9efbedc737ba342d8a2459afc9bd5c5df31adcdf774b772a4e663739f2cf0d06"}, + {file = "grpcio-1.53.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0f76287d98ec79a38cba8292d0bdcd6ab9b9daf568dce1d53b9eb0135fc14d26"}, + {file = "grpcio-1.53.2-cp37-cp37m-win_amd64.whl", hash = "sha256:d406cf2f6ccf39883a24b048c448a37bac16939408c1b6fbb4d021f3cd961448"}, + {file = "grpcio-1.53.2-cp38-cp38-linux_armv7l.whl", hash = "sha256:f9f7c0dd17f24e1774cc3a8df738246772994e853c28b28ed6ba7711ccf0abb4"}, + {file = "grpcio-1.53.2-cp38-cp38-macosx_10_10_universal2.whl", hash = "sha256:f14a82d12d53eb93298c35edf88d8c3ef37243b95f94dd3c75fddcba575d34ab"}, + {file = "grpcio-1.53.2-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:1deeb84bb344351434f999cea4704ac6f1e07b3d861e34c44b50d8afa06caaa1"}, + {file = "grpcio-1.53.2-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7cbf1e3aaec3edf734ef90182363a395d234cd4790544be914cedbe1b9fec99a"}, + {file = "grpcio-1.53.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ea235cecb9df14b49a75cbd27a634683a96bb76576363407ec820ae454ce2b2"}, + {file = "grpcio-1.53.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1df931fbb4c36363d2cb985c2c26fda8f060b541a89c6c1191fdb59151a8c934"}, + {file = "grpcio-1.53.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7734d1b91f1f3b1f186debf8ec4d168ee088a54e8186c14d89a95f7e51d3198d"}, + {file = "grpcio-1.53.2-cp38-cp38-win32.whl", hash = "sha256:b16258a31269b97e26a08d71b5deb56499e86077d26e453fad8f6ec4c06fe666"}, + {file = "grpcio-1.53.2-cp38-cp38-win_amd64.whl", hash = "sha256:b676c4365a5753bc8c49f922a5f88bdb5df6746c670a9d859d2ba2f5f97d9269"}, + {file = "grpcio-1.53.2-cp39-cp39-linux_armv7l.whl", hash = "sha256:8fc7667564c8c15748354dea1bb4035c5118df4e9dc5154ccdb6e62a3e5a2bac"}, + {file = "grpcio-1.53.2-cp39-cp39-macosx_10_10_universal2.whl", hash = "sha256:80a8867746cff41c2db436dd9eea18ebbfcd0449d65b64b3ed3c995207898971"}, + {file = "grpcio-1.53.2-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:431f864f2642a97d0aa8c6b606c307f03d22f919b1a226af90488426aed35809"}, + {file = "grpcio-1.53.2-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bea6a20c5a732a27b64623d43614b3022e6fcfc081a75236b7f9aa069d2eaa4d"}, + {file = "grpcio-1.53.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:504af9e86ab01c9c33d8a452fe846aa931d024945f2e897537ccb8f7d76778ee"}, + {file = "grpcio-1.53.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:2b4f5671f9e88b7f51f54adda37a23277b7fdebd1557c47543b3e8a8044dd510"}, + {file = "grpcio-1.53.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d9c51ca201326b49cfee38336c6e7dd1cb8a6b6d0dcf84aeaecbae310a736dbc"}, + {file = "grpcio-1.53.2-cp39-cp39-win32.whl", hash = "sha256:7e6885a8431939f1ee547e965fa3cb801a518b83d3d3509e90dbef78f0b5fd29"}, + {file = "grpcio-1.53.2-cp39-cp39-win_amd64.whl", hash = "sha256:ea84becb5cbd6a94a810c5214eb263ae57e915a9ed1bdcd5b4a6baf13d8c5177"}, + {file = "grpcio-1.53.2.tar.gz", hash = "sha256:0c9e42f2499c8603af1d88771dc97e2c6b0310c278337058fd7fd1ddb35ab853"}, ] [package.extras] -protobuf = ["grpcio-tools (>=1.51.1)"] +protobuf = ["grpcio-tools (>=1.53.2)"] [[package]] name = "grpcio-status" @@ -754,12 +834,12 @@ protobuf = ">=3.12.0" [[package]] name = "hdn-research-environment" -version = "1.4.0" +version = "2.3.8" description = "A Django app for supporting cloud-native research environments" optional = false python-versions = ">=3.7" files = [ - {file = "hdn-research-environment-1.4.0.tar.gz", hash = "sha256:296a336847c1078c149baa6773654a2e2a5b16cc1b03ca25f6f19f8606980e5b"}, + {file = "hdn-research-environment-2.3.8.tar.gz", hash = "sha256:371b33950e3c1598b650edefd42fa19a3532d2ca815dd42f495f0460c57df97f"}, ] [package.dependencies] @@ -803,19 +883,67 @@ files = [ {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, ] +[[package]] +name = "importlib-metadata" +version = "7.0.2" +description = "Read metadata from Python packages" +optional = false +python-versions = ">=3.8" +files = [ + {file = "importlib_metadata-7.0.2-py3-none-any.whl", hash = "sha256:f4bc4c0c070c490abf4ce96d715f68e95923320370efb66143df00199bb6c100"}, + {file = "importlib_metadata-7.0.2.tar.gz", hash = "sha256:198f568f3230878cb1b44fbd7975f87906c22336dba2e4a7f05278c281fbd792"}, +] + +[package.dependencies] +zipp = ">=0.5" + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +perf = ["ipython"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] + +[[package]] +name = "jinja2" +version = "3.1.3" +description = "A very fast and expressive template engine." +optional = false +python-versions = ">=3.7" +files = [ + {file = "Jinja2-3.1.3-py3-none-any.whl", hash = "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa"}, + {file = "Jinja2-3.1.3.tar.gz", hash = "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90"}, +] + +[package.dependencies] +MarkupSafe = ">=2.0" + +[package.extras] +i18n = ["Babel (>=2.7)"] + +[[package]] +name = "jmespath" +version = "1.0.1" +description = "JSON Matching Expressions" +optional = false +python-versions = ">=3.7" +files = [ + {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"}, + {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"}, +] + [[package]] name = "jwcrypto" -version = "1.4.2" +version = "1.5.6" description = "Implementation of JOSE Web standards" optional = false -python-versions = ">= 3.6" +python-versions = ">= 3.8" files = [ - {file = "jwcrypto-1.4.2.tar.gz", hash = "sha256:80a35e9ed1b3b2c43ce03d92c5d48e6d0b6647e2aa2618e4963448923d78a37b"}, + {file = "jwcrypto-1.5.6-py3-none-any.whl", hash = "sha256:150d2b0ebbdb8f40b77f543fb44ffd2baeff48788be71f67f03566692fd55789"}, + {file = "jwcrypto-1.5.6.tar.gz", hash = "sha256:771a87762a0c081ae6166958a954f80848820b2ab066937dc8b8379d65b1b039"}, ] [package.dependencies] -cryptography = ">=2.3" -deprecated = "*" +cryptography = ">=3.4" +typing-extensions = ">=4.5.0" [[package]] name = "libsass" @@ -839,6 +967,124 @@ files = [ [package.dependencies] six = "*" +[[package]] +name = "markupsafe" +version = "2.1.3" +description = "Safely add untrusted strings to HTML/XML markup." +optional = false +python-versions = ">=3.7" +files = [ + {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-win32.whl", hash = "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-win_amd64.whl", hash = "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-win32.whl", hash = "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-win_amd64.whl", hash = "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"}, + {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"}, +] + +[[package]] +name = "moto" +version = "4.2.10" +description = "" +optional = false +python-versions = ">=3.7" +files = [ + {file = "moto-4.2.10-py2.py3-none-any.whl", hash = "sha256:5cf0736d1f43cb887498d00b00ae522774bfddb7db1f4994fedea65b290b9f0e"}, + {file = "moto-4.2.10.tar.gz", hash = "sha256:92595fe287474a31ac3ef847941ebb097e8ffb0c3d6c106e47cf573db06933b2"}, +] + +[package.dependencies] +boto3 = ">=1.9.201" +botocore = ">=1.12.201" +cryptography = ">=3.3.1" +Jinja2 = ">=2.10.1" +python-dateutil = ">=2.1,<3.0.0" +requests = ">=2.5" +responses = ">=0.13.0" +werkzeug = ">=0.5,<2.2.0 || >2.2.0,<2.2.1 || >2.2.1" +xmltodict = "*" + +[package.extras] +all = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "multipart", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.4.2)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"] +apigateway = ["PyYAML (>=5.1)", "ecdsa (!=0.15)", "openapi-spec-validator (>=0.5.0)", "python-jose[cryptography] (>=3.1.0,<4.0.0)"] +apigatewayv2 = ["PyYAML (>=5.1)"] +appsync = ["graphql-core"] +awslambda = ["docker (>=3.0.0)"] +batch = ["docker (>=3.0.0)"] +cloudformation = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.4.2)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"] +cognitoidp = ["ecdsa (!=0.15)", "python-jose[cryptography] (>=3.1.0,<4.0.0)"] +ds = ["sshpubkeys (>=3.1.0)"] +dynamodb = ["docker (>=3.0.0)", "py-partiql-parser (==0.4.2)"] +dynamodbstreams = ["docker (>=3.0.0)", "py-partiql-parser (==0.4.2)"] +ebs = ["sshpubkeys (>=3.1.0)"] +ec2 = ["sshpubkeys (>=3.1.0)"] +efs = ["sshpubkeys (>=3.1.0)"] +eks = ["sshpubkeys (>=3.1.0)"] +glue = ["pyparsing (>=3.0.7)"] +iotdata = ["jsondiff (>=1.1.2)"] +proxy = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=2.5.1)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "multipart", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.4.2)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"] +resourcegroupstaggingapi = ["PyYAML (>=5.1)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.4.2)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "sshpubkeys (>=3.1.0)"] +route53resolver = ["sshpubkeys (>=3.1.0)"] +s3 = ["PyYAML (>=5.1)", "py-partiql-parser (==0.4.2)"] +s3crc32c = ["PyYAML (>=5.1)", "crc32c", "py-partiql-parser (==0.4.2)"] +server = ["PyYAML (>=5.1)", "aws-xray-sdk (>=0.93,!=0.96)", "cfn-lint (>=0.40.0)", "docker (>=3.0.0)", "ecdsa (!=0.15)", "flask (!=2.2.0,!=2.2.1)", "flask-cors", "graphql-core", "jsondiff (>=1.1.2)", "openapi-spec-validator (>=0.5.0)", "py-partiql-parser (==0.4.2)", "pyparsing (>=3.0.7)", "python-jose[cryptography] (>=3.1.0,<4.0.0)", "setuptools", "sshpubkeys (>=3.1.0)"] +ssm = ["PyYAML (>=5.1)"] +xray = ["aws-xray-sdk (>=0.93,!=0.96)", "setuptools"] + [[package]] name = "oauthlib" version = "3.2.2" @@ -890,77 +1136,89 @@ docs = ["sphinx", "sphinx-argparse"] [[package]] name = "pillow" -version = "9.3.0" +version = "10.3.0" description = "Python Imaging Library (Fork)" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "Pillow-9.3.0-1-cp37-cp37m-win32.whl", hash = "sha256:e6ea6b856a74d560d9326c0f5895ef8050126acfdc7ca08ad703eb0081e82b74"}, - {file = "Pillow-9.3.0-1-cp37-cp37m-win_amd64.whl", hash = "sha256:32a44128c4bdca7f31de5be641187367fe2a450ad83b833ef78910397db491aa"}, - {file = "Pillow-9.3.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:0b7257127d646ff8676ec8a15520013a698d1fdc48bc2a79ba4e53df792526f2"}, - {file = "Pillow-9.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b90f7616ea170e92820775ed47e136208e04c967271c9ef615b6fbd08d9af0e3"}, - {file = "Pillow-9.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68943d632f1f9e3dce98908e873b3a090f6cba1cbb1b892a9e8d97c938871fbe"}, - {file = "Pillow-9.3.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:be55f8457cd1eac957af0c3f5ece7bc3f033f89b114ef30f710882717670b2a8"}, - {file = "Pillow-9.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d77adcd56a42d00cc1be30843d3426aa4e660cab4a61021dc84467123f7a00c"}, - {file = "Pillow-9.3.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:829f97c8e258593b9daa80638aee3789b7df9da5cf1336035016d76f03b8860c"}, - {file = "Pillow-9.3.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:801ec82e4188e935c7f5e22e006d01611d6b41661bba9fe45b60e7ac1a8f84de"}, - {file = "Pillow-9.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:871b72c3643e516db4ecf20efe735deb27fe30ca17800e661d769faab45a18d7"}, - {file = "Pillow-9.3.0-cp310-cp310-win32.whl", hash = "sha256:655a83b0058ba47c7c52e4e2df5ecf484c1b0b0349805896dd350cbc416bdd91"}, - {file = "Pillow-9.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:9f47eabcd2ded7698106b05c2c338672d16a6f2a485e74481f524e2a23c2794b"}, - {file = "Pillow-9.3.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:57751894f6618fd4308ed8e0c36c333e2f5469744c34729a27532b3db106ee20"}, - {file = "Pillow-9.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7db8b751ad307d7cf238f02101e8e36a128a6cb199326e867d1398067381bff4"}, - {file = "Pillow-9.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3033fbe1feb1b59394615a1cafaee85e49d01b51d54de0cbf6aa8e64182518a1"}, - {file = "Pillow-9.3.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22b012ea2d065fd163ca096f4e37e47cd8b59cf4b0fd47bfca6abb93df70b34c"}, - {file = "Pillow-9.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9a65733d103311331875c1dca05cb4606997fd33d6acfed695b1232ba1df193"}, - {file = "Pillow-9.3.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:502526a2cbfa431d9fc2a079bdd9061a2397b842bb6bc4239bb176da00993812"}, - {file = "Pillow-9.3.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:90fb88843d3902fe7c9586d439d1e8c05258f41da473952aa8b328d8b907498c"}, - {file = "Pillow-9.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:89dca0ce00a2b49024df6325925555d406b14aa3efc2f752dbb5940c52c56b11"}, - {file = "Pillow-9.3.0-cp311-cp311-win32.whl", hash = "sha256:3168434d303babf495d4ba58fc22d6604f6e2afb97adc6a423e917dab828939c"}, - {file = "Pillow-9.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:18498994b29e1cf86d505edcb7edbe814d133d2232d256db8c7a8ceb34d18cef"}, - {file = "Pillow-9.3.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:772a91fc0e03eaf922c63badeca75e91baa80fe2f5f87bdaed4280662aad25c9"}, - {file = "Pillow-9.3.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa4107d1b306cdf8953edde0534562607fe8811b6c4d9a486298ad31de733b2"}, - {file = "Pillow-9.3.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b4012d06c846dc2b80651b120e2cdd787b013deb39c09f407727ba90015c684f"}, - {file = "Pillow-9.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77ec3e7be99629898c9a6d24a09de089fa5356ee408cdffffe62d67bb75fdd72"}, - {file = "Pillow-9.3.0-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:6c738585d7a9961d8c2821a1eb3dcb978d14e238be3d70f0a706f7fa9316946b"}, - {file = "Pillow-9.3.0-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:828989c45c245518065a110434246c44a56a8b2b2f6347d1409c787e6e4651ee"}, - {file = "Pillow-9.3.0-cp37-cp37m-win32.whl", hash = "sha256:82409ffe29d70fd733ff3c1025a602abb3e67405d41b9403b00b01debc4c9a29"}, - {file = "Pillow-9.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:41e0051336807468be450d52b8edd12ac60bebaa97fe10c8b660f116e50b30e4"}, - {file = "Pillow-9.3.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:b03ae6f1a1878233ac620c98f3459f79fd77c7e3c2b20d460284e1fb370557d4"}, - {file = "Pillow-9.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4390e9ce199fc1951fcfa65795f239a8a4944117b5935a9317fb320e7767b40f"}, - {file = "Pillow-9.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40e1ce476a7804b0fb74bcfa80b0a2206ea6a882938eaba917f7a0f004b42502"}, - {file = "Pillow-9.3.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0a06a052c5f37b4ed81c613a455a81f9a3a69429b4fd7bb913c3fa98abefc20"}, - {file = "Pillow-9.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03150abd92771742d4a8cd6f2fa6246d847dcd2e332a18d0c15cc75bf6703040"}, - {file = "Pillow-9.3.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:15c42fb9dea42465dfd902fb0ecf584b8848ceb28b41ee2b58f866411be33f07"}, - {file = "Pillow-9.3.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:51e0e543a33ed92db9f5ef69a0356e0b1a7a6b6a71b80df99f1d181ae5875636"}, - {file = "Pillow-9.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3dd6caf940756101205dffc5367babf288a30043d35f80936f9bfb37f8355b32"}, - {file = "Pillow-9.3.0-cp38-cp38-win32.whl", hash = "sha256:f1ff2ee69f10f13a9596480335f406dd1f70c3650349e2be67ca3139280cade0"}, - {file = "Pillow-9.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:276a5ca930c913f714e372b2591a22c4bd3b81a418c0f6635ba832daec1cbcfc"}, - {file = "Pillow-9.3.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:73bd195e43f3fadecfc50c682f5055ec32ee2c933243cafbfdec69ab1aa87cad"}, - {file = "Pillow-9.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1c7c8ae3864846fc95f4611c78129301e203aaa2af813b703c55d10cc1628535"}, - {file = "Pillow-9.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e0918e03aa0c72ea56edbb00d4d664294815aa11291a11504a377ea018330d3"}, - {file = "Pillow-9.3.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b0915e734b33a474d76c28e07292f196cdf2a590a0d25bcc06e64e545f2d146c"}, - {file = "Pillow-9.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af0372acb5d3598f36ec0914deed2a63f6bcdb7b606da04dc19a88d31bf0c05b"}, - {file = "Pillow-9.3.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:ad58d27a5b0262c0c19b47d54c5802db9b34d38bbf886665b626aff83c74bacd"}, - {file = "Pillow-9.3.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:97aabc5c50312afa5e0a2b07c17d4ac5e865b250986f8afe2b02d772567a380c"}, - {file = "Pillow-9.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9aaa107275d8527e9d6e7670b64aabaaa36e5b6bd71a1015ddd21da0d4e06448"}, - {file = "Pillow-9.3.0-cp39-cp39-win32.whl", hash = "sha256:bac18ab8d2d1e6b4ce25e3424f709aceef668347db8637c2296bcf41acb7cf48"}, - {file = "Pillow-9.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:b472b5ea442148d1c3e2209f20f1e0bb0eb556538690fa70b5e1f79fa0ba8dc2"}, - {file = "Pillow-9.3.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:ab388aaa3f6ce52ac1cb8e122c4bd46657c15905904b3120a6248b5b8b0bc228"}, - {file = "Pillow-9.3.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dbb8e7f2abee51cef77673be97760abff1674ed32847ce04b4af90f610144c7b"}, - {file = "Pillow-9.3.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bca31dd6014cb8b0b2db1e46081b0ca7d936f856da3b39744aef499db5d84d02"}, - {file = "Pillow-9.3.0-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c7025dce65566eb6e89f56c9509d4f628fddcedb131d9465cacd3d8bac337e7e"}, - {file = "Pillow-9.3.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:ebf2029c1f464c59b8bdbe5143c79fa2045a581ac53679733d3a91d400ff9efb"}, - {file = "Pillow-9.3.0-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:b59430236b8e58840a0dfb4099a0e8717ffb779c952426a69ae435ca1f57210c"}, - {file = "Pillow-9.3.0-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:12ce4932caf2ddf3e41d17fc9c02d67126935a44b86df6a206cf0d7161548627"}, - {file = "Pillow-9.3.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ae5331c23ce118c53b172fa64a4c037eb83c9165aba3a7ba9ddd3ec9fa64a699"}, - {file = "Pillow-9.3.0-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:0b07fffc13f474264c336298d1b4ce01d9c5a011415b79d4ee5527bb69ae6f65"}, - {file = "Pillow-9.3.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:073adb2ae23431d3b9bcbcff3fe698b62ed47211d0716b067385538a1b0f28b8"}, - {file = "Pillow-9.3.0.tar.gz", hash = "sha256:c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f"}, + {file = "pillow-10.3.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:90b9e29824800e90c84e4022dd5cc16eb2d9605ee13f05d47641eb183cd73d45"}, + {file = "pillow-10.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a2c405445c79c3f5a124573a051062300936b0281fee57637e706453e452746c"}, + {file = "pillow-10.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78618cdbccaa74d3f88d0ad6cb8ac3007f1a6fa5c6f19af64b55ca170bfa1edf"}, + {file = "pillow-10.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:261ddb7ca91fcf71757979534fb4c128448b5b4c55cb6152d280312062f69599"}, + {file = "pillow-10.3.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:ce49c67f4ea0609933d01c0731b34b8695a7a748d6c8d186f95e7d085d2fe475"}, + {file = "pillow-10.3.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:b14f16f94cbc61215115b9b1236f9c18403c15dd3c52cf629072afa9d54c1cbf"}, + {file = "pillow-10.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d33891be6df59d93df4d846640f0e46f1a807339f09e79a8040bc887bdcd7ed3"}, + {file = "pillow-10.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b50811d664d392f02f7761621303eba9d1b056fb1868c8cdf4231279645c25f5"}, + {file = "pillow-10.3.0-cp310-cp310-win32.whl", hash = "sha256:ca2870d5d10d8726a27396d3ca4cf7976cec0f3cb706debe88e3a5bd4610f7d2"}, + {file = "pillow-10.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:f0d0591a0aeaefdaf9a5e545e7485f89910c977087e7de2b6c388aec32011e9f"}, + {file = "pillow-10.3.0-cp310-cp310-win_arm64.whl", hash = "sha256:ccce24b7ad89adb5a1e34a6ba96ac2530046763912806ad4c247356a8f33a67b"}, + {file = "pillow-10.3.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:5f77cf66e96ae734717d341c145c5949c63180842a545c47a0ce7ae52ca83795"}, + {file = "pillow-10.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e4b878386c4bf293578b48fc570b84ecfe477d3b77ba39a6e87150af77f40c57"}, + {file = "pillow-10.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdcbb4068117dfd9ce0138d068ac512843c52295ed996ae6dd1faf537b6dbc27"}, + {file = "pillow-10.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9797a6c8fe16f25749b371c02e2ade0efb51155e767a971c61734b1bf6293994"}, + {file = "pillow-10.3.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:9e91179a242bbc99be65e139e30690e081fe6cb91a8e77faf4c409653de39451"}, + {file = "pillow-10.3.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:1b87bd9d81d179bd8ab871603bd80d8645729939f90b71e62914e816a76fc6bd"}, + {file = "pillow-10.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:81d09caa7b27ef4e61cb7d8fbf1714f5aec1c6b6c5270ee53504981e6e9121ad"}, + {file = "pillow-10.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:048ad577748b9fa4a99a0548c64f2cb8d672d5bf2e643a739ac8faff1164238c"}, + {file = "pillow-10.3.0-cp311-cp311-win32.whl", hash = "sha256:7161ec49ef0800947dc5570f86568a7bb36fa97dd09e9827dc02b718c5643f09"}, + {file = "pillow-10.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:8eb0908e954d093b02a543dc963984d6e99ad2b5e36503d8a0aaf040505f747d"}, + {file = "pillow-10.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:4e6f7d1c414191c1199f8996d3f2282b9ebea0945693fb67392c75a3a320941f"}, + {file = "pillow-10.3.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:e46f38133e5a060d46bd630faa4d9fa0202377495df1f068a8299fd78c84de84"}, + {file = "pillow-10.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:50b8eae8f7334ec826d6eeffaeeb00e36b5e24aa0b9df322c247539714c6df19"}, + {file = "pillow-10.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d3bea1c75f8c53ee4d505c3e67d8c158ad4df0d83170605b50b64025917f338"}, + {file = "pillow-10.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:19aeb96d43902f0a783946a0a87dbdad5c84c936025b8419da0a0cd7724356b1"}, + {file = "pillow-10.3.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:74d28c17412d9caa1066f7a31df8403ec23d5268ba46cd0ad2c50fb82ae40462"}, + {file = "pillow-10.3.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:ff61bfd9253c3915e6d41c651d5f962da23eda633cf02262990094a18a55371a"}, + {file = "pillow-10.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d886f5d353333b4771d21267c7ecc75b710f1a73d72d03ca06df49b09015a9ef"}, + {file = "pillow-10.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4b5ec25d8b17217d635f8935dbc1b9aa5907962fae29dff220f2659487891cd3"}, + {file = "pillow-10.3.0-cp312-cp312-win32.whl", hash = "sha256:51243f1ed5161b9945011a7360e997729776f6e5d7005ba0c6879267d4c5139d"}, + {file = "pillow-10.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:412444afb8c4c7a6cc11a47dade32982439925537e483be7c0ae0cf96c4f6a0b"}, + {file = "pillow-10.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:798232c92e7665fe82ac085f9d8e8ca98826f8e27859d9a96b41d519ecd2e49a"}, + {file = "pillow-10.3.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:4eaa22f0d22b1a7e93ff0a596d57fdede2e550aecffb5a1ef1106aaece48e96b"}, + {file = "pillow-10.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cd5e14fbf22a87321b24c88669aad3a51ec052eb145315b3da3b7e3cc105b9a2"}, + {file = "pillow-10.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1530e8f3a4b965eb6a7785cf17a426c779333eb62c9a7d1bbcf3ffd5bf77a4aa"}, + {file = "pillow-10.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d512aafa1d32efa014fa041d38868fda85028e3f930a96f85d49c7d8ddc0383"}, + {file = "pillow-10.3.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:339894035d0ede518b16073bdc2feef4c991ee991a29774b33e515f1d308e08d"}, + {file = "pillow-10.3.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:aa7e402ce11f0885305bfb6afb3434b3cd8f53b563ac065452d9d5654c7b86fd"}, + {file = "pillow-10.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0ea2a783a2bdf2a561808fe4a7a12e9aa3799b701ba305de596bc48b8bdfce9d"}, + {file = "pillow-10.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c78e1b00a87ce43bb37642c0812315b411e856a905d58d597750eb79802aaaa3"}, + {file = "pillow-10.3.0-cp38-cp38-win32.whl", hash = "sha256:72d622d262e463dfb7595202d229f5f3ab4b852289a1cd09650362db23b9eb0b"}, + {file = "pillow-10.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:2034f6759a722da3a3dbd91a81148cf884e91d1b747992ca288ab88c1de15999"}, + {file = "pillow-10.3.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:2ed854e716a89b1afcedea551cd85f2eb2a807613752ab997b9974aaa0d56936"}, + {file = "pillow-10.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:dc1a390a82755a8c26c9964d457d4c9cbec5405896cba94cf51f36ea0d855002"}, + {file = "pillow-10.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4203efca580f0dd6f882ca211f923168548f7ba334c189e9eab1178ab840bf60"}, + {file = "pillow-10.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3102045a10945173d38336f6e71a8dc71bcaeed55c3123ad4af82c52807b9375"}, + {file = "pillow-10.3.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:6fb1b30043271ec92dc65f6d9f0b7a830c210b8a96423074b15c7bc999975f57"}, + {file = "pillow-10.3.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:1dfc94946bc60ea375cc39cff0b8da6c7e5f8fcdc1d946beb8da5c216156ddd8"}, + {file = "pillow-10.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b09b86b27a064c9624d0a6c54da01c1beaf5b6cadfa609cf63789b1d08a797b9"}, + {file = "pillow-10.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3b2348a78bc939b4fed6552abfd2e7988e0f81443ef3911a4b8498ca084f6eb"}, + {file = "pillow-10.3.0-cp39-cp39-win32.whl", hash = "sha256:45ebc7b45406febf07fef35d856f0293a92e7417ae7933207e90bf9090b70572"}, + {file = "pillow-10.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:0ba26351b137ca4e0db0342d5d00d2e355eb29372c05afd544ebf47c0956ffeb"}, + {file = "pillow-10.3.0-cp39-cp39-win_arm64.whl", hash = "sha256:50fd3f6b26e3441ae07b7c979309638b72abc1a25da31a81a7fbd9495713ef4f"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6b02471b72526ab8a18c39cb7967b72d194ec53c1fd0a70b050565a0f366d355"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:8ab74c06ffdab957d7670c2a5a6e1a70181cd10b727cd788c4dd9005b6a8acd9"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:048eeade4c33fdf7e08da40ef402e748df113fd0b4584e32c4af74fe78baaeb2"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e2ec1e921fd07c7cda7962bad283acc2f2a9ccc1b971ee4b216b75fad6f0463"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:4c8e73e99da7db1b4cad7f8d682cf6abad7844da39834c288fbfa394a47bbced"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:16563993329b79513f59142a6b02055e10514c1a8e86dca8b48a893e33cf91e3"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:dd78700f5788ae180b5ee8902c6aea5a5726bac7c364b202b4b3e3ba2d293170"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aff76a55a8aa8364d25400a210a65ff59d0168e0b4285ba6bf2bd83cf675ba32"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:b7bc2176354defba3edc2b9a777744462da2f8e921fbaf61e52acb95bafa9828"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:793b4e24db2e8742ca6423d3fde8396db336698c55cd34b660663ee9e45ed37f"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d93480005693d247f8346bc8ee28c72a2191bdf1f6b5db469c096c0c867ac015"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c83341b89884e2b2e55886e8fbbf37c3fa5efd6c8907124aeb72f285ae5696e5"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1a1d1915db1a4fdb2754b9de292642a39a7fb28f1736699527bb649484fb966a"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a0eaa93d054751ee9964afa21c06247779b90440ca41d184aeb5d410f20ff591"}, + {file = "pillow-10.3.0.tar.gz", hash = "sha256:9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d"}, ] [package.extras] -docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-issues (>=3.0.1)", "sphinx-removed-in", "sphinxext-opengraph"] +docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"] +fpx = ["olefile"] +mic = ["olefile"] tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"] +typing = ["typing-extensions"] +xmp = ["defusedxml"] [[package]] name = "proto-plus" @@ -1070,17 +1328,17 @@ files = [ [[package]] name = "pyopenssl" -version = "23.1.1" +version = "23.2.0" description = "Python wrapper module around the OpenSSL library" optional = false python-versions = ">=3.6" files = [ - {file = "pyOpenSSL-23.1.1-py3-none-any.whl", hash = "sha256:9e0c526404a210df9d2b18cd33364beadb0dc858a739b885677bc65e105d4a4c"}, - {file = "pyOpenSSL-23.1.1.tar.gz", hash = "sha256:841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7"}, + {file = "pyOpenSSL-23.2.0-py3-none-any.whl", hash = "sha256:24f0dc5227396b3e831f4c7f602b950a5e9833d292c8e4a2e06b709292806ae2"}, + {file = "pyOpenSSL-23.2.0.tar.gz", hash = "sha256:276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac"}, ] [package.dependencies] -cryptography = ">=38.0.0,<41" +cryptography = ">=38.0.0,<40.0.0 || >40.0.0,<40.0.1 || >40.0.1,<42" [package.extras] docs = ["sphinx (!=5.2.0,!=5.2.0.post0)", "sphinx-rtd-theme"] @@ -1097,6 +1355,20 @@ files = [ {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] +[[package]] +name = "python-dateutil" +version = "2.8.2" +description = "Extensions to the standard Python datetime module" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" +files = [ + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, +] + +[package.dependencies] +six = ">=1.5" + [[package]] name = "python-decouple" version = "3.4" @@ -1130,6 +1402,66 @@ files = [ {file = "pytz-2022.1.tar.gz", hash = "sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7"}, ] +[[package]] +name = "pyyaml" +version = "6.0.1" +description = "YAML parser and emitter for Python" +optional = false +python-versions = ">=3.6" +files = [ + {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, + {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, + {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, + {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, + {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, + {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"}, + {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"}, + {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, + {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, + {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, + {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, + {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, + {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, +] + [[package]] name = "requests" version = "2.31.0" @@ -1188,6 +1520,25 @@ requests = ">=2.0.0" [package.extras] rsa = ["oauthlib[signedtoken] (>=3.0.0)"] +[[package]] +name = "responses" +version = "0.24.1" +description = "A utility library for mocking out the `requests` Python library." +optional = false +python-versions = ">=3.8" +files = [ + {file = "responses-0.24.1-py3-none-any.whl", hash = "sha256:a2b43f4c08bfb9c9bd242568328c65a34b318741d3fab884ac843c5ceeb543f9"}, + {file = "responses-0.24.1.tar.gz", hash = "sha256:b127c6ca3f8df0eb9cc82fd93109a3007a86acb24871834c47b77765152ecf8c"}, +] + +[package.dependencies] +pyyaml = "*" +requests = ">=2.30.0,<3.0" +urllib3 = ">=1.25.10,<3.0" + +[package.extras] +tests = ["coverage (>=6.0.0)", "flake8", "mypy", "pytest (>=7.0.0)", "pytest-asyncio", "pytest-cov", "pytest-httpserver", "tomli", "tomli-w", "types-PyYAML", "types-requests"] + [[package]] name = "rsa" version = "4.7.2" @@ -1202,6 +1553,23 @@ files = [ [package.dependencies] pyasn1 = ">=0.1.3" +[[package]] +name = "s3transfer" +version = "0.6.2" +description = "An Amazon S3 Transfer Manager" +optional = false +python-versions = ">= 3.7" +files = [ + {file = "s3transfer-0.6.2-py3-none-any.whl", hash = "sha256:b014be3a8a2aab98cfe1abc7229cc5a9a0cf05eb9c1f2b86b230fd8df3f78084"}, + {file = "s3transfer-0.6.2.tar.gz", hash = "sha256:cab66d3380cca3e70939ef2255d01cd8aece6a4907a9528740f668c4b0611861"}, +] + +[package.dependencies] +botocore = ">=1.12.36,<2.0a.0" + +[package.extras] +crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] + [[package]] name = "selenium" version = "3.141.0" @@ -1297,6 +1665,17 @@ dev = ["build", "flake8"] doc = ["sphinx"] test = ["pytest", "pytest-cov"] +[[package]] +name = "typing-extensions" +version = "4.10.0" +description = "Backported and Experimental Type Hints for Python 3.8+" +optional = false +python-versions = ">=3.8" +files = [ + {file = "typing_extensions-4.10.0-py3-none-any.whl", hash = "sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475"}, + {file = "typing_extensions-4.10.0.tar.gz", hash = "sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb"}, +] + [[package]] name = "tzdata" version = "2022.7" @@ -1321,28 +1700,28 @@ files = [ [[package]] name = "urllib3" -version = "1.26.15" +version = "1.26.18" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" files = [ - {file = "urllib3-1.26.15-py2.py3-none-any.whl", hash = "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"}, - {file = "urllib3-1.26.15.tar.gz", hash = "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305"}, + {file = "urllib3-1.26.18-py2.py3-none-any.whl", hash = "sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07"}, + {file = "urllib3-1.26.18.tar.gz", hash = "sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0"}, ] [package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] +brotli = ["brotli (==1.0.9)", "brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "uwsgi" -version = "2.0.21" +version = "2.0.22" description = "The uWSGI server" optional = false python-versions = "*" files = [ - {file = "uwsgi-2.0.21.tar.gz", hash = "sha256:35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9"}, + {file = "uwsgi-2.0.22.tar.gz", hash = "sha256:4cc4727258671ac5fa17ab422155e9aaef8a2008ebb86e4404b66deaae965db2"}, ] [[package]] @@ -1357,89 +1736,48 @@ files = [ ] [[package]] -name = "wrapt" -version = "1.15.0" -description = "Module for decorators, wrappers and monkey patching." -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" -files = [ - {file = "wrapt-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ca1cccf838cd28d5a0883b342474c630ac48cac5df0ee6eacc9c7290f76b11c1"}, - {file = "wrapt-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e826aadda3cae59295b95343db8f3d965fb31059da7de01ee8d1c40a60398b29"}, - {file = "wrapt-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:5fc8e02f5984a55d2c653f5fea93531e9836abbd84342c1d1e17abc4a15084c2"}, - {file = "wrapt-1.15.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:96e25c8603a155559231c19c0349245eeb4ac0096fe3c1d0be5c47e075bd4f46"}, - {file = "wrapt-1.15.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:40737a081d7497efea35ab9304b829b857f21558acfc7b3272f908d33b0d9d4c"}, - {file = "wrapt-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:f87ec75864c37c4c6cb908d282e1969e79763e0d9becdfe9fe5473b7bb1e5f09"}, - {file = "wrapt-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:1286eb30261894e4c70d124d44b7fd07825340869945c79d05bda53a40caa079"}, - {file = "wrapt-1.15.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:493d389a2b63c88ad56cdc35d0fa5752daac56ca755805b1b0c530f785767d5e"}, - {file = "wrapt-1.15.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:58d7a75d731e8c63614222bcb21dd992b4ab01a399f1f09dd82af17bbfc2368a"}, - {file = "wrapt-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:21f6d9a0d5b3a207cdf7acf8e58d7d13d463e639f0c7e01d82cdb671e6cb7923"}, - {file = "wrapt-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ce42618f67741d4697684e501ef02f29e758a123aa2d669e2d964ff734ee00ee"}, - {file = "wrapt-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41d07d029dd4157ae27beab04d22b8e261eddfc6ecd64ff7000b10dc8b3a5727"}, - {file = "wrapt-1.15.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:54accd4b8bc202966bafafd16e69da9d5640ff92389d33d28555c5fd4f25ccb7"}, - {file = "wrapt-1.15.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2fbfbca668dd15b744418265a9607baa970c347eefd0db6a518aaf0cfbd153c0"}, - {file = "wrapt-1.15.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:76e9c727a874b4856d11a32fb0b389afc61ce8aaf281ada613713ddeadd1cfec"}, - {file = "wrapt-1.15.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e20076a211cd6f9b44a6be58f7eeafa7ab5720eb796975d0c03f05b47d89eb90"}, - {file = "wrapt-1.15.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a74d56552ddbde46c246b5b89199cb3fd182f9c346c784e1a93e4dc3f5ec9975"}, - {file = "wrapt-1.15.0-cp310-cp310-win32.whl", hash = "sha256:26458da5653aa5b3d8dc8b24192f574a58984c749401f98fff994d41d3f08da1"}, - {file = "wrapt-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:75760a47c06b5974aa5e01949bf7e66d2af4d08cb8c1d6516af5e39595397f5e"}, - {file = "wrapt-1.15.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ba1711cda2d30634a7e452fc79eabcadaffedf241ff206db2ee93dd2c89a60e7"}, - {file = "wrapt-1.15.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:56374914b132c702aa9aa9959c550004b8847148f95e1b824772d453ac204a72"}, - {file = "wrapt-1.15.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a89ce3fd220ff144bd9d54da333ec0de0399b52c9ac3d2ce34b569cf1a5748fb"}, - {file = "wrapt-1.15.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3bbe623731d03b186b3d6b0d6f51865bf598587c38d6f7b0be2e27414f7f214e"}, - {file = "wrapt-1.15.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3abbe948c3cbde2689370a262a8d04e32ec2dd4f27103669a45c6929bcdbfe7c"}, - {file = "wrapt-1.15.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b67b819628e3b748fd3c2192c15fb951f549d0f47c0449af0764d7647302fda3"}, - {file = "wrapt-1.15.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7eebcdbe3677e58dd4c0e03b4f2cfa346ed4049687d839adad68cc38bb559c92"}, - {file = "wrapt-1.15.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:74934ebd71950e3db69960a7da29204f89624dde411afbfb3b4858c1409b1e98"}, - {file = "wrapt-1.15.0-cp311-cp311-win32.whl", hash = "sha256:bd84395aab8e4d36263cd1b9308cd504f6cf713b7d6d3ce25ea55670baec5416"}, - {file = "wrapt-1.15.0-cp311-cp311-win_amd64.whl", hash = "sha256:a487f72a25904e2b4bbc0817ce7a8de94363bd7e79890510174da9d901c38705"}, - {file = "wrapt-1.15.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:4ff0d20f2e670800d3ed2b220d40984162089a6e2c9646fdb09b85e6f9a8fc29"}, - {file = "wrapt-1.15.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9ed6aa0726b9b60911f4aed8ec5b8dd7bf3491476015819f56473ffaef8959bd"}, - {file = "wrapt-1.15.0-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:896689fddba4f23ef7c718279e42f8834041a21342d95e56922e1c10c0cc7afb"}, - {file = "wrapt-1.15.0-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:75669d77bb2c071333417617a235324a1618dba66f82a750362eccbe5b61d248"}, - {file = "wrapt-1.15.0-cp35-cp35m-win32.whl", hash = "sha256:fbec11614dba0424ca72f4e8ba3c420dba07b4a7c206c8c8e4e73f2e98f4c559"}, - {file = "wrapt-1.15.0-cp35-cp35m-win_amd64.whl", hash = "sha256:fd69666217b62fa5d7c6aa88e507493a34dec4fa20c5bd925e4bc12fce586639"}, - {file = "wrapt-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b0724f05c396b0a4c36a3226c31648385deb6a65d8992644c12a4963c70326ba"}, - {file = "wrapt-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bbeccb1aa40ab88cd29e6c7d8585582c99548f55f9b2581dfc5ba68c59a85752"}, - {file = "wrapt-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:38adf7198f8f154502883242f9fe7333ab05a5b02de7d83aa2d88ea621f13364"}, - {file = "wrapt-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:578383d740457fa790fdf85e6d346fda1416a40549fe8db08e5e9bd281c6a475"}, - {file = "wrapt-1.15.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:a4cbb9ff5795cd66f0066bdf5947f170f5d63a9274f99bdbca02fd973adcf2a8"}, - {file = "wrapt-1.15.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:af5bd9ccb188f6a5fdda9f1f09d9f4c86cc8a539bd48a0bfdc97723970348418"}, - {file = "wrapt-1.15.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:b56d5519e470d3f2fe4aa7585f0632b060d532d0696c5bdfb5e8319e1d0f69a2"}, - {file = "wrapt-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:77d4c1b881076c3ba173484dfa53d3582c1c8ff1f914c6461ab70c8428b796c1"}, - {file = "wrapt-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:077ff0d1f9d9e4ce6476c1a924a3332452c1406e59d90a2cf24aeb29eeac9420"}, - {file = "wrapt-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5c5aa28df055697d7c37d2099a7bc09f559d5053c3349b1ad0c39000e611d317"}, - {file = "wrapt-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a8564f283394634a7a7054b7983e47dbf39c07712d7b177b37e03f2467a024e"}, - {file = "wrapt-1.15.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:780c82a41dc493b62fc5884fb1d3a3b81106642c5c5c78d6a0d4cbe96d62ba7e"}, - {file = "wrapt-1.15.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e169e957c33576f47e21864cf3fc9ff47c223a4ebca8960079b8bd36cb014fd0"}, - {file = "wrapt-1.15.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b02f21c1e2074943312d03d243ac4388319f2456576b2c6023041c4d57cd7019"}, - {file = "wrapt-1.15.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f2e69b3ed24544b0d3dbe2c5c0ba5153ce50dcebb576fdc4696d52aa22db6034"}, - {file = "wrapt-1.15.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d787272ed958a05b2c86311d3a4135d3c2aeea4fc655705f074130aa57d71653"}, - {file = "wrapt-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:02fce1852f755f44f95af51f69d22e45080102e9d00258053b79367d07af39c0"}, - {file = "wrapt-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:abd52a09d03adf9c763d706df707c343293d5d106aea53483e0ec8d9e310ad5e"}, - {file = "wrapt-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:cdb4f085756c96a3af04e6eca7f08b1345e94b53af8921b25c72f096e704e145"}, - {file = "wrapt-1.15.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:230ae493696a371f1dbffaad3dafbb742a4d27a0afd2b1aecebe52b740167e7f"}, - {file = "wrapt-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63424c681923b9f3bfbc5e3205aafe790904053d42ddcc08542181a30a7a51bd"}, - {file = "wrapt-1.15.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6bcbfc99f55655c3d93feb7ef3800bd5bbe963a755687cbf1f490a71fb7794b"}, - {file = "wrapt-1.15.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c99f4309f5145b93eca6e35ac1a988f0dc0a7ccf9ccdcd78d3c0adf57224e62f"}, - {file = "wrapt-1.15.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b130fe77361d6771ecf5a219d8e0817d61b236b7d8b37cc045172e574ed219e6"}, - {file = "wrapt-1.15.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:96177eb5645b1c6985f5c11d03fc2dbda9ad24ec0f3a46dcce91445747e15094"}, - {file = "wrapt-1.15.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d5fe3e099cf07d0fb5a1e23d399e5d4d1ca3e6dfcbe5c8570ccff3e9208274f7"}, - {file = "wrapt-1.15.0-cp38-cp38-win32.whl", hash = "sha256:abd8f36c99512755b8456047b7be10372fca271bf1467a1caa88db991e7c421b"}, - {file = "wrapt-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:b06fa97478a5f478fb05e1980980a7cdf2712015493b44d0c87606c1513ed5b1"}, - {file = "wrapt-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2e51de54d4fb8fb50d6ee8327f9828306a959ae394d3e01a1ba8b2f937747d86"}, - {file = "wrapt-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0970ddb69bba00670e58955f8019bec4a42d1785db3faa043c33d81de2bf843c"}, - {file = "wrapt-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76407ab327158c510f44ded207e2f76b657303e17cb7a572ffe2f5a8a48aa04d"}, - {file = "wrapt-1.15.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cd525e0e52a5ff16653a3fc9e3dd827981917d34996600bbc34c05d048ca35cc"}, - {file = "wrapt-1.15.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d37ac69edc5614b90516807de32d08cb8e7b12260a285ee330955604ed9dd29"}, - {file = "wrapt-1.15.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:078e2a1a86544e644a68422f881c48b84fef6d18f8c7a957ffd3f2e0a74a0d4a"}, - {file = "wrapt-1.15.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:2cf56d0e237280baed46f0b5316661da892565ff58309d4d2ed7dba763d984b8"}, - {file = "wrapt-1.15.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:7dc0713bf81287a00516ef43137273b23ee414fe41a3c14be10dd95ed98a2df9"}, - {file = "wrapt-1.15.0-cp39-cp39-win32.whl", hash = "sha256:46ed616d5fb42f98630ed70c3529541408166c22cdfd4540b88d5f21006b0eff"}, - {file = "wrapt-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:eef4d64c650f33347c1f9266fa5ae001440b232ad9b98f1f43dfe7a79435c0a6"}, - {file = "wrapt-1.15.0-py3-none-any.whl", hash = "sha256:64b1df0f83706b4ef4cfb4fb0e4c2669100fd7ecacfb59e091fad300d4e04640"}, - {file = "wrapt-1.15.0.tar.gz", hash = "sha256:d06730c6aed78cee4126234cf2d071e01b44b915e725a6cb439a879ec9754a3a"}, +name = "werkzeug" +version = "3.0.1" +description = "The comprehensive WSGI web application library." +optional = false +python-versions = ">=3.8" +files = [ + {file = "werkzeug-3.0.1-py3-none-any.whl", hash = "sha256:90a285dc0e42ad56b34e696398b8122ee4c681833fb35b8334a095d82c56da10"}, + {file = "werkzeug-3.0.1.tar.gz", hash = "sha256:507e811ecea72b18a404947aded4b3390e1db8f826b494d76550ef45bb3b1dcc"}, +] + +[package.dependencies] +MarkupSafe = ">=2.1.1" + +[package.extras] +watchdog = ["watchdog (>=2.3)"] + +[[package]] +name = "xmltodict" +version = "0.13.0" +description = "Makes working with XML feel like you are working with JSON" +optional = false +python-versions = ">=3.4" +files = [ + {file = "xmltodict-0.13.0-py2.py3-none-any.whl", hash = "sha256:aa89e8fd76320154a40d19a0df04a4695fb9dc5ba977cbb68ab3e4eb225e7852"}, + {file = "xmltodict-0.13.0.tar.gz", hash = "sha256:341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56"}, +] + +[[package]] +name = "zipp" +version = "3.18.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +optional = false +python-versions = ">=3.8" +files = [ + {file = "zipp-3.18.0-py3-none-any.whl", hash = "sha256:c1bb803ed69d2cce2373152797064f7e79bc43f0a3748eb494096a867e0ebf79"}, + {file = "zipp-3.18.0.tar.gz", hash = "sha256:df8d042b02765029a09b157efd8e820451045890acc30f8e37dd2f94a060221f"}, ] +[package.extras] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"] + [[package]] name = "zxcvbn" version = "4.4.28" @@ -1453,4 +1791,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "5dd3b6f971fe4c7d126bae05aa658814469b37cd78bd58f55ddb1dc850515301" +content-hash = "3707e52f2e0996873138ab542443ff54f4aa0e372da84e25f789f226beb9064a" diff --git a/pyproject.toml b/pyproject.toml index bb670bcf80..3da7542e65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,18 +7,22 @@ authors = [] [tool.poetry.dependencies] python = "^3.9" bleach = "^3.3.0" +boto3 = "^1.28.53" +botocore = "^1.31.53" chardet = "^3.0.4" -Django = "4.1.10" +cryptography = "^41.0.6" +Django = "4.2.11" django-autocomplete-light = "^3.9.4" django-background-tasks-updated = "=1.2.7" django-ckeditor = "6.5.1" djangorestframework = "3.14.0" +django-q2 = "1.6.2" google-cloud-storage = "^1.41.1" html2text = "^2018.1.9" -Pillow = "^9.3.0" +Pillow = "^10.3.0" python-decouple = "^3.1" -uWSGI = "2.0.21" -pyOpenSSL = "^23.1.1" +uWSGI = "2.0.22" +pyOpenSSL = "^23.2.0" google-api-python-client = "^1.7.9" psycopg2 = "2.9.5" httplib2 = "^0.19.0" @@ -33,16 +37,19 @@ cffi = "^1.15.1" pytz = "^2022.1" django-sass = "1.1.0" zxcvbn = "^4.4.28" -certifi = "^2022.12.7" +certifi = "^2023.7.22" setuptools = "65.5.1" django-js-asset = "2.0.0" -hdn-research-environment = "^1.4.0" +hdn-research-environment = "2.3.8" django-oauth-toolkit = "^2.2.0" django-cors-headers = "^3.14.0" +urllib3 = "^1.26.18" [tool.poetry.dev-dependencies] coverage = "^7.2.3" +django-coverage-plugin = "^3.1.0" django-debug-toolbar = "^3.2.4" +moto = "^4.2.0" requests = "^2.21.0" requests-mock = "^1.7.0" selenium = "^3.141.0" diff --git a/requirements.txt b/requirements.txt index 39832dcac3..195b367753 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,21 @@ -asgiref==3.5.2 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4 \ - --hash=sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424 +asgiref==3.7.2 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e \ + --hash=sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed bleach==3.3.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:6123ddc1052673e52bab52cdc955bcb57a015264a1c57d37bea2f6b817af0125 \ --hash=sha256:98b3170739e5e83dd9dc19633f074727ad848cbedb6026708c8ac2d3b697a433 +boto3==1.28.53 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:b95b0cc39f08402029c3a2bb141e1775cfa46576ebe9f9916f79bde90e27f53f \ + --hash=sha256:dc2da9aff7de359774030a243a09b74568664117e2afb77c6e4b90572ae3a6c3 +botocore==1.31.53 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:905580ea724d74f11652bab63fcec6bf0d32f1cf8b2963f7388efc0ea406b69b \ + --hash=sha256:aa647f94039d21de97c969df21ce8c5186b68234eb5c53148f0d8bbd708e375d cachetools==4.2.2 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:2cc0b89715337ab6dbba85b5b50effe2b0c74e035d83ee8ed637cf52f12ae001 \ --hash=sha256:61b5ed1e22a0924aed1d23b478f37e8d52549ff8a961de2909c69bf950020cff -certifi==2022.12.7 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ - --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 +certifi==2023.7.22 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \ + --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9 cffi==1.15.1 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ @@ -133,29 +139,30 @@ coverage==7.2.3 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:fa546d66639d69aa967bf08156eb8c9d0cd6f6de84be9e8c9819f52ad499c910 \ --hash=sha256:fd214917cabdd6f673a29d708574e9fbdb892cb77eb426d0eae3490d95ca7859 \ --hash=sha256:fff5aaa6becf2c6a1699ae6a39e2e6fb0672c2d42eca8eb0cafa91cf2e9bd312 -cryptography==40.0.1 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:0a4e3406cfed6b1f6d6e87ed243363652b2586b2d917b0609ca4f97072994405 \ - --hash=sha256:1e0af458515d5e4028aad75f3bb3fe7a31e46ad920648cd59b64d3da842e4356 \ - --hash=sha256:2803f2f8b1e95f614419926c7e6f55d828afc614ca5ed61543877ae668cc3472 \ - --hash=sha256:28d63d75bf7ae4045b10de5413fb1d6338616e79015999ad9cf6fc538f772d41 \ - --hash=sha256:32057d3d0ab7d4453778367ca43e99ddb711770477c4f072a51b3ca69602780a \ - --hash=sha256:3a4805a4ca729d65570a1b7cac84eac1e431085d40387b7d3bbaa47e39890b88 \ - --hash=sha256:63dac2d25c47f12a7b8aa60e528bfb3c51c5a6c5a9f7c86987909c6c79765554 \ - --hash=sha256:650883cc064297ef3676b1db1b7b1df6081794c4ada96fa457253c4cc40f97db \ - --hash=sha256:6f2bbd72f717ce33100e6467572abaedc61f1acb87b8d546001328d7f466b778 \ - --hash=sha256:7c872413353c70e0263a9368c4993710070e70ab3e5318d85510cc91cce77e7c \ - --hash=sha256:918cb89086c7d98b1b86b9fdb70c712e5a9325ba6f7d7cfb509e784e0cfc6917 \ - --hash=sha256:9618a87212cb5200500e304e43691111570e1f10ec3f35569fdfcd17e28fd797 \ - --hash=sha256:a805a7bce4a77d51696410005b3e85ae2839bad9aa38894afc0aa99d8e0c3160 \ - --hash=sha256:cc3a621076d824d75ab1e1e530e66e7e8564e357dd723f2533225d40fe35c60c \ - --hash=sha256:cd033d74067d8928ef00a6b1327c8ea0452523967ca4463666eeba65ca350d4c \ - --hash=sha256:cf91e428c51ef692b82ce786583e214f58392399cf65c341bc7301d096fa3ba2 \ - --hash=sha256:d36bbeb99704aabefdca5aee4eba04455d7a27ceabd16f3b3ba9bdcc31da86c4 \ - --hash=sha256:d8aa3609d337ad85e4eb9bb0f8bcf6e4409bfb86e706efa9a027912169e89122 \ - --hash=sha256:f5d7b79fa56bc29580faafc2ff736ce05ba31feaa9d4735048b0de7d9ceb2b94 -deprecated==1.2.13 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:43ac5335da90c31c24ba028af536a91d41d53f9e6901ddb021bcc572ce44e38d \ - --hash=sha256:64756e3e14c8c5eea9795d93c524551432a0be75629f8f29e67ab8caf076c76d +cryptography==41.0.6 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:068bc551698c234742c40049e46840843f3d98ad7ce265fd2bd4ec0d11306596 \ + --hash=sha256:0f27acb55a4e77b9be8d550d762b0513ef3fc658cd3eb15110ebbcbd626db12c \ + --hash=sha256:2132d5865eea673fe6712c2ed5fb4fa49dba10768bb4cc798345748380ee3660 \ + --hash=sha256:3288acccef021e3c3c10d58933f44e8602cf04dba96d9796d70d537bb2f4bbc4 \ + --hash=sha256:35f3f288e83c3f6f10752467c48919a7a94b7d88cc00b0668372a0d2ad4f8ead \ + --hash=sha256:398ae1fc711b5eb78e977daa3cbf47cec20f2c08c5da129b7a296055fbb22aed \ + --hash=sha256:422e3e31d63743855e43e5a6fcc8b4acab860f560f9321b0ee6269cc7ed70cc3 \ + --hash=sha256:48783b7e2bef51224020efb61b42704207dde583d7e371ef8fc2a5fb6c0aabc7 \ + --hash=sha256:4d03186af98b1c01a4eda396b137f29e4e3fb0173e30f885e27acec8823c1b09 \ + --hash=sha256:5daeb18e7886a358064a68dbcaf441c036cbdb7da52ae744e7b9207b04d3908c \ + --hash=sha256:60e746b11b937911dc70d164060d28d273e31853bb359e2b2033c9e93e6f3c43 \ + --hash=sha256:742ae5e9a2310e9dade7932f9576606836ed174da3c7d26bc3d3ab4bd49b9f65 \ + --hash=sha256:7e00fb556bda398b99b0da289ce7053639d33b572847181d6483ad89835115f6 \ + --hash=sha256:85abd057699b98fce40b41737afb234fef05c67e116f6f3650782c10862c43da \ + --hash=sha256:8efb2af8d4ba9dbc9c9dd8f04d19a7abb5b49eab1f3694e7b5a16a5fc2856f5c \ + --hash=sha256:ae236bb8760c1e55b7a39b6d4d32d2279bc6c7c8500b7d5a13b6fb9fc97be35b \ + --hash=sha256:afda76d84b053923c27ede5edc1ed7d53e3c9f475ebaf63c68e69f1403c405a8 \ + --hash=sha256:b27a7fd4229abef715e064269d98a7e2909ebf92eb6912a9603c7e14c181928c \ + --hash=sha256:b648fe2a45e426aaee684ddca2632f62ec4613ef362f4d681a9a6283d10e079d \ + --hash=sha256:c5a550dc7a3b50b116323e3d376241829fd326ac47bc195e04eb33a8170902a9 \ + --hash=sha256:da46e2b5df770070412c46f87bac0849b8d685c5f2679771de277a422c7d0b86 \ + --hash=sha256:f39812f70fc5c71a15aa3c97b2bbe213c3f2a460b79bd21c40d033bb34a9bf36 \ + --hash=sha256:ff369dd19e8fe0528b02e8df9f2aeb2479f89b1270d90f96a63500afe9af5cae django-autocomplete-light==3.9.4 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:0f6da75c1c7186698b867a467a8cdb359f0513fdd8e09288a0c2fb018ae3d94e django-background-tasks-updated==1.2.7 ; python_version >= "3.9" and python_version < "4.0" \ @@ -167,6 +174,9 @@ django-ckeditor==6.5.1 ; python_version >= "3.9" and python_version < "4.0" \ django-cors-headers==3.14.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:5fbd58a6fb4119d975754b2bc090f35ec160a8373f276612c675b00e8a138739 \ --hash=sha256:684180013cc7277bdd8702b80a3c5a4b3fcae4abb2bf134dceb9f5dfe300228e +django-coverage-plugin==3.1.0 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:223d34bf92bebadcb8b7b89932480e41c7bd98b44a8156934488fbe7f4a71f99 \ + --hash=sha256:eb0ea8ffdb0db11a02994fc99be6500550efb496c350d709f418ff3d8e553a67 django-debug-toolbar==3.2.4 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:644bbd5c428d3283aa9115722471769cac1bec189edf3a0c855fd8ff870375a9 \ --hash=sha256:6b633b6cfee24f232d73569870f19aa86c819d750e7f3e833f2344a9eb4b4409 @@ -176,15 +186,21 @@ django-js-asset==2.0.0 ; python_version >= "3.9" and python_version < "4.0" \ django-oauth-toolkit==2.2.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:46890decb24a34e2a5382debeaf7752e50d90b7a11716cf2a9fd067097ec0963 \ --hash=sha256:abd85c74af525a62365ec2049113e73a2ff8b46ef906e7104a7ba968ef02a11d +django-picklefield==3.1 ; python_version >= "3.9" and python_version < "4" \ + --hash=sha256:c786cbeda78d6def2b43bff4840d19787809c8909f7ad683961703060398d356 \ + --hash=sha256:d77c504df7311e8ec14e8b779f10ca6fec74de6c7f8e2c136e1ef60cf955125d +django-q2==1.6.2 ; python_version >= "3.9" and python_version < "4" \ + --hash=sha256:c2d75552c80b83ca0d8c0b0db7db4f17e9f43ee131a46d0ddd514c5f5fc603cb \ + --hash=sha256:cd83c16b5791cd99f83a8d106d2447305d73c6c8ed8ec22c7cb954fe0e814284 django-sass==1.1.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:992f39d97a7b2d7d891255e5f99512ffd616b2e0aae1ca9b76983c5ecd603342 \ --hash=sha256:da163cd7ad7b9c2f1f10f2ec8b76939640d5b32d21ee74a240ca50a059c5fe7a django-storages[google]==1.12.3 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:204a99f218b747c46edbfeeb1310d357f83f90fa6a6024d8d0a3f422570cee84 \ --hash=sha256:a475edb2f0f04c4f7e548919a751ecd50117270833956ed5bd585c0575d2a5e7 -django==4.1.10 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:26d0260c2fb8121009e62ffc548b2398dea2522b6454208a852fb0ef264c206c \ - --hash=sha256:56343019a9fd839e2e5bf203daf45f25af79d5bffa4c71d56eae4f4404d82ade +django==4.2.11 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4 \ + --hash=sha256:ddc24a0a8280a0430baa37aff11f28574720af05888c62b7cfe71d219f4599d3 djangorestframework==3.14.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8 \ --hash=sha256:eb63f58c9f218e1a7d064d17a70751f528ed4e1d35547fdade9aaf4cd103fd08 @@ -251,54 +267,54 @@ googleapis-common-protos==1.58.0 ; python_version >= "3.9" and python_version < grpcio-status==1.48.2 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:2c33bbdbe20188b2953f46f31af669263b6ee2a9b2d38fa0d36ee091532e21bf \ --hash=sha256:53695f45da07437b7c344ee4ef60d370fd2850179f5a28bb26d8e2aa1102ec11 -grpcio==1.51.1 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:094e64236253590d9d4075665c77b329d707b6fca864dd62b144255e199b4f87 \ - --hash=sha256:0dc5354e38e5adf2498312f7241b14c7ce3484eefa0082db4297189dcbe272e6 \ - --hash=sha256:0e1a9e1b4a23808f1132aa35f968cd8e659f60af3ffd6fb00bcf9a65e7db279f \ - --hash=sha256:0fb93051331acbb75b49a2a0fd9239c6ba9528f6bdc1dd400ad1cb66cf864292 \ - --hash=sha256:16c71740640ba3a882f50b01bf58154681d44b51f09a5728180a8fdc66c67bd5 \ - --hash=sha256:172405ca6bdfedd6054c74c62085946e45ad4d9cec9f3c42b4c9a02546c4c7e9 \ - --hash=sha256:17ec9b13cec4a286b9e606b48191e560ca2f3bbdf3986f91e480a95d1582e1a7 \ - --hash=sha256:22b011674090594f1f3245960ced7386f6af35485a38901f8afee8ad01541dbd \ - --hash=sha256:24ac1154c4b2ab4a0c5326a76161547e70664cd2c39ba75f00fc8a2170964ea2 \ - --hash=sha256:257478300735ce3c98d65a930bbda3db172bd4e00968ba743e6a1154ea6edf10 \ - --hash=sha256:29cb97d41a4ead83b7bcad23bdb25bdd170b1e2cba16db6d3acbb090bc2de43c \ - --hash=sha256:2b170eaf51518275c9b6b22ccb59450537c5a8555326fd96ff7391b5dd75303c \ - --hash=sha256:31bb6bc7ff145e2771c9baf612f4b9ebbc9605ccdc5f3ff3d5553de7fc0e0d79 \ - --hash=sha256:3c2b3842dcf870912da31a503454a33a697392f60c5e2697c91d133130c2c85d \ - --hash=sha256:3f9b0023c2c92bebd1be72cdfca23004ea748be1813a66d684d49d67d836adde \ - --hash=sha256:471d39d3370ca923a316d49c8aac66356cea708a11e647e3bdc3d0b5de4f0a40 \ - --hash=sha256:49d680356a975d9c66a678eb2dde192d5dc427a7994fb977363634e781614f7c \ - --hash=sha256:4c4423ea38a7825b8fed8934d6d9aeebdf646c97e3c608c3b0bcf23616f33877 \ - --hash=sha256:506b9b7a4cede87d7219bfb31014d7b471cfc77157da9e820a737ec1ea4b0663 \ - --hash=sha256:538d981818e49b6ed1e9c8d5e5adf29f71c4e334e7d459bf47e9b7abb3c30e09 \ - --hash=sha256:59dffade859f157bcc55243714d57b286da6ae16469bf1ac0614d281b5f49b67 \ - --hash=sha256:5a6ebcdef0ef12005d56d38be30f5156d1cb3373b52e96f147f4a24b0ddb3a9d \ - --hash=sha256:5dca372268c6ab6372d37d6b9f9343e7e5b4bc09779f819f9470cd88b2ece3c3 \ - --hash=sha256:6df3b63538c362312bc5fa95fb965069c65c3ea91d7ce78ad9c47cab57226f54 \ - --hash=sha256:6f0b89967ee11f2b654c23b27086d88ad7bf08c0b3c2a280362f28c3698b2896 \ - --hash=sha256:75e29a90dc319f0ad4d87ba6d20083615a00d8276b51512e04ad7452b5c23b04 \ - --hash=sha256:7942b32a291421460d6a07883033e392167d30724aa84987e6956cd15f1a21b9 \ - --hash=sha256:9235dcd5144a83f9ca6f431bd0eccc46b90e2c22fe27b7f7d77cabb2fb515595 \ - --hash=sha256:97d67983189e2e45550eac194d6234fc38b8c3b5396c153821f2d906ed46e0ce \ - --hash=sha256:9ff42c5620b4e4530609e11afefa4a62ca91fa0abb045a8957e509ef84e54d30 \ - --hash=sha256:a8a0b77e992c64880e6efbe0086fe54dfc0bbd56f72a92d9e48264dcd2a3db98 \ - --hash=sha256:aacb54f7789ede5cbf1d007637f792d3e87f1c9841f57dd51abf89337d1b8472 \ - --hash=sha256:bc59f7ba87972ab236f8669d8ca7400f02a0eadf273ca00e02af64d588046f02 \ - --hash=sha256:cc2bece1737b44d878cc1510ea04469a8073dbbcdd762175168937ae4742dfb3 \ - --hash=sha256:cd3baccea2bc5c38aeb14e5b00167bd4e2373a373a5e4d8d850bd193edad150c \ - --hash=sha256:dad6533411d033b77f5369eafe87af8583178efd4039c41d7515d3336c53b4f1 \ - --hash=sha256:e223a9793522680beae44671b9ed8f6d25bbe5ddf8887e66aebad5e0686049ef \ - --hash=sha256:e473525c28251558337b5c1ad3fa969511e42304524a4e404065e165b084c9e4 \ - --hash=sha256:e4ef09f8997c4be5f3504cefa6b5c6cc3cf648274ce3cede84d4342a35d76db6 \ - --hash=sha256:e6dfc2b6567b1c261739b43d9c59d201c1b89e017afd9e684d85aa7a186c9f7a \ - --hash=sha256:eacad297ea60c72dd280d3353d93fb1dcca952ec11de6bb3c49d12a572ba31dd \ - --hash=sha256:f1158bccbb919da42544a4d3af5d9296a3358539ffa01018307337365a9a0c64 \ - --hash=sha256:f1fec3abaf274cdb85bf3878167cfde5ad4a4d97c68421afda95174de85ba813 \ - --hash=sha256:f96ace1540223f26fbe7c4ebbf8a98e3929a6aa0290c8033d12526847b291c0f \ - --hash=sha256:fbdbe9a849854fe484c00823f45b7baab159bdd4a46075302281998cb8719df5 -hdn-research-environment==1.4.0 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:296a336847c1078c149baa6773654a2e2a5b16cc1b03ca25f6f19f8606980e5b +grpcio==1.53.2 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:07b83c06e7d113044cf3da15ca52f578c5f3dca299af711e9a589c1b71eb8be5 \ + --hash=sha256:0c9e42f2499c8603af1d88771dc97e2c6b0310c278337058fd7fd1ddb35ab853 \ + --hash=sha256:0e92dc6a85cd1de42527812ef1276095e62169d002d86c888b6e889fcda1dd29 \ + --hash=sha256:0f76287d98ec79a38cba8292d0bdcd6ab9b9daf568dce1d53b9eb0135fc14d26 \ + --hash=sha256:18afdda2bbe0c615da4daff754cab0df9bbd859c415d85e7e741a2975b3208b4 \ + --hash=sha256:1af074f28a56425e4f4d99761708981543a27ae963f5b4b0a36ff71f3483479d \ + --hash=sha256:1d1a320230e0d020880178b8eb453300bd57700b44c3744268370502e7376a9b \ + --hash=sha256:1deeb84bb344351434f999cea4704ac6f1e07b3d861e34c44b50d8afa06caaa1 \ + --hash=sha256:1df931fbb4c36363d2cb985c2c26fda8f060b541a89c6c1191fdb59151a8c934 \ + --hash=sha256:1fcced1abb13cdb6a5d8b105765d30212a6cb29ab0dfb01eedecf2ff6c84371b \ + --hash=sha256:24c63592103fded38b258f1e520ba8b0a7a0bbc397cddd6520a1f74dc4b5dec0 \ + --hash=sha256:2b4f5671f9e88b7f51f54adda37a23277b7fdebd1557c47543b3e8a8044dd510 \ + --hash=sha256:33f7678287ac330c94e25f96cdb951e0861e206115ba4d8ea66cf6546b1a09d0 \ + --hash=sha256:3b789472e9ef75d179295d0c6a1f7f0aefd08189cd1c822b068b0523365a1dbe \ + --hash=sha256:431f864f2642a97d0aa8c6b606c307f03d22f919b1a226af90488426aed35809 \ + --hash=sha256:504af9e86ab01c9c33d8a452fe846aa931d024945f2e897537ccb8f7d76778ee \ + --hash=sha256:53d34cbf212f03634d74ba366d595b4a06a3b60fcc731eddbd6fd7ebe4acf981 \ + --hash=sha256:590c7206f764cfe37a65003a75977358e20919ed488f970935f54efa2741b497 \ + --hash=sha256:5b403c4ad22f3ba37c7720547d8888a1e4b74ad980a94332bbbc50330b623abc \ + --hash=sha256:5b49f372df33f5f84865aef5d46cacd23180b586c80e8cbe0ce149b96dfa8c4c \ + --hash=sha256:6275a54b41d6b1ec539b019bc3affaf6d05b0a0ba36af1a65b8a2810ef69e07d \ + --hash=sha256:69e99fe6bdc2cdacd04cef6b6585b00630d958c98e36d825de3eea406e15fb31 \ + --hash=sha256:6be86e8d5cf47415968588e5dfbfb92ee8757fb41139584192b67050d1a72c58 \ + --hash=sha256:712113946b303db9ae4245a13de213710367850a6c3c53530b70e87989feb8e0 \ + --hash=sha256:7734d1b91f1f3b1f186debf8ec4d168ee088a54e8186c14d89a95f7e51d3198d \ + --hash=sha256:7b44ed75b9d67d17e5a098a0f99a8fd3e5861fd3c4eb54212277a0acdf298434 \ + --hash=sha256:7cbf1e3aaec3edf734ef90182363a395d234cd4790544be914cedbe1b9fec99a \ + --hash=sha256:7e6885a8431939f1ee547e965fa3cb801a518b83d3d3509e90dbef78f0b5fd29 \ + --hash=sha256:7ea235cecb9df14b49a75cbd27a634683a96bb76576363407ec820ae454ce2b2 \ + --hash=sha256:80a8867746cff41c2db436dd9eea18ebbfcd0449d65b64b3ed3c995207898971 \ + --hash=sha256:8166ac6671472d172cc0db50323b7a7504bd534de54aa31354465a00ca44409d \ + --hash=sha256:8fc7667564c8c15748354dea1bb4035c5118df4e9dc5154ccdb6e62a3e5a2bac \ + --hash=sha256:9efbedc737ba342d8a2459afc9bd5c5df31adcdf774b772a4e663739f2cf0d06 \ + --hash=sha256:a3bee217bda6b2c81d9e2866f523217135a03a007a89043eee074e93d76706b0 \ + --hash=sha256:b16258a31269b97e26a08d71b5deb56499e86077d26e453fad8f6ec4c06fe666 \ + --hash=sha256:b676c4365a5753bc8c49f922a5f88bdb5df6746c670a9d859d2ba2f5f97d9269 \ + --hash=sha256:bea6a20c5a732a27b64623d43614b3022e6fcfc081a75236b7f9aa069d2eaa4d \ + --hash=sha256:d406cf2f6ccf39883a24b048c448a37bac16939408c1b6fbb4d021f3cd961448 \ + --hash=sha256:d9c51ca201326b49cfee38336c6e7dd1cb8a6b6d0dcf84aeaecbae310a736dbc \ + --hash=sha256:df07843c8c0dc71a56d3af3dfe19165fb0d3af7d3354a72185f6fa1b4ac05cab \ + --hash=sha256:ea84becb5cbd6a94a810c5214eb263ae57e915a9ed1bdcd5b4a6baf13d8c5177 \ + --hash=sha256:f14a82d12d53eb93298c35edf88d8c3ef37243b95f94dd3c75fddcba575d34ab \ + --hash=sha256:f3761f9a6817e32898eaa5aecd0b0ad69d0c68ab45ea7bf206e8dc4548f025f0 \ + --hash=sha256:f7e66d8b31ef2bada7029275debbe12c97397ec7ac70a659837a7b8a6a9dc916 \ + --hash=sha256:f9f7c0dd17f24e1774cc3a8df738246772994e853c28b28ed6ba7711ccf0abb4 +hdn-research-environment==2.3.8 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:371b33950e3c1598b650edefd42fa19a3532d2ca815dd42f495f0460c57df97f html2text==2018.1.9 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:490db40fe5b2cd79c461cf56be4d39eb8ca68191ae41ba3ba79f6cb05b7dd662 \ --hash=sha256:627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4 @@ -308,8 +324,18 @@ httplib2==0.19.1 ; python_version >= "3.9" and python_version < "4.0" \ idna==2.10 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 \ --hash=sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 -jwcrypto==1.4.2 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:80a35e9ed1b3b2c43ce03d92c5d48e6d0b6647e2aa2618e4963448923d78a37b +importlib-metadata==7.0.2 ; python_version >= "3.9" and python_version < "3.10" \ + --hash=sha256:198f568f3230878cb1b44fbd7975f87906c22336dba2e4a7f05278c281fbd792 \ + --hash=sha256:f4bc4c0c070c490abf4ce96d715f68e95923320370efb66143df00199bb6c100 +jinja2==3.1.3 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa \ + --hash=sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90 +jmespath==1.0.1 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980 \ + --hash=sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe +jwcrypto==1.5.6 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:150d2b0ebbdb8f40b77f543fb44ffd2baeff48788be71f67f03566692fd55789 \ + --hash=sha256:771a87762a0c081ae6166958a954f80848820b2ab066937dc8b8379d65b1b039 libsass==0.21.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:06c8776417fe930714bdc930a3d7e795ae3d72be6ac883ff72a1b8f7c49e5ffb \ --hash=sha256:12f39712de38689a8b785b7db41d3ba2ea1d46f9379d81ea4595802d91fa6529 \ @@ -321,6 +347,70 @@ libsass==0.21.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:c9ec490609752c1d81ff6290da33485aa7cb6d7365ac665b74464c1b7d97f7da \ --hash=sha256:d5ba529d9ce668be9380563279f3ffe988f27bc5b299c5a28453df2e0b0fbaf2 \ --hash=sha256:e2b1a7d093f2e76dc694c17c0c285e846d0b0deb0e8b21dc852ba1a3a4e2f1d6 +markupsafe==2.1.3 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \ + --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \ + --hash=sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431 \ + --hash=sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686 \ + --hash=sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c \ + --hash=sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559 \ + --hash=sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc \ + --hash=sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb \ + --hash=sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939 \ + --hash=sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c \ + --hash=sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0 \ + --hash=sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4 \ + --hash=sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9 \ + --hash=sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575 \ + --hash=sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba \ + --hash=sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d \ + --hash=sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd \ + --hash=sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3 \ + --hash=sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00 \ + --hash=sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155 \ + --hash=sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac \ + --hash=sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52 \ + --hash=sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f \ + --hash=sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8 \ + --hash=sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b \ + --hash=sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007 \ + --hash=sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24 \ + --hash=sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea \ + --hash=sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198 \ + --hash=sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0 \ + --hash=sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee \ + --hash=sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be \ + --hash=sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2 \ + --hash=sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1 \ + --hash=sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707 \ + --hash=sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6 \ + --hash=sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c \ + --hash=sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58 \ + --hash=sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823 \ + --hash=sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779 \ + --hash=sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636 \ + --hash=sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c \ + --hash=sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad \ + --hash=sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee \ + --hash=sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc \ + --hash=sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2 \ + --hash=sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48 \ + --hash=sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7 \ + --hash=sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e \ + --hash=sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b \ + --hash=sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa \ + --hash=sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5 \ + --hash=sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e \ + --hash=sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb \ + --hash=sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9 \ + --hash=sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57 \ + --hash=sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc \ + --hash=sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc \ + --hash=sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2 \ + --hash=sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11 +moto==4.2.10 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:5cf0736d1f43cb887498d00b00ae522774bfddb7db1f4994fedea65b290b9f0e \ + --hash=sha256:92595fe287474a31ac3ef847941ebb097e8ffb0c3d6c106e47cf573db06933b2 oauthlib==3.2.2 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:8139f29aac13e25d502680e9e19963e83f16838d48a0d71c287fe40e7067fbca \ --hash=sha256:9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918 @@ -330,72 +420,80 @@ packaging==20.9 ; python_version >= "3.9" and python_version < "4.0" \ pdfminer-six==20211012 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:0351f17d362ee2d48b158be52bcde6576d96460efd038a3e89a043fba6d634d7 \ --hash=sha256:d3efb75c0249b51c1bf795e3a8bddf1726b276c77bf75fb136adea471ee2825b -pillow==9.3.0 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:03150abd92771742d4a8cd6f2fa6246d847dcd2e332a18d0c15cc75bf6703040 \ - --hash=sha256:073adb2ae23431d3b9bcbcff3fe698b62ed47211d0716b067385538a1b0f28b8 \ - --hash=sha256:0b07fffc13f474264c336298d1b4ce01d9c5a011415b79d4ee5527bb69ae6f65 \ - --hash=sha256:0b7257127d646ff8676ec8a15520013a698d1fdc48bc2a79ba4e53df792526f2 \ - --hash=sha256:12ce4932caf2ddf3e41d17fc9c02d67126935a44b86df6a206cf0d7161548627 \ - --hash=sha256:15c42fb9dea42465dfd902fb0ecf584b8848ceb28b41ee2b58f866411be33f07 \ - --hash=sha256:18498994b29e1cf86d505edcb7edbe814d133d2232d256db8c7a8ceb34d18cef \ - --hash=sha256:1c7c8ae3864846fc95f4611c78129301e203aaa2af813b703c55d10cc1628535 \ - --hash=sha256:22b012ea2d065fd163ca096f4e37e47cd8b59cf4b0fd47bfca6abb93df70b34c \ - --hash=sha256:276a5ca930c913f714e372b2591a22c4bd3b81a418c0f6635ba832daec1cbcfc \ - --hash=sha256:2e0918e03aa0c72ea56edbb00d4d664294815aa11291a11504a377ea018330d3 \ - --hash=sha256:3033fbe1feb1b59394615a1cafaee85e49d01b51d54de0cbf6aa8e64182518a1 \ - --hash=sha256:3168434d303babf495d4ba58fc22d6604f6e2afb97adc6a423e917dab828939c \ - --hash=sha256:32a44128c4bdca7f31de5be641187367fe2a450ad83b833ef78910397db491aa \ - --hash=sha256:3dd6caf940756101205dffc5367babf288a30043d35f80936f9bfb37f8355b32 \ - --hash=sha256:40e1ce476a7804b0fb74bcfa80b0a2206ea6a882938eaba917f7a0f004b42502 \ - --hash=sha256:41e0051336807468be450d52b8edd12ac60bebaa97fe10c8b660f116e50b30e4 \ - --hash=sha256:4390e9ce199fc1951fcfa65795f239a8a4944117b5935a9317fb320e7767b40f \ - --hash=sha256:502526a2cbfa431d9fc2a079bdd9061a2397b842bb6bc4239bb176da00993812 \ - --hash=sha256:51e0e543a33ed92db9f5ef69a0356e0b1a7a6b6a71b80df99f1d181ae5875636 \ - --hash=sha256:57751894f6618fd4308ed8e0c36c333e2f5469744c34729a27532b3db106ee20 \ - --hash=sha256:5d77adcd56a42d00cc1be30843d3426aa4e660cab4a61021dc84467123f7a00c \ - --hash=sha256:655a83b0058ba47c7c52e4e2df5ecf484c1b0b0349805896dd350cbc416bdd91 \ - --hash=sha256:68943d632f1f9e3dce98908e873b3a090f6cba1cbb1b892a9e8d97c938871fbe \ - --hash=sha256:6c738585d7a9961d8c2821a1eb3dcb978d14e238be3d70f0a706f7fa9316946b \ - --hash=sha256:73bd195e43f3fadecfc50c682f5055ec32ee2c933243cafbfdec69ab1aa87cad \ - --hash=sha256:772a91fc0e03eaf922c63badeca75e91baa80fe2f5f87bdaed4280662aad25c9 \ - --hash=sha256:77ec3e7be99629898c9a6d24a09de089fa5356ee408cdffffe62d67bb75fdd72 \ - --hash=sha256:7db8b751ad307d7cf238f02101e8e36a128a6cb199326e867d1398067381bff4 \ - --hash=sha256:801ec82e4188e935c7f5e22e006d01611d6b41661bba9fe45b60e7ac1a8f84de \ - --hash=sha256:82409ffe29d70fd733ff3c1025a602abb3e67405d41b9403b00b01debc4c9a29 \ - --hash=sha256:828989c45c245518065a110434246c44a56a8b2b2f6347d1409c787e6e4651ee \ - --hash=sha256:829f97c8e258593b9daa80638aee3789b7df9da5cf1336035016d76f03b8860c \ - --hash=sha256:871b72c3643e516db4ecf20efe735deb27fe30ca17800e661d769faab45a18d7 \ - --hash=sha256:89dca0ce00a2b49024df6325925555d406b14aa3efc2f752dbb5940c52c56b11 \ - --hash=sha256:90fb88843d3902fe7c9586d439d1e8c05258f41da473952aa8b328d8b907498c \ - --hash=sha256:97aabc5c50312afa5e0a2b07c17d4ac5e865b250986f8afe2b02d772567a380c \ - --hash=sha256:9aaa107275d8527e9d6e7670b64aabaaa36e5b6bd71a1015ddd21da0d4e06448 \ - --hash=sha256:9f47eabcd2ded7698106b05c2c338672d16a6f2a485e74481f524e2a23c2794b \ - --hash=sha256:a0a06a052c5f37b4ed81c613a455a81f9a3a69429b4fd7bb913c3fa98abefc20 \ - --hash=sha256:ab388aaa3f6ce52ac1cb8e122c4bd46657c15905904b3120a6248b5b8b0bc228 \ - --hash=sha256:ad58d27a5b0262c0c19b47d54c5802db9b34d38bbf886665b626aff83c74bacd \ - --hash=sha256:ae5331c23ce118c53b172fa64a4c037eb83c9165aba3a7ba9ddd3ec9fa64a699 \ - --hash=sha256:af0372acb5d3598f36ec0914deed2a63f6bcdb7b606da04dc19a88d31bf0c05b \ - --hash=sha256:afa4107d1b306cdf8953edde0534562607fe8811b6c4d9a486298ad31de733b2 \ - --hash=sha256:b03ae6f1a1878233ac620c98f3459f79fd77c7e3c2b20d460284e1fb370557d4 \ - --hash=sha256:b0915e734b33a474d76c28e07292f196cdf2a590a0d25bcc06e64e545f2d146c \ - --hash=sha256:b4012d06c846dc2b80651b120e2cdd787b013deb39c09f407727ba90015c684f \ - --hash=sha256:b472b5ea442148d1c3e2209f20f1e0bb0eb556538690fa70b5e1f79fa0ba8dc2 \ - --hash=sha256:b59430236b8e58840a0dfb4099a0e8717ffb779c952426a69ae435ca1f57210c \ - --hash=sha256:b90f7616ea170e92820775ed47e136208e04c967271c9ef615b6fbd08d9af0e3 \ - --hash=sha256:b9a65733d103311331875c1dca05cb4606997fd33d6acfed695b1232ba1df193 \ - --hash=sha256:bac18ab8d2d1e6b4ce25e3424f709aceef668347db8637c2296bcf41acb7cf48 \ - --hash=sha256:bca31dd6014cb8b0b2db1e46081b0ca7d936f856da3b39744aef499db5d84d02 \ - --hash=sha256:be55f8457cd1eac957af0c3f5ece7bc3f033f89b114ef30f710882717670b2a8 \ - --hash=sha256:c7025dce65566eb6e89f56c9509d4f628fddcedb131d9465cacd3d8bac337e7e \ - --hash=sha256:c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f \ - --hash=sha256:dbb8e7f2abee51cef77673be97760abff1674ed32847ce04b4af90f610144c7b \ - --hash=sha256:e6ea6b856a74d560d9326c0f5895ef8050126acfdc7ca08ad703eb0081e82b74 \ - --hash=sha256:ebf2029c1f464c59b8bdbe5143c79fa2045a581ac53679733d3a91d400ff9efb \ - --hash=sha256:f1ff2ee69f10f13a9596480335f406dd1f70c3650349e2be67ca3139280cade0 +pillow==10.3.0 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:048ad577748b9fa4a99a0548c64f2cb8d672d5bf2e643a739ac8faff1164238c \ + --hash=sha256:048eeade4c33fdf7e08da40ef402e748df113fd0b4584e32c4af74fe78baaeb2 \ + --hash=sha256:0ba26351b137ca4e0db0342d5d00d2e355eb29372c05afd544ebf47c0956ffeb \ + --hash=sha256:0ea2a783a2bdf2a561808fe4a7a12e9aa3799b701ba305de596bc48b8bdfce9d \ + --hash=sha256:1530e8f3a4b965eb6a7785cf17a426c779333eb62c9a7d1bbcf3ffd5bf77a4aa \ + --hash=sha256:16563993329b79513f59142a6b02055e10514c1a8e86dca8b48a893e33cf91e3 \ + --hash=sha256:19aeb96d43902f0a783946a0a87dbdad5c84c936025b8419da0a0cd7724356b1 \ + --hash=sha256:1a1d1915db1a4fdb2754b9de292642a39a7fb28f1736699527bb649484fb966a \ + --hash=sha256:1b87bd9d81d179bd8ab871603bd80d8645729939f90b71e62914e816a76fc6bd \ + --hash=sha256:1dfc94946bc60ea375cc39cff0b8da6c7e5f8fcdc1d946beb8da5c216156ddd8 \ + --hash=sha256:2034f6759a722da3a3dbd91a81148cf884e91d1b747992ca288ab88c1de15999 \ + --hash=sha256:261ddb7ca91fcf71757979534fb4c128448b5b4c55cb6152d280312062f69599 \ + --hash=sha256:2ed854e716a89b1afcedea551cd85f2eb2a807613752ab997b9974aaa0d56936 \ + --hash=sha256:3102045a10945173d38336f6e71a8dc71bcaeed55c3123ad4af82c52807b9375 \ + --hash=sha256:339894035d0ede518b16073bdc2feef4c991ee991a29774b33e515f1d308e08d \ + --hash=sha256:412444afb8c4c7a6cc11a47dade32982439925537e483be7c0ae0cf96c4f6a0b \ + --hash=sha256:4203efca580f0dd6f882ca211f923168548f7ba334c189e9eab1178ab840bf60 \ + --hash=sha256:45ebc7b45406febf07fef35d856f0293a92e7417ae7933207e90bf9090b70572 \ + --hash=sha256:4b5ec25d8b17217d635f8935dbc1b9aa5907962fae29dff220f2659487891cd3 \ + --hash=sha256:4c8e73e99da7db1b4cad7f8d682cf6abad7844da39834c288fbfa394a47bbced \ + --hash=sha256:4e6f7d1c414191c1199f8996d3f2282b9ebea0945693fb67392c75a3a320941f \ + --hash=sha256:4eaa22f0d22b1a7e93ff0a596d57fdede2e550aecffb5a1ef1106aaece48e96b \ + --hash=sha256:50b8eae8f7334ec826d6eeffaeeb00e36b5e24aa0b9df322c247539714c6df19 \ + --hash=sha256:50fd3f6b26e3441ae07b7c979309638b72abc1a25da31a81a7fbd9495713ef4f \ + --hash=sha256:51243f1ed5161b9945011a7360e997729776f6e5d7005ba0c6879267d4c5139d \ + --hash=sha256:5d512aafa1d32efa014fa041d38868fda85028e3f930a96f85d49c7d8ddc0383 \ + --hash=sha256:5f77cf66e96ae734717d341c145c5949c63180842a545c47a0ce7ae52ca83795 \ + --hash=sha256:6b02471b72526ab8a18c39cb7967b72d194ec53c1fd0a70b050565a0f366d355 \ + --hash=sha256:6fb1b30043271ec92dc65f6d9f0b7a830c210b8a96423074b15c7bc999975f57 \ + --hash=sha256:7161ec49ef0800947dc5570f86568a7bb36fa97dd09e9827dc02b718c5643f09 \ + --hash=sha256:72d622d262e463dfb7595202d229f5f3ab4b852289a1cd09650362db23b9eb0b \ + --hash=sha256:74d28c17412d9caa1066f7a31df8403ec23d5268ba46cd0ad2c50fb82ae40462 \ + --hash=sha256:78618cdbccaa74d3f88d0ad6cb8ac3007f1a6fa5c6f19af64b55ca170bfa1edf \ + --hash=sha256:793b4e24db2e8742ca6423d3fde8396db336698c55cd34b660663ee9e45ed37f \ + --hash=sha256:798232c92e7665fe82ac085f9d8e8ca98826f8e27859d9a96b41d519ecd2e49a \ + --hash=sha256:81d09caa7b27ef4e61cb7d8fbf1714f5aec1c6b6c5270ee53504981e6e9121ad \ + --hash=sha256:8ab74c06ffdab957d7670c2a5a6e1a70181cd10b727cd788c4dd9005b6a8acd9 \ + --hash=sha256:8eb0908e954d093b02a543dc963984d6e99ad2b5e36503d8a0aaf040505f747d \ + --hash=sha256:90b9e29824800e90c84e4022dd5cc16eb2d9605ee13f05d47641eb183cd73d45 \ + --hash=sha256:9797a6c8fe16f25749b371c02e2ade0efb51155e767a971c61734b1bf6293994 \ + --hash=sha256:9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d \ + --hash=sha256:9d3bea1c75f8c53ee4d505c3e67d8c158ad4df0d83170605b50b64025917f338 \ + --hash=sha256:9e2ec1e921fd07c7cda7962bad283acc2f2a9ccc1b971ee4b216b75fad6f0463 \ + --hash=sha256:9e91179a242bbc99be65e139e30690e081fe6cb91a8e77faf4c409653de39451 \ + --hash=sha256:a0eaa93d054751ee9964afa21c06247779b90440ca41d184aeb5d410f20ff591 \ + --hash=sha256:a2c405445c79c3f5a124573a051062300936b0281fee57637e706453e452746c \ + --hash=sha256:aa7e402ce11f0885305bfb6afb3434b3cd8f53b563ac065452d9d5654c7b86fd \ + --hash=sha256:aff76a55a8aa8364d25400a210a65ff59d0168e0b4285ba6bf2bd83cf675ba32 \ + --hash=sha256:b09b86b27a064c9624d0a6c54da01c1beaf5b6cadfa609cf63789b1d08a797b9 \ + --hash=sha256:b14f16f94cbc61215115b9b1236f9c18403c15dd3c52cf629072afa9d54c1cbf \ + --hash=sha256:b50811d664d392f02f7761621303eba9d1b056fb1868c8cdf4231279645c25f5 \ + --hash=sha256:b7bc2176354defba3edc2b9a777744462da2f8e921fbaf61e52acb95bafa9828 \ + --hash=sha256:c78e1b00a87ce43bb37642c0812315b411e856a905d58d597750eb79802aaaa3 \ + --hash=sha256:c83341b89884e2b2e55886e8fbbf37c3fa5efd6c8907124aeb72f285ae5696e5 \ + --hash=sha256:ca2870d5d10d8726a27396d3ca4cf7976cec0f3cb706debe88e3a5bd4610f7d2 \ + --hash=sha256:ccce24b7ad89adb5a1e34a6ba96ac2530046763912806ad4c247356a8f33a67b \ + --hash=sha256:cd5e14fbf22a87321b24c88669aad3a51ec052eb145315b3da3b7e3cc105b9a2 \ + --hash=sha256:ce49c67f4ea0609933d01c0731b34b8695a7a748d6c8d186f95e7d085d2fe475 \ + --hash=sha256:d33891be6df59d93df4d846640f0e46f1a807339f09e79a8040bc887bdcd7ed3 \ + --hash=sha256:d3b2348a78bc939b4fed6552abfd2e7988e0f81443ef3911a4b8498ca084f6eb \ + --hash=sha256:d886f5d353333b4771d21267c7ecc75b710f1a73d72d03ca06df49b09015a9ef \ + --hash=sha256:d93480005693d247f8346bc8ee28c72a2191bdf1f6b5db469c096c0c867ac015 \ + --hash=sha256:dc1a390a82755a8c26c9964d457d4c9cbec5405896cba94cf51f36ea0d855002 \ + --hash=sha256:dd78700f5788ae180b5ee8902c6aea5a5726bac7c364b202b4b3e3ba2d293170 \ + --hash=sha256:e46f38133e5a060d46bd630faa4d9fa0202377495df1f068a8299fd78c84de84 \ + --hash=sha256:e4b878386c4bf293578b48fc570b84ecfe477d3b77ba39a6e87150af77f40c57 \ + --hash=sha256:f0d0591a0aeaefdaf9a5e545e7485f89910c977087e7de2b6c388aec32011e9f \ + --hash=sha256:fdcbb4068117dfd9ce0138d068ac512843c52295ed996ae6dd1faf537b6dbc27 \ + --hash=sha256:ff61bfd9253c3915e6d41c651d5f962da23eda633cf02262990094a18a55371a proto-plus==1.22.2 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:0e8cda3d5a634d9895b75c573c9352c16486cb75deb0e078b5fda34db4243165 \ --hash=sha256:de34e52d6c9c6fcd704192f09767cb561bb4ee64e70eede20b0834d841f0be4d -protobuf==3.20.3 ; python_version < "4.0" and python_version >= "3.9" \ +protobuf==3.20.3 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \ --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \ --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \ @@ -441,12 +539,15 @@ pyasn1==0.4.8 ; python_version >= "3.9" and python_version < "4.0" \ pycparser==2.20 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \ --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 -pyopenssl==23.1.1 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:841498b9bec61623b1b6c47ebbc02367c07d60e0e195f19790817f10cc8db0b7 \ - --hash=sha256:9e0c526404a210df9d2b18cd33364beadb0dc858a739b885677bc65e105d4a4c +pyopenssl==23.2.0 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:24f0dc5227396b3e831f4c7f602b950a5e9833d292c8e4a2e06b709292806ae2 \ + --hash=sha256:276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac pyparsing==2.4.7 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b +python-dateutil==2.8.2 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ + --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 python-decouple==3.4 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:2e5adb0263a4f963b58d7407c4760a2465d464ee212d733e2a2c179e54c08d8f \ --hash=sha256:a8268466e6389a639a20deab9d880faee186eb1eb6a05e54375bdf158d691981 @@ -456,6 +557,58 @@ python-json-logger==2.0.2 ; python_version >= "3.9" and python_version < "4.0" \ pytz==2022.1 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7 \ --hash=sha256:e68985985296d9a66a881eb3193b0906246245294a881e7c8afe623866ac6a5c +pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5 \ + --hash=sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc \ + --hash=sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df \ + --hash=sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741 \ + --hash=sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206 \ + --hash=sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27 \ + --hash=sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595 \ + --hash=sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62 \ + --hash=sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98 \ + --hash=sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696 \ + --hash=sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290 \ + --hash=sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9 \ + --hash=sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d \ + --hash=sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6 \ + --hash=sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867 \ + --hash=sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47 \ + --hash=sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486 \ + --hash=sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6 \ + --hash=sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3 \ + --hash=sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007 \ + --hash=sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938 \ + --hash=sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0 \ + --hash=sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c \ + --hash=sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735 \ + --hash=sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d \ + --hash=sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28 \ + --hash=sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4 \ + --hash=sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba \ + --hash=sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8 \ + --hash=sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef \ + --hash=sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5 \ + --hash=sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd \ + --hash=sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3 \ + --hash=sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0 \ + --hash=sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515 \ + --hash=sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c \ + --hash=sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c \ + --hash=sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924 \ + --hash=sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34 \ + --hash=sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43 \ + --hash=sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859 \ + --hash=sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673 \ + --hash=sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54 \ + --hash=sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a \ + --hash=sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b \ + --hash=sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab \ + --hash=sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa \ + --hash=sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c \ + --hash=sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585 \ + --hash=sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d \ + --hash=sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f requests-mock==1.9.3 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:0a2d38a117c08bb78939ec163522976ad59a6b7fdd82b709e23bb98004a44970 \ --hash=sha256:8d72abe54546c1fc9696fa1516672f1031d72a55a1d66c85184f972a24ba0eba @@ -465,9 +618,15 @@ requests-oauthlib==1.3.0 ; python_version >= "3.9" and python_version < "4.0" \ requests==2.31.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 +responses==0.24.1 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:a2b43f4c08bfb9c9bd242568328c65a34b318741d3fab884ac843c5ceeb543f9 \ + --hash=sha256:b127c6ca3f8df0eb9cc82fd93109a3007a86acb24871834c47b77765152ecf8c rsa==4.7.2 ; python_version >= "3.9" and python_version < "4" \ --hash=sha256:78f9a9bf4e7be0c5ded4583326e7461e3a3c5aae24073648b4bdfa797d78c9d2 \ --hash=sha256:9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9 +s3transfer==0.6.2 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:b014be3a8a2aab98cfe1abc7229cc5a9a0cf05eb9c1f2b86b230fd8df3f78084 \ + --hash=sha256:cab66d3380cca3e70939ef2255d01cd8aece6a4907a9528740f668c4b0611861 selenium==3.141.0 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:2d7131d7bc5a5b99a2d9b04aaf2612c411b03b8ca1b1ee8d3de5845a9be2cb3c \ --hash=sha256:deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d @@ -483,95 +642,31 @@ six==1.16.0 ; python_version >= "3.9" and python_version < "4.0" \ sqlparse==0.4.4 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:5430a4fe2ac7d0f93e66f1efc6e1338a41884b7ddf2a350cedd20ccc4d9d28f3 \ --hash=sha256:d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c +typing-extensions==4.10.0 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475 \ + --hash=sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb tzdata==2022.7 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "win32" \ --hash=sha256:2b88858b0e3120792a3c0635c23daf36a7d7eeeca657c323da299d2094402a0d \ --hash=sha256:fe5f866eddd8b96e9fcba978f8e503c909b19ea7efda11e52e39494bad3a7bfa uritemplate==3.0.1 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:07620c3f3f8eed1f12600845892b0e036a2420acf513c53f7de0abd911a5894f \ --hash=sha256:5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae -urllib3==1.26.15 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305 \ - --hash=sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42 -uwsgi==2.0.21 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9 +urllib3==1.26.18 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \ + --hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0 +uwsgi==2.0.22 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:4cc4727258671ac5fa17ab422155e9aaef8a2008ebb86e4404b66deaae965db2 webencodings==0.5.1 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 -wrapt==1.15.0 ; python_version >= "3.9" and python_version < "4.0" \ - --hash=sha256:02fce1852f755f44f95af51f69d22e45080102e9d00258053b79367d07af39c0 \ - --hash=sha256:077ff0d1f9d9e4ce6476c1a924a3332452c1406e59d90a2cf24aeb29eeac9420 \ - --hash=sha256:078e2a1a86544e644a68422f881c48b84fef6d18f8c7a957ffd3f2e0a74a0d4a \ - --hash=sha256:0970ddb69bba00670e58955f8019bec4a42d1785db3faa043c33d81de2bf843c \ - --hash=sha256:1286eb30261894e4c70d124d44b7fd07825340869945c79d05bda53a40caa079 \ - --hash=sha256:21f6d9a0d5b3a207cdf7acf8e58d7d13d463e639f0c7e01d82cdb671e6cb7923 \ - --hash=sha256:230ae493696a371f1dbffaad3dafbb742a4d27a0afd2b1aecebe52b740167e7f \ - --hash=sha256:26458da5653aa5b3d8dc8b24192f574a58984c749401f98fff994d41d3f08da1 \ - --hash=sha256:2cf56d0e237280baed46f0b5316661da892565ff58309d4d2ed7dba763d984b8 \ - --hash=sha256:2e51de54d4fb8fb50d6ee8327f9828306a959ae394d3e01a1ba8b2f937747d86 \ - --hash=sha256:2fbfbca668dd15b744418265a9607baa970c347eefd0db6a518aaf0cfbd153c0 \ - --hash=sha256:38adf7198f8f154502883242f9fe7333ab05a5b02de7d83aa2d88ea621f13364 \ - --hash=sha256:3a8564f283394634a7a7054b7983e47dbf39c07712d7b177b37e03f2467a024e \ - --hash=sha256:3abbe948c3cbde2689370a262a8d04e32ec2dd4f27103669a45c6929bcdbfe7c \ - --hash=sha256:3bbe623731d03b186b3d6b0d6f51865bf598587c38d6f7b0be2e27414f7f214e \ - --hash=sha256:40737a081d7497efea35ab9304b829b857f21558acfc7b3272f908d33b0d9d4c \ - --hash=sha256:41d07d029dd4157ae27beab04d22b8e261eddfc6ecd64ff7000b10dc8b3a5727 \ - --hash=sha256:46ed616d5fb42f98630ed70c3529541408166c22cdfd4540b88d5f21006b0eff \ - --hash=sha256:493d389a2b63c88ad56cdc35d0fa5752daac56ca755805b1b0c530f785767d5e \ - --hash=sha256:4ff0d20f2e670800d3ed2b220d40984162089a6e2c9646fdb09b85e6f9a8fc29 \ - --hash=sha256:54accd4b8bc202966bafafd16e69da9d5640ff92389d33d28555c5fd4f25ccb7 \ - --hash=sha256:56374914b132c702aa9aa9959c550004b8847148f95e1b824772d453ac204a72 \ - --hash=sha256:578383d740457fa790fdf85e6d346fda1416a40549fe8db08e5e9bd281c6a475 \ - --hash=sha256:58d7a75d731e8c63614222bcb21dd992b4ab01a399f1f09dd82af17bbfc2368a \ - --hash=sha256:5c5aa28df055697d7c37d2099a7bc09f559d5053c3349b1ad0c39000e611d317 \ - --hash=sha256:5fc8e02f5984a55d2c653f5fea93531e9836abbd84342c1d1e17abc4a15084c2 \ - --hash=sha256:63424c681923b9f3bfbc5e3205aafe790904053d42ddcc08542181a30a7a51bd \ - --hash=sha256:64b1df0f83706b4ef4cfb4fb0e4c2669100fd7ecacfb59e091fad300d4e04640 \ - --hash=sha256:74934ebd71950e3db69960a7da29204f89624dde411afbfb3b4858c1409b1e98 \ - --hash=sha256:75669d77bb2c071333417617a235324a1618dba66f82a750362eccbe5b61d248 \ - --hash=sha256:75760a47c06b5974aa5e01949bf7e66d2af4d08cb8c1d6516af5e39595397f5e \ - --hash=sha256:76407ab327158c510f44ded207e2f76b657303e17cb7a572ffe2f5a8a48aa04d \ - --hash=sha256:76e9c727a874b4856d11a32fb0b389afc61ce8aaf281ada613713ddeadd1cfec \ - --hash=sha256:77d4c1b881076c3ba173484dfa53d3582c1c8ff1f914c6461ab70c8428b796c1 \ - --hash=sha256:780c82a41dc493b62fc5884fb1d3a3b81106642c5c5c78d6a0d4cbe96d62ba7e \ - --hash=sha256:7dc0713bf81287a00516ef43137273b23ee414fe41a3c14be10dd95ed98a2df9 \ - --hash=sha256:7eebcdbe3677e58dd4c0e03b4f2cfa346ed4049687d839adad68cc38bb559c92 \ - --hash=sha256:896689fddba4f23ef7c718279e42f8834041a21342d95e56922e1c10c0cc7afb \ - --hash=sha256:96177eb5645b1c6985f5c11d03fc2dbda9ad24ec0f3a46dcce91445747e15094 \ - --hash=sha256:96e25c8603a155559231c19c0349245eeb4ac0096fe3c1d0be5c47e075bd4f46 \ - --hash=sha256:9d37ac69edc5614b90516807de32d08cb8e7b12260a285ee330955604ed9dd29 \ - --hash=sha256:9ed6aa0726b9b60911f4aed8ec5b8dd7bf3491476015819f56473ffaef8959bd \ - --hash=sha256:a487f72a25904e2b4bbc0817ce7a8de94363bd7e79890510174da9d901c38705 \ - --hash=sha256:a4cbb9ff5795cd66f0066bdf5947f170f5d63a9274f99bdbca02fd973adcf2a8 \ - --hash=sha256:a74d56552ddbde46c246b5b89199cb3fd182f9c346c784e1a93e4dc3f5ec9975 \ - --hash=sha256:a89ce3fd220ff144bd9d54da333ec0de0399b52c9ac3d2ce34b569cf1a5748fb \ - --hash=sha256:abd52a09d03adf9c763d706df707c343293d5d106aea53483e0ec8d9e310ad5e \ - --hash=sha256:abd8f36c99512755b8456047b7be10372fca271bf1467a1caa88db991e7c421b \ - --hash=sha256:af5bd9ccb188f6a5fdda9f1f09d9f4c86cc8a539bd48a0bfdc97723970348418 \ - --hash=sha256:b02f21c1e2074943312d03d243ac4388319f2456576b2c6023041c4d57cd7019 \ - --hash=sha256:b06fa97478a5f478fb05e1980980a7cdf2712015493b44d0c87606c1513ed5b1 \ - --hash=sha256:b0724f05c396b0a4c36a3226c31648385deb6a65d8992644c12a4963c70326ba \ - --hash=sha256:b130fe77361d6771ecf5a219d8e0817d61b236b7d8b37cc045172e574ed219e6 \ - --hash=sha256:b56d5519e470d3f2fe4aa7585f0632b060d532d0696c5bdfb5e8319e1d0f69a2 \ - --hash=sha256:b67b819628e3b748fd3c2192c15fb951f549d0f47c0449af0764d7647302fda3 \ - --hash=sha256:ba1711cda2d30634a7e452fc79eabcadaffedf241ff206db2ee93dd2c89a60e7 \ - --hash=sha256:bbeccb1aa40ab88cd29e6c7d8585582c99548f55f9b2581dfc5ba68c59a85752 \ - --hash=sha256:bd84395aab8e4d36263cd1b9308cd504f6cf713b7d6d3ce25ea55670baec5416 \ - --hash=sha256:c99f4309f5145b93eca6e35ac1a988f0dc0a7ccf9ccdcd78d3c0adf57224e62f \ - --hash=sha256:ca1cccf838cd28d5a0883b342474c630ac48cac5df0ee6eacc9c7290f76b11c1 \ - --hash=sha256:cd525e0e52a5ff16653a3fc9e3dd827981917d34996600bbc34c05d048ca35cc \ - --hash=sha256:cdb4f085756c96a3af04e6eca7f08b1345e94b53af8921b25c72f096e704e145 \ - --hash=sha256:ce42618f67741d4697684e501ef02f29e758a123aa2d669e2d964ff734ee00ee \ - --hash=sha256:d06730c6aed78cee4126234cf2d071e01b44b915e725a6cb439a879ec9754a3a \ - --hash=sha256:d5fe3e099cf07d0fb5a1e23d399e5d4d1ca3e6dfcbe5c8570ccff3e9208274f7 \ - --hash=sha256:d6bcbfc99f55655c3d93feb7ef3800bd5bbe963a755687cbf1f490a71fb7794b \ - --hash=sha256:d787272ed958a05b2c86311d3a4135d3c2aeea4fc655705f074130aa57d71653 \ - --hash=sha256:e169e957c33576f47e21864cf3fc9ff47c223a4ebca8960079b8bd36cb014fd0 \ - --hash=sha256:e20076a211cd6f9b44a6be58f7eeafa7ab5720eb796975d0c03f05b47d89eb90 \ - --hash=sha256:e826aadda3cae59295b95343db8f3d965fb31059da7de01ee8d1c40a60398b29 \ - --hash=sha256:eef4d64c650f33347c1f9266fa5ae001440b232ad9b98f1f43dfe7a79435c0a6 \ - --hash=sha256:f2e69b3ed24544b0d3dbe2c5c0ba5153ce50dcebb576fdc4696d52aa22db6034 \ - --hash=sha256:f87ec75864c37c4c6cb908d282e1969e79763e0d9becdfe9fe5473b7bb1e5f09 \ - --hash=sha256:fbec11614dba0424ca72f4e8ba3c420dba07b4a7c206c8c8e4e73f2e98f4c559 \ - --hash=sha256:fd69666217b62fa5d7c6aa88e507493a34dec4fa20c5bd925e4bc12fce586639 +werkzeug==3.0.1 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:507e811ecea72b18a404947aded4b3390e1db8f826b494d76550ef45bb3b1dcc \ + --hash=sha256:90a285dc0e42ad56b34e696398b8122ee4c681833fb35b8334a095d82c56da10 +xmltodict==0.13.0 ; python_version >= "3.9" and python_version < "4.0" \ + --hash=sha256:341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56 \ + --hash=sha256:aa89e8fd76320154a40d19a0df04a4695fb9dc5ba977cbb68ab3e4eb225e7852 +zipp==3.18.0 ; python_version >= "3.9" and python_version < "3.10" \ + --hash=sha256:c1bb803ed69d2cce2373152797064f7e79bc43f0a3748eb494096a867e0ebf79 \ + --hash=sha256:df8d042b02765029a09b157efd8e820451045890acc30f8e37dd2f94a060221f zxcvbn==4.4.28 ; python_version >= "3.9" and python_version < "4.0" \ --hash=sha256:151bd816817e645e9064c354b13544f85137ea3320ca3be1fb6873ea75ef7dc1