[release] v0.78.0

api/entrypoints/routers.py

@@ -99,7 +99,6 @@
     testset_router,
     user_profile,
     variants_router,
-    bases_router,
     configs_router,
     health_router,
     permissions_router,
@@ -569,12 +568,6 @@ async def lifespan(*args, **kwargs):
     tags=["Environments"],
 )
 
-app.include_router(
-    bases_router.router,
-    prefix="/bases",
-    tags=["Bases"],
-)
-
 app.include_router(
     configs_router.router,
     prefix="/configs",

api/oss/src/apis/fastapi/testsets/router.py

@@ -525,7 +525,7 @@ async def create_testset(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -555,7 +555,7 @@ async def fetch_testset(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.VIEW_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -584,7 +584,7 @@ async def edit_testset(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -615,7 +615,7 @@ async def archive_testset(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -643,7 +643,7 @@ async def unarchive_testset(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -671,7 +671,7 @@ async def query_testsets(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.VIEW_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -713,7 +713,7 @@ async def create_testset_variant(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -738,7 +738,7 @@ async def fetch_testset_variant(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.VIEW_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -767,11 +767,13 @@ async def edit_testset_variant(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
-        if str(testset_variant_id) not in request.state.user_id:
+        if str(testset_variant_id) != str(
+            testset_variant_edit_request.testset_variant.id
+        ):
             return TestsetVariantResponse()
 
         testset_variant = await self.testsets_service.edit_testset_variant(
@@ -798,7 +800,7 @@ async def archive_testset_variant(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -826,7 +828,7 @@ async def unarchive_testset_variant(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -854,7 +856,7 @@ async def query_testset_variants(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.VIEW_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -890,7 +892,7 @@ async def retrieve_testset_revision(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.VIEW_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -944,7 +946,7 @@ async def create_testset_revision(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -977,7 +979,7 @@ async def fetch_testset_revision(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.VIEW_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -1007,7 +1009,7 @@ async def edit_testset_revision(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -1041,7 +1043,7 @@ async def archive_testset_revision(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -1069,7 +1071,7 @@ async def unarchive_testset_revision(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -1183,7 +1185,7 @@ async def query_testset_revisions(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.VIEW_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -1219,7 +1221,7 @@ async def commit_testset_revision(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.EDIT_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 
@@ -1260,7 +1262,7 @@ async def log_testset_revisions(
             if not await check_action_access(  # type: ignore
                 user_uid=request.state.user_id,
                 project_id=request.state.project_id,
-                permission=Permission.EDIT_EVALUATORS,  # type: ignore
+                permission=Permission.VIEW_TESTSETS,  # type: ignore
             ):
                 raise FORBIDDEN_EXCEPTION  # type: ignore
 

api/oss/src/routers/testset_router.py

@@ -203,90 +203,6 @@ async def upload_file(
         raise HTTPException(status_code=403, detail=e.errors())
 
 
-@router.post(
-    "/endpoint", response_model=TestsetSimpleResponse, operation_id="import_testset"
-)
-async def import_testset(
-    request: Request,
-    endpoint: str = Form(None),
-    testset_name: str = Form(None),
-    authorization: Optional[str] = None,
-):
-    """
-    Import JSON testset data from an endpoint and save it to Postgres.
-
-    Args:
-        endpoint (str): An endpoint URL to import data from.
-        testset_name (str): the name of the testset if provided.
-
-    Returns:
-        dict: The result of the import process.
-    """
-
-    if is_ee():
-        has_permission = await check_action_access(
-            user_uid=request.state.user_id,
-            project_id=request.state.project_id,
-            permission=Permission.CREATE_TESTSET,
-        )
-        if not has_permission:
-            error_msg = f"You do not have permission to perform this action. Please contact your organization admin."
-            log.error(error_msg)
-            return JSONResponse(
-                {"detail": error_msg},
-                status_code=403,
-            )
-
-    try:
-        response = httpx.get(
-            endpoint,
-            timeout=10,
-            headers={"Authorization": authorization} if authorization else None,
-        )
-        if response.status_code != 200:
-            raise HTTPException(
-                status_code=400, detail="Failed to fetch testset from endpoint"
-            )
-
-        # Create a document
-        document = {
-            "name": testset_name,
-            "csvdata": [],
-        }
-
-        # Populate the document with column names and values
-        json_response = response.json()
-
-        _validate_testset_limits(json_response)
-
-        for row in json_response:
-            document["csvdata"].append(row)
-
-        testset = await db_manager.create_testset(
-            project_id=request.state.project_id,
-            testset_data=document,
-        )
-        return TestsetSimpleResponse(
-            id=str(testset.id),
-            name=document["name"],
-            created_at=str(testset.created_at),
-        )
-
-    except HTTPException as error:
-        log.error(error)
-        raise error
-    except json.JSONDecodeError as error:
-        log.error(error)
-        raise HTTPException(
-            status_code=400, detail="Endpoint does not return valid JSON testset data"
-        ) from error
-    except Exception as error:
-        log.error(error)
-        raise HTTPException(
-            status_code=500, detail="Failed to import testset from endpoint"
-        ) from error
-
-
 @router.post(
     "/", response_model=TestsetSimpleResponse, operation_id="create_legacy_testset"
 )

api/oss/src/routers/variants_router.py

@@ -291,7 +291,7 @@ async def update_variant_url(request: Request, payload: UpdateVariantURLPayload)
         traceback.print_exc()
         detail = f"Error while trying to update the app variant: {str(e)}"
         raise HTTPException(status_code=500, detail=detail)
-    except:
+    except Exception as e:
         import traceback
 
         traceback.print_exc()