* optimzie app chat & app vlm

Author: lxowalle

projects/app_chat/main.py

@@ -233,6 +233,10 @@ def __llm_on_reply(self, obj, resp):
 
         self.llm_last_msg += resp.msg_new
 
+        if app.need_exit():
+            self.llm.cancel()
+
+
     def __show_load_info(self, text: str, tips: str = '', x:int = 0, y:int = 0, color:image.Color=image.COLOR_WHITE):
         if self.disp:
             str_size = image.string_size(text)
@@ -321,6 +325,7 @@ class Status:
             time.sleep_ms(5)
 
         if self.llm:
+            self.llm.cancel()
             del self.llm
             self.llm = None
 

projects/app_vlm/main.py

@@ -147,6 +147,7 @@ def __init__(self):
         self.vlm_img: image.Image | None = None
         self.vlm_thread_lock = threading.Lock()
         self.vlm_result:str = ''
+        self.vlm_thread = None
         self.page_text = PagedText(self.disp_w, self.disp_h - self.cam.height())
         self.sta = self.Status.IDLE
 
@@ -250,8 +251,8 @@ def __vlm_thread(self, vlm, img:image.Image, msg: str):
 
     def run_vlm(self, img: image.Image, msg: str):
         self.page_text.clear()
-        t = threading.Thread(target=self.__vlm_thread, args=[self.vlm, img, msg], daemon=True)
-        t.start()
+        self.vlm_thread = threading.Thread(target=self.__vlm_thread, args=[self.vlm, img, msg], daemon=True)
+        self.vlm_thread.start()
         # t.run()
 
     def check_exit(self):
@@ -289,24 +290,28 @@ def show_ui(self):
         exit_img_y = 0
         img.draw_image(exit_img_x, exit_img_y, self.exit_img)
         self.check_exit()
-
         # en/zh
         size = image.string_size("ZH", scale=2)
         if self.language == 'zh':
             img.draw_string(self.disp_w - size.width(), 0, "ZH", image.COLOR_WHITE, scale=2)
         else:
             img.draw_string(self.disp_w - size.width(), 0, "EN", image.COLOR_WHITE, scale=2)
-
+        
         if self.support_zh:
-            if ts_data[2] and self.disp_w - size.width()*2<=ts_data[0]<=self.disp_w and 0 <=ts_data[1]<=size.height() * 2:
+            if ts_data[2] and self.disp_w - size.width()*4<=ts_data[0]<=self.disp_w and 0 <=ts_data[1]<=size.height()*4:
                 if self.language == 'zh':
                     self.language = 'en'
                 else:
                     self.language = 'zh'
+                if self.vlm:
+                    self.vlm.cancel()
+                    if isinstance(self.vlm_thread, threading.Thread) and self.vlm_thread.is_alive():
+                        self.vlm_thread.join()
+                    self.page_text.clear()
         else:
             self.language = 'en'
-        self.disp.show(img)
 
+        self.disp.show(img)
 
     def __vlm_on_reply(self, obj, resp):
         print(resp.msg_new)

tools/os/maixcam2/gen_sd_os.sh

@@ -389,12 +389,10 @@ main() {
     check_exists "$BOOTFS_PATH"
     check_exists "$ROOTFS_PATH"
     check_root
-
-    umount tmp2/sd/sd_boot &> /dev/null
-    umount tmp2/sd/sd_rootfs &> /dev/null
-    umount tmp2/sd/ubuntu_rootfs &> /dev/null
-    umount tmp2/sd/bootfs &> /dev/null
-
+    umount tmp2/sd/sd_boot &> /dev/null || echo ""
+    umount tmp2/sd/sd_rootfs &> /dev/null || echo ""
+    umount tmp2/sd/ubuntu_rootfs &> /dev/null || echo ""
+    umount tmp2/sd/bootfs &> /dev/null || echo ""
     print_info "Converting $ROOTFS_PATH to $ROOTFS_RAW_PATH..."
     if [ $DISABLE_ROOTFS_SIMG2IMG -eq 1 ]; then
         print_warning "Skip convert $ROOTFS_PATH to $ROOTFS_RAW_PATH..."
@@ -461,11 +459,11 @@ main() {
 
     print_info "Unmounting..."
     sleep 2
-    umount tmp2/sd/sd_boot &> /dev/null
-    umount tmp2/sd/sd_rootfs &> /dev/null
-    umount tmp2/sd/ubuntu_rootfs &> /dev/null
-    umount tmp2/sd/bootfs &> /dev/null
-    losetup -d $DEVICE &> /dev/null
+    umount tmp2/sd/sd_boot &> /dev/null || echo ""
+    umount tmp2/sd/sd_rootfs &> /dev/null || echo ""
+    umount tmp2/sd/ubuntu_rootfs &> /dev/null || echo ""
+    umount tmp2/sd/bootfs &> /dev/null || echo ""
+    losetup -d $DEVICE &> /dev/null || echo ""
 
     print_info "Compressing sd.img..."
     if [ $DISABLE_COMPRESS_IMAGE -eq 1 ]; then