devpi-web 5.0.1__tar.gz → 5.0.2__tar.gz

devpi_web-5.0.2/.flake8

@@ -0,0 +1,3 @@
+[flake8]
+# E203 is ignored because we enforce ruff format which contradicts it
+ignore = E203,E501,E704,E741,W503

{devpi_web-5.0.1 → devpi_web-5.0.2}/CHANGELOG

@@ -2,6 +2,26 @@
 
 .. towncrier release notes start
 
+5.0.2 (2026-03-17)
+==================
+
+Bug Fixes
+---------
+
+- Prevent double indexing work on first start of freshly initialized/imported instance.
+
+- Optimize preparation of mirror project data for indexing.
+
+- Consistently use offline mode when indexing. This especially helps performance on startup.
+
+- Skip redirect if an installer is detected which is configured without ``+simple`` in the URL.
+
+Other Changes
+-------------
+
+- Support string timestamps for file history log entries from devpi-server 7.0.0.
+
+
 5.0.1 (2025-06-15)
 ==================
 
@@ -11,7 +31,6 @@ Bug Fixes
 - Fix traceback during unpacking of documentation in some cases.
 
 
-
 5.0.0 (2025-06-12)
 ==================
 
@@ -24,15 +43,11 @@ Deprecations and Removals
 
 - Future releases will more often require newer devpi-server than before.
 
-
-
 Bug Fixes
 ---------
 
 - Fix #930: remove remaining uses of unmaintained py library.
 
-
-
 Other Changes
 -------------
 
@@ -69,7 +84,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -79,7 +93,6 @@ Features
 - index.pt, project.pt, version.pt: Fix #1062: Added a link to download the documentation as zip-file to the index, project and version view.
 
 
-
 4.2.3 (2024-09-19)
 ==================
 
@@ -95,7 +108,6 @@ Bug Fixes
 - Increase threshold for index status from 60 s to 300 s for warnings and from 300 s to 3600 s for fatal.
 
 
-
 4.2.2 (2024-04-20)
 ==================
 
@@ -109,7 +121,6 @@ Bug Fixes
 - Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
 
 
-
 4.2.1 (2023-07-02)
 ==================
 
@@ -131,7 +142,6 @@ Features
 
 - Add ``--keep-docs-packed`` option.
 
-
 Bug Fixes
 ---------
 
@@ -151,7 +161,6 @@ Bug Fixes
 4.1.1 (2022-09-28)
 ==================
 
-
 Bug Fixes
 ---------
 
@@ -170,7 +179,6 @@ Features
 
 - project.pt: add navigation links to original project page for mirrors and to "Simple page" of projects.
 
-
 Bug Fixes
 ---------
 
@@ -216,7 +224,6 @@ Bug Fixes
 
 - Use a lock file to prevent concurrent unpacking of documentation.
 
-
 Other Changes
 -------------
 
@@ -277,7 +284,6 @@ Deprecations and Removals
 
 - Dropped support for Python 2.7.
 
-
 Features
 --------
 
@@ -317,7 +323,6 @@ Features
 
 - Indexer backend options can now be specified as a dict in yaml config files.
 
-
 Bug Fixes
 ---------
 
@@ -325,7 +330,6 @@ Bug Fixes
 
 - Pass query string on to documentation iframe, this fixes Sphinx search among other things.
 
-
 Other Changes
 -------------
 
@@ -364,7 +368,6 @@ Features
 
 - feature #193: adding support for using markdown in package descriptions.
 
-
 Bug Fixes
 ---------
 
@@ -404,7 +407,6 @@ Features
 
 - Use ``mirror_web_url_fmt`` in ``get_description`` for mirror indexes.
 
-
 Bug Fixes
 ---------
 
@@ -629,7 +631,6 @@ Bug Fixes
 - fix notfound-redirect when serving under an outside URL with a sub path
 
 
-
 2.2.0
 =====
 

{devpi_web-5.0.1 → devpi_web-5.0.2}/CHANGELOG.short.rst

@@ -9,6 +9,26 @@ Changelog
 
 .. towncrier release notes start
 
+5.0.2 (2026-03-17)
+==================
+
+Bug Fixes
+---------
+
+- Prevent double indexing work on first start of freshly initialized/imported instance.
+
+- Optimize preparation of mirror project data for indexing.
+
+- Consistently use offline mode when indexing. This especially helps performance on startup.
+
+- Skip redirect if an installer is detected which is configured without ``+simple`` in the URL.
+
+Other Changes
+-------------
+
+- Support string timestamps for file history log entries from devpi-server 7.0.0.
+
+
 5.0.1 (2025-06-15)
 ==================
 
@@ -18,7 +38,6 @@ Bug Fixes
 - Fix traceback during unpacking of documentation in some cases.
 
 
-
 5.0.0 (2025-06-12)
 ==================
 
@@ -31,15 +50,11 @@ Deprecations and Removals
 
 - Future releases will more often require newer devpi-server than before.
 
-
-
 Bug Fixes
 ---------
 
 - Fix #930: remove remaining uses of unmaintained py library.
 
-
-
 Other Changes
 -------------
 
@@ -76,7 +91,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -86,7 +100,6 @@ Features
 - index.pt, project.pt, version.pt: Fix #1062: Added a link to download the documentation as zip-file to the index, project and version view.
 
 
-
 4.2.3 (2024-09-19)
 ==================
 
@@ -101,18 +114,3 @@ Bug Fixes
 
 - Increase threshold for index status from 60 s to 300 s for warnings and from 300 s to 3600 s for fatal.
 
-
-
-4.2.2 (2024-04-20)
-==================
-
-Bug Fixes
----------
-
-- style.css: Always let content be full browser height. This also gives more height with some documentation themes when content is short.
-
-- style.css: set ``scrollbar-gutter: stable`` on ``body`` to prevent jumping content in documentation iframe.
-
-- Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
-
-

{devpi_web-5.0.1 → devpi_web-5.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-web
-Version: 5.0.1
+Version: 5.0.2
 Summary: devpi-web: a web view for devpi-server
 Maintainer-email: Florian Schulze <mail@pyfidelity.com>
 License-Expression: MIT
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
@@ -87,6 +88,26 @@ Changelog
 
 .. towncrier release notes start
 
+5.0.2 (2026-03-17)
+==================
+
+Bug Fixes
+---------
+
+- Prevent double indexing work on first start of freshly initialized/imported instance.
+
+- Optimize preparation of mirror project data for indexing.
+
+- Consistently use offline mode when indexing. This especially helps performance on startup.
+
+- Skip redirect if an installer is detected which is configured without ``+simple`` in the URL.
+
+Other Changes
+-------------
+
+- Support string timestamps for file history log entries from devpi-server 7.0.0.
+
+
 5.0.1 (2025-06-15)
 ==================
 
@@ -96,7 +117,6 @@ Bug Fixes
 - Fix traceback during unpacking of documentation in some cases.
 
 
-
 5.0.0 (2025-06-12)
 ==================
 
@@ -109,15 +129,11 @@ Deprecations and Removals
 
 - Future releases will more often require newer devpi-server than before.
 
-
-
 Bug Fixes
 ---------
 
 - Fix #930: remove remaining uses of unmaintained py library.
 
-
-
 Other Changes
 -------------
 
@@ -154,7 +170,6 @@ Other Changes
 - macros.pt: Move ``versions`` macro to separate ``footer_versions.pt`` template.
 
 
-
 4.3.0 (2024-10-16)
 ==================
 
@@ -164,7 +179,6 @@ Features
 - index.pt, project.pt, version.pt: Fix #1062: Added a link to download the documentation as zip-file to the index, project and version view.
 
 
-
 4.2.3 (2024-09-19)
 ==================
 
@@ -179,18 +193,3 @@ Bug Fixes
 
 - Increase threshold for index status from 60 s to 300 s for warnings and from 300 s to 3600 s for fatal.
 
-
-
-4.2.2 (2024-04-20)
-==================
-
-Bug Fixes
----------
-
-- style.css: Always let content be full browser height. This also gives more height with some documentation themes when content is short.
-
-- style.css: set ``scrollbar-gutter: stable`` on ``body`` to prevent jumping content in documentation iframe.
-
-- Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
-
-

devpi_web-5.0.2/devpi_web/__init__.py

@@ -0,0 +1 @@
+__version__ = "5.0.2"

{devpi_web-5.0.1 → devpi_web-5.0.2}/devpi_web/indexing.py

@@ -1,10 +1,17 @@
+from __future__ import annotations
+
+from attrs import define
 from collections.abc import Mapping
-from devpi_common.types import ensure_unicode
 from devpi_common.metadata import get_sorted_versions
+from devpi_common.types import ensure_unicode
 from devpi_common.validation import normalize_name
 from devpi_web.config import get_pluginmanager
 from devpi_web.doczip import Docs
-import attr
+from typing import TYPE_CHECKING
+
+
+if TYPE_CHECKING:
+    from typing import Any
 
 
 def is_project_cached(stage, project):
@@ -14,7 +21,7 @@ def is_project_cached(stage, project):
     return True
 
 
-def preprocess_project(project):
+def preprocess_project(project: ProjectIndexingInfo) -> dict | None:
     stage = project.stage
     pm = get_pluginmanager(stage.xom.config)
     name = normalize_name(project.name)
@@ -25,15 +32,19 @@ def preprocess_project(project):
         user, index = stage.name.split('/')
     user = ensure_unicode(user)
     index = ensure_unicode(index)
-    if not is_project_cached(stage, name):
-        result = dict(name=project.name, user=user, index=index)
-        pm.hook.devpiweb_modify_preprocess_project_result(
-            project=project, result=result)
-        return result
-    stage.offline = True
-    if not stage.has_project_perstage(name):
+    result: dict[str, object]
+    if stage.ixconfig["type"] == "mirror":
+        stage.offline = True
+        if not stage.is_project_cached(name):
+            # only index basic info for projects with no downloads
+            result = dict(name=project.name, user=user, index=index)
+            pm.hook.devpiweb_modify_preprocess_project_result(
+                project=project, result=result
+            )
+            return result
+    elif not stage.has_project_perstage(name):
         # project doesn't exist anymore
-        return
+        return None
     # metadata_keys is only available on private indexes
     setuptools_metadata = frozenset(getattr(stage, 'metadata_keys', ()))
     versions = get_sorted_versions(stage.list_versions_perstage(name))
@@ -49,8 +60,7 @@ def preprocess_project(project):
                 result['doc_version'] = version
                 result['+doczip'] = docs
             break
-        else:
-            assert '+doczip' not in result
+        assert "+doczip" not in result
 
     result[u'user'] = user
     result[u'index'] = index
@@ -64,17 +74,18 @@ def preprocess_project(project):
     return result
 
 
-@attr.s(slots=True)
-class ProjectIndexingInfo(object):
-    stage = attr.ib()
-    name = attr.ib(type=str)
+@define
+class ProjectIndexingInfo:
+    stage: Any
+    name: str
+    num_names: int
 
     @property
-    def indexname(self):
+    def indexname(self) -> str:
         return self.stage.name
 
     @property
-    def is_from_mirror(self):
+    def is_from_mirror(self) -> bool:
         return self.stage.ixconfig['type'] == 'mirror'
 
 
@@ -92,18 +103,21 @@ def iter_indexes(xom):
     yield from mirrors
 
 
-def iter_projects(xom):
+def iter_projects(xom, *, offline=True):
     for username, index in iter_indexes(xom):
         stage = xom.model.getstage(username, index)
         if stage is None:  # this is async, so the stage may be gone
             continue
         names = stage.list_projects_perstage()
+        # only go offline after we got the projects list
+        if stage.ixconfig["type"] == "mirror":
+            stage.offline = offline
         if isinstance(names, Mapping):
             # since devpi-server 6.6.0 mirrors return a mapping where
             # the un-normalized names are in the values
             names = names.values()
+        num_names = len(names)
         for name in names:
-            name = ensure_unicode(name)
             yield ProjectIndexingInfo(
-                stage=stage,
-                name=name)
+                stage=stage, name=ensure_unicode(name), num_names=num_names
+            )

