oops

untitled/generation.py

@@ -1,6 +1,6 @@
 import random
 
-from untitled import content
+from untitled import PACKAGE_ROOT, content, namegen, rules
 
 
 def generate_trait_sentence(traits):
@@ -26,3 +26,8 @@ def generate_cat_choice(personality=None):
 def generate_cat_choices(n=5):
     personalities = random.sample(content.CAT_PERSONALITIES, n)
     return [generate_cat_choice(p) for p in personalities]
+
+
+with open(PACKAGE_ROOT / "assets" / "cat_names.txt") as f:
+    names = f.read().splitlines()
+cat_name_generator = namegen.NameGenerator(names, rules.validate_auto_gen_cat_name)

untitled/screens/adoption.py

@@ -1,10 +1,7 @@
-from untitled import PACKAGE_ROOT, generation, model, namegen, rules, ui
+from untitled import generation, model, rules, ui
 
 
 def adoption():
-    with open(PACKAGE_ROOT / "assets" / "cat_names.txt") as f:
-        names = f.read().splitlines()
-    name_generator = namegen.NameGenerator(names, rules.validate_auto_gen_cat_name)
     print("Welcome to the shelter!")
     while True:
         auto_name = ""
@@ -28,7 +25,7 @@ def adoption():
                     break
                 print(error)
             else:
-                auto_name = name_generator.generate_name().capitalize()
+                auto_name = generation.cat_name_generator.generate_name().capitalize()
 
         if ui.confirm(
             f"Do you want to adopt {name}, {generation.generate_trait_sentence(choice).lower()}?"