aiverify-moonshot 0.4.4__py3-none-any.whl → 0.4.6__py3-none-any.whl

moonshot/integrations/cli/common/connectors.py

@@ -13,6 +13,26 @@ from moonshot.api import (
     api_read_endpoint,
     api_update_endpoint,
 )
+from moonshot.integrations.cli.cli_errors import (
+    ERROR_COMMON_ADD_ENDPOINT_CONNECTOR_TYPE_VALIDATION,
+    ERROR_COMMON_ADD_ENDPOINT_MAX_CALLS_PER_SECOND_VALIDATION,
+    ERROR_COMMON_ADD_ENDPOINT_MAX_CONCURRENCY_VALIDATION,
+    ERROR_COMMON_ADD_ENDPOINT_NAME_VALIDATION,
+    ERROR_COMMON_ADD_ENDPOINT_PARAMS_VALIDATION,
+    ERROR_COMMON_ADD_ENDPOINT_TOKEN_VALIDATION,
+    ERROR_COMMON_ADD_ENDPOINT_URI_VALIDATION,
+    ERROR_COMMON_DELETE_ENDPOINT_ENDPOINT_VALIDATION,
+    ERROR_COMMON_LIST_CONNECTOR_TYPES_FIND_VALIDATION,
+    ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION,
+    ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION_1,
+    ERROR_COMMON_LIST_ENDPOINTS_FIND_VALIDATION,
+    ERROR_COMMON_LIST_ENDPOINTS_PAGINATION_VALIDATION,
+    ERROR_COMMON_LIST_ENDPOINTS_PAGINATION_VALIDATION_1,
+    ERROR_COMMON_UPDATE_ENDPOINT_ENDPOINT_VALIDATION,
+    ERROR_COMMON_UPDATE_ENDPOINT_VALUES_VALIDATION,
+    ERROR_COMMON_UPDATE_ENDPOINT_VALUES_VALIDATION_1,
+    ERROR_COMMON_VIEW_ENDPOINT_ENDPOINT_VALIDATION,
+)
 from moonshot.integrations.cli.utils.process_data import filter_data
 
 console = Console()
@@ -42,7 +62,44 @@ def add_endpoint(args) -> None:
         None
     """
     try:
-        params_dict = literal_eval(args.params)
+        if not isinstance(args.name, str) or not args.name or args.name is None:
+            raise TypeError(ERROR_COMMON_ADD_ENDPOINT_NAME_VALIDATION)
+
+        if (
+            not isinstance(args.connector_type, str)
+            or not args.connector_type
+            or args.connector_type is None
+        ):
+            raise TypeError(ERROR_COMMON_ADD_ENDPOINT_CONNECTOR_TYPE_VALIDATION)
+
+        if not isinstance(args.uri, str) or not args.uri or args.uri is None:
+            raise TypeError(ERROR_COMMON_ADD_ENDPOINT_URI_VALIDATION)
+
+        if not isinstance(args.token, str) or not args.token or args.token is None:
+            raise TypeError(ERROR_COMMON_ADD_ENDPOINT_TOKEN_VALIDATION)
+
+        if (
+            not isinstance(args.max_calls_per_second, int)
+            or not args.max_calls_per_second
+            or args.max_calls_per_second is None
+            or args.max_calls_per_second < 0
+        ):
+            raise TypeError(ERROR_COMMON_ADD_ENDPOINT_MAX_CALLS_PER_SECOND_VALIDATION)
+
+        if (
+            not isinstance(args.max_concurrency, int)
+            or not args.max_concurrency
+            or args.max_concurrency is None
+            or args.max_calls_per_second < 0
+        ):
+            raise TypeError(ERROR_COMMON_ADD_ENDPOINT_MAX_CONCURRENCY_VALIDATION)
+
+        try:
+            params_dict = literal_eval(args.params)
+        except Exception:
+            raise SyntaxError(ERROR_COMMON_ADD_ENDPOINT_PARAMS_VALIDATION)
+        if not isinstance(params_dict, dict):
+            raise ValueError(ERROR_COMMON_ADD_ENDPOINT_PARAMS_VALIDATION)
 
         new_endpoint_id = api_create_endpoint(
             args.name,
@@ -74,9 +131,30 @@ def list_endpoints(args) -> list | None:
         list | None: A list of ConnectorEndpoint or None if there is no result.
     """
     try:
+        if args.find is not None:
+            if not isinstance(args.find, str) or not args.find:
+                raise TypeError(ERROR_COMMON_LIST_ENDPOINTS_FIND_VALIDATION)
+
+        if args.pagination is not None:
+            if not isinstance(args.pagination, str) or not args.pagination:
+                raise TypeError(ERROR_COMMON_LIST_ENDPOINTS_PAGINATION_VALIDATION)
+            try:
+                pagination = literal_eval(args.pagination)
+                if not (
+                    isinstance(pagination, tuple)
+                    and len(pagination) == 2
+                    and all(isinstance(i, int) for i in pagination)
+                ):
+                    raise ValueError(
+                        ERROR_COMMON_LIST_ENDPOINTS_PAGINATION_VALIDATION_1
+                    )
+            except (ValueError, SyntaxError):
+                raise ValueError(ERROR_COMMON_LIST_ENDPOINTS_PAGINATION_VALIDATION_1)
+        else:
+            pagination = ()
+
         endpoints_list = api_get_all_endpoint()
         keyword = args.find.lower() if args.find else ""
-        pagination = literal_eval(args.pagination) if args.pagination else ()
 
         if endpoints_list:
             filtered_endpoints_list = filter_data(endpoints_list, keyword, pagination)
@@ -86,7 +164,6 @@ def list_endpoints(args) -> list | None:
 
         console.print("[red]There are no endpoints found.[/red]")
         return None
-
     except Exception as e:
         print(f"[list_endpoints]: {str(e)}")
 
@@ -107,9 +184,32 @@ def list_connector_types(args) -> list | None:
         list | None: A list of Connector or None if there is no result.
     """
     try:
+        if args.find is not None:
+            if not isinstance(args.find, str) or not args.find:
+                raise TypeError(ERROR_COMMON_LIST_CONNECTOR_TYPES_FIND_VALIDATION)
+
+        if args.pagination is not None:
+            if not isinstance(args.pagination, str) or not args.pagination:
+                raise TypeError(ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION)
+            try:
+                pagination = literal_eval(args.pagination)
+                if not (
+                    isinstance(pagination, tuple)
+                    and len(pagination) == 2
+                    and all(isinstance(i, int) for i in pagination)
+                ):
+                    raise ValueError(
+                        ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION_1
+                    )
+            except (ValueError, SyntaxError):
+                raise ValueError(
+                    ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION_1
+                )
+        else:
+            pagination = ()
+
         connector_type_list = api_get_all_connector_type()
         keyword = args.find.lower() if args.find else ""
-        pagination = literal_eval(args.pagination) if args.pagination else ()
 
         if connector_type_list:
             filtered_connector_type_list = filter_data(
@@ -121,7 +221,6 @@ def list_connector_types(args) -> list | None:
 
         console.print("[red]There are no connector types found.[/red]")
         return None
-
     except Exception as e:
         print(f"[list_connector_types]: {str(e)}")
 
@@ -142,6 +241,13 @@ def view_endpoint(args) -> None:
         None
     """
     try:
+        if (
+            not isinstance(args.endpoint, str)
+            or not args.endpoint
+            or args.endpoint is None
+        ):
+            raise TypeError(ERROR_COMMON_VIEW_ENDPOINT_ENDPOINT_VALIDATION)
+
         endpoint_info = api_read_endpoint(args.endpoint)
         _display_endpoints([endpoint_info])
     except Exception as e:
