Skip to content

Commit

Permalink
Fix flake8 issues in __init__.py
Browse files Browse the repository at this point in the history
  • Loading branch information
forslund committed Aug 11, 2024
1 parent b6f355a commit 88e5079
Showing 1 changed file with 25 additions and 9 deletions.
34 changes: 25 additions & 9 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,26 @@
def search_cocktail(name):
"""Search the Cocktails DB for a drink."""
r = requests.get(SEARCH, params={"s": name}, timeout=3)
if 200 <= r.status_code < 300 and "drinks" in r.json() and r.json().get("drinks"):
if (200 <= r.status_code < 300 and "drinks" in r.json() and
r.json().get("drinks")):
return r.json()["drinks"][0]
return None


def search_ingredient(ingredient):
"""Search the Cocktails DB for a drink."""
r = requests.get(SEARCH, params={"s": ingredient}, timeout=3)
if 200 <= r.status_code < 300 and "drinks" in r.json() and r.json()["drinks"]:
if (200 <= r.status_code < 300 and "drinks" in r.json() and
r.json()["drinks"]):
return r.json()["drinks"][0]
return None


def random_cocktail():
"""Get a random drink."""
r = requests.get(RANDOM, timeout=3)
if 200 <= r.status_code < 300 and "drinks" in r.json() and r.json()["drinks"]:
if (200 <= r.status_code < 300 and "drinks" in r.json() and
r.json()["drinks"]):
return r.json()["drinks"][0]
return None

Expand All @@ -57,7 +60,8 @@ def ingredients(drink):
if not drink[ingredient_key]:
break
if drink[measure_key] is not None:
ingredients.append(" ".join((drink[measure_key], drink[ingredient_key])))
ingredients.append(" ".join((drink[measure_key],
drink[ingredient_key])))
else: # If there is no measurement for the ingredient ignore it
ingredients.append(drink[ingredient_key])

Expand Down Expand Up @@ -92,7 +96,10 @@ def get_random(self, message: Message):
time.sleep(1)
self.speak_dialog(
"YouWillNeed",
{"ingredients": ", ".join(ingredients(cocktail)[:-1]), "final_ingredient": ingredients(cocktail)[-1]},
{
"ingredients": ", ".join(ingredients(cocktail)[:-1]),
"final_ingredient": ingredients(cocktail)[-1]
},
)
time.sleep(1)
self.speak(cocktail["strInstructions"])
Expand All @@ -104,7 +111,9 @@ def get_recipe(self, message: Message):
if cocktail:
self.speak_dialog(
"YouWillNeed",
{"ingredients": ", ".join(ingredients(cocktail)[:-1]), "final_ingredient": ingredients(cocktail)[-1]},
{
"ingredients": ", ".join(ingredients(cocktail)[:-1]),
"final_ingredient": ingredients(cocktail)[-1]},
)
time.sleep(1)
self.speak(cocktail["strInstructions"])
Expand All @@ -121,19 +130,26 @@ def get_ingredients(self, message: Message):
if cocktail:
self.speak_dialog(
"YouWillNeed",
{"ingredients": ", ".join(ingredients(cocktail)[:-1]), "final_ingredient": ingredients(cocktail)[-1]},
{"ingredients": ", ".join(ingredients(cocktail)[:-1]),
"final_ingredient": ingredients(cocktail)[-1]},
)
self.set_context("IngredientContext", str(ingredients(cocktail)))
else:
self.speak_dialog("NotFound")

@intent_handler(IntentBuilder("").require("Ingredients").require("What").require("IngredientContext"))
@intent_handler(
IntentBuilder("").require("Ingredients")
.require("What")
.require("IngredientContext"))
def what_were_ingredients(self, message: Message):
"""Context aware handler if the user asks for a repeat."""
return self.repeat_ingredients(message.data["IngredientContext"])

@intent_handler(
IntentBuilder("").require("Ingredients").require("TellMe").require("Again").require("IngredientContext")
IntentBuilder("").require("Ingredients")
.require("TellMe")
.require("Again")
.require("IngredientContext")
)
def tell_ingredients_again(self, message: Message):
return self.repeat_ingredients(message.data["IngredientContext"])

0 comments on commit 88e5079

Please sign in to comment.