add cookies support

* also add configuration options and change behaviour accordingly

docs/ahriman.web.schemas.rst

@@ -140,6 +140,14 @@ ahriman.web.schemas.logs\_schema module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.schemas.logs\_search\_schema module
+-----------------------------------------------
+
+.. automodule:: ahriman.web.schemas.logs_search_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.schemas.oauth2\_schema module
 -----------------------------------------
 

docs/configuration.rst

@@ -166,6 +166,7 @@ Reporting to web service related settings. In most cases there is fallback to we
 Web server settings. This feature requires ``aiohttp`` libraries to be installed.
 
 * ``address`` - optional address in form ``proto://host:port`` (``port`` can be omitted in case of default ``proto`` ports), will be used instead of ``http://{host}:{port}`` in case if set, string, optional. This option is required in case if ``OAuth`` provider is used.
+* ``autorefresh_intervals`` - enable page auto refresh options, space separated list of integers, optional. The first defined interval will be used as default. If no intervals set, the auto refresh buttons will be disabled. If first element of the list equals ``0``, auto refresh will be disabled by default.
 * ``enable_archive_upload`` - allow to upload packages via HTTP (i.e. call of ``/api/v1/service/upload`` uri), boolean, optional, default ``no``.
 * ``host`` - host to bind, string, optional.
 * ``index_url`` - full URL of the repository index page, string, optional.

package/share/ahriman/settings/ahriman.ini.d/00-web.ini

@@ -28,6 +28,10 @@ allow_read_only = yes
 ; External address of the web service. Will be used for some features like OAuth. If none set will be generated as
 ;     address = http://${web:host}:${web:port}
 ;address = http://${web:host}:${web:port}
+; Enable page auto refresh. Intervals are given in seconds. Default interval is always the first element of the list.
+; If no intervals set, auto refresh will be disabled. 0 can only be the first element and will disable auto refresh
+; by default.
+autorefresh_intervals = 5 1 10 30 60
 ; Enable file upload endpoint used by some triggers.
 ;enable_archive_upload = no
 ; Address to bind the server.

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

@@ -80,6 +80,21 @@
                 <button type="button" class="btn btn-secondary" onclick="reload()">
                     <i class="bi bi-arrow-clockwise"></i><span class="d-none d-sm-inline"> reload</span>
                 </button>
+
+                {% if autorefresh_intervals %}
+                    <div class="btn-group">
+                        <input id="table-autoreload-button" type="checkbox" class="btn-check" autocomplete="off" onclick="toggleTableAutoReload()" checked>
+                        <label for="table-autoreload-button" class="btn btn-outline-secondary" title="toggle auto reload"><i class="bi bi-clock"></i></label>
+                        <button type="button" class="btn btn-outline-secondary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                            <span class="visually-hidden">select interval</span>
+                        </button>
+                        <ul id="table-autoreload-input" class="dropdown-menu">
+                            {% for interval in autorefresh_intervals %}
+                                <li><a class="dropdown-item {{ "active" if interval.is_active }}" onclick="toggleTableAutoReload({{ interval.interval }})" data-interval="{{ interval.interval }}">{{ interval.text }}</a></li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% endif %}
             </div>
 
             <table id="packages"

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

@@ -101,7 +101,21 @@
                     <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 %}
-                <button type="button" class="btn btn-secondary" onclick="showPackageInfo()"><i class="bi bi-arrow-clockwise"></i><span class="d-none d-sm-inline"> reload</span></button>
+                {% if autorefresh_intervals %}
+                    <button type="button" class="btn btn-secondary" onclick="showPackageInfo()"><i class="bi bi-arrow-clockwise"></i><span class="d-none d-sm-inline"> reload</span></button>
+                    <div class="btn-group dropup">
+                        <input id="package-info-autoreload-button" type="checkbox" class="btn-check" autocomplete="off" onclick="togglePackageInfoAutoReload()" checked>
+                        <label for="package-info-autoreload-button" class="btn btn-outline-secondary" title="toggle auto reload"><i class="bi bi-clock"></i></label>
+                        <button type="button" class="btn btn-outline-secondary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
+                            <span class="visually-hidden">select interval</span>
+                        </button>
+                        <ul id="package-info-autoreload-input" class="dropdown-menu">
+                            {% for interval in autorefresh_intervals %}
+                                <li><a class="dropdown-item {{ "active" if interval.is_active }}" onclick="togglePackageInfoAutoReload({{ interval.interval }})" data-interval="{{ interval.interval }}">{{ interval.text }}</a></li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% endif %}
                 <button type="button" class="btn btn-primary" data-bs-dismiss="modal"><i class="bi bi-x"></i><span class="d-none d-sm-inline"> close</span></button>
             </div>
         </div>
@@ -140,6 +154,10 @@
 
     const packageInfoRefreshInput = document.getElementById("package-info-refresh-input");
 
