chat: flake fixes #1301
Merged
chat: flake fixes #1301
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rmackay9
force-pushed
the
chat-flake-fixes
branch
from
90f18a4
to
e94a756
Compare
peterbarker
approved these changes
Jan 4, 2024
| @@ -228,7 +234,7 @@ def handle_function_call(self, run): | |||
| # convert to json | |||
| stage_str = "convert output to json" | |||
| output = json.dumps(output) | |||
| except: | |||
| except Exception: | |||
There was a problem hiding this comment.
This is a sensible change, but note that catching Exception can lead to very annoying behaviours where it catches things that you don't want it to (e.g. the user pressing ctrl-c to kill the program!).
Best to narrow exceptions as much as possible.
| @@ -64,20 +68,20 @@ def main(openai_api_key=None, delete_unused=False): | |||
| for assistant_file in client.beta.assistants.files.list(assistant_id=assistant.id): | |||
| file_assistant_count[assistant_file.id] = file_assistant_count.get(assistant_file.id, 0) + 1 | |||
| filename_size_date = get_filename_size_date_from_id(existing_files, assistant_file.id) | |||
| print(" id:" + assistant_file.id + " name:" + filename_size_date[0] + " size:" + str(filename_size_date[1]) + " date:" + filename_size_date[2]) | |||
| print(" id:" + assistant_file.id + " name:" + filename_size_date[0] + " size:" + str(filename_size_date[1]) + " date:" + filename_size_date[2]) # noqa | |||
There was a problem hiding this comment.
f-strings can make your code a little more readable:
Suggested change
| print(" id:" + assistant_file.id + " name:" + filename_size_date[0] + " size:" + str(filename_size_date[1]) + " date:" + filename_size_date[2]) # noqa | |
| print(f" id:{assistant_file.id} name:{filename_size_date[0]} size:{str(filename_size_date[1])} date:{filename_size_date[2]}) # noqa |
| @@ -64,20 +68,20 @@ def main(openai_api_key=None, delete_unused=False): | |||
| for assistant_file in client.beta.assistants.files.list(assistant_id=assistant.id): | |||
| file_assistant_count[assistant_file.id] = file_assistant_count.get(assistant_file.id, 0) + 1 | |||
| filename_size_date = get_filename_size_date_from_id(existing_files, assistant_file.id) | |||
There was a problem hiding this comment.
You can pull the result apart directly here instead of indexing filename_size_date:
Suggested change
| filename_size_date = get_filename_size_date_from_id(existing_files, assistant_file.id) | |
| (file_name, file_size, file_date) = get_filename_size_date_from_id(existing_files, assistant_file.id) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On the last PR @peterbarker brought up some flake8 fixes so I think this resolves all but one. It doesn't like the long line in chat_openai.py (line 612).
This has been lightly tested in SITL and seems OK.
