Skip to content
This repository has been archived by the owner on Dec 18, 2023. It is now read-only.

Fix: #38 - Upload button redirects to error page #40

Merged
merged 1 commit into from
Mar 16, 2023
Merged

Fix: #38 - Upload button redirects to error page #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 22 additions & 20 deletions application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,26 +126,28 @@ def github_sign():
username = get_username()
log_db(username=username)

if check_user_in_db(username=username):
if check_user_in_settings_db(username=username):
insert_initial_upload_quota_db(username)

mp.track(username, 'User signed up')
return redirect('/')


@application.route('/upload')
# @application.route('/debug-sentry')
@login_required
def upload():
try:
mp.track(get_username(), 'Users in Upload page')
with start_transaction(op="task", name="Upload Page"):
if check_user_in_settings_db(username=get_username()):
insert_initial_upload_quota_db(get_username())

upload_count = get_upload_count(get_username())

return render_template('upload.html', auth=check_authorized_status(),
upload_count=upload_count,
response=None,
version=version.__version__)
upload_count=upload_count,
response=None,
version=version.__version__)
except Exception as e:
print(e)
capture_exception(e)
Expand Down Expand Up @@ -239,18 +241,18 @@ def fetch_performance_results(contents, filename, username):
presence_penalty=constants.presence_penalty
)
log_db(username=username, openai_id=response['id'],
openai_prompt_tokens=response['usage']['prompt_tokens'],
openai_completion_tokens=response['usage']['completion_tokens'],
openai_total_tokens=response['usage']['total_tokens'],
openai_created=response['created'])
openai_prompt_tokens=response['usage']['prompt_tokens'],
openai_completion_tokens=response['usage']['completion_tokens'],
openai_total_tokens=response['usage']['total_tokens'],
openai_created=response['created'])

# Send Slack Notifications if enabled
if get_slack_notification_status() == 'true':
try:
slack.send_slack_notifications(msg=response['choices'][0]['text'],
filename=filename,
title=title,
webhook=get_webhook())
filename=filename,
title=title,
webhook=get_webhook())
except Exception as e:
capture_exception(e)
pass
Expand Down Expand Up @@ -279,7 +281,7 @@ def askgpt_upload():
openai.api_key = _vars['OPENAI_API_KEY']
except KeyError:
return render_template("upload.html", response="API key not set. Please contact the "
"administrator.",
"administrator.",
auth=check_authorized_status(),
upload_count=upload_count,
version=version.__version__)
Expand All @@ -302,9 +304,9 @@ def askgpt_upload():
capture_exception(e)

return render_template('upload.html', response="Cannot read file data. Please make sure "
"the file is not empty and is in one of "
"the"
" supported formats.",
"the file is not empty and is in one of "
"the"
" supported formats.",
auth=check_authorized_status(),
upload_count=upload_count,
version=version.__version__)
Expand Down Expand Up @@ -335,10 +337,10 @@ def askgpt_upload():
version=version.__version__)
else:
return render_template('upload.html', response="You do not have enough credits. Please wait for the "
"next month credit or upgrade now.",
auth=check_authorized_status(),
upload_count=upload_count,
version=version.__version__)
"next month credit or upgrade now.",
auth=check_authorized_status(),
upload_count=upload_count,
version=version.__version__)
except Exception as e:
print(e)
capture_exception(e)
Expand Down
6 changes: 2 additions & 4 deletions utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def update_upload_count(username, upload_count):
capture_exception(e)


def check_user_in_db(username):
def check_user_in_settings_db(username):
"""

:param username: username
Expand Down Expand Up @@ -248,7 +248,6 @@ def log_db(username, openai_id=None, openai_prompt_tokens=None, openai_completio
"openai_total_tokens": openai_total_tokens,
}
)
print("Inside logDB: ", str(db_response))
except ClientError as e:
print_exceptions(e)
if e.response['Error']['Code'] == 'ExpiredTokenException':
Expand Down Expand Up @@ -289,8 +288,7 @@ def get_upload_count(username):
key = {'username': username}
# response = settings_table.query(KeyConditionExpression=Key('username').eq(username))
response = settings_table.get_item(Key=key)

if 'initial_upload_quota' in response['Item']:
if 'Item' in response and 'initial_upload_quota' in response['Item']:
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ruturaj123

total_count = response['Item']['initial_upload_quota']
return int(total_count)
return int(total_count)
Expand Down