From 6220bde2d61e2c18f0aaf46132ef1adffb1cf37e Mon Sep 17 00:00:00 2001
From: anqixxx <anqix2002@gmail.com>
Date: Wed, 21 May 2025 10:47:01 -0700
Subject: [PATCH] Added mypy ignore fix for logging.py (library change), as
 well as quick mac fix on mem.cached

---
 src/nominatim_api/logging.py              | 3 ++-
 src/nominatim_db/tools/database_import.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/nominatim_api/logging.py b/src/nominatim_api/logging.py
index 1a6aef9b..64d43fdc 100644
--- a/src/nominatim_api/logging.py
+++ b/src/nominatim_api/logging.py
@@ -342,7 +342,8 @@ HTML_HEADER: str = """<!DOCTYPE html>
   <title>Nominatim - Debug</title>
   <style>
 """ + \
-    (HtmlFormatter(nobackground=True).get_style_defs('.highlight') if CODE_HIGHLIGHT else '') + \
+    (HtmlFormatter(nobackground=True).get_style_defs('.highlight')  # type: ignore[no-untyped-call]
+     if CODE_HIGHLIGHT else '') + \
     """
     h2 { font-size: x-large }
 
diff --git a/src/nominatim_db/tools/database_import.py b/src/nominatim_db/tools/database_import.py
index a7ee807e..809a8839 100644
--- a/src/nominatim_db/tools/database_import.py
+++ b/src/nominatim_db/tools/database_import.py
@@ -127,7 +127,7 @@ def import_osm_data(osm_files: Union[Path, Sequence[Path]],
                 fsize += os.stat(str(fname)).st_size
         else:
             fsize = os.stat(str(osm_files)).st_size
-        options['osm2pgsql_cache'] = int(min((mem.available + mem.cached) * 0.75,
+        options['osm2pgsql_cache'] = int(min((mem.available + getattr(mem, 'cached', 0)) * 0.75,
                                              fsize * 2) / 1024 / 1024) + 1
 
     run_osm2pgsql(options)
-- 
2.39.5

