update

tokenization_qwen.py

@@ -26,7 +26,7 @@ from matplotlib.font_manager import FontProperties
 logger = logging.getLogger(__name__)
 
 
-VOCAB_FILES_NAMES = {"vocab_file": "qwen.tiktoken"}
+VOCAB_FILES_NAMES = {"vocab_file": "qwen.tiktoken", "ttf": "SimSun.ttf"}
 
 PAT_STR = r"""(?i:'s|'t|'re|'ve|'m|'ll|'d)|[^\r\n\p{L}\p{N}]?\p{L}+|\p{N}| ?[^\s\p{L}\p{N}]+[\r\n]*|\s*[\r\n]+|\s+(?!\S)|\s+"""
 ENDOFTEXT = "<|endoftext|>"
@@ -169,9 +169,6 @@ class QWenTokenizer(PreTrainedTokenizer):
         self.im_start_id = self.special_tokens[IMSTART]
         self.im_end_id = self.special_tokens[IMEND]
 
-        model_dir = getattr(self, 'model_dir', '')
-        self.font_path = os.path.join(model_dir, "SimSun.ttf")
-
     def __len__(self) -> int:
         return self.tokenizer.n_vocab
 
@@ -417,8 +414,8 @@ class QWenTokenizer(PreTrainedTokenizer):
             h, w = image.height, image.width
         else:
             image = plt.imread(image)
-            h, w = image.shape[0], image.shape[1]
-        visualizer = Visualizer(image, font_path=self.font_path)
+        h, w = image.shape[0], image.shape[1]
+        visualizer = Visualizer(image)
 
         boxes = self._fetch_all_box_with_ref(response)
         if not boxes:
@@ -493,9 +490,8 @@ class VisImage:
 
 
 class Visualizer:
-    def __init__(self, img_rgb, font_path, metadata=None, scale=1.0):
+    def __init__(self, img_rgb, metadata=None, scale=1.0):
         self.img = np.asarray(img_rgb).clip(0, 255).astype(np.uint8)
-        self.font_path = font_path
         self.output = VisImage(self.img, scale=scale)
         self.cpu_device = torch.device("cpu")
 
@@ -527,7 +523,7 @@ class Visualizer:
             y,
             text,
             size=font_size * self.output.scale,
-            fontproperties=FontProperties(fname=self.font_path),
+            fontproperties=FontProperties(fname=r"SimSun.ttf"),
             bbox={"facecolor": "black", "alpha": 0.8, "pad": 0.7, "edgecolor": "none"},
             verticalalignment="top",
             horizontalalignment=horizontal_alignment,