+    const packageInfoAutoReloadButton = document.getElementById("package-info-autoreload-button");
+    const packageInfoAutoReloadInput = document.getElementById("package-info-autoreload-input");
+    let packageInfoAutoReloadTask = null;
+
     function clearChart() {
         packageInfoEventsUpdateChartCanvas.hidden = true;
         if (packageInfoEventsUpdateChart) {
@@ -148,6 +166,13 @@
         }
     }
 
+    function convertLogs(data, filter) {
+        return data
+            .filter((filter || Boolean))
+            .map(log_record => `[${new Date(1000 * log_record.created).toISOString()}] ${log_record.message}`)
+            .join("\n");
+    }
+
     async function copyChanges() {
         const changes = packageInfoChangesInput.textContent;
         await copyToClipboard(changes, packageInfoChangesCopyButton);
@@ -319,15 +344,19 @@
                         const link = document.createElement("a");
                         link.classList.add("dropdown-item");
 
+                        link.dataset.version = version.version;
+                        link.dataset.processId = version.process_id;
+                        link.dataset.logs = convertLogs(data, log_record => log_record.version === version.version && log_record.process_id === version.process_id);
+
                         link.textContent = new Date(1000 * version.created).toISOStringShort();
                         link.href = "#";
                         link.onclick = _ => {
-                            const logs = data
-                                .filter(log_record => log_record.version === version.version && log_record.process_id === version.process_id)
-                                .map(log_record => `[${new Date(1000 * log_record.created).toISOString()}] ${log_record.message}`);
-
-                            packageInfoLogsInput.textContent = logs.join("\n");
+                            // check if we are at the bottom of the code block
+                            const isScrolledToBottom = packageInfoLogsInput.scrollTop + packageInfoLogsInput.clientHeight >= packageInfoLogsInput.scrollHeight;
+                            packageInfoLogsInput.textContent = link.dataset.logs;
                             highlight(packageInfoLogsInput);
+                            if (isScrolledToBottom)
+                                packageInfoLogsInput.scrollTop = packageInfoLogsInput.scrollHeight; // scroll to the new end
 
                             Array.from(packageInfoLogsVersions.children).forEach(el => el.classList.remove("active"));
                             link.classList.add("active");
@@ -403,23 +432,46 @@
     }
 
     function packageInfoRemove() {
-        const packageBase = packageInfoModal.package;
+        const packageBase = packageInfoModal.dataset.package;
         packagesRemove([packageBase]);
     }
 
     function packageInfoUpdate() {
-        const packageBase = packageInfoModal.package;
+        const packageBase = packageInfoModal.dataset.package;
         packagesAdd(packageBase, [], repository, {refresh: packageInfoRefreshInput.checked});
     }
 
+    function reloadActiveLogs(packageBase) {
+        const activeLogSelector = packageInfoLogsVersions.querySelector(".active");
+
+        if (activeLogSelector) {
+            makeRequest(
+                `/api/v2/packages/${packageBase}/logs`,
+                {
+                    query: {
+                        architecture: repository.architecture,
+                        repository: repository.repository,
+                        version: activeLogSelector.dataset.version,
+                        process_id: activeLogSelector.dataset.processId,
+                    },
+                    convert: response => response.json(),
+                },
+                data => {
+                    activeLogSelector.dataset.logs = convertLogs(data);
+                    activeLogSelector.click();
+                },
+            );
+        }
+    }
+
     function showPackageInfo(packageBase) {
         const isPackageBaseSet = packageBase !== undefined;
         if (isPackageBaseSet) {
             // set package base as currently used
-            packageInfoModal.package = packageBase;
+            packageInfoModal.dataset.package = packageBase;
         } else {
             // read package base from the current window attribute
-            packageBase = packageInfoModal.package;
+            packageBase = packageInfoModal.dataset.package;
         }
 
         const onFailure = error => {
@@ -438,9 +490,24 @@
 
         if (isPackageBaseSet) {
             bootstrap.Modal.getOrCreateInstance(packageInfoModal).show();
+            {% if autorefresh_intervals %}
+                togglePackageInfoAutoReload();
+            {% endif %}
         }
     }
 
+    function togglePackageInfoAutoReload(interval) {
+        clearInterval(packageInfoAutoReloadTask);
+        packageInfoAutoReloadTask = toggleAutoReload(packageInfoAutoReloadButton, interval, packageInfoAutoReloadInput, _ => {
+            if (!hasActiveSelection()) {
+                const packageBase = packageInfoModal.dataset.package;
+                // we only poll status and logs here
+                loadPackage(packageBase);
+                reloadActiveLogs(packageBase);
+            }
+        });
+    }
+
     ready(_ => {
         packageInfoEventsUpdateChart = new Chart(packageInfoEventsUpdateChartCanvas, {
             type: "line",
@@ -468,6 +535,9 @@
             packageInfoChangesInput.textContent = "";
             packageInfoEventsTable.bootstrapTable("load", []);
             clearChart();
+
+            clearInterval(packageInfoAutoReloadTask);
+            packageInfoAutoReloadTask = null; // not really required (?) but lets clear everything
         });
     });
 </script>

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

@@ -10,6 +10,10 @@
     const dashboardButton = document.getElementById("dashboard-button");
     const versionBadge = document.getElementById("badge-version");
 
+    const tableAutoReloadButton = document.getElementById("table-autoreload-button");
+    const tableAutoReloadInput = document.getElementById("table-autoreload-input");
+    let tableAutoReloadTask = null;
+
     function doPackageAction(uri, packages, repository, successText, failureText, data) {
         makeRequest(
             uri,
@@ -86,8 +90,10 @@
         doPackageAction("/api/v1/service/update", [], repository, onSuccess, onFailure, parameters);
     }
 
-    function reload() {
-        table.bootstrapTable("showLoading");
+    function reload(silent) {
+        if (!silent) {
+            table.bootstrapTable("showLoading");
+        }
 
         const badgeClass = status => {
             if (status === "pending") return "btn-outline-warning";
@@ -128,16 +134,18 @@
                 table.bootstrapTable("hideLoading");
             },
             error => {
-                if ((error.status === 401) || (error.status === 403)) {
-                    // authorization error
-                    const text = "In order to see statuses you must login first.";
-                    table.find("tr.unauthorized").remove();
-                    table.find("tbody").append(`<tr class="unauthorized"><td colspan="100%">${safe(text)}</td></tr>`);
-                    table.bootstrapTable("hideLoading");
-                } else {
-                    // other errors
-                    const message = details => `Could not load list of packages: ${details}`;
-                    showFailure("Load failure", message, error);
+                if (!silent) {
+                    if ((error.status === 401) || (error.status === 403)) {
+                        // authorization error
+                        const text = "In order to see statuses you must login first.";
+                        table.find("tr.unauthorized").remove();
+                        table.find("tbody").append(`<tr class="unauthorized"><td colspan="100%">${safe(text)}</td></tr>`);
+                        table.bootstrapTable("hideLoading");
+                    } else {
+                        // other errors
+                        const message = details => `Could not load list of packages: ${details}`;
+                        showFailure("Load failure", message, error);
+                    }
                 }
             },
         );
@@ -230,6 +238,17 @@
         return {classes: cellClass(value)};
     }
 
+    function toggleTableAutoReload(interval) {
+        clearInterval(tableAutoReloadTask);
+        tableAutoReloadTask = toggleAutoReload(tableAutoReloadButton, interval, tableAutoReloadInput, _ => {
+            if ((getSelection().length === 0) &&
+                (table.bootstrapTable("getOptions").pageNumber === 1) &&
+                (!dashboardModal.classList.contains("show"))) {
+                reload(true);
+            }
+        });
+    }
+
     ready(_ => {
         document.querySelectorAll("#repositories a").forEach(element => {
             element.onclick = _ => {
@@ -247,7 +266,7 @@
 
         table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", _ => {
             if (packageRemoveButton) {
-                packageRemoveButton.disabled = !table.bootstrapTable("getSelections").length;
+                packageRemoveButton.disabled = !getSelection().length;
             }
         });
         table.on("click-row.bs.table", (self, data, row, cell) => {
@@ -289,5 +308,8 @@
         });
 
         selectRepository();
+        {% if autorefresh_intervals %}
+            toggleTableAutoReload();
+        {% endif %}
     });
 </script>

package/share/ahriman/templates/utils/bootstrap-scripts.jinja2

@@ -19,6 +19,8 @@
 
 <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.4/dist/chart.umd.min.js" crossorigin="anonymous" type="application/javascript"></script>
 
+<script src="https://cdn.jsdelivr.net/npm/js-cookie@3.0.5/dist/js.cookie.min.js" crossorigin="anonymous" type="application/javascript"></script>
+
 <script>
     async function copyToClipboard(text, button) {
         await navigator.clipboard.writeText(text);
@@ -58,6 +60,10 @@
         return value.includes(dataList[index].toLowerCase());
     }
 
+    function hasActiveSelection() {
+        return !document.getSelection().isCollapsed; // not sure if it is a valid way, but I guess so
+    }
+
     function headerClass(status) {
         if (status === "pending") return ["bg-warning"];
         if (status === "building") return ["bg-warning"];
@@ -133,6 +139,33 @@
         return element;
     }
 
+    function toggleAutoReload(toggle, interval, intervalSelector, callback) {
+        if (interval) {
+            toggle.checked = true; // toggle reload
+        } else {
+            interval = intervalSelector.querySelector(".active")?.dataset?.interval; // find active element
+        }
+
+        let intervalId = null;
+        if (interval) {
+            if (toggle.checked) {
+                // refresh UI
+                Array.from(intervalSelector.children).forEach(il => {
+                    Array.from(il.children).forEach(el => el.classList.remove("active"));
+                });
+                intervalSelector.querySelector(`a[data-interval="${interval}"]`)?.classList?.add("active");
+                // finally create timer task
+                intervalId = setInterval(callback, interval);
+            }
+        } else {
+            toggle.checked = false; // no active interval found, disable toggle
+        }
+
+        Cookies.set(`ahriman-${toggle.id}-refresh-enabled`, toggle.checked);
+        Cookies.set(`ahriman-${toggle.id}-refresh-interval`, interval);
+        return intervalId;
+    }
+
     Date.prototype.toISOStringShort = function() {
         const pad = number => String(number).padStart(2, "0");
         return `${this.getFullYear()}-${pad(this.getMonth() + 1)}-${pad(this.getDate())} ${pad(this.getHours())}:${pad(this.getMinutes())}:${pad(this.getSeconds())}`;

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

@@ -94,6 +94,15 @@ class Remote(SyncHttpClient):
                 for package in portion
                 if package.name in packages or not packages
             }
+
+        # simple check for duplicates. This method will remove all packages under base if there is
+        # a package named exactly as its base
+        packages = {
+            package.name: package
+            for package in packages.values()
+            if package.package_base not in packages or package.package_base == package.name
+        }
+
         return list(packages.values())
 
     @classmethod

src/ahriman/core/configuration/configuration.py

@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+# pylint: disable=too-many-public-methods
 import configparser
 import shlex
 import sys
@@ -85,9 +86,10 @@ class Configuration(configparser.RawConfigParser):
             empty_lines_in_values=not allow_multi_key,
             interpolation=ShellInterpolator(),
             converters={
+                "intlist": lambda value: list(map(int, shlex.split(value))),
                 "list": shlex.split,
                 "path": self._convert_path,
-                "pathlist": lambda value: [self._convert_path(element) for element in shlex.split(value)],
+                "pathlist": lambda value: list(map(self._convert_path, shlex.split(value))),
             },
         )
 
@@ -236,6 +238,8 @@ class Configuration(configparser.RawConfigParser):
 
     # pylint and mypy are too stupid to find these methods
     # pylint: disable=missing-function-docstring,unused-argument
+    def getintlist(self, *args: Any, **kwargs: Any) -> list[int]: ...  # type: ignore[empty-body]
+
     def getlist(self, *args: Any, **kwargs: Any) -> list[str]: ...  # type: ignore[empty-body]
 
     def getpath(self, *args: Any, **kwargs: Any) -> Path: ...  # type: ignore[empty-body]

src/ahriman/core/configuration/schema.py

@@ -324,6 +324,15 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
                 "empty": False,
                 "is_url": ["http", "https"],
             },
+            "autorefresh_intervals": {
+                "type": "list",
+                "coerce": "list",
+                "schema": {
+                    "type": "integer",
+                    "coerce": "integer",
+                    "min": 0,
+                },
+            },
             "enable_archive_upload": {
                 "type": "boolean",
                 "coerce": "boolean",

src/ahriman/core/database/operations/logs_operations.py

@@ -29,13 +29,15 @@ class LogsOperations(Operations):
     logs operations
     """
 
-    def logs_get(self, package_base: str, limit: int = -1, offset: int = 0,
-                 repository_id: RepositoryId | None = None) -> list[LogRecord]:
+    def logs_get(self, package_base: str, version: str | None = None, process_id: str | None = None,
+                 limit: int = -1, offset: int = 0, repository_id: RepositoryId | None = None) -> list[LogRecord]:
         """
         extract logs for specified package base
 
         Args:
             package_base(str): package base to extract logs
+            version(str | None, optional): package version to filter (Default value = None)
+            process_id(str | None, optional): process identifier to filter (Default value = None)
             limit(int, optional): limit records to the specified count, -1 means unlimited (Default value = -1)
             offset(int, optional): records offset (Default value = 0)
             repository_id(RepositoryId, optional): repository unique identifier override (Default value = None)
@@ -52,12 +54,17 @@ class LogsOperations(Operations):
                     """
                     select created, message, version, process_id from (
                         select * from logs
-                        where package_base = :package_base and repository = :repository
+                        where package_base = :package_base
+                          and repository = :repository
+                          and (:version is null or version = :version)
+                          and (:process_id is null or process_id = :process_id)
                         order by created desc limit :limit offset :offset
                     ) order by created asc
                     """,
                     {
                         "package_base": package_base,
+                        "version": version,
+                        "process_id": process_id,
                         "repository": repository_id.id,
                         "limit": limit,
                         "offset": offset,

src/ahriman/core/status/client.py

@@ -203,12 +203,15 @@ class Client:
         """
         # this method does not raise NotImplementedError because it is actively used as dummy client for http log
 
-    def package_logs_get(self, package_base: str, limit: int = -1, offset: int = 0) -> list[LogRecord]:
+    def package_logs_get(self, package_base: str, version: str | None = None, process_id: str | None = None,
+                         limit: int = -1, offset: int = 0) -> list[LogRecord]:
         """
         get package logs
 
         Args:
             package_base(str): package base
+            version(str | None, optional): package version to search (Default value = None)
+            process_id(str | None, optional): process identifier to search (Default value = None)
             limit(int, optional): limit records to the specified count, -1 means unlimited (Default value = -1)
             offset(int, optional): records offset (Default value = 0)
 

src/ahriman/core/status/local_client.py

@@ -152,19 +152,22 @@ class LocalClient(Client):
         """
         self.database.logs_insert(log_record, self.repository_id)
 
-    def package_logs_get(self, package_base: str, limit: int = -1, offset: int = 0) -> list[LogRecord]:
+    def package_logs_get(self, package_base: str, version: str | None = None, process_id: str | None = None,
+                         limit: int = -1, offset: int = 0) -> list[LogRecord]:
         """
         get package logs
 
         Args:
             package_base(str): package base
+            version(str | None, optional): package version to search (Default value = None)
+            process_id(str | None, optional): process identifier to search (Default value = None)
             limit(int, optional): limit records to the specified count, -1 means unlimited (Default value = -1)
             offset(int, optional): records offset (Default value = 0)
 
         Returns:
             list[LogRecord]: package logs
         """
-        return self.database.logs_get(package_base, limit, offset, self.repository_id)
+        return self.database.logs_get(package_base, version, process_id, limit, offset, self.repository_id)
 
     def package_logs_remove(self, package_base: str, version: str | None) -> None:
         """

src/ahriman/core/status/watcher.py

@@ -109,7 +109,7 @@ class Watcher(LazyLogging):
 
     package_logs_add: Callable[[LogRecord], None]
 
-    package_logs_get: Callable[[str, int, int], list[LogRecord]]
+    package_logs_get: Callable[[str, str | None, str | None, int, int], list[LogRecord]]
 
     package_logs_remove: Callable[[str, str | None], None]
 

src/ahriman/core/status/web_client.py

@@ -326,12 +326,15 @@ class WebClient(Client, SyncAhrimanClient):
         self.make_request("POST", self._logs_url(log_record.log_record_id.package_base),
                           params=self.repository_id.query(), json=payload, suppress_errors=True)
 
-    def package_logs_get(self, package_base: str, limit: int = -1, offset: int = 0) -> list[LogRecord]:
+    def package_logs_get(self, package_base: str, version: str | None = None, process_id: str | None = None,
+                         limit: int = -1, offset: int = 0) -> list[LogRecord]:
         """
         get package logs
 
         Args:
             package_base(str): package base
+            version(str | None, optional): package version to search (Default value = None)
+            process_id(str | None, optional): process identifier to search (Default value = None)
             limit(int, optional): limit records to the specified count, -1 means unlimited (Default value = -1)
             offset(int, optional): records offset (Default value = 0)
 
@@ -339,6 +342,10 @@ class WebClient(Client, SyncAhrimanClient):
             list[LogRecord]: package logs
         """
         query = self.repository_id.query() + [("limit", str(limit)), ("offset", str(offset))]
+        if version is not None:
+            query.append(("version", version))
+        if process_id is not None:
+            query.append(("process_id", process_id))
 
         with contextlib.suppress(Exception):
             response = self.make_request("GET", self._logs_url(package_base), params=query)

src/ahriman/core/utils.py

@@ -51,6 +51,7 @@ __all__ = [
     "parse_version",
     "partition",
     "pretty_datetime",
+    "pretty_interval",
     "pretty_size",
     "safe_filename",
     "srcinfo_property",
@@ -353,6 +354,28 @@ def pretty_datetime(timestamp: datetime.datetime | float | int | None) -> str:
     return timestamp.strftime("%Y-%m-%d %H:%M:%S")
 
 
+def pretty_interval(interval: int) -> str:
+    """
+    convert time interval to string
+
+    Args:
+        interval(int): time interval in seconds
+
+    Returns:
+        str: pretty printable interval as string
+    """
+    minutes, seconds = divmod(interval, 60)
+    hours, minutes = divmod(minutes, 60)
+    return " ".join([
+        f"{value} {description}{"s" if value > 1 else ""}"
+        for value, description in [
+            (hours, "hour"),
+            (minutes, "minute"),
+            (seconds, "second"),
+        ] if value > 0
+    ])
+
+
 def pretty_size(size: float | None, level: int = 0) -> str:
     """
     convert size to string

src/ahriman/web/schemas/__init__.py

@@ -34,6 +34,7 @@ from ahriman.web.schemas.log_schema import LogSchema
 from ahriman.web.schemas.login_schema import LoginSchema
 from ahriman.web.schemas.logs_rotate_schema import LogsRotateSchema
 from ahriman.web.schemas.logs_schema import LogsSchema
+from ahriman.web.schemas.logs_search_schema import LogsSearchSchema
 from ahriman.web.schemas.oauth2_schema import OAuth2Schema
 from ahriman.web.schemas.package_name_schema import PackageNameSchema
 from ahriman.web.schemas.package_names_schema import PackageNamesSchema

src/ahriman/web/schemas/logs_search_schema.py

@@ -0,0 +1,36 @@
+#
+# Copyright (c) 2021-2025 ahriman team.
+#
+# This file is part of ahriman
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from ahriman import __version__
+from ahriman.web.apispec import fields
+from ahriman.web.schemas.pagination_schema import PaginationSchema
+
+
+class LogsSearchSchema(PaginationSchema):
+    """
+    request log search schema
+    """
+
+    version = fields.String(metadata={
+        "description": "Package version to search",
+        "example": __version__,
+    })
+    process_id = fields.String(metadata={
+        "description": "Process unique identifier to search",
+    })

src/ahriman/web/views/index.py

@@ -22,6 +22,7 @@ import aiohttp_jinja2
 from typing import Any, ClassVar
 
 from ahriman.core.auth.helpers import authorized_userid
+from ahriman.core.utils import pretty_interval
 from ahriman.models.user_access import UserAccess
 from ahriman.web.apispec import aiohttp_apispec
 from ahriman.web.views.base import BaseView
@@ -37,6 +38,10 @@ class IndexView(BaseView):
             * control - HTML to insert for login control, HTML string, required
             * enabled - whether authorization is enabled by configuration or not, boolean, required
             * username - authenticated username if any, string, null means not authenticated
+        * autorefresh_intervals - auto refresh intervals, optional
+            * interval - auto refresh interval in milliseconds, integer, required
+            * is_active - is current interval active or not, boolean, required
+            * text - text representation of the interval (e.g. "30 seconds"), string, required
         * docs_enabled - indicates if api docs is enabled, boolean, required
         * index_url - url to the repository index, string, optional
         * repositories - list of repositories unique identifiers, required
@@ -66,8 +71,19 @@ class IndexView(BaseView):
             "username": auth_username,
         }
 
+        autorefresh_intervals = [
+            {
+                "interval": interval * 1000,  # milliseconds
+                "is_active": index == 0,  # first element is always default
+                "text": pretty_interval(interval),
+            }
+            for index, interval in enumerate(self.configuration.getintlist("web", "autorefresh_intervals", fallback=[]))
+            if interval > 0  # special case if 0 exists and first, refresh will not be turned on by default
+        ]
+
         return {
             "auth": auth,
+            "autorefresh_intervals": sorted(autorefresh_intervals, key=lambda interval: interval["interval"]),
             "docs_enabled": aiohttp_apispec is not None,
             "index_url": self.configuration.get("web", "index_url", fallback=None),
             "repositories": [

src/ahriman/web/views/v1/packages/logs.py

@@ -90,7 +90,7 @@ class LogsView(StatusViewGuard, BaseView):
 
         try:
             _, status = self.service().package_get(package_base)
-            logs = self.service(package_base=package_base).package_logs_get(package_base, -1, 0)
+            logs = self.service(package_base=package_base).package_logs_get(package_base, None, None, -1, 0)
         except UnknownPackageError:
             raise HTTPNotFound(reason=f"Package {package_base} is unknown")
 

src/ahriman/web/views/v1/service/search.py

@@ -70,7 +70,7 @@ class SearchView(BaseView):
         if not packages:
             raise HTTPNotFound(reason=f"No packages found for terms: {search}")
 
-        comparator: Callable[[AURPackage], str] = lambda item: str(item.package_base)
+        comparator: Callable[[AURPackage], str] = lambda item: item.package_base
         response = [
             {
                 "package": package.package_base,

src/ahriman/web/views/v2/packages/logs.py

@@ -22,7 +22,7 @@ from typing import ClassVar
 
 from ahriman.models.user_access import UserAccess
 from ahriman.web.apispec.decorators import apidocs
-from ahriman.web.schemas import LogSchema, PackageNameSchema, PaginationSchema
+from ahriman.web.schemas import LogSchema, LogsSearchSchema, PackageNameSchema
 from ahriman.web.views.base import BaseView
 from ahriman.web.views.status_view_guard import StatusViewGuard
 
@@ -47,7 +47,7 @@ class LogsView(StatusViewGuard, BaseView):
         error_404_description="Package base and/or repository are unknown",
         schema=LogSchema(many=True),
         match_schema=PackageNameSchema,
-        query_schema=PaginationSchema,
+        query_schema=LogsSearchSchema,
     )
     async def get(self) -> Response:
         """
@@ -61,8 +61,10 @@ class LogsView(StatusViewGuard, BaseView):
         """
         package_base = self.request.match_info["package"]
         limit, offset = self.page()
+        version = self.request.query.get("version", None)
+        process = self.request.query.get("process_id", None)
 
-        logs = self.service(package_base=package_base).package_logs_get(package_base, limit, offset)
+        logs = self.service(package_base=package_base).package_logs_get(package_base, version, process, limit, offset)
 
         response = [log_record.view() for log_record in logs]
         return json_response(response)

tests/ahriman/core/alpm/remote/test_remote.py

@@ -1,5 +1,6 @@
 import pytest
 
+from dataclasses import replace
 from pytest_mock import MockerFixture
 from unittest.mock import call as MockCall
 
@@ -88,6 +89,17 @@ def test_multisearch_single(aur_package_ahriman: AURPackage, pacman: Pacman, moc
     search_mock.assert_called_once_with("ahriman", pacman=pacman, search_by=None)
 
 
+def test_multisearch_remove_duplicates(aur_package_ahriman: AURPackage, pacman: Pacman, mocker: MockerFixture) -> None:
+    """
+    must remove duplicates from search result
+    """
+    package1 = replace(aur_package_ahriman)
+    package2 = replace(aur_package_ahriman, name="ahriman-triggers")
+    mocker.patch("ahriman.core.alpm.remote.Remote.package_search", return_value=[package1, package2])
+
+    assert Remote.multisearch("ahriman", pacman=pacman) == [package1]
+
+
 def test_remote_git_url(remote: Remote) -> None:
     """
     must raise NotImplemented for missing remote git url

tests/ahriman/core/configuration/test_configuration.py

@@ -133,6 +133,14 @@ def test_dump_architecture_specific(configuration: Configuration) -> None:
     assert dump["build"]["archbuild_flags"] == "hello flag"
 
 
+def test_getintlist(configuration: Configuration) -> None:
+    """
+    must extract list of integers
+    """
+    configuration.set_option("build", "test_int_list", "1 42 3")
+    assert configuration.getintlist("build", "test_int_list") == [1, 42, 3]
+
+
 def test_getlist(configuration: Configuration) -> None:
     """
     must return list of string correctly

tests/ahriman/core/database/operations/test_logs_operations.py

@@ -71,11 +71,35 @@ def test_logs_insert_get_pagination(database: SQLite, package_ahriman: Package)
     """
     database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "1"), 42.0, "message 1"))
     database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "1"), 43.0, "message 2"))
