feat: add ability to refresh databases on package addition through web

interface

.github/workflows/release.yml

@@ -13,15 +13,7 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    container:
-      image: archlinux:base
-      options: -w /build
-      volumes:
-        - ${{ github.workspace }}:/build
-
     steps:
-      - run: pacman --noconfirm -Syu base-devel git python-tox
-
       - uses: actions/checkout@v4
 
       - name: Extract version
@@ -35,6 +27,10 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           filter: 'Release \d+\.\d+\.\d+'
 
+      - uses: ConorMacBride/install-package@v1.1.0
+        with:
+          apt: tox
+
       - name: Create archive
         run: tox -e archive
         env:

docs/_static/architecture.dot

@@ -64,7 +64,7 @@ digraph G {
     ahriman_core_alpm_remote_aur [fillcolor="blue",fontcolor="white",label="ahriman\.\ncore\.\nalpm\.\nremote\.\naur",shape="box"];
     ahriman_core_alpm_remote_official [fillcolor="blue",fontcolor="white",label="ahriman\.\ncore\.\nalpm\.\nremote\.\nofficial",shape="box"];
     ahriman_core_alpm_remote_official_syncdb [fillcolor="blue",fontcolor="white",label="ahriman\.\ncore\.\nalpm\.\nremote\.\nofficial_syncdb",shape="box"];
-    ahriman_core_alpm_remote_remote [fillcolor="#a5401d",fontcolor="#ffffff",label="ahriman\.\ncore\.\nalpm\.\nremote\.\nremote"];
+    ahriman_core_alpm_remote_remote [fillcolor="#ae441e",fontcolor="#ffffff",label="ahriman\.\ncore\.\nalpm\.\nremote\.\nremote"];
     ahriman_core_alpm_repo [fillcolor="#994d33",fontcolor="#ffffff",label="ahriman\.\ncore\.\nalpm\.\nrepo"];
     ahriman_core_auth [fillcolor="blue",fontcolor="white",label="ahriman\.\ncore\.\nauth",shape="box"];
     ahriman_core_auth_auth [fillcolor="blue",fontcolor="white",label="ahriman\.\ncore\.\nauth\.\nauth",shape="box"];
@@ -509,9 +509,9 @@ digraph G {
     ahriman_core_alpm_remote_official -> ahriman_core_alpm_remote [fillcolor="blue",minlen="0",weight="4"];
     ahriman_core_alpm_remote_official -> ahriman_core_alpm_remote_official_syncdb [fillcolor="blue",minlen="0",weight="4"];
     ahriman_core_alpm_remote_official_syncdb -> ahriman_core_alpm_remote [fillcolor="blue",minlen="0",weight="4"];
-    ahriman_core_alpm_remote_remote -> ahriman_core_alpm_remote [fillcolor="#a5401d",minlen="0",weight="4"];
-    ahriman_core_alpm_remote_remote -> ahriman_core_alpm_remote_aur [fillcolor="#a5401d",minlen="0",weight="4"];
-    ahriman_core_alpm_remote_remote -> ahriman_core_alpm_remote_official [fillcolor="#a5401d",minlen="0",weight="4"];
+    ahriman_core_alpm_remote_remote -> ahriman_core_alpm_remote [fillcolor="#ae441e",minlen="0",weight="4"];
+    ahriman_core_alpm_remote_remote -> ahriman_core_alpm_remote_aur [fillcolor="#ae441e",minlen="0",weight="4"];
+    ahriman_core_alpm_remote_remote -> ahriman_core_alpm_remote_official [fillcolor="#ae441e",minlen="0",weight="4"];
     ahriman_core_alpm_repo -> ahriman_core_repository_repository_properties [fillcolor="#994d33",minlen="2",weight="2"];
     ahriman_core_auth -> ahriman_web_keys [fillcolor="blue",minlen="2"];
     ahriman_core_auth -> ahriman_web_middlewares_auth_handler [fillcolor="blue",minlen="3"];
@@ -710,7 +710,6 @@ digraph G {
     ahriman_core_exceptions -> ahriman_core_alpm_remote_aur [fillcolor="#ef4306",minlen="2",weight="2"];
     ahriman_core_exceptions -> ahriman_core_alpm_remote_official [fillcolor="#ef4306",minlen="2",weight="2"];
     ahriman_core_exceptions -> ahriman_core_alpm_remote_official_syncdb [fillcolor="#ef4306",minlen="2",weight="2"];
-    ahriman_core_exceptions -> ahriman_core_alpm_remote_remote [fillcolor="#ef4306",minlen="2",weight="2"];
     ahriman_core_exceptions -> ahriman_core_alpm_repo [fillcolor="#ef4306",minlen="2",weight="2"];
     ahriman_core_exceptions -> ahriman_core_auth_oauth [fillcolor="#ef4306",minlen="2",weight="2"];
     ahriman_core_exceptions -> ahriman_core_auth_pam [fillcolor="#ef4306",minlen="2",weight="2"];

package/archlinux/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase='ahriman'
 pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.19.1
+pkgver=2.18.3
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')

package/share/ahriman/templates/build-status.jinja2

@@ -55,11 +55,6 @@
                                 <i class="bi bi-play"></i> update
                             </button>
                         </li>
-                        <li>
-                            <button id="update-repositories-button" class="btn dropdown-item" onclick="refreshDatabases()">
-                                <i class="bi bi-arrow-down-circle"></i> update pacman databases
-                            </button>
-                        </li>
                         <li>
                             <button id="package-rebuild-button" class="btn dropdown-item" data-bs-toggle="modal" data-bs-target="#package-rebuild-modal">
                                 <i class="bi bi-arrow-clockwise"></i> rebuild

package/share/ahriman/templates/build-status/package-add-modal.jinja2

@@ -28,7 +28,7 @@
                         <label class="col-3 col-form-label"></label>
                         <div class="col-9">
                             <input id="package-add-refresh-input" type="checkbox" class="form-check-input" value="" checked>
-                            <label for="package-add-refresh-input" class="form-check-label">update pacman databases</label>
+                            <label for="package-add-refresh-input" class="form-check-label">refresh pacman databases</label>
                         </div>
                     </div>
                     <div class="form-group row">
@@ -108,17 +108,16 @@
         return {patches: patches};
     }
 
-    function packagesAdd(packages, patches, repository, data) {
+    function packagesAdd(packages, patches, repository) {
         packages = packages ?? packageAddInput.value;
         patches = patches ?? patchesParse();
         repository = repository ?? getRepositorySelector(packageAddRepositoryInput);
-        data = data ?? {refresh: packageAddRefreshInput.checked};
+        const parameters = Object.assign({}, {refresh: packageAddRefreshInput.checked}, patches);
 
         if (packages) {
             bootstrap.Modal.getOrCreateInstance(packageAddModal).hide();
             const onSuccess = update => `Packages ${update} have been added`;
             const onFailure = error => `Package addition failed: ${error}`;
-            const parameters = Object.assign({}, data, patches);
             doPackageAction("/api/v1/service/add", [packages], repository, onSuccess, onFailure, parameters);
         }
     }

package/share/ahriman/templates/build-status/package-info-modal.jinja2

@@ -95,9 +95,6 @@
             </div>
             <div class="modal-footer">
                 {% if not auth.enabled or auth.username is not none %}
-                    <input id="package-info-refresh-input" type="checkbox" class="form-check-input" value="" checked>
-                    <label for="package-info-refresh-input" class="form-check-label">update pacman databases</label>
-
                     <button id="package-info-update-button" type="submit" class="btn btn-success" onclick="packageInfoUpdate()" data-bs-dismiss="modal"><i class="bi bi-play"></i><span class="d-none d-sm-inline"> update</span></button>
                     <button id="package-info-remove-button" type="submit" class="btn btn-danger" onclick="packageInfoRemove()" data-bs-dismiss="modal"><i class="bi bi-trash"></i><span class="d-none d-sm-inline"> remove</span></button>
                 {% endif %}
@@ -138,8 +135,6 @@
     const packageInfoVariablesBlock = document.getElementById("package-info-variables-block");
     const packageInfoVariablesDiv = document.getElementById("package-info-variables-div");
 
-    const packageInfoRefreshInput = document.getElementById("package-info-refresh-input");
-
     function clearChart() {
         packageInfoEventsUpdateChartCanvas.hidden = true;
         if (packageInfoEventsUpdateChart) {
@@ -409,7 +404,7 @@
 
     function packageInfoUpdate() {
         const packageBase = packageInfoModal.package;
-        packagesAdd(packageBase, [], repository, {refresh: packageInfoRefreshInput.checked});
+        packagesAdd(packageBase, [], repository);
     }
 
     function showPackageInfo(packageBase) {

package/share/ahriman/templates/build-status/table.jinja2

@@ -73,19 +73,6 @@
         doPackageAction(url, currentSelection, repository, onSuccess, onFailure);
     }
 
-    function refreshDatabases() {
-        const onSuccess = _ => "Pacman database update has been requested";
-        const onFailure = error => `Could not update pacman databases: ${error}`;
-        const parameters = {
-            refresh: true,
-            aur: false,
-            local: false,
-            manual: false,
-        };
-
-        doPackageAction("/api/v1/service/update", [], repository, onSuccess, onFailure, parameters);
-    }
-
     function reload() {
         table.bootstrapTable("showLoading");
 

package/share/man/man1/ahriman.1

@@ -1,4 +1,4 @@
-.TH AHRIMAN "1" "2025\-07\-14" "ahriman 2.19.1" "ArcH linux ReposItory MANager"
+.TH AHRIMAN "1" "2025\-06\-23" "ahriman 2.18.3" "ArcH linux ReposItory MANager"
 .SH NAME
 ahriman \- ArcH linux ReposItory MANager
 .SH SYNOPSIS

src/ahriman/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.19.1"
+__version__ = "2.18.3"

src/ahriman/core/alpm/pacman.py

@@ -267,8 +267,7 @@ class Pacman(LazyLogging):
             Package: list of packages which were returned by the query
         """
         def is_package_provided(package: Package) -> bool:
-            provides = [trim_package(name) for name in package.provides]
-            return package_name in provides
+            return package_name in package.provides
 
         for database in self.handle.get_syncdbs():
             yield from filter(is_package_provided, database.search(package_name))

src/ahriman/core/alpm/remote/aur.py

@@ -146,7 +146,7 @@ class AUR(Remote):
             # search api provides reduced models
             for stub in self.package_search(package_name, pacman=pacman, search_by="provides")
             # verity that found package actually provides it
-            if package_name in (package := self.package_info(stub.name, pacman=pacman)).provides
+            if package_name in (package := self.package_info(stub.package_base, pacman=pacman)).provides
         ]
 
     def package_search(self, *keywords: str, pacman: Pacman | None, search_by: str | None) -> list[AURPackage]:

src/ahriman/core/database/migrations/m011_repository_name.py

@@ -203,8 +203,6 @@ def migrate_package_repository(connection: Connection, configuration: Configurat
         configuration(Configuration): configuration instance
     """
     _, repository_id = configuration.check_loaded()
-    if repository_id.is_empty:
-        return  # no repository available yet
 
     connection.execute("""update build_queue set repository = :repository""", {"repository": repository_id.id})
     connection.execute("""update package_bases set repository = :repository""", {"repository": repository_id.id})

src/ahriman/core/http/sync_http_client.py

@@ -72,8 +72,8 @@ class SyncHttpClient(LazyLogging):
         """
         session = requests.Session()
         python_version = ".".join(map(str, sys.version_info[:3]))  # just major.minor.patch
-        session.headers["User-Agent"] = f"ahriman/{__version__} " \
-            f"{requests.utils.default_user_agent()} " \
+        session.headers["User-Agent"] = f"ahriman/{__version__}" \
+            f"{requests.utils.default_user_agent()}" \
             f"python/{python_version}"
 
         return session

src/ahriman/models/aur_package.py

@@ -25,7 +25,7 @@ from dataclasses import dataclass, field, fields
 from pyalpm import Package  # type: ignore[import-not-found]
 from typing import Any, Self
 
-from ahriman.core.utils import filter_json, full_version, trim_package
+from ahriman.core.utils import filter_json, full_version
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -103,17 +103,6 @@ class AURPackage:
     keywords: list[str] = field(default_factory=list)
     groups: list[str] = field(default_factory=list)
 
-    def __post_init__(self) -> None:
-        """
-        update packages lists accordingly
-        """
-        object.__setattr__(self, "depends", [trim_package(package) for package in self.depends])
-        object.__setattr__(self, "make_depends", [trim_package(package) for package in self.make_depends])
-        object.__setattr__(self, "opt_depends", [trim_package(package) for package in self.opt_depends])
-        object.__setattr__(self, "check_depends", [trim_package(package) for package in self.check_depends])
-        object.__setattr__(self, "conflicts", [trim_package(package) for package in self.conflicts])
-        object.__setattr__(self, "provides", [trim_package(package) for package in self.provides])
-
     @classmethod
     def from_json(cls, dump: dict[str, Any]) -> Self:
         """

src/ahriman/models/package_description.py

@@ -83,13 +83,12 @@ class PackageDescription:
 
     def __post_init__(self) -> None:
         """
-        update packages lists accordingly
+        update dependencies list accordingly
         """
         self.depends = [trim_package(package) for package in self.depends]
-        self.make_depends = [trim_package(package) for package in self.make_depends]
         self.opt_depends = [trim_package(package) for package in self.opt_depends]
+        self.make_depends = [trim_package(package) for package in self.make_depends]
         self.check_depends = [trim_package(package) for package in self.check_depends]
-        self.provides = [trim_package(package) for package in self.provides]
 
     @property
     def filepath(self) -> Path | None:

tests/ahriman/core/alpm/test_pacman.py

@@ -289,4 +289,3 @@ def test_package_provided_by(pacman: Pacman) -> None:
     must search through the provides lists
     """
     assert list(pacman.provided_by("sh"))
-    assert list(pacman.provided_by("libacl.so"))  # case with exact version

tests/ahriman/core/database/migrations/test_m011_repository_name.py

@@ -6,7 +6,6 @@ from unittest.mock import call as MockCall
 
 from ahriman.core.configuration import Configuration
 from ahriman.core.database.migrations.m011_repository_name import migrate_data, migrate_package_repository, steps
-from ahriman.models.repository_id import RepositoryId
 
 
 def test_migration_repository_name() -> None:
@@ -38,13 +37,3 @@ def test_migrate_package_repository(connection: Connection, configuration: Confi
         MockCall(pytest.helpers.anyvar(str, strict=True), {"repository": configuration.repository_id.id}),
         MockCall(pytest.helpers.anyvar(str, strict=True), {"repository": configuration.repository_id.id}),
     ])
-
-
-def test_migrate_package_repository_empty_id(connection: Connection, configuration: Configuration,
-                                             mocker: MockerFixture) -> None:
-    """
-    must do nothing on empty repository id
-    """
-    mocker.patch("ahriman.core.configuration.Configuration.check_loaded", return_value=("", RepositoryId("", "")))
-    migrate_package_repository(connection, configuration)
-    connection.execute.assert_not_called()

tests/ahriman/models/test_aur_package.py

@@ -2,7 +2,7 @@ import datetime
 import json
 import pyalpm  # typing: ignore
 
-from dataclasses import asdict, fields, replace
+from dataclasses import asdict, fields
 from pathlib import Path
 from pytest_mock import MockerFixture
 from typing import Any
@@ -38,25 +38,6 @@ def _get_official_data(resource_path_root: Path) -> dict[str, Any]:
     return json.loads(response)["results"][0]
 
 
-def test_post_init(aur_package_ahriman: AURPackage) -> None:
-    """
-    must trim versions and descriptions from packages list
-    """
-    package = replace(
-        aur_package_ahriman,
-        depends=["a=1"],
-        make_depends=["b>=3"],
-        opt_depends=["c: a description"],
-        check_depends=["d=4"],
-        provides=["e=5"],
-    )
-    assert package.depends == ["a"]
-    assert package.make_depends == ["b"]
-    assert package.opt_depends == ["c"]
-    assert package.check_depends == ["d"]
-    assert package.provides == ["e"]
-
-
 def test_from_json(aur_package_ahriman: AURPackage, resource_path_root: Path) -> None:
     """
     must load package from json

tests/ahriman/models/test_package_description.py

@@ -6,15 +6,10 @@ from ahriman.models.package_description import PackageDescription
 
 def test_post_init() -> None:
     """
-    must trim versions and descriptions from packages list
+    must trim versions and descriptions from dependencies list
     """
-    assert PackageDescription(
-        depends=["a=1"],
-        make_depends=["b>=3"],
-        opt_depends=["c: a description"],
-        check_depends=["d=4"],
-        provides=["e=5"]
-    ) == PackageDescription(depends=["a"], make_depends=["b"], opt_depends=["c"], check_depends=["d"], provides=["e"])
+    assert PackageDescription(depends=["a=1"], make_depends=["b>=3"], opt_depends=["c: a description"]) == \
+        PackageDescription(depends=["a"], make_depends=["b"], opt_depends=["c"])
 
 
 def test_filepath(package_description_ahriman: PackageDescription) -> None: