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

Api v1.15.0 (#1580)

Browse source 
* fix(chalice): fixed public API
refactor(chalice): changed path logging
refactor(chalice): refactored public API
This commit is contained in:
Kraiem Taha Yassine 2023-10-27 14:35:16 +02:00 • committed by GitHub
parent 1269431c8a
commit 437fe9533b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 40 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/auth/auth_apikey.py
View file

@ -27,5 +27,5 @@ class APIKeyAuth(APIKeyHeader):
r["authorizer_identity"] = "api_key"
logger.debug(r)
request.state.authorizer_identity = "api_key"
request.state.currentContext = CurrentAPIContext(tenant_id=r["tenantId"])
request.state.currentContext = CurrentAPIContext(tenantId=r["tenantId"])
return request.state.currentContext

7
api/chalicelib/core/jobs.py
View file

@ -14,13 +14,14 @@ class JobStatus:
CANCELLED = "cancelled"
def get(job_id):
def get(job_id, project_id):
with pg_client.PostgresClient() as cur:
query = cur.mogrify(
"""SELECT *
FROM public.jobs
WHERE job_id = %(job_id)s;""",
{"job_id": job_id}
WHERE job_id = %(job_id)s
AND project_id= %(project_id)s;""",
{"job_id": job_id, "project_id": project_id}
)
cur.execute(query=query)
data = cur.fetchone()

8
api/or_dependencies.py
View file

@ -1,17 +1,20 @@
import json
import logging
from typing import Callable
from fastapi import Depends, Security
from fastapi.routing import APIRoute
from fastapi.security import SecurityScopes
from starlette import status
from starlette.exceptions import HTTPException
from starlette.requests import Request
from starlette.responses import Response, JSONResponse
from fastapi.security import SecurityScopes
from fastapi import Depends, Security
import schemas
from chalicelib.utils import helper
logger = logging.getLogger(__name__)
async def OR_context(request: Request) -> schemas.CurrentContext:
if hasattr(request.state, "currentContext"):
@ -25,6 +28,7 @@ class ORRoute(APIRoute):
original_route_handler = super().get_route_handler()
async def custom_route_handler(request: Request) -> Response:
logger.debug(f"call processed by: {self.methods} {self.path_format}")
try:
response: Response = await original_route_handler(request)
except HTTPException as e:

8
api/routers/core.py
View file

@ -1,9 +1,7 @@
import json
from datetime import datetime, timedelta
from typing import Union, List, Dict, Optional
from typing import Union, Optional
from decouple import config
from fastapi import Depends, Body, Query, HTTPException
from starlette.responses import FileResponse
from fastapi import Depends, Body, Query
import schemas
from chalicelib.core import log_tool_rollbar, sourcemaps, events, sessions_assignments, projects, \

47
api/routers/subs/v1_api.py
View file

@ -9,13 +9,11 @@ public_app, app, app_apikey = get_routers()
@app_apikey.get('/v1/{projectKey}/users/{userId}/sessions', tags=["api"])
def get_user_sessions(projectKey: str, userId: str, start_date: int = None, end_date: int = None):
projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
if projectId is None:
return {"errors": ["invalid projectKey"]}
def get_user_sessions(projectKey: str, userId: str, start_date: int = None, end_date: int = None,
context: schemas.CurrentContext = Depends(OR_context)):
return {
"data": sessions.get_user_sessions(
project_id=projectId,
project_id=context.project.project_id,
user_id=userId,
start_date=start_date,
end_date=end_date
@ -24,56 +22,45 @@ def get_user_sessions(projectKey: str, userId: str, start_date: int = None, end_
@app_apikey.get('/v1/{projectKey}/sessions/{sessionId}/events', tags=["api"])
def get_session_events(projectKey: str, sessionId: int):
projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
if projectId is None:
return {"errors": ["invalid projectKey"]}
def get_session_events(projectKey: str, sessionId: int, context: schemas.CurrentContext = Depends(OR_context)):
return {
"data": events.get_by_session_id(
project_id=projectId,
project_id=context.project.project_id,
session_id=sessionId
)
}
@app_apikey.get('/v1/{projectKey}/users/{userId}', tags=["api"])
def get_user_details(projectKey: str, userId: str):
projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
if projectId is None:
return {"errors": ["invalid projectKey"]}
def get_user_details(projectKey: str, userId: str, context: schemas.CurrentContext = Depends(OR_context)):
return {
"data": sessions.get_session_user(
project_id=projectId,
project_id=context.project.project_id,
user_id=userId
)
}
@app_apikey.delete('/v1/{projectKey}/users/{userId}', tags=["api"])
def schedule_to_delete_user_data(projectKey: str, userId: str, _=Body(None)):
projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
if projectId is None:
return {"errors": ["invalid projectKey"]}
record = jobs.create(project_id=projectId, user_id=userId)
def schedule_to_delete_user_data(projectKey: str, userId: str, _=Body(None),
context: schemas.CurrentContext = Depends(OR_context)):
record = jobs.create(project_id=context.project.project_id, user_id=userId)
return {"data": record}
@app_apikey.get('/v1/{projectKey}/jobs', tags=["api"])
def get_jobs(projectKey: str):
projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
if projectId is None:
return {"errors": ["invalid projectKey"]}
return {"data": jobs.get_all(project_id=projectId)}
def get_jobs(projectKey: str, context: schemas.CurrentContext = Depends(OR_context)):
return {"data": jobs.get_all(project_id=context.project.project_id)}
@app_apikey.get('/v1/{projectKey}/jobs/{jobId}', tags=["api"])
def get_job(projectKey: str, jobId: int):
return {"data": jobs.get(job_id=jobId)}
def get_job(projectKey: str, jobId: int, context: schemas.CurrentContext = Depends(OR_context)):
return {"data": jobs.get(job_id=jobId, project_id=context.project.project_id)}
@app_apikey.delete('/v1/{projectKey}/jobs/{jobId}', tags=["api"])
def cancel_job(projectKey: str, jobId: int, _=Body(None)):
job = jobs.get(job_id=jobId)
def cancel_job(projectKey: str, jobId: int, _=Body(None), context: schemas.CurrentContext = Depends(OR_context)):
job = jobs.get(job_id=jobId, project_id=context.project.project_id)
job_not_found = len(job.keys()) == 0
if job_not_found:
@ -97,7 +84,7 @@ def get_projects(context: schemas.CurrentContext = Depends(OR_context)):
@app_apikey.get('/v1/projects/{projectKey}', tags=["api"])
def get_project(projectKey: str, context: schemas.CurrentContext = Depends(OR_context)):
return {
"data": projects.get_by_project_key(tenant_id=context.tenant_id, project_key=projectKey)
"data": projects.get_by_project_key(project_key=projectKey)
}

1
ee/api/chalicelib/core/traces.py
View file

@ -10,7 +10,6 @@ from starlette.background import BackgroundTask
import app as main_app
import schemas
import schemas
from chalicelib.utils import pg_client, helper
from chalicelib.utils.TimeUTC import TimeUTC
from schemas import CurrentContext

6
ee/api/or_dependencies.py
View file

@ -1,4 +1,5 @@
import json
import logging
from typing import Callable
from fastapi import HTTPException, Depends
@ -11,8 +12,10 @@ from starlette.requests import Request
from starlette.responses import Response, JSONResponse
import schemas
from chalicelib.utils import helper
from chalicelib.core import traces
from chalicelib.utils import helper
logger = logging.getLogger(__name__)
async def OR_context(request: Request) -> schemas.CurrentContext:
@ -27,6 +30,7 @@ class ORRoute(APIRoute):
original_route_handler = super().get_route_handler()
async def custom_route_handler(request: Request) -> Response:
logger.debug(f"call processed by: {self.methods} {self.path_format}")
try:
response: Response = await original_route_handler(request)
except HTTPException as e:

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

@ -2,7 +2,6 @@ from fastapi import Depends, Body
import schemas
from chalicelib.utils import assist_helper
from chalicelib.core import projects
from or_dependencies import OR_context
from routers import core
from routers.base import get_routers
@ -20,16 +19,10 @@ 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)):
projectId = projects.get_by_project_key(projectKey)
if projectId is None:
return {"errors": ["invalid projectKey"]}
return core.get_sessions_live(projectId=projectId, userId=userId, context=context)
return core.get_sessions_live(projectId=context.project.project_id, userId=userId, context=context)
@app_apikey.post('/v1/{projectKey}/assist/sessions', tags=["api"])
def sessions_live(projectKey: str, data: schemas.LiveSessionsSearchPayloadSchema = Body(...),
context: schemas.CurrentContext = Depends(OR_context)):
projectId = projects.get_by_project_key(projectKey)
if projectId is None:
return {"errors": ["invalid projectKey"]}
return core.sessions_live(projectId=projectId, data=data, context=context)
return core.sessions_live(projectId=context.project.project_id, data=data, context=context)

1
ee/scripts/schema/db/init_dbs/postgresql/1.15.0/1.15.0.sql
View file

@ -131,6 +131,7 @@ CREATE TABLE IF NOT EXISTS public.assist_events
event_state varchar NOT NULL,
timestamp integer NOT NULL,
user_id varchar,
duration integer,
agent_id varchar
);

1
ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql
View file

@ -980,6 +980,7 @@ $$
event_state varchar NOT NULL,
timestamp integer NOT NULL,
user_id varchar,
duration integer,
agent_id varchar
);