@@ -165,8 +271,27 @@ def update_endpoint(args) -> None:
         None
     """
     try:
+        if (
+            args.endpoint is None
+            or not isinstance(args.endpoint, str)
+            or not args.endpoint
+        ):
+            raise ValueError(ERROR_COMMON_UPDATE_ENDPOINT_ENDPOINT_VALIDATION)
         endpoint = args.endpoint
-        update_values = dict(literal_eval(args.update_kwargs))
+
+        if (
+            args.update_values is None
+            or not isinstance(args.update_values, str)
+            or not args.update_values
+        ):
+            raise ValueError(ERROR_COMMON_UPDATE_ENDPOINT_VALUES_VALIDATION)
+
+        if literal_eval(args.update_values) and all(
+            isinstance(i, tuple) for i in literal_eval(args.update_values)
+        ):
+            update_values = dict(literal_eval(args.update_values))
+        else:
+            raise ValueError(ERROR_COMMON_UPDATE_ENDPOINT_VALUES_VALIDATION_1)
         api_update_endpoint(endpoint, **update_values)
         print("[update_endpoint]: Endpoint updated.")
     except Exception as e:
@@ -196,6 +321,12 @@ def delete_endpoint(args) -> None:
         console.print("[bold yellow]Endpoint deletion cancelled.[/]")
         return
     try:
+        if (
+            args.endpoint is None
+            or not isinstance(args.endpoint, str)
+            or not args.endpoint
+        ):
+            raise ValueError(ERROR_COMMON_DELETE_ENDPOINT_ENDPOINT_VALIDATION)
         api_delete_endpoint(args.endpoint)
         print("[delete_endpoint]: Endpoint deleted.")
     except Exception as e:

moonshot/integrations/cli/common/dataset.py

@@ -3,11 +3,19 @@ from ast import literal_eval
 import cmd2
 from rich.console import Console
 
-from moonshot.api import (
-    api_create_datasets,
+from moonshot.api import api_create_datasets
+from moonshot.integrations.cli.cli_errors import (
+    ERROR_COMMON_ADD_DATASET_DESC_VALIDATION,
+    ERROR_COMMON_ADD_DATASET_LICENSE_VALIDATION,
+    ERROR_COMMON_ADD_DATASET_METHOD_VALIDATION,
+    ERROR_COMMON_ADD_DATASET_NAME_VALIDATION,
+    ERROR_COMMON_ADD_DATASET_PARAMS_VALIDATION,
+    ERROR_COMMON_ADD_DATASET_REFERENCE_VALIDATION,
 )
 
 console = Console()
+
+
 def add_dataset(args) -> None:
     """
     Create a new dataset using the provided arguments and log the result.
