junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-07-12 13:29:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #207 from Hestia-Homes/main

Browse source 
Give permission to lambda to read from data bucket
This commit is contained in:
KhalimCK 2023-09-01 19:14:08 +01:00 • committed by GitHub
commit 30e2efecb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/deploy_sap_model_lambda.yml vendored
View file

@ -72,6 +72,7 @@ jobs:
RUNTIME_ENVIRONMENT: ${{ github.ref_name }} RUNTIME_ENVIRONMENT: ${{ github.ref_name }}
MODEL_DIRECTORY_BUCKET: 'retrofit-model-directory-${{ github.ref_name }}' MODEL_DIRECTORY_BUCKET: 'retrofit-model-directory-${{ github.ref_name }}'
PREDICTIONS_BUCKET: 'retrofit-sap-predictions-${{ github.ref_name }}' PREDICTIONS_BUCKET: 'retrofit-sap-predictions-${{ github.ref_name }}'
DATA_BUCKET: 'retrofit-data-${{ github.ref_name }}'
DOMAIN_NAME: ${{ steps.set_domain.outputs.domain }} DOMAIN_NAME: ${{ steps.set_domain.outputs.domain }}
ECR_URI: ${{ steps.set_ecr_credentials.outputs.ecr_uri }} ECR_URI: ${{ steps.set_ecr_credentials.outputs.ecr_uri }}
GITHUB_SHA: ${{ github.sha }} GITHUB_SHA: ${{ github.sha }}

9
model_data/simulation_system/handlers/predictions_app.py
View file

@ -19,11 +19,10 @@ def handler(event, context):
# Assuming a file in a bucket landing for now? # Assuming a file in a bucket landing for now?
# Assuming we have a model to use # Assuming we have a model to use
payload = event["body"] data_path = event["file_location"]
data_path = payload["file_location"] property_id = event["property_id"]
property_id = payload["property_id"] portfolio_id = event["portfolio_id"]
portfolio_id = payload["portfolio_id"] created_at = event["created_at"]
created_at = payload["created_at"]
try: try:
# We could fix the model path but for the moment, we just take the best model path based on the registry # We could fix the model path but for the moment, we just take the best model path based on the registry

7
sapmodel.serverless.yml
View file

@ -8,6 +8,7 @@ provider:
RUNTIME_ENVIRONMENT: ${env:RUNTIME_ENVIRONMENT} RUNTIME_ENVIRONMENT: ${env:RUNTIME_ENVIRONMENT}
MODEL_DIRECTORY_BUCKET: ${env:MODEL_DIRECTORY_BUCKET} MODEL_DIRECTORY_BUCKET: ${env:MODEL_DIRECTORY_BUCKET}
PREDICTIONS_BUCKET: ${env:PREDICTIONS_BUCKET} PREDICTIONS_BUCKET: ${env:PREDICTIONS_BUCKET}
DATA_BUCKET: ${env:DATA_BUCKET}
DOMAIN_NAME: ${env:DOMAIN_NAME} DOMAIN_NAME: ${env:DOMAIN_NAME}
ECR_URI: ${env:ECR_URI} ECR_URI: ${env:ECR_URI}
GITHUB_SHA: ${env:GITHUB_SHA} GITHUB_SHA: ${env:GITHUB_SHA}
@ -52,7 +53,7 @@ resources:
PolicyDocument: PolicyDocument:
Version: '2012-10-17' Version: '2012-10-17'
Statement: Statement:
# Allow reading from MODEL_DIRECTORY_BUCKET # Allow reading from MODEL_DIRECTORY_BUCKET and DATA_BUCKET
- Effect: Allow - Effect: Allow
Action: Action:
- s3:GetObject - s3:GetObject
@ -60,6 +61,8 @@ resources:
Resource: Resource:
- arn:aws:s3:::${env:MODEL_DIRECTORY_BUCKET} - arn:aws:s3:::${env:MODEL_DIRECTORY_BUCKET}
- arn:aws:s3:::${env:MODEL_DIRECTORY_BUCKET}/* - arn:aws:s3:::${env:MODEL_DIRECTORY_BUCKET}/*
- arn:aws:s3:::${env:DATA_BUCKET}
- arn:aws:s3:::${env:DATA_BUCKET}/*
# Allow reading and writing to PREDICTIONS_BUCKET # Allow reading and writing to PREDICTIONS_BUCKET
- Effect: Allow - Effect: Allow
Action: Action:
@ -68,4 +71,4 @@ resources:
- s3:ListBucket - s3:ListBucket
Resource: Resource:
- arn:aws:s3:::${env:PREDICTIONS_BUCKET} - arn:aws:s3:::${env:PREDICTIONS_BUCKET}
- arn:aws:s3:::${env:PREDICTIONS_BUCKET}/* - arn:aws:s3:::${env:PREDICTIONS_BUCKET}/*