jshbrmn/irt-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed to loft service to be more clear, added solution file generation naming via regex, few qol things

Browse Source
This commit is contained in:
Josh Burman
2021-10-29 00:10:30 +00:00
parent 3a42d83b76
commit d13574ac08
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/services/loft.py → app/services/loft_service.py
View File

@ -2,7 +2,6 @@ import os
import json
import random
import io
import time
from helpers import aws_helper, tar_helper, csv_helper, service_helper
@ -12,7 +11,7 @@ from models.form import Form
from services.base import Base
class Loft(Base):
class LoftService(Base):
def process(self):
self.solver_run = SolverRun.parse_obj(self.retreive_attributes_from_message())
self.solution = self.generate_solution()
@ -20,17 +19,17 @@ class Loft(Base):
def retreive_attributes_from_message(self):
# get s3 object
key = aws_helper.get_key_from_message(self.source)
s3_object = aws_helper.get_object(key, os.environ['SOLVER_INGEST_BUCKET'])
self.key = aws_helper.get_key_from_message(self.source)
s3_object = aws_helper.get_object(self.key, os.environ['SOLVER_INGEST_BUCKET'])
# convert to tar
tar = tar_helper.raw_to_tar(s3_object)
self.tar = tar_helper.raw_to_tar(s3_object)
# get attributes file and convert to dict
attributes = json.loads(tar_helper.extract_file_from_tar(tar, 'solver_run_attributes.json').read())
attributes = json.loads(tar_helper.extract_file_from_tar(self.tar , 'solver_run_attributes.json').read())
# get items file and convert to dict
items_csv = tar_helper.extract_file_from_tar(tar, 'items.csv')
items_csv = tar_helper.extract_file_from_tar(self.tar , 'items.csv')
items_csv_reader = csv_helper.file_stream_reader(items_csv)
# add items to attributes dict
@ -60,4 +59,4 @@ class Loft(Base):
solution_file = service_helper.solution_to_file(buffer, self.solver_run.total_form_items, self.solution.forms)
# upload generated file to s3 and return result
return aws_helper.file_stream_upload(solution_file, f'test_solution_{time.time()}.csv', os.environ['MEASURE_PROCESSED_BUCKET'])
return aws_helper.file_stream_upload(solution_file, f'{service_helper.key_to_uuid(self.key)}.csv', os.environ['MEASURE_PROCESSED_BUCKET'])