@@ -26,6 +34,41 @@ def add_dataset(args) -> None:
             - params (dict): Additional parameters for dataset creation.
     """
     try:
+        if not isinstance(args.name, str) or not args.name or args.name is None:
+            raise TypeError(ERROR_COMMON_ADD_DATASET_NAME_VALIDATION)
+
+        if (
+            not isinstance(args.description, str)
+            or not args.description
+            or args.description is None
+        ):
+            raise TypeError(ERROR_COMMON_ADD_DATASET_DESC_VALIDATION)
+
+        if (
+            not isinstance(args.reference, str)
+            or not args.reference
+            or args.reference is None
+        ):
+            raise TypeError(ERROR_COMMON_ADD_DATASET_REFERENCE_VALIDATION)
+
+        if (
+            not isinstance(args.license, str)
+            or not args.license
+            or args.license is None
+        ):
+            raise TypeError(ERROR_COMMON_ADD_DATASET_LICENSE_VALIDATION)
+
+        if (
+            not isinstance(args.method, str)
+            or not args.method
+            or args.method is None
+            or args.method.lower() not in ["hf", "csv"]
+        ):
+            raise TypeError(ERROR_COMMON_ADD_DATASET_METHOD_VALIDATION)
+
+        if not isinstance(args.params, dict) or not args.params or args.params is None:
+            raise TypeError(ERROR_COMMON_ADD_DATASET_PARAMS_VALIDATION)
+
         new_dataset_id = api_create_datasets(
             args.name,
             args.description,
@@ -38,7 +81,8 @@ def add_dataset(args) -> None:
     except Exception as e:
         print(f"[add_dataset]: {str(e)}")
 
-        # ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
 # Cmd2 Arguments Parsers
 # ------------------------------------------------------------------------------
 # Add dataset arguments
@@ -46,21 +90,30 @@ add_dataset_args = cmd2.Cmd2ArgumentParser(
     description="Add a new dataset. The 'name' argument will be slugified to create a unique identifier.",
     epilog=(
         "Examples:\n"
-        "1. add_dataset 'dataset-name' 'A brief description' 'http://reference.com' 'MIT' 'csv' \"{'csv_file_path': '/path/to/your/file.csv'}\"\n"
-        "2. add_dataset 'dataset-name' 'A brief description' 'http://reference.com' 'MIT' 'hf' \"{'dataset_name': 'cais/mmlu', 'dataset_config': 'college_biology', 'split': 'test', 'input_col': ['question','choices'], 'target_col': 'answer'}\""
+        "1. add_dataset 'dataset-name' 'A brief description' 'http://reference.com' 'MIT' 'csv' \"{'csv_file_path': '/path/to/your/file.csv'}\"\n"  # noqa: E501
+        "2. add_dataset 'dataset-name' 'A brief description' 'http://reference.com' 'MIT' 'hf' \"{'dataset_name': 'cais/mmlu', 'dataset_config': 'college_biology', 'split': 'test', 'input_col': ['question','choices'], 'target_col': 'answer'}\""  # noqa: E501
     ),
 )
 add_dataset_args.add_argument("name", type=str, help="Name of the new dataset")
-add_dataset_args.add_argument("description", type=str, help="Description of the new dataset")
-add_dataset_args.add_argument("reference", type=str, help="Reference of the new dataset")
+add_dataset_args.add_argument(
+    "description", type=str, help="Description of the new dataset"
+)
+add_dataset_args.add_argument(
+    "reference", type=str, help="Reference of the new dataset"
+)
 add_dataset_args.add_argument("license", type=str, help="License of the new dataset")
-add_dataset_args.add_argument("method", type=str, choices=['hf', 'csv'], help="Method to convert the new dataset. Choose either 'hf' or 'csv'.")
 add_dataset_args.add_argument(
-    "params", 
-    type=literal_eval, 
+    "method",
+    type=str,
+    choices=["hf", "csv"],
+    help="Method to convert the new dataset. Choose either 'hf' or 'csv'.",
+)
+add_dataset_args.add_argument(
+    "params",
+    type=literal_eval,
     help=(
         "Params of the new dataset in dictionary format. For example: \n"
         "1. For 'csv' method: \"{'csv_file_path': '/path/to/your/file.csv'}\"\n"
-        "2. For 'hf' method: \"{'dataset_name': 'cais_mmlu', 'dataset_config': 'college_biology', 'split': 'test', 'input_col': ['questions','choices'], 'target_col': 'answer'}\""
-    )
-)
+        "2. For 'hf' method: \"{'dataset_name': 'cais_mmlu', 'dataset_config': 'college_biology', 'split': 'test', 'input_col': ['questions','choices'], 'target_col': 'answer'}\""  # noqa: E501
+    ),
+)

moonshot/integrations/cli/common/prompt_template.py

@@ -5,6 +5,12 @@ from rich.console import Console
 from rich.table import Table
 
 from moonshot.api import api_delete_prompt_template, api_get_all_prompt_template_detail
+from moonshot.integrations.cli.cli_errors import (
+    ERROR_COMMON_DELETE_PROMPT_TEMPLATE_PROMPT_TEMPLATE_VALIDATION,
+    ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION,
+    ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION_1,
+    ERROR_COMMON_LIST_PROMPT_TEMPLATES_FIND_VALIDATION,
+)
 from moonshot.integrations.cli.utils.process_data import filter_data
 
 console = Console()
@@ -26,9 +32,32 @@ def list_prompt_templates(args) -> list | None:
         list | None: A list of PromptTemplate or None if there is no result.
     """
     try:
+        if args.find is not None:
+            if not isinstance(args.find, str) or not args.find:
+                raise TypeError(ERROR_COMMON_LIST_PROMPT_TEMPLATES_FIND_VALIDATION)
+
+        if args.pagination is not None:
+            if not isinstance(args.pagination, str) or not args.pagination:
+                raise TypeError(ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION)
+            try:
+                pagination = literal_eval(args.pagination)
+                if not (
+                    isinstance(pagination, tuple)
+                    and len(pagination) == 2
+                    and all(isinstance(i, int) for i in pagination)
+                ):
+                    raise ValueError(
+                        ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION_1
+                    )
+            except (ValueError, SyntaxError):
+                raise ValueError(
+                    ERROR_COMMON_LIST_CONNECTOR_TYPES_PAGINATION_VALIDATION_1
+                )
+        else:
+            pagination = ()
+
         prompt_templates_list = api_get_all_prompt_template_detail()
         keyword = args.find.lower() if args.find else ""
