apis-acdhch-default-settings 1.7.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

apis_acdhch_default_settings/settings.py

@@ -1,6 +1,7 @@
 import os
 import re
 from typing import Any, Dict
+from pathlib import Path
 
 from django.core.management.utils import get_random_secret_key
 import dj_database_url
@@ -25,10 +26,7 @@ if os.environ.get("SENTRY_DSN"):
 
 SECRET_KEY = os.environ.get("SECRET_KEY", get_random_secret_key())
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(
-    os.path.dirname(os.path.abspath(os.path.join(__file__, "../")))
-)
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 # Application definition
 # put apis_override_select2js at the beginning of the list
@@ -43,6 +41,7 @@ INSTALLED_APPS = [
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
+    "django_removals",
     "crispy_forms",
     "crispy_bootstrap4",
     "django_filters",
@@ -50,7 +49,6 @@ INSTALLED_APPS = [
     "rest_framework",
     "apis_ontology",
     "apis_acdhch_default_settings",
-    "apis_core.apis_relations",
     "apis_core.apis_entities",
     "apis_core.apis_metainfo",
     "apis_core.apis_vocabularies",
@@ -82,20 +80,11 @@ CSP_DEFAULT_SRC = (
     "'unsafe-inline'",
     "cdnjs.cloudflare.com",
     "cdn.jsdelivr.net",
-    "fonts.googleapis.com",
     "ajax.googleapis.com",
-    "cdn.rawgit.com",
     "*.acdh.oeaw.ac.at",
     "unpkg.com",
-    "fonts.gstatic.com",
-    "cdn.datatables.net",
-    "code.highcharts.com",
-    "*.acdh-dev.oeaw.ac.at",
-    "*.acdh.oeaw.ac.at",
-    "openstreetmap.org",
     "*.openstreetmap.org",
 )
-CSP_FRAME_SRC = ("sennierer.github.io",)
 
 # django-crispy-forms settings
 # https://django-crispy-forms.readthedocs.io/en/latest/install.html#template-packs
@@ -134,6 +123,8 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "csp.middleware.CSPMiddleware",
     "crum.CurrentRequestUserMiddleware",
+    # this is used by the apis_core.history module:
+    "simple_history.middleware.HistoryRequestMiddleware",
 ]
 
 # https://docs.djangoproject.com/en/stable/ref/settings/#root-urlconf
@@ -164,13 +155,15 @@ AUTH_PASSWORD_VALIDATORS = [
     {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
 ]
 
+# Default primary key field type
+# https://docs.djangoproject.com/en/stable/ref/settings/#default-auto-field
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 # Internationalization
 # https://docs.djangoproject.com/en/stable/topics/i18n/
 LANGUAGE_CODE = "en"
 TIME_ZONE = "UTC"
 USE_I18N = True
-USE_L10N = True
 USE_TZ = True
 
 # Static files (CSS, JavaScript, Images)

apis_acdhch_default_settings/urls.py

@@ -5,7 +5,7 @@ from django.contrib import admin
 from django.urls import path
 from django.views.generic import TemplateView
 
-from apis_acdhch_default_settings import utils
+from apis_acdhch_default_settings.views import Imprint
 
 from apis_core.apis_entities.api_views import GetEntityGeneric
 
@@ -25,4 +25,4 @@ if "apis_bibsonomy" in settings.INSTALLED_APPS:
     )
 
 urlpatterns.append(path("", TemplateView.as_view(template_name="base.html")))
-urlpatterns.append(path("imprint", TemplateView.as_view(template_name="imprint.html", extra_context={"imprint": utils.get_imprint()}), name="imprint"))
+urlpatterns.append(path("imprint", Imprint.as_view(), name="imprint"))

apis_acdhch_default_settings/views.py

@@ -0,0 +1,29 @@
+import requests
+import os
+from django.views.generic import TemplateView
+from django.views.decorators.cache import cache_page
+from django.utils.decorators import method_decorator
+
+from django.conf import settings
+
+
+@method_decorator(cache_page(60 * 5), name='dispatch')
+class Imprint(TemplateView):
+    template_name = "imprint.html"
+
+    def get_context_data(self) -> str:
+        ctx = super().get_context_data()
+        base_url = getattr(settings, "ACDH_IMPRINT_URL", "https://imprint.acdh.oeaw.ac.at/")
+        redmine_id = getattr(settings, "REDMINE_ID", os.getenv("SERVICE_ID", ""))
+
+        r = requests.get(f"{base_url}{redmine_id}")
+
+        if r and redmine_id:
+            ctx["imprint"] = r.text
+        else:
+            ctx["imprint"] = """
+            One of our services is currently not available. Please try it later or write
+            an email to acdh@oeaw.ac.at; if you are service provider, make sure that you
+            provided ACDH_IMPRINT_URL and REDMINE_ID.
+            """
+        return ctx

{apis_acdhch_default_settings-1.7.0.dist-info → apis_acdhch_default_settings-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: apis-acdhch-default-settings
-Version: 1.7.0
+Version: 2.0.0
 Summary: Default settings for APIS instances at the ACDH-CH
 License: MIT
 Author: Birger Schacht
@@ -15,6 +15,7 @@ Requires-Dist: dj-database-url (>=2.0.0,<3.0.0)
 Requires-Dist: django-allow-cidr (>=0.6.0,<0.7.0)
 Requires-Dist: django-auth-ldap (>=4.6.0,<5.0.0)
 Requires-Dist: django-csp (>=3.7,<4.0)
+Requires-Dist: django-removals (>=1.0.5,<2.0.0)
 Requires-Dist: opentelemetry-distro
 Requires-Dist: opentelemetry-exporter-otlp
 Requires-Dist: opentelemetry-instrumentation-asgi

apis_acdhch_default_settings-2.0.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+apis_acdhch_default_settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apis_acdhch_default_settings/ldapauth.py,sha256=P1NDgWG2Pp4JzqoETq3VDC3DtECoEIXWBA3Lzn6CUIA,423
+apis_acdhch_default_settings/settings.py,sha256=gpLwPiHHsrdyK5lhje3ftr-VbMz06k020x6ldDR2NfQ,9065
+apis_acdhch_default_settings/templates/base.html,sha256=c3QhbTzJLzCii-Ck5x0wftHx_Y0aFhPfJUhUVknz_Ks,217
+apis_acdhch_default_settings/templates/imprint.html,sha256=juOqq6yzT9FMhjPjhbofDPZxRNO2fhOLlS478reFjE0,254
+apis_acdhch_default_settings/urls.py,sha256=QOkc8QD0rEj0ftcJWJqVyO9qFAgVXrj1rl9R9jARSqc,1017
+apis_acdhch_default_settings/views.py,sha256=4fwNnkjH-X4T2zojGTFndxvznOl_3JavHbmpDLD6wOA,1022
+apis_acdhch_default_settings-2.0.0.dist-info/LICENSE,sha256=cMJgiPvvZVbZQcWrf-s1Es1W2b8sxKA0C7HlD4n8_Oo,1146
+apis_acdhch_default_settings-2.0.0.dist-info/METADATA,sha256=kvUFBsRflpAyFcNzTR6Jj3i8cxbvPe2jDxPJezdImr4,1340
+apis_acdhch_default_settings-2.0.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+apis_acdhch_default_settings-2.0.0.dist-info/RECORD,,

{apis_acdhch_default_settings-1.7.0.dist-info → apis_acdhch_default_settings-2.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any

apis_acdhch_default_settings/utils.py

@@ -1,22 +0,0 @@
-import functools
-import requests
-import os
-
-from django.conf import settings
-
-
-@functools.cache
-def get_imprint() -> str:
-    base_url = getattr(settings, "ACDH_IMPRINT_URL", "https://imprint.acdh.oeaw.ac.at/")
-    redmine_id = getattr(settings, "REDMINE_ID", os.getenv("SERVICE_ID", ""))
-
-    r = requests.get(f"{base_url}{redmine_id}")
-
-    if r and redmine_id:
-        return r.text
-    else:
-        return """
-        One of our services is currently not available. Please try it later or write
-        an email to acdh@oeaw.ac.at; if you are service provider, make sure that you
-        provided ACDH_IMPRINT_URL and REDMINE_ID.
-        """

apis_acdhch_default_settings-1.7.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-apis_acdhch_default_settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apis_acdhch_default_settings/ldapauth.py,sha256=P1NDgWG2Pp4JzqoETq3VDC3DtECoEIXWBA3Lzn6CUIA,423
-apis_acdhch_default_settings/settings.py,sha256=9vmQBm7-mntCUwJUZQ1NWje1YPt4pQrlBARcXSO2jbQ,9161
-apis_acdhch_default_settings/templates/base.html,sha256=c3QhbTzJLzCii-Ck5x0wftHx_Y0aFhPfJUhUVknz_Ks,217
-apis_acdhch_default_settings/templates/imprint.html,sha256=juOqq6yzT9FMhjPjhbofDPZxRNO2fhOLlS478reFjE0,254
-apis_acdhch_default_settings/urls.py,sha256=Fr5zKACUYS31awqERkJNaa_SNKJJLEwlsPIbZsfqyTM,1090
-apis_acdhch_default_settings/utils.py,sha256=9uh0oQMPirTYvGxMg1f8IrOqrsxdxa8UgDJOrZaJdPs,647
-apis_acdhch_default_settings-1.7.0.dist-info/LICENSE,sha256=cMJgiPvvZVbZQcWrf-s1Es1W2b8sxKA0C7HlD4n8_Oo,1146
-apis_acdhch_default_settings-1.7.0.dist-info/METADATA,sha256=hrvVziiFYXVZN1tyyBV4ns8vLSmngFsVzNM81U5-JMg,1292
-apis_acdhch_default_settings-1.7.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-apis_acdhch_default_settings-1.7.0.dist-info/RECORD,,