pybaseutils 2.2.10__tar.gz → 2.2.11__tar.gz

{pybaseutils-2.2.10 → pybaseutils-2.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.2.10
+Version: 2.2.11
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.2.10 → pybaseutils-2.2.11}/pybaseutils/__init__.py

@@ -5,4 +5,4 @@
     @Date   : 2019-05-07 17:40:27
 """
 
-__version__ = '2.2.10'
+__version__ = '2.2.11'

{pybaseutils-2.2.10 → pybaseutils-2.2.11}/pybaseutils/http_utils.py

@@ -8,7 +8,7 @@ from pybaseutils import log_utils
 logger = log_utils.get_logger()
 
 
-def post(url, params, timeout=6, max_retries=1, **kwargs):
+def post(url, params=None, timeout=6, max_retries=1, **kwargs):
     """
     :param url: 请求URL
     :param params: 请求参数
@@ -38,7 +38,7 @@ def post(url, params, timeout=6, max_retries=1, **kwargs):
     return result
 
 
-def get(url, params, timeout=6, max_retries=1, **kwargs):
+def get(url, params=None, timeout=6, max_retries=1, **kwargs):
     """
     :param url: 请求URL
     :param params: 请求参数

{pybaseutils-2.2.10 → pybaseutils-2.2.11}/pybaseutils/image_utils.py

@@ -396,9 +396,13 @@ def data_normalize(x, ymin=0, ymax=1.0, xmin=None, xmax=None):
     :param xmax: 输入参数xmax的最大值
     :return: 输出参数y：归一化到区间[omin,omax]的数据
     """
+    if len(x) == 0: return x
     xmax = np.max(x) if xmax is None else xmax  # %计算最大值
     xmin = np.min(x) if xmin is None else xmin  # %计算最小值
-    y = (ymax - ymin) * (x - xmin) / (xmax - xmin) + ymin
+    if (xmax - xmin) > 0:
+        y = (ymax - ymin) * (x - xmin) / (xmax - xmin) + ymin
+    else:
+        y = x / xmax
     return y
 
 

{pybaseutils-2.2.10 → pybaseutils-2.2.11}/pybaseutils/numpy_utils.py

@@ -553,37 +553,29 @@ def get_error(data1, data2):
     return mse, rmse, mae
 
 
-def get_topK(data, k=1, axis=-1, reverse=False):
-    """
-    选取Top5: contours = sorted(contours, key=cv2.contourArea, reverse=True)[:5]
-    多维数组排序
-    Args:
-        data: 多维数组
-        k: 取数
-        axis: 轴维度
-        reverse: 是否倒序
-    Returns:
-        top_sorted_scores: 值
-        top_sorted_indexes: 位置
+def get_topK(data: np.ndarray, K: int, reverse=False):
     """