-        pagination = literal_eval(args.pagination) if args.pagination else ()
 
         if prompt_templates_list:
             filtered_prompt_templates_list = filter_data(
@@ -40,7 +69,6 @@ def list_prompt_templates(args) -> list | None:
 
         console.print("[red]There are no prompt templates found.[/red]")
         return None
-
     except Exception as e:
         print(f"[list_prompt_templates]: {str(e)}")
 
@@ -61,6 +89,14 @@ def delete_prompt_template(args) -> None:
         console.print("[bold yellow]Prompt template deletion cancelled.[/]")
         return
     try:
+        if (
+            args.prompt_template is None
+            or not isinstance(args.prompt_template, str)
+            or not args.prompt_template
+        ):
+            raise ValueError(
+                ERROR_COMMON_DELETE_PROMPT_TEMPLATE_PROMPT_TEMPLATE_VALIDATION
+            )
         api_delete_prompt_template(args.prompt_template)
         print("[delete_prompt_template]: Prompt template deleted.")
     except Exception as e:

moonshot/integrations/cli/redteam/session.py

@@ -22,6 +22,23 @@ from moonshot.api import (
     api_load_session,
 )
 from moonshot.integrations.cli.active_session_cfg import active_session
+from moonshot.integrations.cli.cli_errors import (
+    ERROR_RED_TEAMING_ADD_BOOKMARK_ENDPOINT_VALIDATION,
+    ERROR_RED_TEAMING_ADD_BOOKMARK_ENDPOINT_VALIDATION_1,
+    ERROR_RED_TEAMING_ADD_BOOKMARK_NO_ACTIVE_SESSION,
+    ERROR_RED_TEAMING_LIST_SESSIONS_FIND_VALIDATION,
+    ERROR_RED_TEAMING_LIST_SESSIONS_PAGINATION_VALIDATION,
+    ERROR_RED_TEAMING_LIST_SESSIONS_PAGINATION_VALIDATION_1,
+    ERROR_RED_TEAMING_NEW_SESSION_ENDPOINTS_VALIDATION,
+    ERROR_RED_TEAMING_NEW_SESSION_FAILED_TO_USE_SESSION,
+    ERROR_RED_TEAMING_NEW_SESSION_PARAMS_VALIDATION,
+    ERROR_RED_TEAMING_NEW_SESSION_PARAMS_VALIDATION_1,
+    ERROR_RED_TEAMING_SHOW_PROMPTS_NO_ACTIVE_SESSION_VALIDATION,
+    ERROR_RED_TEAMING_USE_BOOKMARK_NO_ACTIVE_SESSION,
+    ERROR_RED_TEAMING_USE_SESSION_NO_SESSION_METADATA_VALIDATION,
+    ERROR_RED_TEAMING_USE_SESSION_RUNNER_ID_TYPE_VALIDATION,
+    ERROR_RED_TEAMING_USE_SESSION_RUNNER_ID_VALIDATION,
+)
 from moonshot.integrations.cli.utils.process_data import filter_data
 from moonshot.src.redteaming.session.session import Session
 
@@ -43,38 +60,73 @@ def new_session(args) -> None:
             - endpoints (str, optional): The list of endpoints for the runner."""
     global active_session
 
-    runner_id = args.runner_id
-    context_strategy = args.context_strategy if args.context_strategy else ""
-    prompt_template = args.prompt_template if args.prompt_template else ""
-    endpoints = literal_eval(args.endpoints) if args.endpoints else []
-
-    # create new runner and session
-    if endpoints:
-        runner = api_create_runner(runner_id, endpoints)
-    # load existing runner
-    else:
-        runner = api_load_runner(runner_id)
+    try:
+        required_parameters = [("runner_id", str)]
+        optional_parameters = [("context_strategy", str), ("prompt_template", str)]
+        # Check if required parameters exist in args
+        for param, param_type in required_parameters:
+            param_value = getattr(args, param, None)
+            if not param_value:
+                raise ValueError(
+                    ERROR_RED_TEAMING_NEW_SESSION_PARAMS_VALIDATION.format(param=param)
+                )
+            if not isinstance(param_value, param_type):
+                raise TypeError(
+                    ERROR_RED_TEAMING_NEW_SESSION_PARAMS_VALIDATION_1.format(
+                        param=param, param_type=param_type.__name__
+                    )
+                )
 
-    runner_args = {}
-    runner_args["context_strategy"] = context_strategy
-    runner_args["prompt_template"] = prompt_template
+        # Check the type of optional parameters if they exist
+        for param, param_type in optional_parameters:
+            param_value = getattr(args, param, None)
+            if param_value is not None and not isinstance(param_value, param_type):
+                raise TypeError(
+                    ERROR_RED_TEAMING_NEW_SESSION_PARAMS_VALIDATION_1.format(
+                        param=param, param_type=param_type.__name__
+                    )
+                )
 
-    # create new session in runner
-    if runner.database_instance:
-        api_create_session(
-            runner.id, runner.database_instance, runner.endpoints, runner_args
-        )
-        session_metadata = api_load_session(runner.id)
-        if session_metadata:
-            active_session.update(session_metadata)
-            if active_session["context_strategy"]:
-                active_session[
-                    "cs_num_of_prev_prompts"
-                ] = Session.DEFAULT_CONTEXT_STRATEGY_PROMPT
-            print(f"Using session: {active_session['session_id']}")
-            update_chat_display()
+        runner_id = args.runner_id
+        context_strategy = args.context_strategy if args.context_strategy else ""
+        prompt_template = args.prompt_template if args.prompt_template else ""
+        endpoints = []
+
+        # Check if literal eval param is correct type after eval
+        if hasattr(args, "endpoints") and args.endpoints:
+            endpoints = literal_eval(args.endpoints)
+            if not isinstance(endpoints, list):
+                raise TypeError(ERROR_RED_TEAMING_NEW_SESSION_ENDPOINTS_VALIDATION)
+
+        # create new runner and session
+        if endpoints:
+            runner = api_create_runner(runner_id, endpoints)
+        # load existing runner
         else:
-            raise RuntimeError("Unable to use session")
+            runner = api_load_runner(runner_id)
+
+        runner_args = {}
+        runner_args["context_strategy"] = context_strategy
+        runner_args["prompt_template"] = prompt_template
+
+        # create new session in runner
+        if runner.database_instance:
+            api_create_session(
+                runner.id, runner.database_instance, runner.endpoints, runner_args
+            )
+            session_metadata = api_load_session(runner.id)
+            if session_metadata:
+                active_session.update(session_metadata)
+                if active_session["context_strategy"]:
+                    active_session[
+                        "cs_num_of_prev_prompts"
+                    ] = Session.DEFAULT_CONTEXT_STRATEGY_PROMPT
+                print(f"[new_session] Using session: {active_session['session_id']}")
+                update_chat_display()
+            else:
+                raise RuntimeError(ERROR_RED_TEAMING_NEW_SESSION_FAILED_TO_USE_SESSION)
+    except Exception as e:
+        print(f"[new_session]: {str(e)}")
 
 
 def use_session(args) -> None:
@@ -85,15 +137,19 @@ def use_session(args) -> None:
         args (Namespace): The arguments passed to the function.
     """
     global active_session
-    runner_id = args.runner_id
 
     # Load session metadata
     try:
+        if not args.runner_id or args.runner_id is None:
+            raise ValueError(ERROR_RED_TEAMING_USE_SESSION_RUNNER_ID_VALIDATION)
+
+        if not isinstance(args.runner_id, str):
+            raise TypeError(ERROR_RED_TEAMING_USE_SESSION_RUNNER_ID_TYPE_VALIDATION)
+
+        runner_id = args.runner_id
         session_metadata = api_load_session(runner_id)
         if not session_metadata:
-            print(
-                "[Session] Cannot find a session with the existing Runner ID. Please try again."
-            )
+            print(ERROR_RED_TEAMING_USE_SESSION_NO_SESSION_METADATA_VALIDATION)
             return
 
         # Set the current session
@@ -115,7 +171,7 @@ def show_prompts() -> None:
     global active_session
 
     if not active_session:
-        print("There is no active session. Activate a session to show a chat table.")
+        print(ERROR_RED_TEAMING_SHOW_PROMPTS_NO_ACTIVE_SESSION_VALIDATION)
         return
 
     update_chat_display()
@@ -146,6 +202,28 @@ def list_sessions(args) -> list | None:
     """
     try:
         session_metadata_list = api_get_all_session_metadata()
+        if args.find is not None:
+            if not isinstance(args.find, str) or not args.find:
+                raise TypeError(ERROR_RED_TEAMING_LIST_SESSIONS_FIND_VALIDATION)
+
+        if args.pagination is not None:
+            if not isinstance(args.pagination, str) or not args.pagination:
+                raise TypeError(ERROR_RED_TEAMING_LIST_SESSIONS_PAGINATION_VALIDATION)
+            try:
+                pagination = literal_eval(args.pagination)
+                if not (
+                    isinstance(pagination, tuple)
+                    and len(pagination) == 2
+                    and all(isinstance(i, int) for i in pagination)
+                ):
+                    raise ValueError(
+                        ERROR_RED_TEAMING_LIST_SESSIONS_PAGINATION_VALIDATION_1
+                    )
+            except (ValueError, SyntaxError):
+                raise ValueError(
+                    ERROR_RED_TEAMING_LIST_SESSIONS_PAGINATION_VALIDATION_1
+                )
+
         keyword = args.find.lower() if args.find else ""
         pagination = literal_eval(args.pagination) if args.pagination else ()
 
@@ -159,7 +237,6 @@ def list_sessions(args) -> list | None:
 
         console.print("[red]There are no sessions found.[/red]")
         return None
-
     except Exception as e:
         print(f"[list_sessions]: {str(e)}")
 
@@ -214,7 +291,6 @@ def update_chat_display() -> None:
             title_align="left",
         )
         console.print(panel)
-
     else:
         console.print("[red]There are no active session.[/red]")
 
@@ -249,9 +325,7 @@ def add_bookmark(args) -> None:
             target_endpoint_chats = list_of_target_endpoint_chat.get(endpoint, None)
             target_endpoint_chat_record = {}
             if not target_endpoint_chats:
-                print(
-                    "Incorrect endpoint. Please select a valid endpoint in this session."
-                )
+                print(ERROR_RED_TEAMING_ADD_BOOKMARK_ENDPOINT_VALIDATION)
                 return
             for endpoint_chat in target_endpoint_chats:
                 if endpoint_chat["chat_record_id"] == prompt_id:
@@ -273,12 +347,14 @@ def add_bookmark(args) -> None:
                 print("[bookmark_prompt]:", bookmark_message["message"])
             else:
                 print(
-                    f"Unable to find prompt ID in the of prompts for endpoint {endpoint}. Please select a valid ID."
+                    ERROR_RED_TEAMING_ADD_BOOKMARK_ENDPOINT_VALIDATION_1.format(
+                        endpoint=endpoint
+                    )
                 )
         except Exception as e:
             print(f"[bookmark_prompt]: ({str(e)})")
     else:
-        print("There is no active session. Activate a session to bookmark a prompt.")
+        print(ERROR_RED_TEAMING_ADD_BOOKMARK_NO_ACTIVE_SESSION)
         return
 
 
@@ -323,7 +399,7 @@ def use_bookmark(args) -> None:
         except Exception as e:
             print(f"[use_bookmark]: {str(e)}")
     else:
-        print("There is no active session. Activate a session to use a bookmark.")
+        print(ERROR_RED_TEAMING_USE_BOOKMARK_NO_ACTIVE_SESSION)
         return
 
 
@@ -693,6 +769,7 @@ def delete_session(args) -> None:
                        which is the ID of the session to delete.
     """
     # Confirm with the user before deleting a session
+
     confirmation = console.input(
         "[bold red]Are you sure you want to delete the session (y/N)? [/]"
     )
@@ -700,6 +777,12 @@ def delete_session(args) -> None:
         console.print("[bold yellow]Session deletion cancelled.[/]")
         return
     try:
+        if not args.session or args.session is None:
+            raise ValueError("Invalid or missing required parameter: session")
+
+        if not isinstance(args.session, str):
+            raise TypeError("Invalid type for parameter: session. Expecting type str.")
+
         api_delete_session(args.session)
         print("[delete_session]: Session deleted.")
     except Exception as e:
@@ -844,7 +927,7 @@ automated_rt_session_args.add_argument(
     type=str,
     help=(
         "The number of previous prompts to use with the context strategy. If this is set, it will overwrite the"
-        " number of previous promtps set in the session while running this attack module."
+        " number of previous prompts set in the session while running this attack module."
     ),
     nargs="?",
 )

moonshot/integrations/web_api/app.py

@@ -71,7 +71,7 @@ def create_app(cfg: providers.Configuration) -> CustomFastAPI:
     }
 
     app: CustomFastAPI = CustomFastAPI(
-        title="Project Moonshot", version="0.4.4", **app_kwargs
+        title="Project Moonshot", version="0.4.6", **app_kwargs
     )
 
     if cfg.cors.enabled():