From 5e6958aaaff0b9424a8d8f9f1be26c9205708122 Mon Sep 17 00:00:00 2001 From: GangGreenTemperTatum <104169244+GangGreenTemperTatum@users.noreply.github.com> Date: Tue, 1 Oct 2024 14:11:03 -0400 Subject: [PATCH 1/2] fix: asyncio issues from multiple caller repos in ci --- addepar_redflag/util/cli.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/addepar_redflag/util/cli.py b/addepar_redflag/util/cli.py index 4dbb68a..5c93748 100644 --- a/addepar_redflag/util/cli.py +++ b/addepar_redflag/util/cli.py @@ -35,6 +35,20 @@ def common_arguments(parser, default_config): parser.add_argument('--no-progress-bar', action='store_false', dest='progress_bar', help='Flag to not display a progress bar.') parser.add_argument('--no-strip-html-comments', action='store_false', dest='strip_html_comments', help='Flag to not strip HTML comments from PR descriptions.') +async def run_evaluations(github, jira, dataset, config): + await do_evaluations( + github=github, + jira=Jira, + dataset=dataset, + config=config + ) + +async def run_redflag(github, jira, config): + await redflag( + github=github, + jira=Jira, + config=config + ) def cli(): pretty_print_header() @@ -104,24 +118,21 @@ def cli(): try: if args.command == 'eval': dataset = Path(final_config['dataset']) - asyncio.run(do_evaluations( + asyncio.run(run_evaluations( github=github, jira=jira, dataset=dataset, config=final_config )) else: - asyncio.run(redflag( + asyncio.run(run_redflag( github=github, jira=jira, config=final_config )) - - # Unhandled exception handler except Exception as e: pretty_print( - f'An unhandled exception occurred: {e}', + f'Failed to evaluate against {llm.model}, exception: {e}', MessageType.FATAL ) - pretty_print_traceback() - exit(1) + exit(1) \ No newline at end of file From 8f49bbb2c4e53b982ae236c3d626b4fb09d78e33 Mon Sep 17 00:00:00 2001 From: Ads Dawson <104169244+GangGreenTemperTatum@users.noreply.github.com> Date: Tue, 24 Dec 2024 05:56:03 -0500 Subject: [PATCH 2/2] chore: follow up async slack changes --- addepar_redflag/util/cli.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addepar_redflag/util/cli.py b/addepar_redflag/util/cli.py index 1cbea34..c421a3e 100644 --- a/addepar_redflag/util/cli.py +++ b/addepar_redflag/util/cli.py @@ -48,6 +48,7 @@ async def run_redflag(github, jira, config): await redflag( github=github, jira=Jira, + slack=Slack, config=config ) @@ -86,7 +87,7 @@ def cli(): # Validate Bedrock configuration final_config['bedrock']['profile'] = validate_aws_credentials(final_config['bedrock']['profile']) - + # Instantiate GitHub object github_token = final_config['github_token'] auth = Auth.Token(github_token) if github_token else None @@ -107,7 +108,7 @@ def cli(): MessageType.FATAL ) exit(1) - + jira = Jira( url=final_config['jira']['url'], username=jira_user,