Add GenAi-PA error handling

src/c++/perf_analyzer/genai-pa/llm_inputs/llm_inputs.py → src/c++/perf_analyzer/genai-pa/genai_pa/llm_inputs/llm_inputs.py

@@ -17,7 +17,7 @@
 from typing import Dict, List, Optional, Tuple
 
 import requests
-from genaipa_exceptions import GenAiPAException
+from genai_pa.exceptions import GenAiPAException
 from requests import Response
 
 

src/c++/perf_analyzer/genai-pa/genai_pa/main.py

@@ -30,6 +30,7 @@
 
 from genai_pa import parser
 from genai_pa.constants import LOGGER_NAME
+from genai_pa.exceptions import GenAiPAException
 
 logging.basicConfig(level=logging.INFO, format="%(name)s - %(levelname)s - %(message)s")
 logger = logging.getLogger(LOGGER_NAME)
@@ -39,8 +40,11 @@
 # to assert correct errors and messages.
 # Optional argv used for testing - will default to sys.argv if None.
 def run(argv=None):
-    args = parser.parse_args(argv)
-    args.func(args)
+    try:
+        args = parser.parse_args(argv)
+        args.func(args)
+    except Exception as e:
+        raise GenAiPAException(e)
 
 
 def main():

src/c++/perf_analyzer/genai-pa/genai_pa/wrapper.py

@@ -57,4 +57,4 @@ def run(model, args=None):
                         arg = utils.convert_option_name(arg)
                         cmd += f"--{arg} {value} "
         logger.info(f"Running Perf Analyzer : '{cmd}'")
-        subprocess.run(cmd, shell=True)
+        subprocess.run(cmd, shell=True, check=True)

src/c++/perf_analyzer/genai-pa/tests/test_cli.py

@@ -28,6 +28,8 @@
 
 import pytest
 from genai_pa import parser
+from genai_pa.exceptions import GenAiPAException
+from genai_pa.main import run
 
 
 class TestCLIArguments:
@@ -91,3 +93,7 @@
 
         # Check that the exit was unsuccessful
         assert exc_info.value.code != 0
+
+    def test_execption_on_nonzero_exit(self):
+        with pytest.raises(GenAiPAException) as e:
+            _ = run(["-m", "nonexistent_model"])

src/c++/perf_analyzer/genai-pa/tests/test_llm_inputs.py

@@ -16,8 +16,8 @@
 import os
 
 import pytest
-from genaipa_exceptions import GenAiPAException
-from llm_inputs.llm_inputs import LlmInputs
+from genai_pa.exceptions import GenAiPAException
+from genai_pa.llm_inputs.llm_inputs import LlmInputs
 
 
 class TestLlmInputs: