Merge branch 'release/26.0.0'

Author: felliott

CHANGELOG

@@ -2,6 +2,14 @@
 ChangeLog
 *********
 
+26.0.0 (2026-03-26)
+===================
+- Add newerlic support to MFR. (thanks, @antkryt!)
+- Fix datetime conversion issue in tabular renderer. (thanks, @antkryt!)
+- Fix searching/filterinf in tabular renderer. (thanks, @Vlad0n20!)
+- Fix ability to zoom/pan on images.
+- Improve error message for unrenderable spreadsheets.
+
 25.0.0 (2025-11-18)
 ===================
 - Upgrade MFR and dependencies to python v3.13.

mfr/core/exceptions.py

@@ -146,12 +146,15 @@ def __init__(self, message, *args, metadata_url: str = '', response: str = '', *
             'response': self.response
         }])
 
-class CorruptedError(RendererError):
 
-    __TYPE = 'corrupted'
+class UnparseableTableError(RendererError):
+
+    __TYPE = 'unparseable_table'
 
     def __init__(self, *args, renderer_class: str = '', **kwargs):
-        super().__init__("File is corrupted, impossible to render, please check it's integrity", *args, renderer_class, **kwargs)
+        super().__init__("File is not loading. Please check its integrity by downloading.",
+                         *args, renderer_class, **kwargs)
+
 
 class TooBigToRenderError(ProviderError):
     """If the user tries to render a file larger than a server specified maximum, throw a

mfr/extensions/image/templates/viewer.mako

@@ -52,8 +52,7 @@
 
     $(document).ready(function() {
 
-        ## Reference on how mobile is detected: https://stackoverflow.com/a/10364620
-        var isMobile = window.matchMedia("only screen and (max-width: 760px)");
+        var isMobile = window.innerWidth <= 768;
 
         ## Enable the zoom feature only for desktop browsers
         if (!isMobile.matches) {

mfr/extensions/tabular/utilities.py

@@ -1,5 +1,6 @@
 import re
 import xlrd
+from datetime import datetime
 
 from http import HTTPStatus
 from subprocess import (check_call,
@@ -8,7 +9,7 @@
 from tempfile import NamedTemporaryFile
 
 from mfr.extensions.tabular import compat
-from mfr.core.exceptions import SubprocessError, CorruptedError
+from mfr.core.exceptions import SubprocessError, UnparseableTableError
 from mfr.extensions.tabular.settings import (PSPP_CONVERT_BIN,
                                              PSPP_CONVERT_TIMEOUT,
                                              MAX_SIZE)
@@ -114,19 +115,25 @@ def to_bytes(fp):
     raise TypeError("Expected binary file-like object; got text/str")
 
 
+def _convert_value(value):
+    if isinstance(value, datetime):
+        return value.isoformat()
+    return value
+
+
 def _extract_rows(fields, raw_rows):
     rows = []
     for row in raw_rows:
         if len(rows) >= MAX_SIZE:
             break
-        rows.append(dict(zip(fields, row)))
+        rows.append(dict(zip(fields, map(_convert_value, row))))
     return rows
 
 
 def parse_xls(wb, sheets):
     for sheet in wb.sheets():
         if getattr(sheet, 'nrows', None) is None or getattr(sheet, 'ncols', None) is None:
-            raise CorruptedError
+            raise UnparseableTableError
 
         ncols = sheet.ncols
         max_cols = min(ncols, MAX_SIZE)
@@ -145,7 +152,7 @@ def parse_xlsx(wb, sheets):
         ws = wb[name]
 
         if getattr(ws, 'max_row', None) is None or getattr(ws, 'max_column', None) is None:
-            raise CorruptedError
+            raise UnparseableTableError
 
         ncols = getattr(ws, "max_column", 0)
         max_cols = min(ncols, MAX_SIZE)

mfr/version.py

@@ -1 +1 @@
-__version__ = '25.0.0'
+__version__ = '26.0.0'

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mfr"
-version = "25.0.0"
+version = "26.0.0"
 description = "Modular File Renderer"
 authors = ["Center for Open Science <contact@cos.io>"]
 readme = "README.md"
@@ -49,6 +49,7 @@ celery = "5.5.0"
 black = "^25.1.0"
 isort = "^6.0.1"
 ruff = "^0.12.7"
+newrelic = "10.8.1"
 
 
 [tool.poetry.group.dev]

pyproject.toml

@@ -1,4 +1,5 @@
 import os
+import sys
 
 from invoke import task
 
@@ -70,3 +71,28 @@ def celery(ctx, loglevel='INFO', hostname='%h', concurrency=None):
     if concurrency:
         command.extend(['--concurrency', concurrency])
     app.worker_main(command)
+
+
+@task
+def newrelic_init(ctx, key=None, verbose=False):
+    if key is None:
+        sys.exit('No newrelic api key given.  Please generate one and rerun this command '
+                 'with `invoke newrelic-init --key=$key`')
+
+    cmd_tmpl = 'newrelic-admin generate-config {} newrelic.ini'
+    cmd = cmd_tmpl.format(key)
+    if verbose:
+        print(cmd_tmpl.format('<redacted>'))
+    ctx.run(cmd, pty=True)
+
+
+@task
+def newrelic_server(ctx, config='newrelic.ini', verbose=False):
+    if not os.path.exists(config):
+        sys.exit("Couldn't find config file '{}'.  Check path or run `invoke newrelic_init` "
+                 "to generate it.".format(config))
+
+    cmd = f'poetry run env NEW_RELIC_CONFIG_FILE={config} newrelic-admin run-program invoke server'
+    if verbose:
+        print(cmd)
+    ctx.run(cmd, pty=True)