Dev (#2085)
* refactor(chalice): upgraded dependencies refactor(chalice): refactored code * feat(chalice): support android sessions
This commit is contained in:
parent
c56c4595b8
commit
217201eb5c
9 changed files with 16 additions and 29 deletions
10
api/Pipfile
10
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]
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"):
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue