Skip to content

Commit ed1ba8c

Browse files
committed
Use aws_env in more places and lint.
1 parent a8deae1 commit ed1ba8c

File tree

7 files changed

+21
-13
lines changed

7 files changed

+21
-13
lines changed

python_components/document_inference/lambda_function.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@ def handler(event, context):
2727
all_models = helpers.get_models("models.json")
2828
helpers.validate_model(all_models, event["model_name"])
2929
helpers.logger.info("Model is valid")
30-
api_key = helpers.get_secret(all_models[event["model_name"]]["key"], local_mode, aws_env)
30+
api_key = helpers.get_secret(
31+
all_models[event["model_name"]]["key"], local_mode, aws_env
32+
)
3133
asap_creds_user = helpers.get_secret(API_USER_NAME_SECRET, local_mode, aws_env)
32-
asap_creds_password = helpers.get_secret(API_PASSWORD_SECRET, local_mode, aws_env)
34+
asap_creds_password = helpers.get_secret(
35+
API_PASSWORD_SECRET, local_mode, aws_env
36+
)
3337
page_limit_label = (
3438
"unlimited" if event["page_limit"] == 0 else event["page_limit"]
3539
)

python_components/evaluation/evaluation/exception/evaluation.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ async def evaluate(self, document: Document) -> List[Result]:
4646
self.inference_model_name,
4747
"exception",
4848
self.local_mode,
49+
self.aws_env,
4950
self.page_limit,
5051
)
5152
logger.info("Exception check complete. Performing related evaluations.")

python_components/evaluation/evaluation/summary/evaluation.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def evaluate(self, document: Document) -> List[Result]:
2626
self.inference_model_name,
2727
"summary",
2828
self.local_mode,
29+
self.aws_env,
2930
self.page_limit,
3031
)
3132
logger.info("Summarization complete. Performing related evaluations.")

python_components/evaluation/evaluation/utility/asap_inference.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ def get_inference_for_document(
2424
inference_model_name: str,
2525
inference_type: str,
2626
local_mode: bool,
27+
aws_env: str,
2728
page_number: int,
2829
) -> None:
2930
logger.info(f"Performing inference type {inference_type} for {document.url}...")
@@ -40,7 +41,7 @@ def get_inference_for_document(
4041
session = boto3.Session()
4142
client = session.client("lambda")
4243
response = client.get_function_url_config(
43-
FunctionName="asap-pdf-document-inference-evaluation-staging",
44+
FunctionName=f"asap-pdf-document-inference-evaluation-{aws_env}",
4445
)
4546
if "FunctionArn" not in response.keys():
4647
raise RuntimeError(

python_components/evaluation/evaluation/utility/document.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def __init__(
4242
self.commit_sha = commit_sha
4343
self.page_limit = kwargs.get("page_limit", 7)
4444
self.local_mode = kwargs.get("local_mode", False)
45+
self.aws_env = kwargs.get("aws_env", "staging")
4546
now = datetime.datetime.now()
4647
metric_run_date = (
4748
now.strftime("%Y-%m-%d %H:%M:%S") + f".{now.microsecond // 1000:03d}"

python_components/evaluation/evaluation/utility/google_sheet.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@
55
from google.oauth2.service_account import Credentials
66
from googleapiclient.discovery import build
77

8-
GOOGLE_EVAL_SERVICE_ACCOUNT_CREDS = (
9-
"/asap-pdf/production/GOOGLE_SERVICE_ACCOUNT-20250605155250934400000001"
10-
)
11-
GOOGLE_EVAL_SHEET_ID = (
12-
"/asap-pdf/production/GOOGLE_SHEET_ID_EVALUATION-20250605155250934400000003"
13-
)
8+
GOOGLE_EVAL_SERVICE_ACCOUNT_CREDS = "asap-pdf/{AWS_ENV}/GOOGLE_SERVICE_ACCOUNT"
9+
GOOGLE_EVAL_SHEET_ID = "asap-pdf/{AWS_ENV}/GOOGLE_SHEET_ID_EVALUATION"
1410
RANGE_NAME = "Results!A:L"
1511
SCOPES = ["https://www.googleapis.com/auth/spreadsheets"]
1612

1713

18-
def append_to_google_sheet(results: List[dict], local_mode: bool) -> None:
14+
def append_to_google_sheet(results: List[dict], local_mode: bool, aws_env: str) -> None:
1915

20-
creds_json = json.loads(get_secret(GOOGLE_EVAL_SERVICE_ACCOUNT_CREDS, local_mode))
21-
sheet_id = get_secret(GOOGLE_EVAL_SHEET_ID, local_mode)
16+
creds_json = json.loads(
17+
get_secret(GOOGLE_EVAL_SERVICE_ACCOUNT_CREDS, local_mode, aws_env)
18+
)
19+
sheet_id = get_secret(GOOGLE_EVAL_SHEET_ID, local_mode, aws_env)
2220

2321
logger.info(f"Appending results to {sheet_id} range {RANGE_NAME}...")
2422

python_components/evaluation/lambda_function.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def handler(event, context):
4848
event["commit_sha"],
4949
delta,
5050
local_mode=local_mode,
51+
aws_env=aws_env,
5152
)
5253
exception_eval_wrapper = exception.EvaluationWrapper(
5354
eval_model,
@@ -56,6 +57,7 @@ def handler(event, context):
5657
event["commit_sha"],
5758
delta,
5859
local_mode=local_mode,
60+
aws_env=aws_env,
5961
)
6062
output = []
6163
for document_dict in event["documents"]:
@@ -78,7 +80,7 @@ def handler(event, context):
7880
output.extend(results)
7981
if "output_google_sheet" in event.keys():
8082
utility.helpers.logger.info("Writing eval results to Google Sheet")
81-
utility.google_sheet.append_to_google_sheet(output, local_mode)
83+
utility.google_sheet.append_to_google_sheet(output, local_mode, aws_env)
8284
return {
8385
"statusCode": 200,
8486
"body": "Wrote evaluation results to Google Sheet.",

0 commit comments

Comments
 (0)