Further refactor

modules/chat.py

@@ -6,10 +6,13 @@ from pathlib import Path
 
 import modules.shared as shared
 from modules.extensions import apply_extensions
-from modules.html_generator import *
-from modules.prompt import encode
-from modules.prompt import generate_reply
-from modules.prompt import get_max_prompt_length
+from modules.html_generator import generate_chat_html
+from modules.text_generation import encode
+from modules.text_generation import generate_reply
+from modules.text_generation import get_max_prompt_length
+
+if shared.args.picture and (shared.args.cai_chat or shared.args.chat):
+    import modules.bot_picture as bot_picture
 
 history = {'internal': [], 'visible': []}
 character = None

modules/shared.py

@@ -1,7 +1,5 @@
 import argparse
 
-global tokenizer
-
 model = None
 tokenizer = None
 model_name = ""

modules/text_generation.py

@@ -4,7 +4,8 @@ import modules.shared as shared
 import torch
 import transformers
 from modules.extensions import apply_extensions
-from modules.html_generator import *
+from modules.html_generator import generate_4chan_html
+from modules.html_generator import generate_basic_html
 from modules.stopping_criteria import _SentinelTokenStoppingCriteria
 from tqdm import tqdm