Skip to content

Invoke fuzzywuzzy's processor before matching #1045

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.

Sign up for GitHub

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

Merged
Den4200 merged 3 commits into from
Jul 15, 2020
Merged

Invoke fuzzywuzzy's processor before matching #1045

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d62214
Invoke fuzzywuzzy's processor before matching
kosayoda Jul 14, 2020
eec57c8
Pass processed string to `extractBests`
kosayoda Jul 15, 2020
bb00427
Merge branch 'master' into bug/980/fuzzy-processing
Den4200 Jul 15, 2020
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
9 changes: 8 additions & 1 deletion bot/cogs/help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from discord import Colour, Embed, Member, Message, NotFound, Reaction, User
from discord.ext.commands import Bot, Cog, Command, Context, Group, HelpCommand
from fuzzywuzzy import fuzz, process
from fuzzywuzzy.utils import full_process

from bot import constants
from bot.constants import Channels, Emojis, STAFF_ROLES
Expand Down Expand Up @@ -145,7 +146,13 @@ async def command_not_found(self, string: str) -> "HelpQueryNotFound":
Will return an instance of the `HelpQueryNotFound` exception with the error message and possible matches.
"""
choices = await self.get_all_help_choices()
result = process.extractBests(string, choices, scorer=fuzz.ratio, score_cutoff=60)

# Run fuzzywuzzy's processor beforehand, and avoid matching if processed string is empty
# This avoids fuzzywuzzy from raising a warning on inputs with only non-alphanumeric characters
if (processed := full_process(string)):
result = process.extractBests(processed, choices, scorer=fuzz.ratio, score_cutoff=60, processor=None)
else:
result = []

return HelpQueryNotFound(f'Query "{string}" not found.', dict(result))

Expand Down