Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / api / status.py

diff --git a/nominatim/api/status.py b/nominatim/api/status.py
index b6cd69a86b75de17d3c6289606f4f74b639fd350..1069184c88e8bc9655111b737b3a060731d931e6 100644 (file)
--- a/nominatim/api/status.py
+++ b/nominatim/api/status.py
@@ -5,9 +5,9 @@
 # Copyright (C) 2023 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 # Copyright (C) 2023 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """

-Classes and function releated to status call.
+Classes and function related to status call.

 """
 """

-from typing import Optional, cast
+from typing import Optional

 import datetime as dt
 import dataclasses
 
 import datetime as dt
 import dataclasses
 


@@ -36,11 +36,17 @@ async def get_status(conn: SearchConnection) -> StatusResult:
     sql = sa.select(conn.t.import_status.c.lastimportdate).limit(1)
     status.data_updated = await conn.scalar(sql)
 
     sql = sa.select(conn.t.import_status.c.lastimportdate).limit(1)
     status.data_updated = await conn.scalar(sql)
 

+    if status.data_updated is not None:
+        if status.data_updated.tzinfo is None:
+            status.data_updated = status.data_updated.replace(tzinfo=dt.timezone.utc)
+        else:
+            status.data_updated = status.data_updated.astimezone(dt.timezone.utc)
+

     # Database version
     # Database version

-    sql = sa.select(conn.t.properties.c.value)\
-            .where(conn.t.properties.c.property == 'database_version')
-    verstr = await conn.scalar(sql)
-    if verstr is not None:
-        status.database_version = version.parse_version(cast(str, verstr))
+    try:
+        verstr = await conn.get_property('database_version')
+        status.database_version = version.parse_version(verstr)
+    except ValueError:
+        pass

 
     return status
 
     return status