From dded3c4a4fb9ccae8e6e5c6c1ddbc6f87f010665 Mon Sep 17 00:00:00 2001 From: Michael McGuinness Date: Mon, 30 Sep 2024 10:55:08 +0100 Subject: [PATCH] somevars --- fieldProcessing/.envrc | 6 +++--- fieldProcessing/src/config.py | 15 +++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/fieldProcessing/.envrc b/fieldProcessing/.envrc index 8c55cdf..5dbd49f 100644 --- a/fieldProcessing/.envrc +++ b/fieldProcessing/.envrc @@ -1,5 +1,5 @@ dotenv_if_exists .env -require AWS_ACCESS_KEY_ID -require AWS_SECRET_ACCESS_KEY -require AWS_SESSION_TOKEN \ No newline at end of file +require AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN +require LOCAL_PATH +require BUCKET BUCKET_PREFIX \ No newline at end of file diff --git a/fieldProcessing/src/config.py b/fieldProcessing/src/config.py index 98deffd..5c7dd28 100644 --- a/fieldProcessing/src/config.py +++ b/fieldProcessing/src/config.py @@ -1,5 +1,4 @@ - - +import os from datetime import datetime import boto3 #from llama_index.llms.bedrock import Bedrock @@ -79,12 +78,12 @@ VALID_COLUMNS = ['Filename', 'Corrected_NETWORK'] # AWS Keys -AWS_ACCESS_KEY_ID="ASIAZTMXAXNXMQQYFSXT" -AWS_SECRET_ACCESS_KEY="hdSomqARWCnYuq9fxyV7UIiQfdgmEQESpoAxDtlV" -AWS_SESSION_TOKEN="IQoJb3JpZ2luX2VjEGcaCXVzLWVhc3QtMiJHMEUCIEXUQEAYV2H9hbVeW+LAsvkQFKZ89ipJCbnzIo2p0M/gAiEAhgxZLkrMB30QwbNqIA6RT3RZQT65wdw32lSa7JFoXS0qgwMIMBAAGgw2NjAxMzEwNjg3ODIiDM+gJvWtmiuPv1x0GirgAlceVNB5V46sQ1VF+vBYYqlKyhcNiNfU/fvav4OFd71yVqht2oJIgFhuT/QTuUJlJf2FvscvWJ44raCa6FkOsY/E7E6LKGaykkiJgi2DJel+D4GYEEzg/4xhFeWC2oT0FmX52EBnFmUT3OJplevUv5gXUhrGyRpZYBeHC3WVUjrBB6bf4qk8f94ezVSDl6exFptv5Jf58drlTZu2LoKj+qBXIBcwAf2gS4xuVhgAtdyHXgCveTkNahAGSZ3V0KeDvm7BDG8TUEAT4WDf1P08URnfNi0rPYdKG9Yp5zG2HI/4WaQkz2mahdSlCQZD64mEEXWwU5rAcDh+Ws/vJgMt4fWiUtKz45z9uEhJxM+HT04Ne1yuHOiAuQBWYNwnC63pBuRxug9+OqtpoDzcEQNkunjUFZunN8jtUJuY9SFMlNO+QLVFSxfLzQUEIyK9tDh57J8NpBCPr7Gxdo17lL3oGy8wzZW1tAY6pgHPfjY4ismOUXXQRtfrQHIFXtQ7SZ1JybMe7iEj/U8yvCK5mjXRLX5Qi9ZwTzOVM50UIH8BVZU3NXGXpi8D0ZUGhlXnqGSs6tdK8MKDYH8YZSG/fRpYaDcYwVXfbBb30PRiDl9GaxSEh/pU1187RuTs309uTJglSpU0QAbTYi2qKQO4BzR8XsAhf7YOsTKSc6CFeUvrsrPblBTDOhHr/H15mEtsVZwK" +AWS_ACCESS_KEY_ID = os.getenv('AWS_ACCESS_KEY_ID') +AWS_SECRET_ACCESS_KEY = os.getenv('AWS_SECRET_ACCESS_KEY') +AWS_SESSION_TOKEN = os.getenv('AWS_SESSION_TOKEN') # File Paths -LOCAL_PATH = 'data/test/' # Replace with local +LOCAL_PATH = os.getenv('LOCAL_PATH') # S3 Settings S3_CLIENT = boto3.client('s3', @@ -93,8 +92,8 @@ S3_CLIENT = boto3.client('s3', aws_secret_access_key=AWS_SECRET_ACCESS_KEY, aws_session_token=AWS_SESSION_TOKEN ) -BUCKET = "doczy-dev-infra-textract" -PREFIX = "batches/batch_1/contract-text-file/" # replace with s3 path +BUCKET = os.getenv('BUCKET') +PREFIX = os.getenv('BUCKET_PREFIX') # Bedrock Settings BEDROCK_RUNTIME = boto3.client(service_name="bedrock-runtime",