Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for S3 path issues in data export #235

Merged
merged 3 commits into from
Mar 19, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
changed json to jsonl
star-nox committed Mar 19, 2024
commit 148e6da8386496f7eb6d0a224f582f365969a9f8
14 changes: 7 additions & 7 deletions ai_ta_backend/service/export_service.py
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ def export_documents_json(self, course_name: str, from_date='', to_date=''):
print("last_id: ", last_id)

curr_doc_count = 0
filename = course_name + '_' + str(uuid.uuid4()) + '_documents.json'
filename = course_name + '_' + str(uuid.uuid4()) + '_documents.jsonl'
file_path = os.path.join(os.getcwd(), filename)

while curr_doc_count < total_doc_count:
@@ -71,7 +71,7 @@ def export_documents_json(self, course_name: str, from_date='', to_date=''):

# writing to file
if not os.path.isfile(file_path):
df.to_json(file_path, orient='records')
df.to_json(file_path, orient='records', lines=True)
else:
df.to_json(file_path, orient='records', lines=True, mode='a')

@@ -126,7 +126,7 @@ def export_convo_history_json(self, course_name: str, from_date='', to_date=''):
last_id = response.data[-1]['id']
total_count = response.count

filename = course_name + '_' + str(uuid.uuid4()) + '_convo_history.json'
filename = course_name + '_' + str(uuid.uuid4()) + '_convo_history.jsonl'
file_path = os.path.join(os.getcwd(), filename)
curr_count = 0
# Fetch data in batches of 25 from first_id to last_id
@@ -191,7 +191,7 @@ def export_data_in_bg(response, download_type, course_name, s3_path):
print("pre-defined s3_path: ", s3_path)

curr_doc_count = 0
filename = s3_path.split('/')[-1].split('.')[0] + '.json'
filename = s3_path.split('/')[-1].split('.')[0] + '.jsonl'
file_path = os.path.join(os.getcwd(), filename)

# download data in batches of 100
@@ -203,7 +203,7 @@ def export_data_in_bg(response, download_type, course_name, s3_path):

# writing to file
if not os.path.isfile(file_path):
df.to_json(file_path, orient='records')
df.to_json(file_path, orient='records', lines=True)
else:
df.to_json(file_path, orient='records', lines=True, mode='a')

@@ -267,8 +267,8 @@ def export_data_in_bg(response, download_type, course_name, s3_path):
# send email to admins
subject = "UIUC.chat Data Export Complete for " + course_name
body_text = "The data export for " + course_name + " is complete.\n\nYou can download the file from the following link: \n\n" + s3_url + "\n\nThis link will expire in 48 hours."
email_status = send_email(subject, body_text, os.environ['EMAIL_SENDER'], admin_emails, bcc_emails)
print("email_status: ", email_status)
# email_status = send_email(subject, body_text, os.environ['EMAIL_SENDER'], admin_emails, bcc_emails)
# print("email_status: ", email_status)

return "File uploaded to S3. Email sent to admins."