fix: worker cache

Author: db0

horde/apis/v2/base.py

@@ -42,7 +42,7 @@
 from horde.patreon import patrons
 from horde.r2 import upload_prompt
 from horde.suspicions import Suspicions
-from horde.utils import hash_api_key, hash_dictionary, is_profane, sanitize_string
+from horde.utils import datetime_parser, hash_api_key, hash_dictionary, is_profane, sanitize_string
 from horde.vars import horde_contact_email, horde_title, horde_url
 
 # Not used yet
@@ -873,7 +873,7 @@ def retrieve_workers_details(self):
             else:
                 hr.horde_local_setex_to_json("worker_cache", 300, workers)
             return workers
-        return self.parse_worker_by_query(json.loads(cached_workers))
+        return self.parse_worker_by_query(json.loads(cached_workers, object_hook=datetime_parser))
 
     def get_worker_info_list(self, details_privilege):
         workers_ret = []

horde/classes/stable/waiting_prompt.py

@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 import copy
+import math
 import os
 import random
-import math
 
 from sqlalchemy.sql import expression
 
@@ -415,23 +415,23 @@ def downgrade(self, max_resolution):
         area = self.width * self.height
         if area > area_limit:
             downgraded = True
-            
+
             # Scale to fit into max_resolution
             scale = math.sqrt(area_limit / area)
             new_width = int(self.width * scale)
             new_height = int(self.height * scale)
-            
+
             # Snap down to multiple of 64
             new_width = (new_width // 64) * 64
             new_height = (new_height // 64) * 64
-            
+
             # Decrement more if needed (just in case we missed some edge case)
             while new_width * new_height > area_limit:
                 if new_width >= new_height:
                     new_width -= 64
                 else:
                     new_height -= 64
-                    
+
             # Minimum size
             if new_width * new_height < 512 * 512:
                 new_width = 512
@@ -536,4 +536,3 @@ def get_highest_model_batching_multiplier(self):
 
     def count_pp(self):
         return len(self.params.get("post_processing", []))
-

horde/database/threads.py

@@ -4,7 +4,7 @@
 
 import json
 import os
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
 
 import patreon
 import stripe
@@ -109,6 +109,13 @@ def store_prioritized_wp_queue():
 @logger.catch(reraise=True)
 def store_worker_list():
     """Stores the retrieved worker details as json for 300 seconds horde-wide"""
+
+    def json_serial(obj):
+        """JSON serializer for objects not serializable by default json code"""
+        if isinstance(obj, (datetime, date)):
+            return obj.isoformat()
+        raise TypeError(f"Type {type(obj)} not serializable")
+
     with HORDE.app_context():
         serialized_workers = []
         serialized_workers_privileged = []
@@ -117,8 +124,8 @@ def store_worker_list():
         for worker in get_active_workers():
             serialized_workers.append(worker.get_details())
             serialized_workers_privileged.append(worker.get_details(2))
-        json_workers = json.dumps(serialized_workers)
-        json_workers_privileged = json.dumps(serialized_workers_privileged)
+        json_workers = json.dumps(serialized_workers, default=json_serial)
+        json_workers_privileged = json.dumps(serialized_workers_privileged, default=json_serial)
         try:
             hr.horde_r_setex("worker_cache", timedelta(seconds=300), json_workers)
             hr.horde_r_setex(

horde/utils.py

@@ -155,3 +155,23 @@ def ensure_clean(string, key):
     if is_profane(string):
         raise e.BadRequest(f"{key} contains profanity")
     return sanitize_string(string)
+
+
+# Compiled as a constant to improve performance during high-volume JSON parsing
+ISO_DATETIME_RE = re.compile(r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}")
+
+
+def datetime_parser(json_dict):
+    """
+    Hook for json.loads to convert ISO 8601 strings back to datetime objects.
+    Uses a pre-compiled regex for efficiency.
+    """
+    for key, value in json_dict.items():
+        # Check if it's a string and matches the ISO format pattern
+        if isinstance(value, str) and ISO_DATETIME_RE.match(value):
+            try:
+                json_dict[key] = datetime.fromisoformat(value)
+            except (ValueError, TypeError):
+                # Fallback if it looks like a date but doesn't parse correctly
+                pass
+    return json_dict