Merge pull request #427 from aiverify-foundation/dev_main

[Sprint 22] New features and fixes

Author: imda-jacksonboey

examples/jupyter-notebook/Moonshot - Benchmark Feature Walkthrough.ipynb

@@ -1,10 +1,9 @@
-import sys
 import warnings
 
 from moonshot.integrations.cli.cli import CommandLineInterface
 
 
-def start_app(cli_command = None):
+def start_app(cli_command=None):
     """
     Run the Moonshot application
     """
@@ -22,4 +21,3 @@ def start_app(cli_command = None):
     else:
         # Show help if no command is provided
         cli_instance.onecmd("help")
-              

moonshot/integrations/cli/__main__.py

@@ -58,7 +58,7 @@ def new_session(args) -> None:
             - context_strategy (str, optional): The context strategy to be used.
             - prompt_template (str, optional): The prompt template to be used.
             - endpoints (str, optional): The list of endpoints for the runner."""
-    global active_session
+    global active_session  # noqa: F824
 
     try:
         required_parameters = [("runner_id", str)]
@@ -136,7 +136,7 @@ def use_session(args) -> None:
     Args:
         args (Namespace): The arguments passed to the function.
     """
-    global active_session
+    global active_session  # noqa: F824
 
     # Load session metadata
     try:
@@ -168,7 +168,7 @@ def show_prompts() -> None:
     """
     Shows the chat table in a session so that users don't have to restart a session to view the chat table
     """
-    global active_session
+    global active_session  # noqa: F824
 
     if not active_session:
         print(ERROR_RED_TEAMING_SHOW_PROMPTS_NO_ACTIVE_SESSION_VALIDATION)
@@ -181,7 +181,7 @@ def end_session() -> None:
     """
     Ends the current session by clearing active_session variable.
     """
-    global active_session
+    global active_session  # noqa: F824
     active_session.clear()
 
 
@@ -249,7 +249,7 @@ def update_chat_display() -> None:
     The table includes columns for the chat ID, prepared prompts, and the prompt/response pairs.
     If there is no active session, a message is printed to the console.
     """
-    global active_session
+    global active_session  # noqa: F824
 
     if active_session:
         list_of_endpoint_chats = api_get_all_chats_from_session(
@@ -311,7 +311,7 @@ def add_bookmark(args) -> None:
 
     If there is no active session, a message is printed to the console and the function returns.
     """
-    global active_session
+    global active_session  # noqa: F824
 
     if active_session:
         try:
@@ -372,7 +372,7 @@ def use_bookmark(args) -> None:
 
     If there is no active session, a message is printed to the console and the function returns.
     """
-    global active_session
+    global active_session  # noqa: F824
     if active_session:
         try:
             bookmark_name = args.bookmark_name
@@ -747,7 +747,7 @@ def _reload_session(runner_id: str) -> None:
     Args:
         runner_id (str): The ID of the runner for which the session metadata needs to be reloaded.
     """
-    global active_session
+    global active_session  # noqa: F824
     try:
         session_metadata = api_load_session(runner_id)
         if not session_metadata:

moonshot/integrations/cli/redteam/session.py

@@ -131,6 +131,7 @@ async def get_one_results(
                 status_code=500, detail=f"Failed to retrieve result: {e.msg}"
             )
 
+
 @router.delete("/api/v1/benchmarks/results/{result_id}")
 @inject
 def delete_result(

moonshot/integrations/web_api/routes/benchmark_result.py

@@ -1,4 +1,3 @@
-import os
 from typing import Optional
 
 from dependency_injector.wiring import Provide, inject
@@ -138,6 +137,8 @@ def delete_bookmark(
             raise HTTPException(
                 status_code=500, detail=f"Failed to delete bookmark: {e.msg}"
             )
+
+
 @router.get(
     "/api/v1/bookmarks/export", response_description="Exporting Bookmark to JSON file"
 )
@@ -160,7 +161,9 @@ def export_bookbookmarks(
     """
     try:
         file_path = bookmark_service.export_bookmarks(export_file_name)
-        return FileResponse(file_path, media_type="application/json", filename=export_file_name)
+        return FileResponse(
+            file_path, media_type="application/json", filename=export_file_name
+        )
     except ServiceException as e:
         if e.error_code == "FileNotFound":
             raise HTTPException(

moonshot/integrations/web_api/routes/bookmark.py

@@ -7,6 +7,7 @@
 
 router = APIRouter(tags=["Context Strategy"])
 
+
 @router.get("/api/v1/context-strategies")
 @inject
 def get_all_context_strategies(
@@ -46,7 +47,8 @@ def get_all_context_strategies(
                 status_code=500,
                 detail=f"Failed to retrieve context strategies: {e.msg}",
             )
-        
+
+
 @router.get("/api/v1/context-strategies/name")
 @inject
 def get_all_context_strategies_name(

moonshot/integrations/web_api/routes/context_strategy.py

@@ -87,6 +87,7 @@ def get_all_prompt_templates_names(
                 detail=f"Failed to retrieve prompt template names: {e.msg}",
             )
 
+
 @router.delete("/api/v1/prompt-templates/{prompt_template_name}")
 @inject
 def delete_prompt_template(

moonshot/integrations/web_api/routes/prompt_template.py

@@ -1,9 +1,11 @@
 from typing import Optional
 
+from pydantic import Field
+
 from moonshot.src.cookbooks.cookbook_arguments import (
     CookbookArguments as CookbookPydanticModel,
 )
-from pydantic import Field
+
 
 class CookbookCreateDTO(CookbookPydanticModel):
     id: Optional[str] = None
@@ -20,4 +22,4 @@ class CookbookUpdateDTO(CookbookPydanticModel):
     description: Optional[str] = Field(default=None, min_length=1)
     tags: Optional[list[str]] = None
     categories: Optional[list[str]] = None
-    recipes: Optional[list[str]] = Field(default=None, min_length=1)
+    recipes: Optional[list[str]] = Field(default=None, min_length=1)

moonshot/integrations/web_api/schemas/cookbook_create_dto.py

@@ -3,7 +3,6 @@
 from ..schemas.session_response_model import ChatRecord
 
 
-
 class PromptInfo(BaseModel):
     current_runner_id: str
     current_chats: dict[str, list[ChatRecord]]

moonshot/integrations/web_api/schemas/prompt_response_model.py

@@ -1,8 +1,9 @@
 from typing import Optional
 
+from pydantic import Field
+
 from moonshot.src.recipes.recipe_arguments import RecipeArguments as RecipePydanticModel
 
-from pydantic import Field
 
 class RecipeCreateDTO(RecipePydanticModel):
     id: Optional[str] = None