apis-acdhch-default-settings 2.14.0__tar.gz → 2.16.0__tar.gz

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/.github/workflows/add-to-project.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   add-to-project:
-    uses: acdh-oeaw/prosnet-workflows/.github/workflows/add-to-project.yml@v0.5.2
+    uses: acdh-oeaw/prosnet-workflows/.github/workflows/add-to-project.yml@v0.6.0
     secrets:
       ADD_TO_PROJECT_TOKEN: ${{ secrets.ADD_TO_PROJECT_TOKEN }}
     with:

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/.github/workflows/linters.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Run ruff format
         run: uv run --only-dev ruff format --check .
@@ -22,10 +22,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Run ruff check
         run: uv run --only-dev ruff check .
@@ -34,10 +34,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Run djLint formatter
         run: uv run --only-dev djlint --check  .
@@ -46,10 +46,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Run djLint linter
         run: uv run --only-dev djlint --lint .
@@ -58,10 +58,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Run deptry
         run: uv run --only-dev deptry .

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/.github/workflows/publish.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
@@ -31,7 +31,7 @@ jobs:
     - name: Build a binary wheel and a source tarball
       run: python3 -m build
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: python-package-distributions
         path: dist/
@@ -48,7 +48,7 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: python-package-distributions
         path: dist/

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/.github/workflows/release-please.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           release-type: python
           package-name: apis-acdhch-default-settings
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - run: gh workflow run publish.yml
         env:
           GH_TOKEN: ${{ github.token }}

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.16.0](https://github.com/acdh-oeaw/apis-acdhch-default-settings/compare/v2.15.0...v2.16.0) (2025-12-05)
+
+
+### Features
+
+* **querysets:** add data-mapping to autocompletes ([d39ce20](https://github.com/acdh-oeaw/apis-acdhch-default-settings/commit/d39ce20ddbab95b225d75dc7f16d20b61c54751b))
+
+## [2.15.0](https://github.com/acdh-oeaw/apis-acdhch-default-settings/compare/v2.14.0...v2.15.0) (2025-10-10)
+
+
+### Features
+
+* **ldapauth:** add debug log if user not in list ([9c746bf](https://github.com/acdh-oeaw/apis-acdhch-default-settings/commit/9c746bf04999cce5ba862909e5592e7ab0bee175))
+* **ldapauth:** allow to define the user list in a file ([bfb5cf4](https://github.com/acdh-oeaw/apis-acdhch-default-settings/commit/bfb5cf4726f72ee6d2985a8b9d13965bc673abe8)), closes [#252](https://github.com/acdh-oeaw/apis-acdhch-default-settings/issues/252)
+* **settings:** add *.acdh-dev.oeaw.ac.at to CSP_IMG_SRC ([0edf189](https://github.com/acdh-oeaw/apis-acdhch-default-settings/commit/0edf18911f92f641d555576600e004ebe2d7136b)), closes [#259](https://github.com/acdh-oeaw/apis-acdhch-default-settings/issues/259)
+
 ## [2.14.0](https://github.com/acdh-oeaw/apis-acdhch-default-settings/compare/v2.13.0...v2.14.0) (2025-09-24)
 
 

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apis-acdhch-default-settings
-Version: 2.14.0
+Version: 2.16.0
 Summary: Default settings for APIS instances at the ACDH-CH
 Project-URL: source, https://github.com/acdh-oeaw/apis-acdhch-default-settings
 Project-URL: changelog, https://github.com/acdh-oeaw/apis-acdhch-default-settings/blob/main/CHANGELOG.md
@@ -8,9 +8,9 @@ Project-URL: issues, https://github.com/acdh-oeaw/apis-acdhch-default-settings/i
 Author-email: Birger Schacht <birger.schacht@oeaw.ac.at>
 License-Expression: MIT
 License-File: LICENSE
-Requires-Python: >=3.11
+Requires-Python: >=3.13
 Requires-Dist: apis-acdhch-django-auditlog>=0.2.1
-Requires-Dist: apis-core-rdf>=0.54.0
+Requires-Dist: apis-core-rdf>=0.58.0
 Requires-Dist: dj-database-url<4.0,>=2.0.0
 Requires-Dist: django-allow-cidr<0.9,>=0.6
 Requires-Dist: django-auditlog>=3.1.2

apis_acdhch_default_settings-2.16.0/apis_acdhch_default_settings/ldapauth.py

@@ -0,0 +1,25 @@
+import os
+import pathlib
+import logging
+
+from django_auth_ldap.backend import LDAPBackend
+
+logger = logging.getLogger(__name__)
+
+
+class CustomLDAPBackend(LDAPBackend):
+    def authenticate_ldap_user(self, user, *args, **kwargs):
+        env = os.environ.get("AUTH_LDAP_USER_LIST", "")
+        user_list = env.split(",")
+        if env.startswith("file://"):
+            try:
+                user_list = pathlib.Path.from_uri(env).read_text().splitlines()
+            except Exception as e:
+                logger.debug("Error reading user list from file: %s", e)
+        user_list = list(map(str.strip, user_list))
+        if user._username not in user_list:
+            logger.debug(
+                "User %s not in AUTH_LDAP_USER_LIST, passing on", user._username
+            )
+            return None
+        return super().authenticate_ldap_user(user, *args, **kwargs)

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/apis_acdhch_default_settings/querysets.py

@@ -13,7 +13,8 @@ class E74_GroupExternalAutocomplete(ExternalAutocomplete):
             params={
                 "filter": "type:CorporateBody",
                 "format": "json:preferredName,geographicAreaCode,dateOfEstablishment,broaderTermInstantial",
-            }
+            },
+            data_mapping={"label": "label"},
         ),
     ]
 
@@ -28,12 +29,14 @@ class E53_PlaceExternalAutocomplete(ExternalAutocomplete):
             template="e53_place_from_typesense_autocomplete_result.html",
             token=os.getenv("TYPESENSE_TOKEN", None),
             server=os.getenv("TYPESENSE_SERVER", None),
+            data_mapping={"label": ["document", "label"]},
         ),
         LobidAutocompleteAdapter(
             params={
                 "filter": "type:PlaceOrGeographicName",
                 "format": "json:preferredName",
-            }
+            },
+            data_mapping={"label": "label"},
         ),
     ]
 
@@ -44,11 +47,13 @@ class E21_PersonExternalAutocomplete(ExternalAutocomplete):
             collections="prosnet-wikidata-person-index",
             token=os.getenv("TYPESENSE_TOKEN", None),
             server=os.getenv("TYPESENSE_SERVER", None),
+            data_mapping={"surname": ["document", "label"]},
         ),
         LobidAutocompleteAdapter(
             params={
                 "filter": "type:Person",
                 "format": "json:preferredName,professionOrOccupation",
-            }
+            },
+            data_mapping={"surname": "label"},
         ),
     ]

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/apis_acdhch_default_settings/settings.py

