Merge branch 'master' into asyncio

Author: greenape

flowapi/flowapi/main.py

@@ -82,7 +82,7 @@ async def connect_logger():
     logger = root_logger.getChild("access")
     logger.setLevel(logging.INFO)
     ch = logging.StreamHandler(sys.stdout)
-    ch.setLevel(log_level)
+    ch.setLevel(logging.INFO)
     logger.addHandler(ch)
     # Debug logger. Quart doesn't allow us to override current_app.logger, but won't use it by default.
     current_app.access_logger = structlog.wrap_logger(logger)
@@ -91,7 +91,7 @@ async def connect_logger():
     logger = root_logger.getChild("query")
     logger.setLevel(logging.INFO)
     ch = logging.StreamHandler(sys.stdout)
-    ch.setLevel(log_level)
+    ch.setLevel(logging.INFO)
     logger.addHandler(ch)
     current_app.query_run_logger = structlog.wrap_logger(logger)
 

flowmachine/flowmachine/core/server/query_schemas/subscriber_subset.py

@@ -32,10 +32,9 @@ def __call__(self, value) -> Union[None, str]:
                     ._flowmachine_query_obj
                 )
             except UnkownQueryIdError:
-                raise ValidationError("Must be None or a valid query id.")
-            except ValidationError:
                 if not cache_table_exists(get_db(), value):
                     raise ValidationError("Must be None or a valid query id.")
+
         return value
 
 
@@ -75,5 +74,5 @@ def deserialize(
                     .load(QueryInfoLookup(get_redis()).get_query_params(value))
                     ._flowmachine_query_obj
                 )
-            except ValidationError:
+            except UnkownQueryIdError:
                 return get_query_object_by_id(get_db(), value)