Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.5.21 #1826

Merged
merged 43 commits into from
Sep 19, 2024
Merged

v1.5.21 #1826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
b669973
Merge pull request #1800 from watchdogpolska/develop
PiotrIw Aug 21, 2024
2e6842e
chore(deps): update dependency werkzeug to v3.0.4
renovate[bot] Aug 21, 2024
6d457f7
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Sep 9, 2024
9fb59ee
Merge pull request #1801 from watchdogpolska/renovate/non-production-…
PiotrIw Sep 13, 2024
b934833
chore(deps): update dependency langchain to v0.2.16
renovate[bot] Sep 13, 2024
b3cc6d6
Update package-lock.json
PiotrIw Sep 13, 2024
67ace66
Update package-lock.json
PiotrIw Sep 13, 2024
e526a46
Update package-lock.json
PiotrIw Sep 13, 2024
016a416
Merge pull request #1803 from watchdogpolska/renovate/langchain-0.x
PiotrIw Sep 13, 2024
4174aec
chore(deps): update dependency langchain-community to v0.2.17
renovate[bot] Sep 13, 2024
1a21758
Merge pull request #1802 from watchdogpolska/pre-commit-ci-update-config
PiotrIw Sep 13, 2024
41ab086
chore(deps): update dependency django to v4.2.16
renovate[bot] Sep 13, 2024
3835f4b
Merge pull request #1804 from watchdogpolska/renovate/langchain-commu…
PiotrIw Sep 13, 2024
a079aaa
fix(deps): update dependency postcss to v8.4.45
renovate[bot] Sep 13, 2024
8f60d2e
Merge pull request #1810 from watchdogpolska/renovate/django-4.x
PiotrIw Sep 13, 2024
68a1665
chore(deps): update dependency cryptography to v43.0.1
renovate[bot] Sep 13, 2024
0ebd40f
chore(deps): update dependency langchain-openai to v0.1.24
renovate[bot] Sep 13, 2024
37574f2
Merge pull request #1805 from watchdogpolska/renovate/langchain-opena…
PiotrIw Sep 13, 2024
ae541a8
Merge pull request #1809 from watchdogpolska/renovate/cryptography-43.x
PiotrIw Sep 13, 2024
c4dabd7
chore(deps): update dependency openai to v1.45.0
renovate[bot] Sep 13, 2024
990549f
Merge pull request #1811 from watchdogpolska/renovate/postcss-8.x
PiotrIw Sep 13, 2024
208a1ce
chore(deps): update dependency pytz to v2024.2
renovate[bot] Sep 13, 2024
6e4cdb6
Merge pull request #1812 from watchdogpolska/renovate/openai-1.x
PiotrIw Sep 16, 2024
42d15be
Merge pull request #1814 from watchdogpolska/renovate/pytz-2024.x
PiotrIw Sep 16, 2024
9edde14
fix(deps): update dependency postcss to v8.4.47
renovate[bot] Sep 16, 2024
dd086d0
Merge pull request #1816 from watchdogpolska/renovate/postcss-8.x
PiotrIw Sep 16, 2024
c6a73f6
chore(deps): update dependency openai to v1.45.1
renovate[bot] Sep 16, 2024
f674618
Merge pull request #1818 from watchdogpolska/renovate/openai-1.x
PiotrIw Sep 16, 2024
0c0fa89
chore(deps): update dependency sass to v1.78.0
renovate[bot] Sep 16, 2024
7b97892
Merge pull request #1819 from watchdogpolska/renovate/sass-1.x-lockfile
PiotrIw Sep 16, 2024
781b052
chore(deps): update dependency sentry-sdk to v2.14.0
renovate[bot] Sep 16, 2024
f83f462
Merge pull request #1820 from watchdogpolska/renovate/sentry-sdk-2.x
PiotrIw Sep 16, 2024
3a429e0
chore(deps): update dependency django-model-utils to v5
renovate[bot] Sep 16, 2024
ebb7fe0
Merge pull request #1821 from watchdogpolska/renovate/django-model-ut…
PiotrIw Sep 16, 2024
34e2302
chore(deps): update dependency gulp-notify to v5
renovate[bot] Sep 16, 2024
b2e9b0b
Merge pull request #1822 from watchdogpolska/renovate/gulp-notify-5.x
PiotrIw Sep 16, 2024
813f740
chore(deps): update dependency openai to v1.46.0
renovate[bot] Sep 17, 2024
4f28b1d
Merge pull request #1823 from watchdogpolska/renovate/openai-1.x
PiotrIw Sep 19, 2024
3d586c6
chore: version bumpup
PiotrIw Sep 19, 2024
f19f1cb
fix: add record for new tletter and protect against missing form attrs
PiotrIw Sep 19, 2024
cbbc2f3
fix: update image and secrets syntax
PiotrIw Sep 19, 2024
65d6caf
Merge pull request #103 from PiotrIw/fix_letter_send
PiotrIw Sep 19, 2024
8931138
Merge pull request #1825 from PiotrIw/develop
PiotrIw Sep 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ default_language_version:
minimum_pre_commit_version: "1.20.0"
repos:
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.20.0
rev: 1.21.0
hooks:
- id: django-upgrade
args: [--target-version, "4.2"]
Expand All @@ -28,7 +28,7 @@ repos:
- --skip-glob
- "**/migrations/*.py"
- repo: https://github.com/sirosen/check-jsonschema
rev: 0.29.1
rev: 0.29.2
hooks:
- id: check-github-workflows
- id: check-readthedocs
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,14 @@ services:
# mailbox secrets in imap-to-webhook-url.env
#
# imap-to-webhook-feder:
# image: quay.io/watchdogpolska/imap-to-webhook:latest
# image: siecobywatelska/imap-to-webhook:latest-prod
# environment:
# WEBHOOK_URL: "http://web:8000/listy/webhook?secret=dev_letter_rec_very_secret"
# SENTRY_DSN: ""
# SENTRY_ENVIRONMENT: "feder-dev"
# COMPRESS_EML: "True"
# env_file:
# - secrets_imap-to-webhook-url.env:optional
# - secrets_imap-to-webhook-url.env