-    data = np.asarray(data)
+    计算data中前K大或前K小的元素
+    :param data: 输入数组
+    :param K: 要获取的元素个数
+    :param reverse: False表示获取前K大元素，True表示获取前K小元素
+    :return: (top_value, top_index) 值和对应的索引
+    """
+    K = min(len(data), K)
     if reverse:
-        partition_index = np.take(np.argpartition(data, kth=k, axis=axis), range(0, k), axis)
+        # 获取前K小的元素的索引
+        index = np.argpartition(data, K - 1)[:K]
+        # 按照值的大小对索引进行排序（从小到大）
+        top_index = index[np.argsort(data[index])]
     else:
-        # argpartition分区排序，在给定轴上找到最小的值对应的idx，partition同理找对应的值
-        # kth表示在前的较小值的个数，带来的问题是排序后的结果两个分区间是仍然是无序的
-        # kth绝对值越小，分区排序效果越明显
-        axis_length = data.shape[axis]
-        partition_index = np.take(np.argpartition(data, kth=-k, axis=axis),
-                                  range(axis_length - k, axis_length), axis)
-    top_scores = np.take_along_axis(data, partition_index, axis)
-    # 分区后重新排序
-    sorted_index = np.argsort(top_scores, axis=axis)
-    if not reverse:
-        sorted_index = np.flip(sorted_index, axis=axis)
-    top_k_value = np.take_along_axis(top_scores, sorted_index, axis)
-    top_k_index = np.take_along_axis(partition_index, sorted_index, axis)
-    return top_k_value, top_k_index
+        # 获取前K大的元素的索引
+        index = np.argpartition(data, -K)[-K:]
+        # 按照值的大小对索引进行排序（从大到小）
+        top_index = index[np.argsort(data[index])][::-1]
+
+    # 获取对应的值
+    top_value = data[top_index]
+    return top_value, top_index
 
 
 class Preprocessing(object):

{pybaseutils-2.2.10 → pybaseutils-2.2.11}/pybaseutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybaseutils
-Version: 2.2.10
+Version: 2.2.11
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.2.10 → pybaseutils-2.2.11}/pybaseutils.egg-info/SOURCES.txt

@@ -192,7 +192,6 @@ test_py/audio/speechbrain_asr_indoor_prod.py
 test_py/audio/speechbrain_demo.py
 test_py/camera/__init__.py
 test_py/camera/demo.py
-test_py/camera/main.py
 test_py/captcha/__init__.py
 test_py/captcha/demo.py
 test_py/converter/AffectNet.py

{pybaseutils-2.2.10 → pybaseutils-2.2.11}/test_py/demo3.py

@@ -94,5 +94,5 @@ def convert_HaGRID_dataset(data_root, vis=True):
 
 
 if __name__ == "__main__":
-    data_root = "path/to/gesture/HaGRID/trainval"
-    convert_HaGRID_dataset(data_root, vis=True)
+    x = 1080
+    print(f"{x // 60:2d}:{x % 60:0=2d}")

pybaseutils-2.2.10/test_py/camera/demo.py

@@ -1,89 +0,0 @@
-# -*-coding: utf-8 -*-
-"""
-    @Author : PKing
-    @E-mail : 
-    @Date   : 2024-12-17 15:02:18
-    @Brief  :
-"""
-import cv2
-import time
-from datetime import datetime, timedelta
-
-
-def display_hikvision_stream(rtsp_url):
-    print(f"正在连接摄像头: {rtsp_url}")
-    cap = cv2.VideoCapture(rtsp_url)
-
-    if not cap.isOpened():
-        print("无法连接到摄像头")
-        return
-
-    # 获取视频信息
-    fourcc = int(cap.get(cv2.CAP_PROP_FOURCC))
-    codec = "".join([chr((fourcc >> 8 * i) & 0xFF) for i in range(4)])
-    fps = cap.get(cv2.CAP_PROP_FPS)
-    width = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
-    height = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
-
-    print("视频流信息:")
-    print(f"编码格式: {codec}")
-    print(f"分辨率: {width}x{height}")
-    print(f"帧率: {fps}")
-
-    # 获取起始时间
-    start_time = datetime.now()
-    start_timestamp = time.time() * 1000  # 转换为毫秒
-
-    try:
-        while True:
-            ret, frame = cap.read()
-            if ret:
-                # 获取时间戳信息
-                timestamp_ms = cap.get(cv2.CAP_PROP_POS_MSEC)
-                current_time = datetime.now()
-
-                # 计算摄像头实际时间
-                # if timestamp_ms == 0:  # 如果摄像头没有返回有效时间戳
-                #     elapsed_ms = (time.time() * 1000) - start_timestamp
-                #     camera_datetime = start_time + timedelta(milliseconds=elapsed_ms)
-                # else:
-                camera_datetime = start_time + timedelta(milliseconds=timestamp_ms)
-
-                # 格式化时间字符串
-                camera_time_str = camera_datetime.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
-                system_time_str = current_time.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
-
-                # 在图像上显示时间戳
-                cv2.putText(frame, f"Camera Time: {camera_time_str}", (10, 30),
-                            cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), 2)
-                cv2.putText(frame, f"System Time: {system_time_str}", (10, 70),
-                            cv2.FONT_HERSHEY_SIMPLEX, 1, (0, 255, 0), 2)
-
-                # 显示视频帧
-                frame = cv2.resize(frame, (1280, 720))
-                cv2.imshow('Camera', frame)
-
-                # 打印时间戳信息到控制台
-                print(f"\r摄像头时间: {camera_time_str} | 系统时间: {system_time_str}",
-                      end="", flush=True)
-
-                # 按'q'键退出
-                if cv2.waitKey(1) & 0xFF == ord('q'):
-                    break
-            else:
-                print("\n视频帧获取失败，正在重新连接...")
-                cap.release()
-                time.sleep(1)
-                cap = cv2.VideoCapture(rtsp_url)
-
-    finally:
-        cap.release()
-        cv2.destroyAllWindows()
-        print("\n程序已退出")
-
-
-if __name__ == "__main__":
-    camera_url = "rtsp://admin:C2332416@192.168.2.35/Streaming/Channels/1"
-    # display_hikvision_stream(camera_url)
-    v = (100, 100) + (100, 100)
-    print(v)