diff --git a/api/Pipfile b/api/Pipfile index a7c013891..c01ee072a 100644 --- a/api/Pipfile +++ b/api/Pipfile @@ -4,20 +4,20 @@ verify_ssl = true name = "pypi" [packages] +urllib3 = "==1.26.16" requests = "==2.31.0" -boto3 = "==1.34.78" +boto3 = "==1.34.84" pyjwt = "==2.8.0" psycopg2-binary = "==2.9.9" +psycopg = {extras = ["pool", "binary"], version = "==3.1.18"} elasticsearch = "==8.13.0" jira = "==3.8.0" fastapi = "==0.110.1" +uvicorn = {extras = ["standard"], version = "==0.29.0"} python-decouple = "==3.8" +pydantic = {extras = ["email"], version = "==2.3.0"} apscheduler = "==3.10.4" redis = "==5.0.3" -urllib3 = "==1.26.16" -psycopg = {extras = ["pool", "binary"], version = "==3.1.18"} -uvicorn = {extras = ["standard"], version = "==0.29.0"} -pydantic = {extras = ["email"], version = "==2.3.0"} [dev-packages] diff --git a/api/chalicelib/core/usability_testing/service.py b/api/chalicelib/core/usability_testing/service.py index be71770d0..18984e7d5 100644 --- a/api/chalicelib/core/usability_testing/service.py +++ b/api/chalicelib/core/usability_testing/service.py @@ -115,18 +115,6 @@ def get_ut_test(project_id: int, test_id: int): WHERE utt.test_id = %(test_id)s """ - live_count_sql = """ - WITH RankedSessions AS ( - SELECT *, - ROW_NUMBER() OVER (PARTITION BY session_id ORDER BY timestamp DESC) as rn - FROM ut_tests_signals - WHERE test_id = %(test_id)s AND task_id IS NULL - ) - SELECT COUNT(DISTINCT session_id) AS live_count - FROM RankedSessions - WHERE rn = 1 AND status = 'begin' - """ - select_columns = [ "ut.test_id", "ut.title", diff --git a/api/requirements-alerts.txt b/api/requirements-alerts.txt index 2a8fd9f2c..7f2bb8cdf 100644 --- a/api/requirements-alerts.txt +++ b/api/requirements-alerts.txt @@ -1,7 +1,7 @@ # Keep this version to not have conflicts between requests and boto3 urllib3==1.26.16 requests==2.31.0 -boto3==1.34.78 +boto3==1.34.84 pyjwt==2.8.0 psycopg2-binary==2.9.9 psycopg[pool,binary]==3.1.18 diff --git a/api/requirements.txt b/api/requirements.txt index 90a763785..488426001 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -1,7 +1,7 @@ # Keep this version to not have conflicts between requests and boto3 urllib3==1.26.16 requests==2.31.0 -boto3==1.34.78 +boto3==1.34.84 pyjwt==2.8.0 psycopg2-binary==2.9.9 psycopg[pool,binary]==3.1.18 diff --git a/ee/api/Pipfile b/ee/api/Pipfile index b5de42ee4..5aa3eea82 100644 --- a/ee/api/Pipfile +++ b/ee/api/Pipfile @@ -6,7 +6,7 @@ name = "pypi" [packages] urllib3 = "==1.26.16" requests = "==2.31.0" -boto3 = "==1.34.78" +boto3 = "==1.34.84" pyjwt = "==2.8.0" psycopg2-binary = "==2.9.9" elasticsearch = "==8.13.0" @@ -15,16 +15,15 @@ fastapi = "==0.110.1" gunicorn = "==21.2.0" python-decouple = "==3.8" apscheduler = "==3.10.4" -python3-saml = "==1.16.0" -python-multipart = "==0.0.6" redis = "==5.0.3" -azure-storage-blob = "==12.19.0" +azure-storage-blob = "==12.19.1" psycopg = {extras = ["binary", "pool"], version = "==3.1.18"} uvicorn = {extras = ["standard"], version = "==0.29.0"} pydantic = {extras = ["email"], version = "==2.3.0"} -clickhouse-driver = {extras = ["lz4"], version = "==0.2.6"} +clickhouse-driver = {extras = ["lz4"], version = "==0.2.7"} +python3-saml = "==1.16.0" [dev-packages] [requires] -python_version = "3.12" +python_version = "3.11" diff --git a/ee/api/chalicelib/core/sessions_replay.py b/ee/api/chalicelib/core/sessions_replay.py index d58a66b15..3bdd6102b 100644 --- a/ee/api/chalicelib/core/sessions_replay.py +++ b/ee/api/chalicelib/core/sessions_replay.py @@ -51,7 +51,7 @@ def get_by_id2_pg(project_id, session_id, context: schemas.CurrentContext, full_ if data is not None: data = helper.dict_to_camel_case(data) if full_data: - if data["platform"] == 'ios': + if data["platform"] in ('ios', 'android'): data['events'] = events_ios.get_by_sessionId(project_id=project_id, session_id=session_id) for e in data['events']: if e["type"].endswith("_IOS"): diff --git a/ee/api/requirements-alerts.txt b/ee/api/requirements-alerts.txt index 1cc65a4c2..182e5bd62 100644 --- a/ee/api/requirements-alerts.txt +++ b/ee/api/requirements-alerts.txt @@ -1,7 +1,7 @@ # Keep this version to not have conflicts between requests and boto3 urllib3==1.26.16 requests==2.31.0 -boto3==1.34.78 +boto3==1.34.84 pyjwt==2.8.0 psycopg2-binary==2.9.9 psycopg[pool,binary]==3.1.18 diff --git a/ee/api/requirements-crons.txt b/ee/api/requirements-crons.txt index 2835ba022..f520a2b69 100644 --- a/ee/api/requirements-crons.txt +++ b/ee/api/requirements-crons.txt @@ -1,7 +1,7 @@ # Keep this version to not have conflicts between requests and boto3 urllib3==1.26.16 requests==2.31.0 -boto3==1.34.78 +boto3==1.34.84 pyjwt==2.8.0 psycopg2-binary==2.9.9 psycopg[pool,binary]==3.1.18 diff --git a/ee/api/requirements.txt b/ee/api/requirements.txt index f5432beb4..9de13043b 100644 --- a/ee/api/requirements.txt +++ b/ee/api/requirements.txt @@ -1,7 +1,7 @@ # Keep this version to not have conflicts between requests and boto3 urllib3==1.26.16 requests==2.31.0 -boto3==1.34.78 +boto3==1.34.84 pyjwt==2.8.0 psycopg2-binary==2.9.9 psycopg[pool,binary]==3.1.18