{devpi_web-5.0.1 → devpi_web-5.0.2}/devpi_web/main.py

@@ -101,9 +101,8 @@ def status_info(request):
     msgs = []
     pm = request.registry['devpiweb-pluginmanager']
     for result in pm.hook.devpiweb_get_status_info(request=request):
-        for msg in result:
-            msgs.append(msg)
-    states = set(x['status'] for x in msgs)
+        msgs.extend(result)
+    states = {x["status"] for x in msgs}
     if 'fatal' in states:
         status = 'fatal'
         short_msg = 'fatal'
@@ -284,9 +283,11 @@ def devpiserver_mirror_initialnames(stage, projectnames):
         # since devpi-server 6.6.0 mirrors return a mapping where
         # the un-normalized names are in the values
         projectnames = projectnames.values()
+    num_names = len(projectnames)
     ix.update_projects(
-        ProjectIndexingInfo(stage=stage, name=name)
-        for name in projectnames)
+        ProjectIndexingInfo(stage=stage, name=name, num_names=num_names)
+        for name in projectnames
+    )
     threadlog.info("finished mirror indexing operation")
 
 
@@ -315,14 +316,14 @@ def delete_project(stage, name):
     if stage is None:
         return
     ix = get_indexer(stage.xom)
-    ix.delete_projects([ProjectIndexingInfo(stage=stage, name=name)])
+    ix.delete_projects([ProjectIndexingInfo(stage=stage, name=name, num_names=1)])
 
 
 def index_project(stage, name):
     if stage is None:
         return
     ix = get_indexer(stage.xom)
-    ix.update_projects([ProjectIndexingInfo(stage=stage, name=name)])
+    ix.update_projects([ProjectIndexingInfo(stage=stage, name=name, num_names=1)])
 
 
 @devpiserver_hookimpl
@@ -338,9 +339,10 @@ def devpiserver_on_upload(stage, project, version, link):
 @devpiserver_hookimpl
 def devpiserver_on_changed_versiondata(stage, project, version, metadata):
     if stage is None:
-        # TODO we don't have enough info to delete the project
         return
     if not metadata:
+        if stage.ixconfig["type"] == "mirror":
+            stage.offline = True
         if is_project_cached(stage, project) and not stage.has_project_perstage(project):
             delete_project(stage, project)
             return

{devpi_web-5.0.1 → devpi_web-5.0.2}/devpi_web/null_index.py

@@ -24,9 +24,7 @@ class Index:
         return dict(items=[])
 
     def _matcher(self, searchinfo):
-        items = list(
-            re.escape(x)
-            for x in searchinfo['fields']['name'])
+        items = [re.escape(x) for x in searchinfo["fields"]["name"]]
         return re.compile('|'.join(items)).search
 
     def query_packages(self, searchinfo, sro):

{devpi_web-5.0.1 → devpi_web-5.0.2}/devpi_web/views.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from attrs import define
 from defusedxml.xmlrpc import DefusedExpatParser
 from devpi_common.metadata import Version
@@ -8,8 +10,10 @@ from devpi_common.validation import normalize_name
 from devpi_common.viewhelp import iter_toxresults
 from devpi_server.log import threadlog as log
 from devpi_server.readonly import SeqViewReadonly
-from devpi_server.views import StatusView, url_for_entrypath
 from devpi_server.views import PyPIView
+from devpi_server.views import StatusView
+from devpi_server.views import is_simple_json_or_requested_by_installer
+from devpi_server.views import url_for_entrypath
 from devpi_web.description import get_description
 from devpi_web.doczip import Docs
 from devpi_web.doczip import docs_exist
