Rename RatioMatch to ScoreMatch

This commit is contained in:
AlberLC
2022-11-07 18:41:20 +01:00
parent bb30c10867
commit 910074d3aa

View File

@@ -186,7 +186,7 @@ class FlanaBot(MultiBot, ABC):
@staticmethod @staticmethod
def _get_options(text: str, discarded_words: Iterable = ()) -> list[str]: def _get_options(text: str, discarded_words: Iterable = ()) -> list[str]:
options = (option for option in text.split() if not flanautils.cartesian_product_string_matching(option.lower(), discarded_words, min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT)) options = (option for option in text.split() if not flanautils.cartesian_product_string_matching(option.lower(), discarded_words, min_score=multibot_constants.PARSE_CALLBACKS_MIN_SCORE_DEFAULT))
text = ' '.join(options) text = ' '.join(options)
conjunctions = [f' {conjunction} ' for conjunction in flanautils.CommonWords.get('conjunctions')] conjunctions = [f' {conjunction} ' for conjunction in flanautils.CommonWords.get('conjunctions')]
@@ -205,7 +205,7 @@ class FlanaBot(MultiBot, ABC):
elif ( elif (
(message.chat.is_private or self.is_bot_mentioned(message)) (message.chat.is_private or self.is_bot_mentioned(message))
and and
flanautils.cartesian_product_string_matching(message.text, constants.KEYWORDS['poll'], min_ratio=multibot_constants.PARSE_CALLBACKS_MIN_RATIO_DEFAULT) flanautils.cartesian_product_string_matching(message.text, constants.KEYWORDS['poll'], min_score=multibot_constants.PARSE_CALLBACKS_MIN_SCORE_DEFAULT)
and and
(poll_message := self.Message.find_one({'contents.poll.is_active': True}, sort_keys=(('date', pymongo.DESCENDING),))) (poll_message := self.Message.find_one({'contents.poll.is_active': True}, sort_keys=(('date', pymongo.DESCENDING),)))
): ):
@@ -854,10 +854,10 @@ class FlanaBot(MultiBot, ABC):
# noinspection PyTypeChecker # noinspection PyTypeChecker
place_words = ( place_words = (
OrderedSet(original_text_words) OrderedSet(original_text_words)
- flanautils.cartesian_product_string_matching(original_text_words, multibot_constants.KEYWORDS['show'], min_ratio=0.85).keys() - flanautils.cartesian_product_string_matching(original_text_words, multibot_constants.KEYWORDS['show'], min_score=0.85).keys()
- flanautils.cartesian_product_string_matching(original_text_words, constants.KEYWORDS['weather_chart'], min_ratio=0.85).keys() - flanautils.cartesian_product_string_matching(original_text_words, constants.KEYWORDS['weather_chart'], min_score=0.85).keys()
- flanautils.cartesian_product_string_matching(original_text_words, multibot_constants.KEYWORDS['date'], min_ratio=0.85).keys() - flanautils.cartesian_product_string_matching(original_text_words, multibot_constants.KEYWORDS['date'], min_score=0.85).keys()
- flanautils.cartesian_product_string_matching(original_text_words, multibot_constants.KEYWORDS['thanks'], min_ratio=0.85).keys() - flanautils.cartesian_product_string_matching(original_text_words, multibot_constants.KEYWORDS['thanks'], min_score=0.85).keys()
- flanautils.CommonWords.get() - flanautils.CommonWords.get()
) )
if not place_words: if not place_words: