Api v1.15.0 (#1580)

* fix(chalice): fixed public API
refactor(chalice): changed path logging
refactor(chalice): refactored public API

api/auth/auth_apikey.py

@@ -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

api/chalicelib/core/jobs.py

@@ -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;""",
+               WHERE job_id = %(job_id)s
-            {"job_id": job_id}
+                    AND project_id= %(project_id)s;""",
+            {"job_id": job_id, "project_id": project_id}
         )
         cur.execute(query=query)
         data = cur.fetchone()

api/or_dependencies.py

@@ -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:

api/routers/core.py

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

api/routers/subs/v1_api.py

@@ -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):
+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"]
+                      context: schemas.CurrentContext = Depends(OR_context)):
-    if projectId is None:
-        return {"errors": ["invalid projectKey"]}
     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):
+def get_session_events(projectKey: str, sessionId: int, context: schemas.CurrentContext = Depends(OR_context)):
-    projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
-    if projectId is None:
-        return {"errors": ["invalid projectKey"]}
     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):
+def get_user_details(projectKey: str, userId: str, context: schemas.CurrentContext = Depends(OR_context)):
-    projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
-    if projectId is None:
-        return {"errors": ["invalid projectKey"]}
     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)):
+def schedule_to_delete_user_data(projectKey: str, userId: str, _=Body(None),
-    projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
+                                 context: schemas.CurrentContext = Depends(OR_context)):
-    if projectId is None:
+    record = jobs.create(project_id=context.project.project_id, user_id=userId)
-        return {"errors": ["invalid projectKey"]}
-    record = jobs.create(project_id=projectId, user_id=userId)
     return {"data": record}
 
 
 @app_apikey.get('/v1/{projectKey}/jobs', tags=["api"])
-def get_jobs(projectKey: str):
+def get_jobs(projectKey: str, context: schemas.CurrentContext = Depends(OR_context)):
-    projectId = projects.get_by_project_key(project_key=projectKey)["projectId"]
+    return {"data": jobs.get_all(project_id=context.project.project_id)}
-    if projectId is None:
-        return {"errors": ["invalid projectKey"]}
-    return {"data": jobs.get_all(project_id=projectId)}
 
 
 @app_apikey.get('/v1/{projectKey}/jobs/{jobId}', tags=["api"])
-def get_job(projectKey: str, jobId: int):
+def get_job(projectKey: str, jobId: int, context: schemas.CurrentContext = Depends(OR_context)):
-    return {"data": jobs.get(job_id=jobId)}
+    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)):
+def cancel_job(projectKey: str, jobId: int, _=Body(None), context: schemas.CurrentContext = Depends(OR_context)):
-    job = jobs.get(job_id=jobId)
+    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)
     }
 
 

ee/api/chalicelib/core/traces.py

@@ -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

ee/api/or_dependencies.py

@@ -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:

ee/api/routers/subs/v1_api_ee.py

@@ -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)
+    return core.get_sessions_live(projectId=context.project.project_id, userId=userId, context=context)
-    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: str, data: schemas.LiveSessionsSearchPayloadSchema = Body(...),
                   context: schemas.CurrentContext = Depends(OR_context)):
-    projectId = projects.get_by_project_key(projectKey)
+    return core.sessions_live(projectId=context.project.project_id, data=data, context=context)
-    if projectId is None:
-        return {"errors": ["invalid projectKey"]}
-    return core.sessions_live(projectId=projectId, data=data, context=context)

ee/scripts/schema/db/init_dbs/postgresql/1.15.0/1.15.0.sql

@@ -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
 );
 

ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql

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