-    assert database.logs_get(package_ahriman.base, 1, 1) == [
+    assert database.logs_get(package_ahriman.base, None, None, 1, 1) == [
         LogRecord(LogRecordId(package_ahriman.base, "1"), 42.0, "message 1"),
     ]
 
 
+def test_logs_insert_get_filter_by_version(database: SQLite, package_ahriman: Package) -> None:
+    """
+    must insert and get package logs with pagination
+    """
+    database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "1", "p1"), 42.0, "message 1"))
+    database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "1", "p2"), 43.0, "message 2"))
+    database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "2", "p1"), 44.0, "message 3"))
+
+    assert database.logs_get(package_ahriman.base, "1", None) == [
+        LogRecord(LogRecordId(package_ahriman.base, "1", "p1"), 42.0, "message 1"),
+        LogRecord(LogRecordId(package_ahriman.base, "1", "p2"), 43.0, "message 2"),
+    ]
+    assert database.logs_get(package_ahriman.base, "2", None) == [
+        LogRecord(LogRecordId(package_ahriman.base, "2", "p1"), 44.0, "message 3"),
+    ]
+    assert database.logs_get(package_ahriman.base, None, "p1") == [
+        LogRecord(LogRecordId(package_ahriman.base, "1", "p1"), 42.0, "message 1"),
+        LogRecord(LogRecordId(package_ahriman.base, "2", "p1"), 44.0, "message 3"),
+    ]
+    assert database.logs_get(package_ahriman.base, "1", "p1") == [
+        LogRecord(LogRecordId(package_ahriman.base, "1", "p1"), 42.0, "message 1"),
+    ]
+
+
 def test_logs_insert_get_multi(database: SQLite, package_ahriman: Package) -> None:
     """
     must insert and get package logs for multiple repositories

tests/ahriman/core/status/test_local_client.py

@@ -124,8 +124,9 @@ def test_package_logs_get(local_client: LocalClient, package_ahriman: Package, m
     must retrieve package logs
     """
     logs_mock = mocker.patch("ahriman.core.database.SQLite.logs_get")
