taotoolkit 1.1.9__tar.gz → 2.0.1__tar.gz

{taotoolkit-1.1.9 → taotoolkit-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taotoolkit
-Version: 1.1.9
+Version: 2.0.1
 Summary: Tao ToolKit
 Author-email: taotaoli <taotaoli@asrmicro.com>
 License-Expression: MIT
@@ -19,7 +19,7 @@ Requires-Dist: beautifulsoup4>=4.10.0
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: pywinpty>=3.0.5; platform_system == "Windows"
 Provides-Extra: uiautomator
-Requires-Dist: uiautomator2>=2.0.0; extra == "uiautomator"
+Requires-Dist: uiautomator2>=2.0.1; extra == "uiautomator"
 
 # TAO - Toolkit
 

{taotoolkit-1.1.9 → taotoolkit-2.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "taotoolkit"
-version = "1.1.9"
+version = "2.0.1"
 description = "Tao ToolKit"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -29,5 +29,5 @@ dependencies = [
 
 [project.optional-dependencies]
 uiautomator = [
-  "uiautomator2>=2.0.0",
+  "uiautomator2>=2.0.1",
 ]

{taotoolkit-1.1.9 → taotoolkit-2.0.1}/taotoolkit/__init__.py

@@ -39,7 +39,7 @@ from .tao_camDvt import camDvtMain as camDvtMain, printHelp as camDvtHelp, CamDv
 
 from .asrVrf import Vrf
 
-__version__ = "1.1.9"
+__version__ = "2.0.1"
 
 __all__ = [
     "debugCtrl",

{taotoolkit-1.1.9 → taotoolkit-2.0.1}/taotoolkit/tao_camDvt.py

@@ -20,6 +20,7 @@ from .tao_common import (
     loge,
     logi,
     renameFile,
+    sleep,
     normalize_args,
     register_command,
 )
@@ -62,7 +63,7 @@ class CamDvt(asrCamOp):
     def checkAeChannel(self):
         cmd = f"{self.tuning_assistant} 127.0.0.1 t 3000 3000 3000 r m0_g0 CAECFilter m_pLumaRLong 5 7"
         try:
-            out, _ = pCmd(cmd)
+            out, _ = pCmd(cmd, sleep_s=1.0)
             cmdResult = re.split("[ \n,]+", out)[2]
 
             if is_number(cmdResult):
@@ -79,7 +80,7 @@ class CamDvt(asrCamOp):
         """
 
         cmd = f"{self.tuning_assistant} 127.0.0.1 t 3000 3000 3000 gv"
-        out, _ = pCmd(cmd)
+        out, _ = pCmd(cmd, sleep_s=1.0)
         if "successfully" in out:
             timestamp = time.strftime("%Y%m%d_%H%M%S", time.localtime())
             outPath = os.path.join(os.getcwd(), folderName + timestamp)
@@ -128,7 +129,7 @@ class CamDvt(asrCamOp):
         total = (gainMax - gainMin) // step + 1
         for i in range(gainMin, gainMax + 1, step):
             self.writeIsp("CAECFilter", "m_pTotalGainManual", 0, 0, i)
-            time.sleep(0.1)
+            sleep(0.1)
             luma = self.readIsp("CAECFilter", "m_pLumaMatrixLong", 5, 7, True)
             info = "m_pExpTimeManual(us) = %d m_pTotalGainManual(Q8) = %d luma = %f %d/%d" % (
                 ExpTimeManual,
@@ -139,7 +140,7 @@ class CamDvt(asrCamOp):
             )
             cur += 1
             logi(info)
-            time.sleep(0.1)
+            sleep(0.1)
         self.__filterEnable(1, 1, 1, 1, 1, 1)
 
     # debug API
@@ -156,17 +157,17 @@ class CamDvt(asrCamOp):
         total = (expMax - expMin) // step + 1
         for i in range(expMin, expMax + 1, step):
             self.writeIsp("CAECFilter", "m_pExpTimeManual", 0, 0, i)
-            time.sleep(0.1)
+            sleep(0.1)
             luma = self.readIsp("CAECFilter", "m_pLumaMatrixLong", 5, 7, True)
 
             logi(f"m_pExpTimeManual(us) = {i} m_pTotalGainManual(Q8) = {gainManual} luma = {luma}  {cur}/{total}")
             cur += 1
-            # time.sleep(0.1)
+            # sleep(0.1)
         self.__filterEnable(1, 1, 1, 1, 1, 1)
 
     def __getLumaWithGain(self, gain: int):
         self.writeIsp("CAECFilter", "m_pTotalGainManual", 0, 0, gain)
-        time.sleep(0.6)
+        sleep(0.6)
         if self.aeChl == 3:
             r = self.readIsp("CAECFilter", "m_pLumaRLong", 5, 7, True, strict=True)
             g = self.readIsp("CAECFilter", "m_pLumaGLong", 5, 7, True, strict=True)
@@ -180,7 +181,7 @@ class CamDvt(asrCamOp):
 
     def __getLumaWithExp(self, exp: int):
         self.writeIsp("CAECFilter", "m_pExpTimeManual", 0, 0, exp)
-        time.sleep(0.6)
+        sleep(0.6)
         if self.aeChl == 3:
             r = self.readIsp("CAECFilter", "m_pLumaRLong", 5, 7, True, strict=True)
             g = self.readIsp("CAECFilter", "m_pLumaGLong", 5, 7, True, strict=True)
@@ -208,7 +209,7 @@ class CamDvt(asrCamOp):
             inVrf,
             outVrf,
         )
-        pCmd(cmd)
+        pCmd(cmd, sleep_s=1.0)
         removeFile(inVrf)
         vrfObj = asrVrf.Vrf()
         vrfObj.Read(outVrf)
@@ -286,14 +287,14 @@ class CamDvt(asrCamOp):
     def __getGainLumaWithVrf(self, gain: int, exp: int):
         self.writeIsp("CAECFilter", "m_pTotalGainManual", 0, 0, gain)
         # self.writeIsp("CAECFilter", "m_pExpTimeManual", 0, 0, exp)
-        time.sleep(0.2)
+        sleep(0.2)
         vrfName = "gain" + str(gain) + "_exp" + str(exp) + ".vrf"
         return self.getVrfMean(self.outPath, vrfName, True)
 
     def __getExpLumaWithVrf(self, gain: int, exp: int):
         # self.writeIsp("CAECFilter", "m_pTotalGainManual", 0, 0, gain)
         self.writeIsp("CAECFilter", "m_pExpTimeManual", 0, 0, exp)
-        time.sleep(0.2)
+        sleep(0.2)
         vrfName = "gain" + str(gain) + "_exp" + str(exp) + ".vrf"
         return self.getVrfMean(self.outPath, vrfName, True)
 
@@ -410,7 +411,7 @@ class CamDvt(asrCamOp):
                 f.write(writeStr)
                 logi(writeStr)
 
-        time.sleep(1)
+        sleep(1)
 
     def __aeExpScanVrf(self, blcTest: bool):
         """
@@ -451,7 +452,7 @@ class CamDvt(asrCamOp):
                 f.write(writeStr)
                 logi(writeStr)
 
-        time.sleep(1)
+        sleep(1)
 
     def __aeGainScanStat(self):
         """
@@ -504,7 +505,7 @@ class CamDvt(asrCamOp):
                 f.write(writeStr)
                 logi(writeStr.replace("\n", "").replace("\r", ""))
 
-        time.sleep(1)
+        sleep(1)
 
     def __aeExpScanStat(self):
         """
@@ -557,7 +558,7 @@ class CamDvt(asrCamOp):
                 f.write(writeStr)
                 logi(writeStr.replace("\n", "").replace("\r", ""))
 
-        time.sleep(1)
+        sleep(1)
 
     def calibrateAE(self):
         m_pExpIndexLong = self.readIsp("CAECFilter", "m_pExpIndexLong", 0, 0, False)
@@ -877,8 +878,8 @@ class CamDvt(asrCamOp):
         gainMax = self.readIsp("CAECFilter", "m_pMaxAnaGain")
         print("gainMin(Q8)=", gainMin, "gainMax(Q8)=", gainMax)
         self.writeIsp("CAECFilter", "m_bManualAEEnable", 0, 0, 1)
-        pCmd("adb shell rm data/vendor/camera/*", 1)
-        pCmd("adb shell setprop persist.vendor.camera.enable.capturedump 1", 0.5)
+        pCmd("adb shell rm data/vendor/camera/*", sleep_s=1)
+        pCmd("adb shell setprop persist.vendor.camera.enable.capturedump 1", sleep_s=0.5)
         # outPath = os.path.join(self.outPath, "raw")
         outPath = self.outPath
         if not os.path.exists(outPath):
@@ -888,12 +889,12 @@ class CamDvt(asrCamOp):
             print("gain(Q8)=", gain)
             self.writeIsp("CAECFilter", "m_pTotalGainManual", 0, 0, gain)
             self.writeIsp("CAECFilter", "m_pAnaGainManual", 0, 0, gain)
-            time.sleep(0.2)
+            sleep(0.2)
             vrfName = "gain_" + str(gain // 256) + ".vrf"
             self.dumpVrf(outPath, vrfName)
             # pCmd("adb shell input keyevent 27",sleep_s=5)
 
-        time.sleep(1)
+        sleep(1)
 
     def gainScanVrf(self):
         """
@@ -904,8 +905,8 @@ class CamDvt(asrCamOp):
         gainMax = self.readIsp("CAECFilter", "m_pMaxAnaGain")
         print("gainMin(Q8)=", gainMin, "gainMax(Q8)=", gainMax)
         self.writeIsp("CAECFilter", "m_bManualAEEnable", 0, 0, 0)
-        pCmd("adb shell rm data/vendor/camera/*", 1)
-        pCmd("adb shell setprop persist.vendor.camera.enable.capturedump 1", 0.5)
+        pCmd("adb shell rm data/vendor/camera/*", sleep_s=1)
+        pCmd("adb shell setprop persist.vendor.camera.enable.capturedump 1", sleep_s=0.5)
         # outPath = os.path.join(self.outPath, "raw")
         outPath = self.outPath
         if not os.path.exists(outPath):
@@ -917,12 +918,12 @@ class CamDvt(asrCamOp):
             self.writeIsp("CAECFilter", "m_pMaxAnaGain", 0, 0, gain)
             self.writeIsp("CAECFilter", "m_pMinTotalGain", 0, 0, gain)
             self.writeIsp("CAECFilter", "m_pMaxTotalGain", 0, 0, gain)
-            time.sleep(0.2)
+            sleep(0.2)
             vrfName = "gain_" + str(gain // 256) + ".vrf"
             self.dumpVrf(outPath, vrfName)
             # pCmd("adb shell input keyevent 27",sleep_s=5)
 
-        time.sleep(1)
+        sleep(1)
 
     def afScan(self):
         """
@@ -946,7 +947,7 @@ class CamDvt(asrCamOp):
             for i in range(startPosition, endPosition + 1, step):
                 self.writeIsp("CAFFilter", "m_nManualMotorPosition", 0, 0, i)
                 self.writeIsp("CAFFilter", "m_bMotorManualTrigger", 0, 0, 1)
-                time.sleep(1)
+                sleep(1)
                 m_pRTFVList = self.readIsp("CAFFilter", "m_pRTFVList", 0, 0, False)
 
                 writeStr = "%d/%d position = %d FV = %d \n" % (cur, total, i, m_pRTFVList)
@@ -954,11 +955,11 @@ class CamDvt(asrCamOp):
                 f.write(writeStr)
                 logi(writeStr.replace("\n", "").replace("\r", ""))
 
-        time.sleep(1)
+        sleep(1)
 
     def dumpPDVrf(self, outPath: str, posCode: str):
         cmd = f"{self.tuning_assistant} 127.0.0.1 t 3000 3000 3000 dp m0_g0 {outPath} 1"
-        out = pCmd(cmd)
+        out = pCmd(cmd, sleep_s=1.0)
 
         # 使用正则表达式查找关键词之间的字符串
         keyword1 = "ID="
@@ -999,7 +1000,7 @@ class CamDvt(asrCamOp):
         for i in range(startPosition, endPosition + 1, step):
             self.writeIsp("CAFFilter", "m_nManualMotorPosition", 0, 0, i)
             self.writeIsp("CAFFilter", "m_bMotorManualTrigger", 0, 0, 1)
-            time.sleep(2)
+            sleep(2)
             # outPath = os.path.join(self.outPath, "raw")
             outPath = self.outPath
             if not os.path.exists(outPath):
@@ -1011,15 +1012,15 @@ class CamDvt(asrCamOp):
                 self.dumpVrf(outPath, str(i) + ".vrf")
             logi(f"position = {i} {cur}/{total}")
             cur += 1
-        time.sleep(1)
+        sleep(1)
 
     def afDvt(self):
         """
         光源需直流无频闪,照度800lux, 50cm距离细节丰富的chart
         """
 
-        pCmd("adb shell input keyevent KEYCODE_HOME", 3)
-        pCmd("adb shell am start -a android.media.action.STILL_IMAGE_CAMERA", 2)
+        pCmd("adb shell input keyevent KEYCODE_HOME", sleep_s=3)
+        pCmd("adb shell am start -a android.media.action.STILL_IMAGE_CAMERA", sleep_s=2)
 
         self.__filterEnable(0, 1, 0, 0, 0, 0)
 

{taotoolkit-1.1.9 → taotoolkit-2.0.1}/taotoolkit/tao_cmdTool.py

@@ -556,7 +556,7 @@ def CLI_videoCut(args=None):
     v2 = f"lark_scene{scene}"
     for i in range(5):
         cmd = f'ffmpeg -i {v1}_{i}.mp4 -i {v2}_{i}.mp4 -filter_complex "[0:v][1:v]hstack=inputs=2" -c:v libx264 -crf 18 -preset slow scene{scene}_{i}.mp4'
-        oCmd(cmd, showCmd=True, logLevel="info")
+        oCmd(cmd, sleep_s=1.0, showCmd=True, logLevel="info")
 
 
 def CLI_video2jpg(argsList):
@@ -569,7 +569,7 @@ def CLI_video2jpg(argsList):
     os.makedirs(os.path.join(os.path.curdir, args.out), exist_ok=True)
     cmd = f"ffmpeg -i {args.path} -r {args.fps} -f image2 {args.out}/image-%3d.bmp"
     logi(f"video2jpg cmd: {cmd}")
-    oCmd(cmd, showCmd=True, logLevel="info")
+    oCmd(cmd, sleep_s=1.0, showCmd=True, logLevel="info")
 
 
 _COMMAND_REGISTRY = {}

{taotoolkit-1.1.9 → taotoolkit-2.0.1}/taotoolkit/tao_common.py

@@ -7,6 +7,7 @@ import re
 import subprocess
 import sys
 import time
+import atexit
 from functools import wraps
 from datetime import datetime
 from typing import Callable, Dict, List, Optional, Any
@@ -145,8 +146,64 @@ def iExit(msg: str) -> None:
     sys.exit(0)
 
 
+# ── 命令耗时埋点 ─────────────────────────────────────────
+# 环境变量 TAO_TIMING=1 开启, 进程退出时自动打印汇总;
+# elapsed 只统计命令真实执行时间, sleep_s / 直接 sleep() 单独统计, 便于区分"设备慢"与"等待多"
+_TIMING_ENABLED = os.environ.get("TAO_TIMING", "").strip().lower() not in ("", "0", "false", "off")
+_timingRecords: List[Dict[str, Any]] = []
+_timingSleeps: List[float] = []
+
+
 def sleep(seconds: float) -> None:
     time.sleep(seconds)
+    if _TIMING_ENABLED:
+        _timingSleeps.append(seconds)
+
+
+def timingCtrl(enabled: bool) -> None:
+    """开关命令耗时埋点"""
+    global _TIMING_ENABLED
+    _TIMING_ENABLED = enabled
+
+
+def _timingAdd(kind: str, cmd: str, elapsed: float, sleep_s: float) -> None:
+    if _TIMING_ENABLED:
+        _timingRecords.append({"kind": kind, "cmd": cmd, "elapsed": elapsed, "sleep": sleep_s})
+
+
+def timingReport(top=10, reset=False) -> Dict[str, Any]:
+    """打印并返回耗时统计: 命令真实耗时、sleep 耗时及占比、最慢的 top 条命令"""
+    totalCmd = sum(r["elapsed"] for r in _timingRecords)
+    totalSleep = sum(r["sleep"] for r in _timingRecords) + sum(_timingSleeps)
+    total = totalCmd + totalSleep
+    stat = {
+        "count": len(_timingRecords),
+        "sleepCalls": len(_timingSleeps),
+        "cmdTime": totalCmd,
+        "sleepTime": totalSleep,
+        "totalTime": total,
+        "sleepRatio": (totalSleep / total) if total else 0.0,
+        "slowest": sorted(_timingRecords, key=lambda r: r["elapsed"], reverse=True)[:top],
+    }
+    if _timingRecords or _timingSleeps:
+        print(
+            f"[timing] 命令数={stat['count']} 直接sleep={stat['sleepCalls']}次 命令耗时={totalCmd:.2f}s "
+            f"sleep耗时={totalSleep:.2f}s sleep占比={stat['sleepRatio'] * 100:.1f}%"
+        )
+        for index, r in enumerate(stat["slowest"], 1):
+            print(f"[timing] {index:>2}. {r['elapsed'] * 1000:>8.1f}ms sleep={r['sleep']:.1f}s {r['kind']} {r['cmd'][:100]}")
+    if reset:
+        _timingRecords.clear()
+        _timingSleeps.clear()
+    return stat
+
+
+def _timingAtExit() -> None:
+    if _TIMING_ENABLED and (_timingRecords or _timingSleeps):
+        timingReport()
+
+
+atexit.register(_timingAtExit)
 
 
 sysVersion = sys.platform
@@ -326,7 +383,7 @@ def parseDeviceInfo(info: str) -> Dict[str, str]:
 
 def pCmd(
     cmd: str,
-    sleep_s=1.0,
+    sleep_s=0.0,  # 默认不等待, 需要等待的调用请显式传 sleep_s
     showCmd=False,
     shell=False,
     splitCmd=True,
@@ -347,6 +404,7 @@ def pCmd(
             logCallInfo(cmd)
         else:
             logCallDebug(cmd)
+    t0 = time.perf_counter()
     try:
         if splitCmd:
             proc = subprocess.Popen(
@@ -369,8 +427,10 @@ def pCmd(
                 # env=os.environ.copy(),
             )
     except subprocess.TimeoutExpired:
+        _timingAdd("pCmd", cmd, time.perf_counter() - t0, 0.0)
         return "", f"Command '{cmd}' timed out after {timeOut} seconds"
     except subprocess.CalledProcessError as e:
+        _timingAdd("pCmd", cmd, time.perf_counter() - t0, 0.0)
         return "", f"Command '{cmd}' failed with error: {e.stderr}"
     out = ""
     error = ""
@@ -379,12 +439,15 @@ def pCmd(
             out, error = proc.communicate(timeout=timeOut)
         except subprocess.TimeoutExpired:
             logCallErr(f"{cmd} timeout", "error")
+            _timingAdd("pCmd", cmd, time.perf_counter() - t0, 0.0)
             if not ignoreTimeOut:
                 exit()
             else:
                 return "None", "None"
 
-        sleep(sleep_s)
+        elapsed = time.perf_counter() - t0
+        time.sleep(sleep_s)
+        _timingAdd("pCmd", cmd, elapsed, sleep_s)
         if checkErr:
             checkMsg(error, "error")
             checkMsg(out, "failed")
@@ -398,6 +461,8 @@ def pCmd(
                 logCallInfo(error)
         return out, error
     else:
+        elapsed = time.perf_counter() - t0
+        _timingAdd("pCmd", cmd, elapsed, 0.0)
         return "None", "None"
 
 
@@ -449,7 +514,7 @@ def rCmdRealtime(
 
 def rCmd(
     cmd: str,
-    sleep_s=1.0,
+    sleep_s=0.0,  # 默认不等待, 需要等待的调用请显式传 sleep_s
     showCmd=False,
     shell=False,
     splitCmd=True,
@@ -468,6 +533,7 @@ def rCmd(
             logCallInfo(cmd, callStack=3)
         else:
             logCallDebug(cmd, callStack=3)
+    t0 = time.perf_counter()
     try:
         if splitCmd:
             result = subprocess.run(
@@ -490,11 +556,15 @@ def rCmd(
                 timeout=timeOut,
             )
     except subprocess.TimeoutExpired:
+        _timingAdd("rCmd", cmd, time.perf_counter() - t0, 0.0)
         return "", f"Command '{cmd}' timed out after {timeOut} seconds"
     except subprocess.CalledProcessError as e:
+        _timingAdd("rCmd", cmd, time.perf_counter() - t0, 0.0)
         return "", f"Command '{cmd}' failed with error: {e.stderr}"
 
-    sleep(sleep_s)
+    elapsed = time.perf_counter() - t0
+    time.sleep(sleep_s)
+    _timingAdd("rCmd", cmd, elapsed, sleep_s)
     if checkErr:
         checkMsg(result.stderr, "error")
         checkMsg(result.stderr, "failed")
@@ -510,7 +580,8 @@ def rCmd(
     return result.stdout, result.stderr
 
 
-def oCmd(cmd: str, sleep_s=1.0, showCmd=False, logLevel="debug"):
+def oCmd(cmd: str, sleep_s=0.0, showCmd=False, logLevel="debug"):
+    """执行系统命令; 默认不等待, 需要等待的调用请显式传 sleep_s"""
     if showCmd:
         if logLevel == "warn":
             logCallWarn(cmd, callStack=3)
@@ -520,5 +591,8 @@ def oCmd(cmd: str, sleep_s=1.0, showCmd=False, logLevel="debug"):
             logCallInfo(cmd, callStack=3)
         else:
             logCallDebug(cmd, callStack=3)
+    t0 = time.perf_counter()
     os.system(cmd)
-    sleep(sleep_s)
+    elapsed = time.perf_counter() - t0
+    time.sleep(sleep_s)
+    _timingAdd("oCmd", cmd, elapsed, sleep_s)