create utils.py, add functions for repetitive actions, imports have been corrected

Author: bazarovstas

brain_games/constants.py

@@ -1,4 +1,7 @@
-GREETING = 'Welcome to the Brain Games!\n''May I have your name?'
+GREETING = [
+    'Welcome to the Brain Games!\n'
+    'May I have your name?'
+]
 EVEN_GAME_BRIEFING = 'Answer "yes" if the number is even, otherwise answer "no".'
 CALC_GAME_BRIEFING = 'What is the result of the expression?'
 GCD_GAME_BRIEFING = 'Find the greatest common divisor of given numbers.'

brain_games/games/calc.py

@@ -1,12 +1,13 @@
-import random
+from brain_games.utils import get_random_number, get_random_choice
 from brain_games.game_engine import game_engine
 from brain_games.constants import MATH_SYMBOLS
 from brain_games.constants import CALC_GAME_BRIEFING
 
 
 def get_expression_and_answer():
-    num1, num2 = random.randint(1, 21), random.randint(1, 11)
-    random_symbol = random.choice(MATH_SYMBOLS)
+    num1, num2 = get_random_number(20), get_random_number(10)
+
+    random_symbol = get_random_choice(MATH_SYMBOLS)
     expression = f'{str(num1)} {random_symbol} {str(num2)}'
     answer = str(eval(expression))
     return expression, answer

brain_games/games/even.py

@@ -1,4 +1,4 @@
-import random
+from brain_games.utils import get_random_number
 from brain_games.game_engine import game_engine
 from brain_games.constants import EVEN_GAME_BRIEFING
 
@@ -10,7 +10,7 @@ def is_even(number):
 
 
 def get_random_num_and_answer():
-    random_number = random.randint(1, 101)
+    random_number = get_random_number()
     even_check = is_even(random_number)
     return random_number, even_check
 

brain_games/games/gcd.py

@@ -1,5 +1,4 @@
-import random
-
+from brain_games.utils import get_random_number
 from brain_games.game_engine import game_engine
 from brain_games.constants import GCD_GAME_BRIEFING
 
@@ -11,7 +10,7 @@ def get_greatest_common_divisor(num1, num2):
 
 
 def get_random_numbers_and_answer():
-    num1, num2 = random.randint(1, 101), random.randint(1, 101)
+    num1, num2 = get_random_number(), get_random_number()
     question = f'{num1} {num2}'
     answer = str(get_greatest_common_divisor(num1, num2))
     return question, answer

brain_games/games/prime.py

@@ -1,5 +1,4 @@
-import random
-
+from brain_games.utils import get_random_number
 from brain_games.game_engine import game_engine
 from brain_games.constants import PRIME_GAME_BRIEFING
 
@@ -14,7 +13,7 @@ def is_prime(number):
 
 
 def get_random_number_and_answer():
-    random_number = random.randint(1, 101)
+    random_number = get_random_number()
     return str(random_number), is_prime(random_number)
 
 

brain_games/games/progression.py

@@ -1,19 +1,18 @@
-import random
-
+from brain_games.utils import get_random_number, get_random_choice
 from brain_games.game_engine import game_engine
-# from brain_games.constants import STEP_OF_SEQUENCE
 from brain_games.constants import PROG_GAME_BRIEFING
+# from brain_games.constants import STEP_OF_SEQUENCE
 
 
 def get_random_sequence_and_answer():
-    random_step = random.choice(STEP_OF_SEQUENCE)
-    start_number = random.randint(1, 16)
+    random_step = get_random_choice(STEP_OF_SEQUENCE)
+    start_number = get_random_number(15)
     sequence = []
     sequence.append(start_number)
     for i in range(8):
         sequence += [sequence[i] + random_step]
     question = ''
-    answer = random.choice(sequence)
+    answer = get_random_choice(sequence)
     for i in range(len(sequence)):
         question += ' ' + str(sequence[i]) if sequence[i] != answer else ' ..'
     return question.strip(), str(answer)

brain_games/utils.py

@@ -0,0 +1,11 @@
+import random
+
+
+def get_random_number(range: int = 100) -> int:
+    random_number = random.randint(1, range)
+    return random_number
+
+
+def get_random_choice(collection: list[str]) -> str:
+    random_choice = random.choice(collection)
+    return random_choice