-    local_client.package_logs_get(package_ahriman.base, 1, 2)
-    logs_mock.assert_called_once_with(package_ahriman.base, 1, 2, local_client.repository_id)
+    local_client.package_logs_get(package_ahriman.base, package_ahriman.version, "process", 1, 2)
+    logs_mock.assert_called_once_with(package_ahriman.base, package_ahriman.version, "process", 1, 2,
+                                      local_client.repository_id)
 
 
 def test_package_logs_remove(local_client: LocalClient, package_ahriman: Package, mocker: MockerFixture) -> None:

tests/ahriman/core/status/test_web_client.py

@@ -658,7 +658,7 @@ def test_package_logs_get(web_client: WebClient, package_ahriman: Package, mocke
 
     requests_mock = mocker.patch("ahriman.core.status.web_client.WebClient.make_request", return_value=response_obj)
 
-    result = web_client.package_logs_get(package_ahriman.base, 1, 2)
+    result = web_client.package_logs_get(package_ahriman.base, None, None, 1, 2)
     requests_mock.assert_called_once_with("GET", pytest.helpers.anyvar(str, True),
                                           params=web_client.repository_id.query() + [("limit", "1"), ("offset", "2")])
     assert result == [
@@ -666,6 +666,21 @@ def test_package_logs_get(web_client: WebClient, package_ahriman: Package, mocke
     ]
 
 
+def test_package_logs_get_filter(web_client: WebClient, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must get logs with version and process id filter
+    """
+    requests_mock = mocker.patch("ahriman.core.status.web_client.WebClient.make_request")
+    web_client.package_logs_get(package_ahriman.base, package_ahriman.version, LogRecordId.DEFAULT_PROCESS_ID, 1, 2)
+    requests_mock.assert_called_once_with("GET", pytest.helpers.anyvar(str, True),
+                                          params=web_client.repository_id.query() + [
+                                              ("limit", "1"),
+                                              ("offset", "2"),
+                                              ("version", package_ahriman.version),
+                                              ("process_id", LogRecordId.DEFAULT_PROCESS_ID),
+    ])
+
+
 def test_package_logs_get_failed(web_client: WebClient, package_ahriman: Package, mocker: MockerFixture) -> None:
     """
     must suppress any exception happened during logs fetch

tests/ahriman/core/test_utils.py

@@ -10,8 +10,8 @@ from unittest.mock import call as MockCall
 
 from ahriman.core.exceptions import BuildError, CalledProcessError, OptionError, UnsafeRunError
 from ahriman.core.utils import check_output, check_user, dataclass_view, enum_values, extract_user, filter_json, \
-    full_version, minmax, package_like, parse_version, partition, pretty_datetime, pretty_size, safe_filename, \
-    srcinfo_property, srcinfo_property_list, trim_package, utcnow, walk
+    full_version, minmax, package_like, parse_version, partition, pretty_datetime, pretty_interval, pretty_size, \
+    safe_filename, srcinfo_property, srcinfo_property_list, trim_package, utcnow, walk
 from ahriman.models.package import Package
 from ahriman.models.package_source import PackageSource
 from ahriman.models.repository_id import RepositoryId
@@ -341,6 +341,18 @@ def test_pretty_datetime_empty() -> None:
     assert pretty_datetime(None) == ""
 
 
+def test_pretty_interval() -> None:
+    """
+    must generate string from interval
+    """
+    assert pretty_interval(1) == "1 second"
+    assert pretty_interval(42) == "42 seconds"
+    assert pretty_interval(62) == "1 minute 2 seconds"
+    assert pretty_interval(121) == "2 minutes 1 second"
+    assert pretty_interval(3600) == "1 hour"
+    assert pretty_interval(7242) == "2 hours 42 seconds"
+
+
 def test_pretty_size_bytes() -> None:
     """
     must generate bytes string for bytes value

tests/ahriman/web/schemas/test_logs_search_schema.py

@@ -0,0 +1 @@
+# schema testing goes in view class tests

tests/ahriman/web/views/v2/packages/test_view_v2_packages_logs.py

@@ -86,6 +86,31 @@ async def test_get_with_pagination(client: TestClient, package_ahriman: Package)
     ]
 
 
+async def test_get_with_filter(client: TestClient, package_ahriman: Package) -> None:
+    """
+    must get logs with filter by version and process identifier
+    """
+    await client.post(f"/api/v1/packages/{package_ahriman.base}",
+                      json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()})
+    await client.post(f"/api/v1/packages/{package_ahriman.base}/logs",
+                      json={"created": 42.0, "message": "message 1", "version": "42"})
+    await client.post(f"/api/v1/packages/{package_ahriman.base}/logs",
+                      json={"created": 43.0, "message": "message 2", "version": "43"})
+    request_schema = pytest.helpers.schema_request(LogsView.get, location="querystring")
+    response_schema = pytest.helpers.schema_response(LogsView.get)
+
+    payload = {"version": "42", "process_id": LogRecordId.DEFAULT_PROCESS_ID}
+    assert not request_schema.validate(payload)
+    response = await client.get(f"/api/v2/packages/{package_ahriman.base}/logs", params=payload)
+    assert response.status == 200
+
+    logs = await response.json()
+    assert not response_schema.validate(logs)
+    assert logs == [
+        {"created": 42.0, "message": "message 1", "version": "42", "process_id": LogRecordId.DEFAULT_PROCESS_ID},
+    ]
+
+
 async def test_get_bad_request(client: TestClient, package_ahriman: Package) -> None:
     """
     must return bad request for invalid query parameters