Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update some django specific dependencies
Browse files Browse the repository at this point in the history
ttys0dev committed Dec 5, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 34bd38b commit 2b55dcd
Showing 5 changed files with 202 additions and 307 deletions.
2 changes: 1 addition & 1 deletion cl/audio/models.py
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ class Audio(AbstractDateTimeModel):
case_name_full = models.TextField(
help_text="The full name of the case", blank=True
)
panel = models.ManyToManyField(
panel = models.ManyToManyField( # type: ignore[var-annotated]
Person,
help_text="The judges that heard the oral arguments",
related_name="oral_argument_panel_members",
36 changes: 27 additions & 9 deletions cl/corpus_importer/tasks.py
Original file line number Diff line number Diff line change
@@ -44,14 +44,14 @@
ReadTimeout,
RequestException,
)
from requests.packages.urllib3.exceptions import ReadTimeoutError
from rest_framework.renderers import JSONRenderer
from rest_framework.status import (
HTTP_400_BAD_REQUEST,
HTTP_403_FORBIDDEN,
HTTP_500_INTERNAL_SERVER_ERROR,
HTTP_504_GATEWAY_TIMEOUT,
)
from urllib3.exceptions import ReadTimeoutError

from cl.alerts.tasks import enqueue_docket_alert, send_alert_and_webhook
from cl.audio.models import Audio
@@ -597,7 +597,7 @@ def get_and_process_free_pdf(
rd.pk, result.pacer_case_id, result.pacer_doc_id, cookies
)
except HTTPError as exc:
if exc.response.status_code in [
if exc.response and exc.response.status_code in [
HTTP_500_INTERNAL_SERVER_ERROR,
HTTP_504_GATEWAY_TIMEOUT,
]:
@@ -611,14 +611,22 @@ def get_and_process_free_pdf(
return None
logger.info(f"{msg} Retrying.")
raise self.retry(exc=exc)
else:
elif exc.response:
msg = (
f"Ran into unknown HTTPError while getting PDF: "
f"{exc.response.status_code}. Aborting."
)
logger.error(msg)
self.request.chain = None
return None
else:
msg = (
f"Ran into unknown HTTPError while getting PDF: "
f"{str(exc)}. Aborting."
)
logger.error(msg)
self.request.chain = None
return None
except PacerLoginException as exc:
msg = "PacerLoginException while getting free docs."
logger.info(f"{msg} Retrying.")
@@ -806,7 +814,7 @@ def upload_to_ia(
return None
raise self.retry(exc=exc)
except HTTPError as exc:
if exc.response.status_code in [
if exc.response and exc.response.status_code in [
HTTP_403_FORBIDDEN, # Can't access bucket, typically.
HTTP_400_BAD_REQUEST, # Corrupt PDF, typically.
]:
@@ -1447,19 +1455,24 @@ def get_attachment_page_by_rd(
try:
att_report = get_att_report_by_rd(rd, cookies)
except HTTPError as exc:
if exc.response.status_code in [
if exc.response and exc.response.status_code in [
HTTP_500_INTERNAL_SERVER_ERROR,
HTTP_504_GATEWAY_TIMEOUT,
]:
logger.warning(
"Ran into HTTPError: %s. Retrying.", exc.response.status_code
)
raise self.retry(exc)
else:
elif exc.response:
msg = "Ran into unknown HTTPError. %s. Aborting."
logger.error(msg, exc.response.status_code)
self.request.chain = None
return None
else:
msg = "Ran into unknown HTTPError. %s. Aborting."
logger.error(msg, str(exc))
self.request.chain = None
return None
except requests.RequestException as exc:
logger.warning("Unable to get attachment page for %s", rd)
raise self.retry(exc=exc)
@@ -2040,22 +2053,27 @@ def get_pacer_doc_id_with_show_case_doc_url(
logger.info(f"{msg} Retrying.", rd)
raise self.retry(exc=exc)
except HTTPError as exc:
status_code = exc.response.status_code
if status_code in [
if exc.response and exc.response.status_code in [
HTTP_500_INTERNAL_SERVER_ERROR,
HTTP_504_GATEWAY_TIMEOUT,
]:
status_code = exc.response.status_code
msg = "Got HTTPError with status code %s."
if last_try:
logger.error(f"{msg} Aborting.", status_code)
return

logger.info(f"{msg} Retrying", status_code)
raise self.retry(exc)
else:
elif exc.response:
status_code = exc.response.status_code
msg = "Ran into unknown HTTPError. %s. Aborting."
logger.error(msg, status_code)
return
else:
msg = "Ran into unknown HTTPError. %s. Aborting."
logger.error(msg, str(exc))
return
try:
pacer_doc_id = report.data
except ParsingException:
8 changes: 4 additions & 4 deletions cl/lib/storage.py
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

from django.conf import settings
from django.core.files.storage import FileSystemStorage, Storage
from storages.backends.s3boto3 import S3Boto3Storage, S3ManifestStaticStorage
from storages.backends.s3 import S3Storage, S3ManifestStaticStorage


def clobbering_get_name(
@@ -54,7 +54,7 @@ def get_name_by_incrementing(
return name


class AWSMediaStorage(S3Boto3Storage):
class AWSMediaStorage(S3Storage):
"""Implements AWS file system storage with a few overrides"""

location = ""
@@ -92,11 +92,11 @@ class SubDirectoryS3ManifestStaticStorage(S3ManifestStaticStorage):
manifest_strict = False


class RecapEmailSESStorage(S3Boto3Storage):
class RecapEmailSESStorage(S3Storage):
bucket_name = "recap.email"


class S3PrivateUUIDStorage(S3Boto3Storage):
class S3PrivateUUIDStorage(S3Storage):
"""Implements a UUID file system storage.
Useful when you don't care what the name of the file is, but you want it to
439 changes: 158 additions & 281 deletions poetry.lock

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ courts-db = "^0.10.9"
disposable-email-domains = "*"
Django = "^4.2.7"
django-cache-memoize = "==0.*"
django-cors-headers = "^4.2.0"
django-cors-headers = "^4.3.1"
django-csp = "^3.7.0"
django-extensions = "^3.2.3"
django-filter = "^23.4"
@@ -45,7 +45,7 @@ django-markdown-deux = "^1.0.6"
django-mathfilters = "*"
django-pghistory = "^2.9.0"
django-ratelimit = "^4.1.0"
django-storages = "^1.13.2"
django-storages = "^1.14.2"
djangorestframework = {git = "https://github.com/encode/django-rest-framework.git", rev = "cc3c89a11c7ee9cf7cfd732e0a329c318ace71b2"}
djangorestframework-xml = "^2.0.0"
drf-dynamic-fields = "*"
@@ -95,9 +95,9 @@ numpy = "^1.25.2"
datasketch = "^1.6.0"
PyStemmer = "^2.0.1"
factory-boy = "^3.3.0"
django-elasticsearch-dsl = "^7.3"
django-elasticsearch-dsl = "^8.0"
django-override-storage = "^0.3.2"
django-ses = {extras = ["events"], version = "^3.5.0"}
django-ses = {extras = ["events"], version = "^3.5.2"}
django-environ = "^0.11.2"
judge-pics = "^2.0.1"
django-admin-cursor-paginator = "^0.1.4"
@@ -117,21 +117,21 @@ inflection = "^0.5.1" # necessary for DRF schema generation - remove after drf-


[tool.poetry.group.dev.dependencies]
pre-commit = "^3.3.3"
types-redis = "^4.6.0.5"
pylint = "^2.17.5"
pre-commit = "^3.5.0"
types-redis = "^4.6.0.11"
pylint = "^3.0.2"
pytest = "^7.4.0"
pytest-django = "^4.5.2"
flake8 = "^6.1.0"
exrex = "^0.11.0"
tblib = "^2.0.0"
tblib = "^3.0.0"
flynt = "^1.0.1"
mypy = "^1.5.1"
mypy = "^1.7.1"
types-python-dateutil = "^2.8.19.14"
types-requests = "^2.31.0.2"
django-stubs = "^4.2.3"
types-requests = "^2.31.0.10"
django-stubs = "^4.2.6"
djangorestframework-stubs = "^3.14.2"
black = "^23.7.0"
black = "^23.11.0"
types-simplejson = "^3.19.0.2"
lxml-stubs = "^0.4.0"
django-debug-toolbar = "^4.2.0"

0 comments on commit 2b55dcd

Please sign in to comment.