jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/api-v1.7.0' into dev

Browse source
This commit is contained in:
Taha Yassine Kraiem 2022-06-28 20:44:08 +02:00
commit 831d90cb94
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/chalicelib/core/assist.py
View file

@ -49,11 +49,11 @@ def __get_live_sessions_ws(project_id, data):
if connected_peers.status_code != 200:
print("!! issue with the peer-server")
print(connected_peers.text)
return []
return {"total": 0, "sessions": []}
live_peers = connected_peers.json().get("data", [])
except requests.exceptions.Timeout:
print("Timeout getting Assist response")
live_peers = []
live_peers = {"total": 0, "sessions": []}
except Exception as e:
print("issue getting Live-Assist response")
print(str(e))
@ -62,7 +62,7 @@ def __get_live_sessions_ws(project_id, data):
print(connected_peers.text)
except:
print("couldn't get response")
live_peers = []
live_peers = {"total": 0, "sessions": []}
_live_peers = live_peers
if "sessions" in live_peers:
_live_peers = live_peers["sessions"]

14
ee/api/routers/subs/v1_api_ee.py
View file

@ -20,12 +20,16 @@ def get_assist_credentials():
@app_apikey.get('/v1/{projectKey}/assist/sessions', tags=["api"])
def get_sessions_live(projectKey: str, userId: str = None, context: schemas.CurrentContext = Depends(OR_context)):
return core.get_sessions_live(projectId=projects.get_internal_project_id(projectKey),
userId=userId, context=context)
projectId = projects.get_internal_project_id(projectKey)
if projectId is None:
return {"errors": ["invalid projectKey"]}
return core.get_sessions_live(projectId=projectId, userId=userId, context=context)
@app_apikey.post('/v1/{projectKey}/assist/sessions', tags=["api"])
def sessions_live(projectKey: int, data: schemas.LiveSessionsSearchPayloadSchema = Body(...),
def sessions_live(projectKey: str, data: schemas.LiveSessionsSearchPayloadSchema = Body(...),
context: schemas.CurrentContext = Depends(OR_context)):
return core.sessions_live(projectId=projects.get_internal_project_id(projectKey),
data=data, context=context)
projectId = projects.get_internal_project_id(projectKey)
if projectId is None:
return {"errors": ["invalid projectKey"]}
return core.sessions_live(projectId=projectId, data=data, context=context)