try importing within init

getredash · Feb 10, 2024 · 5b67199 · 5b67199
1 parent 7e110a6
commit 5b67199
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/redash/query_runner/__init__.py b/redash/query_runner/__init__.py
@@ -9,7 +9,6 @@
 from sshtunnel import open_tunnel
 
 from redash import settings, utils
-from redash.query_runner.registry import query_runners
 from redash.utils.requests_session import (
     UnacceptableAddressException,
     requests_or_advocate,
@@ -396,6 +395,9 @@ def get_response(self, url, auth=None, http_method="get", **kwargs):
         return response, error
 
 
+query_runners = {}
+
+
 def register(query_runner_class):
     global query_runners
     if query_runner_class.enabled():

diff --git a/redash/query_runner/registry.py b/redash/query_runner/registry.py
diff --git a/redash/utils/__init__.py b/redash/utils/__init__.py
@@ -20,7 +20,6 @@
 from sqlalchemy.orm.query import Query
 
 from redash import settings
-from redash.query_runner.registry import query_runners
 
 from .human_time import parse_human_time
 
@@ -75,15 +74,16 @@ class JSONEncoder(json.JSONEncoder):
     """Adapter for `json.dumps`."""
 
     def __init__(self, **kwargs):
+        from redash.query_runner import query_runners
+
         self.encoders = [r.custom_json_encoder for r in query_runners.values() if hasattr(r, "custom_json_encoder")]
         super().__init__(**kwargs)
 
     def default(self, o):
         for encoder in self.encoders:
             result = encoder(self, o)
             if result:
-                o = result
-                break
+                return result
         if isinstance(o, Query):
             result = list(o)
         elif isinstance(o, decimal.Decimal):