From f360961500304e21c9064eba6b38746de7c72446 Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Mon, 9 Dec 2024 13:11:17 +0100 Subject: [PATCH] Dev (#2828) * fix(chalice): fixed Math-operators validation refactor(chalice): search for sessions that have events for heatmaps * refactor(chalice): search for sessions that have at least 1 location event for heatmaps * fix(chalice): fixed Math-operators validation refactor(chalice): search for sessions that have events for heatmaps * refactor(chalice): search for sessions that have at least 1 location event for heatmaps * feat(chalice): autocomplete return top 10 with stats * fix(chalice): fixed autocomplete top 10 meta-filters * refactor(chalice): upgraded dependencies refactor(chalice): new ch-driver logs --- api/Pipfile | 4 ++-- api/chalicelib/utils/ch_client_exp.py | 3 ++- api/requirements.txt | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/Pipfile b/api/Pipfile index d5c52995c..ffd5906f5 100644 --- a/api/Pipfile +++ b/api/Pipfile @@ -5,7 +5,7 @@ name = "pypi" [packages] sqlparse = "==0.5.2" -urllib3 = "==1.26.16" +urllib3 = "==2.2.3" requests = "==2.32.3" boto3 = "==1.35.76" pyjwt = "==2.10.1" @@ -21,7 +21,7 @@ uvicorn = {extras = ["standard"], version = "==0.32.1"} python-decouple = "==3.8" pydantic = {extras = ["email"], version = "==2.10.3"} apscheduler = "==3.11.0" -redis = "==5.2.0" +redis = "==5.2.1" [dev-packages] diff --git a/api/chalicelib/utils/ch_client_exp.py b/api/chalicelib/utils/ch_client_exp.py index 017c81fad..3cb461b7d 100644 --- a/api/chalicelib/utils/ch_client_exp.py +++ b/api/chalicelib/utils/ch_client_exp.py @@ -2,7 +2,7 @@ import logging import threading import time from functools import wraps -from queue import Queue +from queue import Queue, Empty import clickhouse_connect from clickhouse_connect.driver.query import QueryContext @@ -34,6 +34,7 @@ if config("CH_COMPRESSION", cast=bool, default=True): def transform_result(original_function): @wraps(original_function) def wrapper(*args, **kwargs): + logger.info("Executing query on CH") result = original_function(*args, **kwargs) if isinstance(result, clickhouse_connect.driver.query.QueryResult): column_names = result.column_names diff --git a/api/requirements.txt b/api/requirements.txt index 943a36e40..7cbe41468 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,5 +1,5 @@ # Keep this version to not have conflicts between requests and boto3 -urllib3==1.26.16 +urllib3==2.2.3 requests==2.32.3 boto3==1.35.76 pyjwt==2.10.1 @@ -19,4 +19,4 @@ python-decouple==3.8 pydantic[email]==2.10.3 apscheduler==3.11.0 -redis==5.2.0 +redis==5.2.1