volumes:
mysql-data:
Expand Down
2 changes: 1 addition & 1 deletion feder/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# PEP 396: The __version__ attribute's value SHOULD be a string.
__version__ = "1.5.20"
__version__ = "1.5.21"


# Compatibility to eg. django-rest-framework
Expand Down
7 changes: 4 additions & 3 deletions feder/letters/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def save(self, *args, **kwargs):
self.instance.body = html_to_text(self.cleaned_data["html_body"])
if (
not (
self.fields["html_body"].widget.attrs["readonly"]
or self.fields["title"].widget.attrs["readonly"]
self.fields["html_body"].widget.attrs.get("readonly", False)
or self.fields["title"].widget.attrs.get("readonly", False)
)
and ("title" in self.changed_data or "html_body" in self.changed_data)
and not self.instance.author_institution
Expand Down Expand Up @@ -128,8 +128,9 @@ def save(self, *args, **kwargs):
+ " categorization and upadte normalized answers created"
),
)
if not hasattr(self.instance, "record"):
self.instance.record = Record.objects.create(case=self.cleaned_data["case"])
self.instance.save()

return super().save(*args, **kwargs)


Expand Down
142 changes: 83 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"datatables.net-plugins": "^1.13.6",
"font-awesome": "^4.7.0",
"jquery": "^3.7.0",
"postcss": "8.4.41"
"postcss": "8.4.47"
},
"devDependencies": {
"gulp": "^4.0.0",
Expand All @@ -21,7 +21,7 @@
"gulp-concat": "^2.6.0",
"gulp-csslint": "^1.0.1",
"gulp-livereload": "^4.0.2",
"gulp-notify": "^4.0.0",
"gulp-notify": "^5.0.0",
"gulp-postcss": "^10.0.0",
"gulp-rename": "^2.0.0",
"gulp-sass": "^5.1.0",
Expand Down
16 changes: 8 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Production and staging Django
Django==4.2.15
Django==4.2.16

# Database adapter
mysqlclient==2.2.4
Expand All @@ -12,7 +12,7 @@ django-braces==1.15.0
django-crispy-forms==1.14.0

# Models
django-model-utils==4.5.1
django-model-utils==5.0.0

# Images
Pillow==10.4.0
Expand All @@ -28,14 +28,14 @@ unicode-slugify==0.1.5
django-autoslug==1.9.9

# Time zones support
pytz==2024.1
pytz==2024.2

# Commands
lxml==5.3.0


# Your custom requirements go here
cryptography==43.0.0
cryptography==43.0.1
django-filter==24.3
django-autocomplete-light==3.11.0
# django-ajax-datatable to be installed from github fork until
Expand Down Expand Up @@ -92,9 +92,9 @@ html2text==2024.2.26
openpyxl==3.1.5

# LLM exvaluation
langchain==0.2.14
langchain-community==0.2.12
langchain==0.2.16
langchain-community==0.2.17
#langchain[llms]==0.1.5
openai==1.42.0
langchain-openai==0.1.22
openai==1.46.0
langchain-openai==0.1.24
tiktoken==0.7.0
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
-r base.txt
Sphinx==7.4.7
sphinx-rtd-theme==2.0.0
Werkzeug==3.0.3
Werkzeug==3.0.4
django-debug-toolbar==4.4.6
ipdb==0.13.13
factory-boy==3.3.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# Django==3.2.23
gevent==24.2.1
gunicorn==23.0.0
sentry-sdk==2.13.0
sentry-sdk==2.14.0
2 changes: 1 addition & 1 deletion secrets_imap-to-webhook-url.env.example
Original file line number Diff line number Diff line change
@@ -1 +1 @@
IMAP_URL="imap+ssl://imap_mailbox_user:imap_mailbox_password@imap_mailbox_server"
IMAP_URL=imap://imap_mailbox_user:imap_mailbox_password@imap_mailbox_server
Loading