aiverify-moonshot 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

{aiverify_moonshot-0.4.1.dist-info → aiverify_moonshot-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aiverify-moonshot
-Version: 0.4.1
+Version: 0.4.3
 Summary: AI Verify advances Gen AI testing with Project Moonshot.
 Project-URL: Repository, https://github.com/aiverify-foundation/moonshot
 Project-URL: Documentation, https://aiverify-foundation.github.io/moonshot/
@@ -43,7 +43,7 @@ Description-Content-Type: text/markdown
 
 ![Moonshot Logo](https://github.com/aiverify-foundation/moonshot/raw/main/misc/aiverify-moonshot-logo.png)
 
-**Version 0.4.1**
+**Version 0.4.3**
 
 A simple and modular tool to evaluate any LLM application.
 

{aiverify_moonshot-0.4.1.dist-info → aiverify_moonshot-0.4.3.dist-info}/RECORD

@@ -1,47 +1,50 @@
 moonshot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/__main__.py,sha256=EHvFjnZcZCQ1WZS4OYud-VkiwG1p6HjRDepBkkyZYkY,7177
-moonshot/api.py,sha256=cI2DR4xcEh5-RonG4du13Ime-uzaCrgwzUuau8WnJ7o,4405
+moonshot/__main__.py,sha256=NB_sWjPRcwr8BbFXtih2y3fbVYPZ1YS5dI_bNNaTD3U,7551
+moonshot/api.py,sha256=f7vIMlpC-1ZQsbqipe2cTlP5dwgoVujQKYNxzEKcWlg,4822
 moonshot/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/cli/__main__.py,sha256=0VnYSj2AayvDCZ3uXpldPcjMHt2Yd7BWojWzFOGSSl4,679
 moonshot/integrations/cli/active_session_cfg.py,sha256=n8hOFxFjvz26qbEFY4q7iPUZYrGLoeCmXJxmOb_xWUE,20
 moonshot/integrations/cli/cli.py,sha256=9tnzcxcSOjblxCUpyh3pK0ke0bLs3s-63OxXtYoZI2g,2769
 moonshot/integrations/cli/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/integrations/cli/benchmark/benchmark.py,sha256=w3hcHd7lbNRsH7wfsqY09IqwVDIMYCYuwlznBuERlao,5818
-moonshot/integrations/cli/benchmark/cookbook.py,sha256=n3vLNnbIquGtE4PUv4OCJN7Sw75qnE9x7eQE2CrmIiQ,20941
-moonshot/integrations/cli/benchmark/datasets.py,sha256=xMTpUna08gzHcfyP97FUCoJ42LWPWVsdiPxl0TuMKr0,6000
-moonshot/integrations/cli/benchmark/metrics.py,sha256=AX8v1yJeYCqC3zHuTZDOQLTodvI7A-lrRABJpFu3Ly8,5117
-moonshot/integrations/cli/benchmark/recipe.py,sha256=FTJbsvtZloHWzpgnMGibeiiGzUCdVXE90Hn89_o2ExI,22202
-moonshot/integrations/cli/benchmark/result.py,sha256=RWsdcpmja5nVni_4h2zFJ3vwO_2geORoO8tx3xoI95o,8379
-moonshot/integrations/cli/benchmark/run.py,sha256=f5XSPivftuoW1ghyOSVxlV4Tm05iZefJuUg475Wt2sk,5122
+moonshot/integrations/cli/benchmark/benchmark.py,sha256=QUxr6DU11-XeH6Y3j1uPsZsotshgy64G_cWNf0Rn2_U,6303
+moonshot/integrations/cli/benchmark/cookbook.py,sha256=9mNuqsaVFCfXnLgVxJQ-fzwSgH8j082NR2gE-GPQbG8,22183
+moonshot/integrations/cli/benchmark/datasets.py,sha256=E-kreuXkrNU39sFuVWGhutFHfoEhsVjFK4tmq7YQwxs,7193
+moonshot/integrations/cli/benchmark/metrics.py,sha256=6wLn3WyqgUJKCRvblxiyx8X4nQ7gA1sKGcC_DNBIWBo,6351
+moonshot/integrations/cli/benchmark/recipe.py,sha256=EYv94Qjq2hqn1zz9NzWaINEY9DNdY7TkSS57xHv6ymQ,22698
+moonshot/integrations/cli/benchmark/result.py,sha256=U0SsjJYNQJYP_EZ3pAil4VaOQLMZHchfzq982nXU-jE,9486
+moonshot/integrations/cli/benchmark/run.py,sha256=Rqdb_FspgQQhkLORjgdiyaijk7HTxM39giOzXpBXA1k,6161
 moonshot/integrations/cli/benchmark/runner.py,sha256=nAnNKihQD0AScl6vPFiFH_9MZU4ppeMG34QaLRidqvU,6602
 moonshot/integrations/cli/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/integrations/cli/common/common.py,sha256=XH0miHQvpB3SrIO3F2lX6Px6nA2x_kwlWbjxfmA3Krg,2582
-moonshot/integrations/cli/common/connectors.py,sha256=jooMggdYNmhMhfmI0UiuJldjAmKriL66B1QqkdD_XZE,11532
+moonshot/integrations/cli/common/common.py,sha256=hSvxj-T91nhKfJtQqxrIPgYdS8P_g7wbOwpFpqBg90I,3090
+moonshot/integrations/cli/common/connectors.py,sha256=8_U7KJzfsS9L13dMbouk5JKOy_ow4UhrILICCw27Q5c,13909
+moonshot/integrations/cli/common/dataset.py,sha256=KZuwSV4Di7C378Aa2bRxIKCd03oo6HdMTEZpBZSQb5w,3113
 moonshot/integrations/cli/common/display_helper.py,sha256=8rVowW33XK0j0C_X_H1jUbFlFk1Y2WpzxmIUE3Ca5Co,1459
-moonshot/integrations/cli/common/prompt_template.py,sha256=Q_xlxI-7JorfkMqxCrdV2sE8Po0snElswxlq87GOx98,3430
+moonshot/integrations/cli/common/prompt_template.py,sha256=KzawF2VaiWUKzRIrXX_TaHboiPVllSiqz5I_o2TqGiA,4812
 moonshot/integrations/cli/initialisation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/cli/initialisation/initialisation.py,sha256=zMjklhoBlYLPshe7Q16vBBbOfhbPjZc4_ooywAFp2XY,387
 moonshot/integrations/cli/redteam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/integrations/cli/redteam/attack_module.py,sha256=p6s8XXHMTmeeBTtERQ-XlO7xgs1RoDigklgz-PNEp8M,2343
-moonshot/integrations/cli/redteam/context_strategy.py,sha256=bl0U8u1xS1tJewwx2Oue5yAsc7VEFullIjdKn392DG8,5132
-moonshot/integrations/cli/redteam/prompt_template.py,sha256=JNPr1GnPr4Vs1w51_jX0OIPTrv1B87rRw4oE6HxE3Y8,2075
-moonshot/integrations/cli/redteam/redteam.py,sha256=-g1hayxhJ-VRn6m6DNIn2VIs3dBP9og-J6JcFC8Y-X0,2767
-moonshot/integrations/cli/redteam/session.py,sha256=gt-NBJGGZujHT1qYgt8XS3JzZvT0TTPYmTFjSMAlmr0,15783
+moonshot/integrations/cli/redteam/attack_module.py,sha256=sjjQdBno7rXNfrXqns55ERSfD0ZFE0CQoWOk-sTJcqo,4599
+moonshot/integrations/cli/redteam/context_strategy.py,sha256=gLNgnd1oHWD1X93BQoKlR7G8b5g9P6AcKFLlE3WvETk,7065
+moonshot/integrations/cli/redteam/prompt_template.py,sha256=rWINvMFLax8ynIFJoX93xsB1cWJ8-dQ1nRyqgdri2yQ,2079
+moonshot/integrations/cli/redteam/redteam.py,sha256=144tVuiSWBLseC0EvvIuevHYJhqn39xvg36-1cLgGWQ,4257
+moonshot/integrations/cli/redteam/session.py,sha256=auZ73LfMAGmT1jLJUjqY6oAsMWoSzHstiRGA8DKF6A4,33652
+moonshot/integrations/cli/utils/process_data.py,sha256=QVL5vp2_8ZgGicmCAdeYEHkeb6f-NC775-JCzWziNiU,1901
 moonshot/integrations/web_api/.env.dev,sha256=0z5_Ut8rF-UqFZtgjkH2qoqORhD5_nSs2w_OeX2SteI,182
 moonshot/integrations/web_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/integrations/web_api/__main__.py,sha256=UDLKKAATJXFXB5I9VqUx4_JUfCn4xDLE0pFRsw4B3hw,1941
-moonshot/integrations/web_api/app.py,sha256=ROPOfly753cXP2IP9GCDe18qIeDwvwsuUxMgy6NxQB4,3616
-moonshot/integrations/web_api/container.py,sha256=ziTi3yPjI-WEGZvUbMFFPi0JPSLAinkUQyPZ1vMwtdQ,5522
+moonshot/integrations/web_api/__main__.py,sha256=MdnLi_ZF-olAAEJwTPU1iGYFYwo-fNWNT2qfchkH3y4,2050
+moonshot/integrations/web_api/app.py,sha256=qsWP9KDEgt18653btn8QUP9p3YIVYymJChKPTaTufFs,3651
+moonshot/integrations/web_api/container.py,sha256=DVkJG_qm7ItcG6tgMYOqIj07wpKhPWOOfy6-bEv72y4,5915
 moonshot/integrations/web_api/logging_conf.py,sha256=t3EGRV6tZhV732KXe8_Tiy0fiwVAWxZX5Tt8VTgrrfg,3388
 moonshot/integrations/web_api/log/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/web_api/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/web_api/routes/attack_modules.py,sha256=m0mGGTEHyaVld8WYHXxQ5Gm0sKdTqy_rJUrNVFcgVgw,2413
 moonshot/integrations/web_api/routes/benchmark.py,sha256=RRzouKcoVNYXm7o1LadsZTgzfmUsaYdQTC0AfsLdiC4,4163
 moonshot/integrations/web_api/routes/benchmark_result.py,sha256=WZ_dI8qT4dli9hKPNkhSwhdfz2VfW5BshirpEVEUci4,6351
+moonshot/integrations/web_api/routes/bookmark.py,sha256=K-1jL0IwOYvmYpgJvU65-lRfQlQhMzJk_n-Zf92IeR0,6135
 moonshot/integrations/web_api/routes/context_strategy.py,sha256=kJTpjrwxfYGyBLY_hAgpHOMZMtjV5Z6vpu7RIdHDylg,4828
 moonshot/integrations/web_api/routes/cookbook.py,sha256=oddmcdfhgH3qZb4_ThfUk8SBKmHOt51dFlAHubQh2fQ,8648
-moonshot/integrations/web_api/routes/dataset.py,sha256=Pvr1WRKom9UrLzfrHozSKXKxOz9BJfbxUZ6EB-M3g10,4319
+moonshot/integrations/web_api/routes/dataset.py,sha256=qtxflHRDr31W3u6voOFE5iRHsCVr0MQ35H94Pw5M1YU,6114
 moonshot/integrations/web_api/routes/endpoint.py,sha256=ZFx0WUe3-GGdmBz_hzYiOmjvJHN4PQy_8lCKJMBjxcE,10715
 moonshot/integrations/web_api/routes/metric.py,sha256=f_HHexxKUfqFE5FkeCwRh8n36H2mREtLnK2pDrw3A-w,2856
 moonshot/integrations/web_api/routes/prompt_template.py,sha256=M3adeNeWvLQJJlFQ0uZqSXEuNpTcagApnuqWvLiL1mg,4890
@@ -50,14 +53,16 @@ moonshot/integrations/web_api/routes/redteam.py,sha256=t-jNot5_PkV6f5_WBorp1HL43
 moonshot/integrations/web_api/routes/runner.py,sha256=NQdAmVIOnNgSESX3am6wAE0YLIxHYXlnQbh00_7-SD4,8438
 moonshot/integrations/web_api/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/web_api/schemas/benchmark_runner_dto.py,sha256=nfNMt_9Xg0YAL5f93dZamu7DxSLvAsz8-tdA_DTCXQQ,322
+moonshot/integrations/web_api/schemas/bookmark_create_dto.py,sha256=C78vG8UG02N7Cmt6RSuS8e4sX_G-MLCiAWT-cF5BE8s,374
 moonshot/integrations/web_api/schemas/cookbook_create_dto.py,sha256=00SPVw7lEpfY9yOFdt1XkvvNAzfFRd7d7CA90qguhuQ,670
 moonshot/integrations/web_api/schemas/cookbook_response_model.py,sha256=eJtAi5cbGfSqP57qyzyeLqffPIrpM5lutqpW7_H0xLY,240
+moonshot/integrations/web_api/schemas/dataset_create_dto.py,sha256=U4D_pmybKNVfdlFuOPC-tew8qs0FEz6z3dDlwY4NJW0,482
 moonshot/integrations/web_api/schemas/dataset_response_dto.py,sha256=s5x4-UXEWccWhK42E0FPXiHG6VqjuFuph-2t5atEkg4,171
 moonshot/integrations/web_api/schemas/endpoint_create_dto.py,sha256=oyw5xNsWg4GxQ5VNbSe_YqvWxE7OI3egPZINqIi3glw,646
 moonshot/integrations/web_api/schemas/endpoint_response_model.py,sha256=OmmM2uaPSgB2aqPFfkhseKkI5OKCKilXR19gDmwFlLc,321
 moonshot/integrations/web_api/schemas/prompt_response_model.py,sha256=S9PwxJERY1ppDaUKLlL9_skHcYcURIIvFnRZj24hLnE,303
 moonshot/integrations/web_api/schemas/prompt_template_response_model.py,sha256=V7znK-QjQVUXUbsmEy5hZHzjnHYCN1kDtvOxgyxF83k,195
-moonshot/integrations/web_api/schemas/recipe_create_dto.py,sha256=LrOzMZjBkpexcwU0nk1JPOLZHo9UP4_d_NS5cWBWkTI,1211
+moonshot/integrations/web_api/schemas/recipe_create_dto.py,sha256=xXT1TlVM3jVGUH4FPrd64vRctoCV8ybnXga4Nb1VzEU,1117
 moonshot/integrations/web_api/schemas/recipe_response_model.py,sha256=qhjiMyr5fc6R3vOZlsellnX2NF5esaBeQAGQ8160mFo,217
 moonshot/integrations/web_api/schemas/session_create_dto.py,sha256=3Xhj5JOEEWwaoq1q4FZLBVUdpo59C6X6m4y_qLurEhg,493
 moonshot/integrations/web_api/schemas/session_prompt_dto.py,sha256=AcMq3UhKrZJIEYDrEfK8xPHeTNk2Ex4IDXrDWZwn6Fo,218
@@ -71,93 +76,102 @@ moonshot/integrations/web_api/services/benchmark_result_service.py,sha256=-oPvLL
 moonshot/integrations/web_api/services/benchmark_test_manager.py,sha256=zsB8zTDUvH-hT1c-rmyh71uO9ZuIxYbUP3msh8Hdkm4,4024
 moonshot/integrations/web_api/services/benchmark_test_state.py,sha256=MyhTxpAhhP66JF0ua1SMc_IIeIjDxQY5swOXv9cmYaY,1887
 moonshot/integrations/web_api/services/benchmarking_service.py,sha256=lJZeNTqxEPBLrZNX3Z9JIilgwetywSkv0deQkcb8mQs,1257
+moonshot/integrations/web_api/services/bookmark_service.py,sha256=jI9nXs1hjzO0CLG2LKaXSzDApLThkfCvPUkaNNV9A5A,3546
 moonshot/integrations/web_api/services/context_strategy_service.py,sha256=6YKnnG8JlE_1nlnr4Hq7rgz-sxI6oQglK0STaWPFQxQ,710
 moonshot/integrations/web_api/services/cookbook_service.py,sha256=avAFiX_ZrBvCZcGFuZlp1Zw9AQVSdZ5ysKIS5JfIeh8,6760
-moonshot/integrations/web_api/services/dataset_service.py,sha256=KAyfewnP2V-6vekktVll4uM_2-tVEzLXFddBVaseB88,768
+moonshot/integrations/web_api/services/dataset_service.py,sha256=WmLyREkb8N44o8gKYtryanqefNjaGMuhzp0OK-wRq04,1710
 moonshot/integrations/web_api/services/endpoint_service.py,sha256=YhcVYMOCVq7BBWPqf0Doji6YdrtnT6ykJkCjZWj-9xs,2356
 moonshot/integrations/web_api/services/metric_service.py,sha256=xWC5Dk8aiU7tuHsxYedTTrEkbA3Ug1pV2nbaBas6cAg,456
 moonshot/integrations/web_api/services/prompt_template_service.py,sha256=5ds7pKDB2R0_0slVDwsCRIpIVdsgpqhI-3wQqSYcpuE,1226
-moonshot/integrations/web_api/services/recipe_service.py,sha256=rOCke7_NKNKrimg-ALl3DfYFZkMGmdDt2p81y68oMbU,5520
+moonshot/integrations/web_api/services/recipe_service.py,sha256=q7hN3yskWnrhR4jUxlv9vHdZLTfXzAZ44vy3HYa7P-c,5465
 moonshot/integrations/web_api/services/runner_service.py,sha256=_ljFTVtMzt3fxlY0l2252KTxgVsqoQB6vsOXBIY0PIU,4584
 moonshot/integrations/web_api/services/session_service.py,sha256=g0iMGkSAbc2Vx3c9m4aqe15LknsiHgzs7ErV1hHq5nA,13821
 moonshot/integrations/web_api/services/utils/exceptions_handler.py,sha256=anaQQYLAXzbt-cL4nAZGm1TIlP9fKt7qYE7lrNtW_04,2070
+moonshot/integrations/web_api/services/utils/file_manager.py,sha256=Hym1DbTQw6ndj2vtbssqYsXifDKSx-OLemKdCS208AI,1545
 moonshot/integrations/web_api/services/utils/results_formatter.py,sha256=rFAHNOWMas_ht0BNAmsOtDcfI4-HcWWfhuJEsXRZTgw,2323
-moonshot/integrations/web_api/status_updater/moonshot_ui_webhook.py,sha256=-72X0WhmLXdEAiaIcNjTnfIGtgE-lu4hFyhgZYGgsfk,2852
+moonshot/integrations/web_api/status_updater/moonshot_ui_webhook.py,sha256=ToyyCOEzArdMS9LnLixnCUNx4TWfib8XYEf6Pki9cr4,2804
 moonshot/integrations/web_api/status_updater/interface/benchmark_progress_callback.py,sha256=MOs_1CKpNh2m3JUAEoJfmZOBivk80DNtSnRuTCJgzJ4,350
 moonshot/integrations/web_api/status_updater/interface/redteam_progress_callback.py,sha256=JRczi3vCq6oPfOddPrF4OCdyHQYAVxgPWK-qOJxElKg,350
+moonshot/integrations/web_api/temp/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/web_api/types/types.py,sha256=AN0Xf61lx2c5AFAYoXA8mVL5iufVBpwYlIPdo8gv-ls,2395
 moonshot/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/src/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+moonshot/src/api/api_bookmark.py,sha256=Nr0B3S6UUnNbuvXyL-dz8IMyFxCywU1u4UL2D8TjHik,3004
 moonshot/src/api/api_connector.py,sha256=JpwLFd7Vh1LRz6oB8fhO2iufMbSTt5RmrMe7nt56bPM,2257
-moonshot/src/api/api_connector_endpoint.py,sha256=gyjRboodnfLvnjLrt2TFY-H8kT9nwfw2holKpGgTpTQ,5506
-moonshot/src/api/api_context_strategy.py,sha256=kzFu0cIK-EopPkbEcoX8j6b3WqWe8excHQsbfB4eAyM,2089
+moonshot/src/api/api_connector_endpoint.py,sha256=UUuHzrgoj0bWcbOXPUJh7FEg-pzBOSo6DLgwqCZnLmw,5503
+moonshot/src/api/api_context_strategy.py,sha256=WqzUEw3f7gROJlc_G7bsGkuP3nO1HycFzn3dfcxzaoc,2153
 moonshot/src/api/api_cookbook.py,sha256=qFItf8KLaDgbDIrv8usbbzSFnoXOYLORQ7IaDvQ5haw,5744
-moonshot/src/api/api_dataset.py,sha256=ryBzXYe5yxGgG5Nhl6ri4GO3Mcv7rN4gEMWMQnPl6mA,1369
+moonshot/src/api/api_dataset.py,sha256=3K6qoLWk6929OBv4W0Qx_Zqx-XgNUm5K16q-RjZBoXY,2670
 moonshot/src/api/api_environment_variables.py,sha256=ubUHvK7LyN1HhAE40ZTls6fDrbl6IYbxoPob68i4c_k,551
 moonshot/src/api/api_metrics.py,sha256=W32Jobh5wUYTsN8Jus0xGvEY1NVkvJrxZ8_a8tVuouI,1586
 moonshot/src/api/api_prompt_template.py,sha256=NsgEz9sOLLlb93CBDBPektfCDB8kviEGaG21m2onVjo,1332
-moonshot/src/api/api_recipe.py,sha256=kvtTlq-i5cZlr5h_CtFtTG2nf8tfcifCP3YScWeqgwY,6273
+moonshot/src/api/api_recipe.py,sha256=1mU6c7OpyCUzCVqrmGoB1J2M-GhgIvvlKrjptplp5Z0,6122
 moonshot/src/api/api_red_teaming.py,sha256=Ar2KeGXOTkeVNvDpegGfIPpIvdEijZBcqb-4dDwOIRc,2019
 moonshot/src/api/api_result.py,sha256=M5zKF7ytKp237UZusLSYJ7QVfui85Ys0WEaYySGcAKw,2532
 moonshot/src/api/api_run.py,sha256=3PrETAVcFnJ09R0-xhWiFkEfqL6eYj4B2voEGJDPznU,2936
 moonshot/src/api/api_runner.py,sha256=cH0rxWREjc2qKmt4Tuwr-fEMrYDBE_TKRw0jOohNEgU,4179
-moonshot/src/api/api_session.py,sha256=A5e1sZR0IKvzRDQwvTSEaEyHo6xAAsywNHnbk8FdJGk,10972
+moonshot/src/api/api_session.py,sha256=OGH05ZxAwo_hKI-RNaJ-jCp_v-zcTm-9bHUclpq2z4Q,10978
+moonshot/src/bookmark/bookmark.py,sha256=KZoKOyJseW02IS5KqfCIMusFiNwESBxOAvOZTwO7YUw,8867
+moonshot/src/bookmark/bookmark_arguments.py,sha256=rwgUPMXmDLNaHfJvRTR4GaZ8vwRilchzOg9bZJQoe_8,1130
 moonshot/src/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/configs/env_variables.py,sha256=pmscAFKpu2hUjsAlx1ki8lRI0vSOxhuMryxAzhQcDtQ,6755
+moonshot/src/configs/env_variables.py,sha256=leemw8TNM6GI_6iaajFb49zv1K3hWB0EpZfO0p9CWZQ,7100
 moonshot/src/connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/connectors/connector.py,sha256=dZ4xy43YehXeRjPgpkP9AC3dxcMIvujbl9cYSJGc9Fs,13145
+moonshot/src/connectors/connector.py,sha256=e0ZCX9m83ezjMiY5H8gbWE64IStsNQqxzVwGtMwShPY,13396
 moonshot/src/connectors/connector_prompt_arguments.py,sha256=cIlAgbFk2g_XUZ0stVM904Ng2g4GYP2LyiAjktmhEQM,470
 moonshot/src/connectors_endpoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/connectors_endpoints/connector_endpoint.py,sha256=eJ-cO-TaQ1XoH5CyIvVGw6RjkPxpcHKA08umMCEl4C8,8256
+moonshot/src/connectors_endpoints/connector_endpoint.py,sha256=hrSvq7iw1IigZssKTcdotkcN8stG8Ov7AlJ8xxZcAJo,9526
 moonshot/src/connectors_endpoints/connector_endpoint_arguments.py,sha256=8WyD0EfrlhGM9rqrzoAcF-YWmSWiWdfpO91E7w6HPY0,2318
 moonshot/src/cookbooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/cookbooks/cookbook.py,sha256=3Cr5YnjBUS7fofneA2ZiB1s26vU889PhqBzo2gCGosA,8756
+moonshot/src/cookbooks/cookbook.py,sha256=LjmbJtFwIPhupQlx6LjjIQLMfpwcWZKurduS8MBgqHI,9661
 moonshot/src/cookbooks/cookbook_arguments.py,sha256=iVp3x1-wi_RL7peTSr5TWbXnjuB_w7Uj29kJrQg48Y0,1210
 moonshot/src/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/datasets/dataset.py,sha256=DInMX_IHlVAQO7PXUOoLykPQIPC0sm5tv7VuVy7zDT0,10051
+moonshot/src/datasets/dataset.py,sha256=xiq2hYDkhCalddsxjt4i4ur3GlDLHL8kQtonKrpEbb8,14939
 moonshot/src/datasets/dataset_arguments.py,sha256=b4FyLA-xBt9e6Itpx6FnTMbyHzvDVMzx4R5SNLqYoXA,1753
 moonshot/src/metrics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/metrics/metric.py,sha256=r8oWMpRBqMqVN-gRH5XZFx33-ZbOnI4PfcsZ0ktYuhc,7361
-moonshot/src/metrics/metric_interface.py,sha256=1VQI4hzVzZLOnihWuDvaneATiY3aUSwXcOokUhaGUFc,3859
+moonshot/src/metrics/metric.py,sha256=llqJYnwtllJRMfNhRRbKWjhzKymY961yR3Jw24COR-Y,7512
+moonshot/src/metrics/metric_interface.py,sha256=RSCV8Um39Ns-SD8Os4TM1bwQl3pjaazk5bPRf55aD4Y,4027
 moonshot/src/prompt_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/prompt_templates/prompt_template.py,sha256=Q-QY9UeUEdF5wb2vUb7nhugQxcVAqRUqWvDbH_WLqtM,3370
+moonshot/src/prompt_templates/prompt_template.py,sha256=IT4ufLFDX43rD_Ewa1lJbYIBW4fHaTu_YyzOvvUU3Ts,3500
 moonshot/src/recipes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/recipes/recipe.py,sha256=dBz6oXn3wB8NoomgJREVMwKRpSbtapmF5tfapfVZiy0,13064
-moonshot/src/recipes/recipe_arguments.py,sha256=7s0MnyIluBxZqaHY-sJdz5MC1c8iR35Tas4pwKpY7u8,4067
+moonshot/src/recipes/recipe.py,sha256=PE4mimP7Y7lDanXib2uMrd9KpLWOxRdg0Cps5rLRQxU,13226
+moonshot/src/recipes/recipe_arguments.py,sha256=9LdVJidB6Sci941QvnudBznvx9_NVCl8r-HvzSZInlY,3914
 moonshot/src/redteaming/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/src/redteaming/attack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/redteaming/attack/attack_module.py,sha256=MFA7102UZ_gS6xGRmYWQfA9H8n5iLe2XlFMtkNFa7fw,24752
+moonshot/src/redteaming/attack/attack_module.py,sha256=HrL7YdsW-wcFB5Dv8t3wkPvg2pf-c9Ep994qdbk1D3s,25061
 moonshot/src/redteaming/attack/attack_module_arguments.py,sha256=L8H6poNj7xNWLUr6jfuSkwE7TNV0aTPaZBal4OvL7IA,1225
-moonshot/src/redteaming/attack/context_strategy.py,sha256=JORekUAQ_-2HPLBwErs_QP6uXCPlA_6aWhPh3gXfIYk,4684
+moonshot/src/redteaming/attack/context_strategy.py,sha256=KiAw85Pl8tuTzQ2d3CkZrjn3Ddp7BnlT5Gc67TTnq4M,4821
 moonshot/src/redteaming/context_strategy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/src/redteaming/context_strategy/context_strategy_interface.py,sha256=AdWEkXBaXE6fmVi3QashI9toWS-Vd-KnAZ0zo8TKSPA,1381
 moonshot/src/redteaming/session/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/src/redteaming/session/chat.py,sha256=KIfyQdc3TmTQ0WsYzXldbswt--ZA4ctLylOuDf-GRlo,7496
 moonshot/src/redteaming/session/red_teaming_progress.py,sha256=MNnzTI98Ra4dFn5DVAFJ9Iizq6gKK2OOpQyuYMKLul0,5547
 moonshot/src/redteaming/session/red_teaming_type.py,sha256=qqhYWyjr2v2fyKr1AD8oFA9vZJkevpwDl57Cmzz-aR8,102
-moonshot/src/redteaming/session/session.py,sha256=9MefcSsL-gmy9YuofrqMYnTo7QcSOErZsYQHLCLdUa4,29794
+moonshot/src/redteaming/session/session.py,sha256=kLifZmdWfqy2IuRHJeC4WhwdnxGdf3wKvayW3Kwpbz8,29994
 moonshot/src/results/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/results/result.py,sha256=GuzWGtDdrq1TlP3dSj4mQY3oQDDlmK0XKjRzWkrD8vw,4383
+moonshot/src/results/result.py,sha256=o56SdhYH-XVfpeeKhN495dJPkU035MmTjRUx48q53lo,4527
 moonshot/src/results/result_arguments.py,sha256=mTR7yajY72PFglfAaa1ajJfvYNV4IBGLXS4VaD53-8c,1334
 moonshot/src/runners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/runners/runner.py,sha256=0x3CvRGu00hlH0l7GWLSJG5x6Weq7I2E9BnqYxagmWI,20144
+moonshot/src/runners/runner.py,sha256=Wsvdzcw4KOa-ppgGVRGSK2YxLfXK-daHDw3k5jETv-4,21197
 moonshot/src/runners/runner_arguments.py,sha256=Bg4OPSmgr9jZKNAwPH0T3epEHw-6qGrflszFc6oMyEU,1640
 moonshot/src/runners/runner_type.py,sha256=jOfnAnaCYp-rPTRJXhM8hin_dinlR0sMwmimQXvLcJ0,100
 moonshot/src/runs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/runs/run.py,sha256=PvHHTz0tSSLparGhssDnE3OUPWrWygfPt6m_-diVBEI,13930
+moonshot/src/runs/run.py,sha256=QFdvWwCnqSjLrsTk3jJ1ccs3R1ZAZNvz5ls9Q_iRxO0,14132
 moonshot/src/runs/run_arguments.py,sha256=G043ERvHIU_dd0JghboZgxDWCcjYOaDwue1ieDunDKA,6443
-moonshot/src/runs/run_progress.py,sha256=zwHxdmHMPRatH96pddf5cT_PzL7hzC6zox83YqRzkJU,6350
+moonshot/src/runs/run_progress.py,sha256=d1BcNo6Kp4vA165TDx_xebl8JDo92aV-YutPxsgCOxE,6495
 moonshot/src/runs/run_status.py,sha256=TRtizcDzPxf6aQ2c3OovM6IQKJ0VCBhqDWvn7UBw5Zg,251
 moonshot/src/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/storage/db_interface.py,sha256=Fh5ehff4aBPtci4WNQi_BB5c-4ZmS1vLVoXVFvg0994,4513
+moonshot/src/storage/db_interface.py,sha256=DiiuizZcPlHrdqhesYirrKOQr-SS1N4ymbY4XXHKXfQ,5019
 moonshot/src/storage/io_interface.py,sha256=9IpMGtsVbToWBuS-ZRnaZJTMneUV8V0drCxk-OaN3dQ,824
-moonshot/src/storage/storage.py,sha256=ipVboJNMcCDIcYJ6QMXCEFNKxKbrcL5pHROZNDokAXA,20812
+moonshot/src/storage/storage.py,sha256=qQrGFPVzsDwYFrBWa3XLajSjhUtQBwGg4pAr54DFC5Y,22027
 moonshot/src/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+moonshot/src/utils/find_feature.py,sha256=a5CZMcDJ-Hp2OlV1fRug8Yu32_31KxlMie9lf4_ij9U,1296
 moonshot/src/utils/import_modules.py,sha256=T9zTN59PFnvY2rjyWhSV9KSIAHxWV1pyBemF0y-hwtw,2844
-moonshot/src/utils/timeit.py,sha256=Y-cO1k5tL804Ir0H6dMRz7C5d519XuR222OOfuyhocg,713
-aiverify_moonshot-0.4.1.dist-info/METADATA,sha256=Uee0Y5Z9hf-FsSYiVQXX3HrEs6P2mszEe6N4CWi8858,12307
-aiverify_moonshot-0.4.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-aiverify_moonshot-0.4.1.dist-info/licenses/AUTHORS.md,sha256=mmAbe3i3sT8JZHJMBhxp3i1xRehV0g7WB4T_eyIBuBs,59
-aiverify_moonshot-0.4.1.dist-info/licenses/LICENSE.md,sha256=mDOKOkWFbJmUORaAchXByEVGC1jw37QRn-zS14wY_wM,11347
-aiverify_moonshot-0.4.1.dist-info/licenses/NOTICES.md,sha256=0Ikx6IBGGQEOJeNb2MkRoXxTXwrtlMz6EDgLBFIz6v0,179593
-aiverify_moonshot-0.4.1.dist-info/RECORD,,
+moonshot/src/utils/log.py,sha256=YNgD7Eh2OT36XlmVBKCGUTAh9TRp4Akfe4kDdvHASgs,2502
+moonshot/src/utils/pagination.py,sha256=5seymyRoqyENIhKllAatr1T91kMCGFslcvRnJHyMSvc,814
+moonshot/src/utils/timeit.py,sha256=TvuF0w8KWhp0oZFY0cUU3UY0xlGKjchb0OkfYfgVTlc,866
+aiverify_moonshot-0.4.3.dist-info/METADATA,sha256=mkhNL-IBI5FOBjjhEu9xu8eG2AsbfzHLiKGloRvbX4E,12307
+aiverify_moonshot-0.4.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+aiverify_moonshot-0.4.3.dist-info/licenses/AUTHORS.md,sha256=mmAbe3i3sT8JZHJMBhxp3i1xRehV0g7WB4T_eyIBuBs,59
+aiverify_moonshot-0.4.3.dist-info/licenses/LICENSE.md,sha256=mDOKOkWFbJmUORaAchXByEVGC1jw37QRn-zS14wY_wM,11347
+aiverify_moonshot-0.4.3.dist-info/licenses/NOTICES.md,sha256=0Ikx6IBGGQEOJeNb2MkRoXxTXwrtlMz6EDgLBFIz6v0,179593
+aiverify_moonshot-0.4.3.dist-info/RECORD,,

moonshot/__main__.py

@@ -1,15 +1,24 @@
-import sys
-import warnings
 import argparse
+import os
 import platform
 import subprocess
-import os
-import threading 
+import sys
+import threading
+import warnings
+
 from dotenv import dotenv_values
+
 from moonshot.api import api_set_environment_variables
+from moonshot.src.utils.log import configure_logger
+
+# Create a logger for this module
+logger = configure_logger(__name__)
+
 """
 Run the Moonshot application
 """
+
+
 def run_subprocess(*args, **kwargs):
     """
     Run a subprocess with the option to use shell=True on Windows.
@@ -18,6 +27,7 @@ def run_subprocess(*args, **kwargs):
         kwargs["shell"] = True
     return subprocess.run(*args, **kwargs)
 
+
 def ms_lib_env_file(data_repo_name):
     """
     Writes the env file to be used for moonshot library
@@ -25,6 +35,7 @@ def ms_lib_env_file(data_repo_name):
     env_content_data = f"""
     # For Data
     ATTACK_MODULES="./{data_repo_name}/attack-modules"
+    BOOKMARKS="./{data_repo_name}/generated-outputs/bookmarks"
     CONNECTORS="./{data_repo_name}/connectors"
     CONNECTORS_ENDPOINTS="./{data_repo_name}/connectors-endpoints"
     CONTEXT_STRATEGY="./{data_repo_name}/context-strategy"
@@ -40,7 +51,7 @@ def ms_lib_env_file(data_repo_name):
     RESULTS_MODULES="./{data_repo_name}/results-modules"
     RUNNERS="./{data_repo_name}/generated-outputs/runners"
     RUNNERS_MODULES="./{data_repo_name}/runners-modules"
-    TOKENIZERS_PARALLELISM = false 
+    TOKENIZERS_PARALLELISM = false
     """
 
     env_content_web_api = """
@@ -58,6 +69,7 @@ def ms_lib_env_file(data_repo_name):
         combined_content = env_content_data + env_content_web_api
         env_file.write(combined_content.strip())
 
+
 def ms_ui_env_file(ui_repo):
     """
     Write the env file to be used with moonshot ui
@@ -71,67 +83,73 @@ def ms_ui_env_file(ui_repo):
     with open(os.path.join(ui_repo, ".env"), "w") as env_file:
         env_file.write(env_content.strip())
 
+
 def moonshot_data_installation():
     # Code for moonshot-data installation
-    print("Installing Moonshot Data from GitHub")
+    logger.info("Installing Moonshot Data from GitHub")
     repo = "https://github.com/aiverify-foundation/moonshot-data.git"
     folder_name = repo.split("/")[-1].replace(".git", "")
-    
+
     # Check if the directory already exists
     if not os.path.exists(folder_name):
-        print(f"Cloning {repo}")
+        logger.info(f"Cloning {repo}")
         # Clone the repository
         run_subprocess(["git", "clone", repo], check=True)
-        
+
         # Create .env to point to installed folder
         ms_lib_env_file(folder_name)
-        
+
         # Change directory to the folder
         os.chdir(folder_name)
 
-        print(f"Installing requirements for {folder_name}")
+        logger.info(f"Installing requirements for {folder_name}")
         # Install the requirements if they exist
         if os.path.exists("requirements.txt"):
             run_subprocess(["pip", "install", "-r", "requirements.txt"], check=True)
             import nltk
-            nltk.download('punkt')
-            nltk.download('stopwords')
-            nltk.download('averaged_perceptron_tagger')
-            nltk.download('universal_tagset')
-        
+
+            nltk.download("punkt")
+            nltk.download("stopwords")
+            nltk.download("averaged_perceptron_tagger")
+            nltk.download("universal_tagset")
+
         # Change back to the base directory
         os.chdir("..")
 
     else:
-        print(f"Directory {folder_name} already exists, skipping clone.")
+        logger.warning(f"Directory {folder_name} already exists, skipping clone.")
+
 
 def moonshot_ui_installation():
     # Code for moonshot-ui installation
     repo = "https://github.com/aiverify-foundation/moonshot-ui.git"
     folder_name = repo.split("/")[-1].replace(".git", "")
-    
+
     # Check if the directory already exists
     if not os.path.exists(folder_name):
-        print(f"Cloning {repo}")
+        logger.info(f"Cloning {repo}")
         # Clone the repository
         run_subprocess(["git", "clone", repo], check=True)
 
         # Change directory to the folder
         os.chdir(folder_name)
 
-        print(f"Installing requirements for {folder_name}")        
+        logger.info(f"Installing requirements for {folder_name}")
         # Install the requirements if they exist
         if os.path.exists("package.json"):
             run_subprocess(["npm", "install"], check=True)
             run_subprocess(["npm", "run", "build"], check=True)
-        
+
         # Change back to the base directory
         os.chdir("..")
 
         # Create .env for ui
         ms_ui_env_file(folder_name)
     else:
-        print(f"Directory {folder_name} already exists, skipping installation.")
+        logger.warning(
+            f"Directory {folder_name} already exists, skipping installation."
+        )
+
 
 def run_moonshot_ui_dev():
     """
@@ -141,31 +159,51 @@ def run_moonshot_ui_dev():
     ui_dev_dir = os.path.join(base_directory, "moonshot-ui")
 
     if not os.path.exists(ui_dev_dir):
-        print("moonshot-ui does not exist. Please run with '-i moonshot-ui' to install moonshot-ui first.")
+        logger.error(
+            "moonshot-ui does not exist. Please run with '-i moonshot-ui' to install moonshot-ui first."
+        )
         sys.exit(1)
     # ms_ui_env_file(ui_dev_dir)
-    run_subprocess(['npm', 'start'], cwd=ui_dev_dir)
+    run_subprocess(["npm", "start"], cwd=ui_dev_dir)
+
 
 def main():
     parser = argparse.ArgumentParser(description="Run the Moonshot application")
-    parser.add_argument('mode', nargs='?', choices=['web-api', 'cli', 'web', 'help'], help='Mode to run Moonshot in', default=help)
-    parser.add_argument('cli_command', nargs='?', help='The CLI command to run (e.g., "interactive")')
-    parser.add_argument('-i', '--install', action='append', choices=['moonshot-data', 'moonshot-ui'], help='Modules to install', default=[])
-    parser.add_argument('-e', '--env', type=str, help='Path to the .env file', default='.env')
-    
+    parser.add_argument(
+        "mode",
+        nargs="?",
+        choices=["web-api", "cli", "web", "help"],
+        help="Mode to run Moonshot in",
+        default=help,
+    )
+    parser.add_argument(
+        "cli_command", nargs="?", help='The CLI command to run (e.g., "interactive")'
+    )
+    parser.add_argument(
+        "-i",
+        "--install",
+        action="append",
+        choices=["moonshot-data", "moonshot-ui"],
+        help="Modules to install",
+        default=[],
+    )
+    parser.add_argument(
+        "-e", "--env", type=str, help="Path to the .env file", default=".env"
+    )
+
     args = parser.parse_args()
-    
+
     # Handle installations based on the -i include arguments
-    if 'moonshot-data' in args.install:
+    if "moonshot-data" in args.install:
         moonshot_data_installation()
 
-    if 'moonshot-ui' in args.install:
+    if "moonshot-ui" in args.install:
         moonshot_ui_installation()
 
     # If mode is not specified, skip running any modes
     if args.mode is None:
         return
-    
+
     if args.mode == "help":
         parser.print_help()
         sys.exit(1)
@@ -174,18 +212,21 @@ def main():
 
     if args.mode == "web-api":
         from moonshot.integrations.web_api import __main__ as web_api
+
         web_api.start_app()
     elif args.mode == "web":
-    # Create and start the UI dev server thread
+        # Create and start the UI dev server thread
         ui_thread = threading.Thread(target=run_moonshot_ui_dev)
         ui_thread.start()
         ui_thread.join(timeout=0.1)  # Wait briefly for the thread to become alive
         if not ui_thread.is_alive():
             sys.exit(1)
         from moonshot.integrations.web_api import __main__ as web_api
+
         web_api.start_app()
     elif args.mode == "cli":
         from moonshot.integrations.cli import __main__ as cli
+
         cli.start_app(args.cli_command)
 
         # Handle CLI mode here, possibly also with additional arguments
@@ -194,6 +235,7 @@ def main():
         parser.print_help()
         sys.exit(1)
 
+
 if __name__ == "__main__":
     warnings.filterwarnings("ignore")
-    main()
+    main()

moonshot/api.py

@@ -29,6 +29,7 @@ from moonshot.src.api.api_dataset import (
     api_delete_dataset,
     api_get_all_datasets,
     api_get_all_datasets_name,
+    api_create_datasets
 )
 from moonshot.src.api.api_environment_variables import api_set_environment_variables
 from moonshot.src.api.api_metrics import (
@@ -86,6 +87,14 @@ from moonshot.src.api.api_session import (
     api_update_prompt_template,
     api_update_system_prompt,
 )
+from moonshot.src.api.api_bookmark import (
+    api_get_all_bookmarks,
+    api_get_bookmark,
+    api_insert_bookmark,
+    api_delete_bookmark,
+    api_delete_all_bookmark,
+    api_export_bookmarks,
+)
 
 __all__ = [
     "api_create_connector_from_endpoint",
@@ -107,6 +116,7 @@ __all__ = [
     "api_read_cookbook",
     "api_read_cookbooks",
     "api_update_cookbook",
+    "api_create_datasets",
     "api_delete_dataset",
     "api_get_all_datasets",
     "api_get_all_datasets_name",
@@ -152,4 +162,10 @@ __all__ = [
     "api_update_metric",
     "api_update_prompt_template",
     "api_update_system_prompt",
+    "api_get_all_bookmarks",
+    "api_get_bookmark",
+    "api_insert_bookmark",
+    "api_delete_bookmark",
+    "api_delete_all_bookmark",
+    "api_export_bookmarks",
 ]

moonshot/integrations/cli/benchmark/benchmark.py

@@ -8,6 +8,7 @@ from moonshot.integrations.cli.benchmark.cookbook import (
     delete_cookbook,
     delete_cookbook_args,
     list_cookbooks,
+    list_cookbooks_args,
     run_cookbook,
     run_cookbook_args,
     update_cookbook,
@@ -19,6 +20,7 @@ from moonshot.integrations.cli.benchmark.datasets import (
     delete_dataset,
     delete_dataset_args,
     list_datasets,
+    list_datasets_args,
     view_dataset,
     view_dataset_args,
 )
@@ -26,6 +28,7 @@ from moonshot.integrations.cli.benchmark.metrics import (
     delete_metric,
     delete_metric_args,
     list_metrics,
+    list_metrics_args,
     view_metric,
     view_metric_args,
 )
@@ -35,6 +38,7 @@ from moonshot.integrations.cli.benchmark.recipe import (
     delete_recipe,
     delete_recipe_args,
     list_recipes,
+    list_recipes_args,
     run_recipe,
     run_recipe_args,
     update_recipe,
@@ -46,10 +50,16 @@ from moonshot.integrations.cli.benchmark.result import (
     delete_result,
     delete_result_args,
     list_results,
+    list_results_args,
     view_result,
     view_result_args,
 )
-from moonshot.integrations.cli.benchmark.run import list_runs, view_run, view_run_args
+from moonshot.integrations.cli.benchmark.run import (
+    list_runs,
+    list_runs_args,
+    view_run,
+    view_run_args,
+)
 from moonshot.integrations.cli.benchmark.runner import (
     delete_runner,
     delete_runner_args,
@@ -68,26 +78,32 @@ class BenchmarkCommandSet(cmd2.CommandSet):
     # List contents
     # ------------------------------------------------------------------------------
 
-    def do_list_cookbooks(self, _: cmd2.Statement) -> None:
-        list_cookbooks()
+    @cmd2.with_argparser(list_cookbooks_args)
+    def do_list_cookbooks(self, args: argparse.Namespace) -> None:
+        list_cookbooks(args)
 
-    def do_list_recipes(self, _: cmd2.Statement) -> None:
-        list_recipes()
+    @cmd2.with_argparser(list_recipes_args)
+    def do_list_recipes(self, args: argparse.Namespace) -> None:
+        list_recipes(args)
 
-    def do_list_results(self, _: cmd2.Statement) -> None:
-        list_results()
+    @cmd2.with_argparser(list_results_args)
+    def do_list_results(self, args: argparse.Namespace) -> None:
+        list_results(args)
 
     def do_list_runners(self, _: cmd2.Statement) -> None:
         list_runners()
 
-    def do_list_runs(self, _: cmd2.Statement) -> None:
-        list_runs()
+    @cmd2.with_argparser(list_runs_args)
+    def do_list_runs(self, args: argparse.Namespace) -> None:
+        list_runs(args)
 
-    def do_list_metrics(self, _: cmd2.Statement) -> None:
-        list_metrics()
+    @cmd2.with_argparser(list_metrics_args)
+    def do_list_metrics(self, args: argparse.Namespace) -> None:
+        list_metrics(args)
 
-    def do_list_datasets(self, _: cmd2.Statement) -> None:
-        list_datasets()
+    @cmd2.with_argparser(list_datasets_args)
+    def do_list_datasets(self, args: argparse.Namespace) -> None:
+        list_datasets(args)
 
     # ------------------------------------------------------------------------------
     # Add contents