apis-acdhch-default-settings 1.1.2__tar.gz → 1.2.2__tar.gz

{apis_acdhch_default_settings-1.1.2 → apis_acdhch_default_settings-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apis-acdhch-default-settings
-Version: 1.1.2
+Version: 1.2.2
 Summary: Default settings for APIS instances at the ACDH-CH
 License: MIT
 Author: Birger Schacht
@@ -10,6 +10,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 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)

{apis_acdhch_default_settings-1.1.2 → apis_acdhch_default_settings-1.2.2}/apis_acdhch_default_settings/settings.py

@@ -49,6 +49,7 @@ INSTALLED_APPS = [
     "django_tables2",
     "rest_framework",
     "apis_ontology",
+    "apis_acdhch_default_settings",
     "apis_core.apis_relations",
     "apis_core.apis_entities",
     "apis_core.apis_metainfo",
@@ -57,7 +58,6 @@ INSTALLED_APPS = [
     "apis_core.core",
     "rest_framework.authtoken",
     "drf_spectacular",
-    "csvexport",
 ]
 
 # https://docs.djangoproject.com/en/5.0/ref/settings/#std-setting-USE_X_FORWARDED_HOST
@@ -240,3 +240,9 @@ LOGGING = {
         "level": "DEBUG",
     },
 }
+
+# Our deployment infrastructure sets the GITLAB_ENVIRONMENT_URL to the
+# repository from which the instance is deployed. Lets reuse this
+# information to set the repository url in APIS
+if os.environ.get("GITLAB_ENVIRONMENT_URL"):
+    GIT_REPOSITORY_URL = os.environ.get("GITLAB_ENVIRONMENT_URL")

apis_acdhch_default_settings-1.2.2/apis_acdhch_default_settings/templates/base.html

@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+{% block imprint %}
+    {% url "imprint" as imprint_url %}
+    {% if imprint_url %}<a href="{{ imprint_url }}">Imprint | Impressum</a>{% endif %}
+{% endblock imprint %}

apis_acdhch_default_settings-1.2.2/apis_acdhch_default_settings/templates/imprint.html

@@ -0,0 +1,11 @@
+{% extends basetemplate|default:"base.html" %}
+
+{% block title %}Imprint{% endblock %}
+
+{% block content %}
+  <div class="container">
+    <div class="card imprint">
+      <div class="card-body">{{ imprint|safe }}</div>
+    </div>
+  </div>
+{% endblock %}

{apis_acdhch_default_settings-1.1.2 → apis_acdhch_default_settings-1.2.2}/apis_acdhch_default_settings/urls.py

@@ -4,6 +4,8 @@ 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_core.apis_entities.api_views import GetEntityGeneric
 
 urlpatterns = [
@@ -25,3 +27,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"))

apis_acdhch_default_settings-1.2.2/apis_acdhch_default_settings/utils.py

@@ -0,0 +1,22 @@
+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.1.2 → apis_acdhch_default_settings-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "apis-acdhch-default-settings"
-version = "1.1.2"
+version = "1.2.2"
 description = "Default settings for APIS instances at the ACDH-CH"
 authors = ["Birger Schacht <birger.schacht@oeaw.ac.at>"]
 license = "MIT"