@@ -19,24 +23,32 @@ from devpi_web.doczip import docs_file_path
 from devpi_web.indexing import is_project_cached
 from devpi_web.main import navigation_version
 from email.utils import parsedate
-from io import TextIOWrapper
 from html import escape
-from operator import attrgetter, itemgetter
+from io import TextIOWrapper
+from operator import attrgetter
+from operator import itemgetter
 from pyramid.decorator import reify
-from pyramid.httpexceptions import HTTPBadGateway, HTTPError
-from pyramid.httpexceptions import HTTPFound, HTTPNotFound
+from pyramid.httpexceptions import HTTPBadGateway
+from pyramid.httpexceptions import HTTPError
+from pyramid.httpexceptions import HTTPFound
+from pyramid.httpexceptions import HTTPNotFound
 from pyramid.httpexceptions import HTTPNotModified
 from pyramid.httpexceptions import default_exceptionresponse_view
 from pyramid.interfaces import IRoutesMapper
-from pyramid.response import FileResponse, Response
-from pyramid.view import notfound_view_config, view_config
+from pyramid.response import FileResponse
+from pyramid.response import Response
+from pyramid.view import notfound_view_config
+from pyramid.view import view_config
 from time import gmtime
 from typing import Any
-from xmlrpc.client import Fault, Unmarshaller, dumps
+from xmlrpc.client import Fault
+from xmlrpc.client import Unmarshaller
+from xmlrpc.client import dumps
 import functools
 import json
 import mimetypes
 
+
 seq_types = (list, tuple, SeqViewReadonly)
 
 
@@ -106,6 +118,8 @@ def ServerViews(context, request):
 
 def tween_trailing_slash_redirect(handler, registry):
     def request_trailing_slash_redirect_handler(request):
+        if is_simple_json_or_requested_by_installer(request):
+            return handler(request)
         if request.path == "/":
             return handler(request)
         if request.method != "GET":
@@ -298,7 +312,8 @@ def sizeof_fmt(num):
 
 def format_timetuple(tt):
     if tt is not None:
-        return "{0}-{1:02d}-{2:02d} {3:02d}:{4:02d}:{5:02d}".format(*tt)
+        return "{}-{:02d}-{:02d} {:02d}:{:02d}:{:02d}".format(*tt)
+    return None
 
 
 def format_timestamp(ts, unset_value=None):
@@ -312,6 +327,12 @@ def format_timestamp(ts, unset_value=None):
     return ts
 
 
+def format_when(when):
+    if isinstance(when, str):
+        return when.replace("T", " ").rstrip("Z")
+    return format_timetuple(when)
+
+
 _what_map = dict(
     overwrite="Replaced",
     push="Pushed",
@@ -323,7 +344,7 @@ def make_history_view_item(request, log_item):
     result['what'] = _what_map.get(log_item['what'], log_item['what'])
     result['who'] = log_item['who']
     if log_item['what'] != 'overwrite':
-        result['when'] = format_timetuple(log_item['when'])
+        result["when"] = format_when(log_item["when"])
     for key in ('dst', 'src'):
         if key in log_item:
             result[key] = dict(
@@ -972,8 +993,7 @@ def batch_list(num, current, left=3, right=3):
         raise ValueError("Current position (%s) can't be greater than total (%s)." % (current, num))
     result.append(0)
     first = current - left
-    if first < 1:
-        first = 1
+    first = max(first, 1)
     if first > 1:
         result.append(None)
     last = current + right + 1
@@ -1093,7 +1113,7 @@ class SearchView:
             highlight = None
             if text_type == 'project':
                 continue
-            elif text_type in ('title', 'page'):
+            if text_type in ("title", "page"):
                 docs = self.get_docs(stage, data)
                 entry = docs[sub_data['text_path']]
                 text = entry['text']
@@ -1199,7 +1219,7 @@ class SearchView:
         else:
             fields = data
             operator = "and"
-        log.debug("xmlrpc_search {0}".format((fields, operator)))
+        log.debug("xmlrpc_search %s", (fields, operator))
         return dict(fields=fields, operator=operator)
 
     @view_config(