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

Release 4.0.3 #4063

Merged
merged 33 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3cae6eb
Increase exporter readiness/liveness probe timeout
tillprochaska Nov 11, 2024
7855df3
Bump ingest-file version
tillprochaska Nov 11, 2024
c65249c
Fix UI message extraction
tillprochaska Nov 11, 2024
f86739d
Update translations
tillprochaska Nov 11, 2024
3cffdd2
Bump version: 4.0.1 → 4.1.0-rc1
tillprochaska Nov 11, 2024
6a28fcf
Do not handle 401/auth errors in router (#4000)
tillprochaska Nov 19, 2024
9b648bb
Bump version: 4.1.0-rc1 → 4.1.0-rc2
tillprochaska Nov 20, 2024
2cad26c
servicelayer 1.23.2
stchris Nov 23, 2024
a270e96
Bump version: 4.1.0-rc2 → 4.1.0-rc3
stchris Nov 23, 2024
796899c
Hash API keys (#3842)
tillprochaska Dec 10, 2024
ebde8d2
Bump version: 4.1.0-rc3 → 4.1.0-rc4
tillprochaska Dec 10, 2024
f45f9a3
bugfix: Run batch indexing on index workers only
stchris Dec 13, 2024
28d8cbc
Use servicelayer 1.23.3-rc1
stchris Dec 13, 2024
2ff613d
Bump version: 4.0.2 → 4.0.3-rc1
stchris Dec 13, 2024
72c53fe
servicelayer 1.23.3-rc2
stchris Dec 17, 2024
bce62c0
Bump version: 4.0.3-rc1 → 4.0.3-rc2
stchris Dec 17, 2024
234e17a
servicelayer 1.23.3-rc3
stchris Dec 18, 2024
1111d0d
Bump version: 4.0.3-rc2 → 4.0.3-rc3
stchris Dec 18, 2024
78f57ad
Bump servicelayer to 1.23.3-rc4
catileptic Dec 18, 2024
c2de577
Bump version: 4.0.3-rc3 → 4.0.3-rc4
catileptic Dec 18, 2024
61ecb4f
Bump servicelayer to 1.23.3-rc5
catileptic Dec 19, 2024
a59ad5d
Bump version: 4.0.3-rc4 → 4.0.3-rc5
stchris Dec 19, 2024
0ef3b84
servicelayer 1.23.3-rc6
stchris Jan 6, 2025
96084f3
Bump version: 4.0.3-rc5 → 4.0.3-rc6
stchris Jan 6, 2025
6e4828e
servicelayer 1.23.3-rc7 and sentry-sdk 2.19.2
stchris Jan 7, 2025
43a4169
Bump version: 4.0.3-rc6 → 4.0.3-rc7
stchris Jan 7, 2025
a3030a1
bugfix: prevent double sentry_sdk init
stchris Jan 7, 2025
9305ace
Bump version: 4.0.3-rc7 → 4.0.3-rc8
stchris Jan 7, 2025
dfe636f
feat: distinct sentry init for api app
stchris Jan 8, 2025
bdd8f26
Bump version: 4.0.3-rc8 → 4.0.3-rc9
stchris Jan 8, 2025
44e458a
Merge branch 'release/4.1.0' into release/4.0.3
stchris Jan 10, 2025
68fdb79
Merge branch 'develop' into release/4.0.3
stchris Jan 10, 2025
dbd22fc
fix wrong merge
stchris Jan 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.0.2
current_version = 4.1.0-rc4
tag_name = {new_version}
commit = True
tag = True
Expand Down
16 changes: 0 additions & 16 deletions aleph/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,12 @@
from werkzeug.local import LocalProxy
from werkzeug.middleware.profiler import ProfilerMiddleware

from aleph import __version__ as aleph_version
from aleph.settings import SETTINGS
from aleph.cache import Cache
from aleph.oauth import configure_oauth
from aleph.util import LoggingTransport
from aleph.metrics.flask import PrometheusExtension

import sentry_sdk
from sentry_sdk.integrations.flask import FlaskIntegration


NONE = "'none'"
log = logging.getLogger(__name__)
Expand Down Expand Up @@ -67,18 +63,6 @@ def create_app(config=None):
config = {}

configure_logging(level=logging.DEBUG)

if SETTINGS.SENTRY_DSN:
sentry_sdk.init(
dsn=SETTINGS.SENTRY_DSN,
integrations=[
FlaskIntegration(),
],
traces_sample_rate=0,
release=aleph_version,
environment=SETTINGS.SENTRY_ENVIRONMENT,
send_default_pii=False,
)
app = Flask("aleph")
app.config.from_object(SETTINGS)
app.config.update(config)
Expand Down
Binary file modified aleph/translations/ar/LC_MESSAGES/aleph.mo
Binary file not shown.
60 changes: 44 additions & 16 deletions aleph/translations/ar/LC_MESSAGES/aleph.po
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-10-14 10:03+0200\n"
"POT-Creation-Date: 2024-11-11 12:15+0000\n"
"PO-Revision-Date: 2018-03-15 07:37+0000\n"
"Last-Translator: Mohammed AlKawmani <[email protected]>, 2020\n"
"Language-Team: Arabic (https://app.transifex.com/aleph/teams/76591/ar/)\n"
Expand Down Expand Up @@ -232,6 +232,38 @@ msgstr ""
msgid "No schema is specified for the query."
msgstr "لم يتم تحديد مخطط للاستعلام."

#: aleph/templates/email/api_key_expired.html:5
#, python-format
msgid "Your Aleph API key has expired on %(expires_at)s UTC."
msgstr ""

#: aleph/templates/email/api_key_expired.html:11
#: aleph/templates/email/api_key_expires_soon.html:11
#, python-format
msgid ""
"If you do not use the Aleph API, or only use the API to access public data "
"you can ignore this email. If you use the Aleph API to access data that is "
"not publicly accessible then you’ll need to <a "
"href=\"%(settings_url)s\">regenerate your API key</a> to maintain access."
msgstr ""

#: aleph/templates/email/api_key_expires_soon.html:5
#, python-format
msgid "Your Aleph API key will expire in 7 days, on %(expires_at)s UTC."
msgstr ""

#: aleph/templates/email/api_key_generated.html:5
msgid ""
"Your Aleph API key has been regenerated. If that wasn’t you, please contact "
"an administrator."
msgstr ""

#: aleph/templates/email/api_key_generated.html:9
msgid ""
"An Aleph API key has been generated for your account. If that wasn’t you, "
"please contact an administrator."
msgstr ""

#: aleph/templates/email/export.html:5
msgid ""
"\n"
Expand Down Expand Up @@ -342,19 +374,19 @@ msgstr "اسم مخطط غير صحيح : 1%s"
msgid "Invalid date: %s"
msgstr "تاريخ خاطئ 1%s"

#: aleph/views/base_api.py:226
#: aleph/views/base_api.py:238
msgid "You are not authorized to do this."
msgstr "غير مخول للقيام بذلك."

#: aleph/views/base_api.py:235
#: aleph/views/base_api.py:247
msgid "This path does not exist."
msgstr "هذا المسار غير موجود."

#: aleph/views/base_api.py:242
#: aleph/views/base_api.py:254
msgid "Internal server error."
msgstr "خطأ في الخادم الداخلي."

#: aleph/views/base_api.py:256
#: aleph/views/base_api.py:268
msgid "Access token is invalid."
msgstr "رمز الدخول غير صحيح"

Expand All @@ -363,27 +395,23 @@ msgstr "رمز الدخول غير صحيح"
msgid "Search: %s"
msgstr ""

#: aleph/views/entitysets_api.py:217
msgid "Only diagrams can be embedded!"
msgstr ""

#: aleph/views/roles_api.py:63
#: aleph/views/roles_api.py:64
msgid "prefix filter is too short"
msgstr "مرشح البادئة قصير جدًا"

#: aleph/views/roles_api.py:112
#: aleph/views/roles_api.py:113
msgid "To proceed, please check your email."
msgstr "للمتابعة ، يرجى مراجعة بريدك الإلكتروني."

#: aleph/views/roles_api.py:145
#: aleph/views/roles_api.py:146
msgid "Invalid code"
msgstr "الرمز غير صحيح"

#: aleph/views/roles_api.py:151
#: aleph/views/roles_api.py:152
msgid "Email is already registered"
msgstr " البريد الإلكتروني مسجل سابقا"

#: aleph/views/roles_api.py:240
#: aleph/views/roles_api.py:241
msgid "Incorrect password."
msgstr "كلمة المرور خاطئة"

Expand All @@ -395,11 +423,11 @@ msgid ""
"Aleph administrator"
msgstr ""

#: aleph/views/sessions_api.py:70
#: aleph/views/sessions_api.py:75
msgid "Invalid user or password."
msgstr "اسم مستخدم أو كلمة مرور غير صحيحة"

#: aleph/views/sessions_api.py:106
#: aleph/views/sessions_api.py:120
msgid "Authentication has failed."
msgstr "فشل التوثيق "

Expand Down
Binary file modified aleph/translations/bs/LC_MESSAGES/aleph.mo
Binary file not shown.
60 changes: 44 additions & 16 deletions aleph/translations/bs/LC_MESSAGES/aleph.po
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-10-14 10:03+0200\n"
"POT-Creation-Date: 2024-11-11 12:15+0000\n"
"PO-Revision-Date: 2018-03-15 07:37+0000\n"
"Last-Translator: Tajna Biscevic <[email protected]>, 2019\n"
"Language-Team: Bosnian (https://app.transifex.com/aleph/teams/76591/bs/)\n"
Expand Down Expand Up @@ -233,6 +233,38 @@ msgstr ""
msgid "No schema is specified for the query."
msgstr "Nije navedena shema za upit."

#: aleph/templates/email/api_key_expired.html:5
#, python-format
msgid "Your Aleph API key has expired on %(expires_at)s UTC."
msgstr ""

#: aleph/templates/email/api_key_expired.html:11
#: aleph/templates/email/api_key_expires_soon.html:11
#, python-format
msgid ""
"If you do not use the Aleph API, or only use the API to access public data "
"you can ignore this email. If you use the Aleph API to access data that is "
"not publicly accessible then you’ll need to <a "
"href=\"%(settings_url)s\">regenerate your API key</a> to maintain access."
msgstr ""

#: aleph/templates/email/api_key_expires_soon.html:5
#, python-format
msgid "Your Aleph API key will expire in 7 days, on %(expires_at)s UTC."
msgstr ""

#: aleph/templates/email/api_key_generated.html:5
msgid ""
"Your Aleph API key has been regenerated. If that wasn’t you, please contact "
"an administrator."
msgstr ""

#: aleph/templates/email/api_key_generated.html:9
msgid ""
"An Aleph API key has been generated for your account. If that wasn’t you, "
"please contact an administrator."
msgstr ""

#: aleph/templates/email/export.html:5
msgid ""
"\n"
Expand Down Expand Up @@ -343,19 +375,19 @@ msgstr ""
msgid "Invalid date: %s"
msgstr ""

#: aleph/views/base_api.py:226
#: aleph/views/base_api.py:238
msgid "You are not authorized to do this."
msgstr "Niste ovlašteni da ovo uradite."

#: aleph/views/base_api.py:235
#: aleph/views/base_api.py:247
msgid "This path does not exist."
msgstr "Ova putanja ne postoji."

#: aleph/views/base_api.py:242
#: aleph/views/base_api.py:254
msgid "Internal server error."
msgstr "Interna greška servera."

#: aleph/views/base_api.py:256
#: aleph/views/base_api.py:268
msgid "Access token is invalid."
msgstr ""

Expand All @@ -364,27 +396,23 @@ msgstr ""
msgid "Search: %s"
msgstr ""

#: aleph/views/entitysets_api.py:217
msgid "Only diagrams can be embedded!"
msgstr ""

#: aleph/views/roles_api.py:63
#: aleph/views/roles_api.py:64
msgid "prefix filter is too short"
msgstr "prefix filter je previše kratak"

#: aleph/views/roles_api.py:112
#: aleph/views/roles_api.py:113
msgid "To proceed, please check your email."
msgstr "Da biste nastavili, molimo vas provjerite svoj email."

#: aleph/views/roles_api.py:145
#: aleph/views/roles_api.py:146
msgid "Invalid code"
msgstr "Nevažeći kod"

#: aleph/views/roles_api.py:151
#: aleph/views/roles_api.py:152
msgid "Email is already registered"
msgstr "Email je već registrovan"

#: aleph/views/roles_api.py:240
#: aleph/views/roles_api.py:241
msgid "Incorrect password."
msgstr ""

Expand All @@ -396,11 +424,11 @@ msgid ""
"Aleph administrator"
msgstr ""

#: aleph/views/sessions_api.py:70
#: aleph/views/sessions_api.py:75
msgid "Invalid user or password."
msgstr ""

#: aleph/views/sessions_api.py:106
#: aleph/views/sessions_api.py:120
msgid "Authentication has failed."
msgstr ""

Expand Down
Binary file modified aleph/translations/de/LC_MESSAGES/aleph.mo
Binary file not shown.
60 changes: 44 additions & 16 deletions aleph/translations/de/LC_MESSAGES/aleph.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-10-14 10:03+0200\n"
"POT-Creation-Date: 2024-11-11 12:15+0000\n"
"PO-Revision-Date: 2018-03-15 07:37+0000\n"
"Last-Translator: pudo <[email protected]>, 2020\n"
"Language-Team: German (https://app.transifex.com/aleph/teams/76591/de/)\n"
Expand Down Expand Up @@ -231,6 +231,38 @@ msgstr "{{export}} ist zum Download bereit"
msgid "No schema is specified for the query."
msgstr "Diese Anfrage muss ein 'schema' enthalten."

#: aleph/templates/email/api_key_expired.html:5
#, python-format
msgid "Your Aleph API key has expired on %(expires_at)s UTC."
msgstr ""

#: aleph/templates/email/api_key_expired.html:11
#: aleph/templates/email/api_key_expires_soon.html:11
#, python-format
msgid ""
"If you do not use the Aleph API, or only use the API to access public data "
"you can ignore this email. If you use the Aleph API to access data that is "
"not publicly accessible then you’ll need to <a "
"href=\"%(settings_url)s\">regenerate your API key</a> to maintain access."
msgstr ""

#: aleph/templates/email/api_key_expires_soon.html:5
#, python-format
msgid "Your Aleph API key will expire in 7 days, on %(expires_at)s UTC."
msgstr ""

#: aleph/templates/email/api_key_generated.html:5
msgid ""
"Your Aleph API key has been regenerated. If that wasn’t you, please contact "
"an administrator."
msgstr ""

#: aleph/templates/email/api_key_generated.html:9
msgid ""
"An Aleph API key has been generated for your account. If that wasn’t you, "
"please contact an administrator."
msgstr ""

#: aleph/templates/email/export.html:5
msgid ""
"\n"
Expand Down Expand Up @@ -354,19 +386,19 @@ msgstr "Ungültige Schemakennung: %s"
msgid "Invalid date: %s"
msgstr "Ungültiges Datum: %s"

#: aleph/views/base_api.py:226
#: aleph/views/base_api.py:238
msgid "You are not authorized to do this."
msgstr "Ihnen fehlt das Recht, dies zu tun."

#: aleph/views/base_api.py:235
#: aleph/views/base_api.py:247
msgid "This path does not exist."
msgstr "Dieser Pfad existiert nicht."

#: aleph/views/base_api.py:242
#: aleph/views/base_api.py:254
msgid "Internal server error."
msgstr "Interner Server-Fehler"

#: aleph/views/base_api.py:256
#: aleph/views/base_api.py:268
msgid "Access token is invalid."
msgstr "Ungültiger Zugriffstoken"

Expand All @@ -375,27 +407,23 @@ msgstr "Ungültiger Zugriffstoken"
msgid "Search: %s"
msgstr "Suche: %s"

#: aleph/views/entitysets_api.py:217
msgid "Only diagrams can be embedded!"
msgstr ""

#: aleph/views/roles_api.py:63
#: aleph/views/roles_api.py:64
msgid "prefix filter is too short"
msgstr "prefix-Filter ist zu kurz"

#: aleph/views/roles_api.py:112
#: aleph/views/roles_api.py:113
msgid "To proceed, please check your email."
msgstr "Um fortzufahren reagieren sie bitte auf eine E-Mail."

#: aleph/views/roles_api.py:145
#: aleph/views/roles_api.py:146
msgid "Invalid code"
msgstr "Ungültiger Code"

#: aleph/views/roles_api.py:151
#: aleph/views/roles_api.py:152
msgid "Email is already registered"
msgstr "Diese E-Mail ist bereits angemeldet"

#: aleph/views/roles_api.py:240
#: aleph/views/roles_api.py:241
msgid "Incorrect password."
msgstr "Falsches Passwort."

Expand All @@ -407,11 +435,11 @@ msgid ""
"Aleph administrator"
msgstr ""

#: aleph/views/sessions_api.py:70
#: aleph/views/sessions_api.py:75
msgid "Invalid user or password."
msgstr "Der Nutzername oder das Passwort ist falsch."

#: aleph/views/sessions_api.py:106
#: aleph/views/sessions_api.py:120
msgid "Authentication has failed."
msgstr "Die Anmeldung ist fehlgeschlagen."

Expand Down
Binary file modified aleph/translations/es/LC_MESSAGES/aleph.mo
Binary file not shown.
Loading
Loading