@@ -71,6 +71,7 @@ CSP_DEFAULT_SRC = (
 CSP_IMG_SRC = [
     "'self'",
     "*.acdh.oeaw.ac.at",
+    "*.acdh-dev.oeaw.ac.at",
     "data:",
     "*.openstreetmap.org",
     "cdnjs.cloudflare.com",

{apis_acdhch_default_settings-2.14.0 → apis_acdhch_default_settings-2.16.0}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "apis-acdhch-default-settings"
-version = "2.14.0"
+version = "2.16.0"
 description = "Default settings for APIS instances at the ACDH-CH"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 authors = [{ name = "Birger Schacht", email = "birger.schacht@oeaw.ac.at" }]
 license = "MIT"
 dependencies = [
@@ -21,7 +21,7 @@ dependencies = [
     "opentelemetry-distro",
     "django-removals>=1.0.5,<=2.0",
     "django>=5",
-    "apis-core-rdf>=0.54.0",
+    "apis-core-rdf>=0.58.0",
     "requests>=2",
     "django-auditlog>=3.1.2",
     "apis-acdhch-django-auditlog>=0.2.1",

apis_acdhch_default_settings-2.14.0/apis_acdhch_default_settings/ldapauth.py

@@ -1,12 +0,0 @@
-import os
-
-from django_auth_ldap.backend import LDAPBackend
-
-
-class CustomLDAPBackend(LDAPBackend):
-    def authenticate_ldap_user(self, user, *args, **kwargs):
-        user_list = os.environ.get("AUTH_LDAP_USER_LIST", "").split(",")
-        user_list = list(map(str.strip, user_list))
-        if user._username not in user_list:
-            return None
-        return super().authenticate_ldap_user(user, *args, **kwargs)