qubitclient 0.0.0.1__tar.gz → 0.0.3.0__tar.gz

qubitclient-0.0.3.0/PKG-INFO

@@ -0,0 +1,112 @@
+Metadata-Version: 2.4
+Name: qubitclient
+Version: 0.0.3.0
+Summary: qubit analysis client
+Home-page: https://github.com/yaqiangsun/QubitClient
+Author: Yaqiang Sun
+Author-email: Yaqiang Sun <sunyaking@163.com>
+License: GPL-3.0
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Dynamic: author
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+
+# QubitClient
+
+#### 介绍
+**qubit-client**
+QubitClient 是用于使用Qubit服务的示例。
+
+# 更新日志   
+
+近期更新:
+
+- **增加scope功能包**: 增加多种任务功能(20251022).
+- **增加曲线类型**: 增加cosin类型曲线拟合(20250606).
+- **构建基础项目:** 基础功能与结构构建.    
+
+
+# 使用
+
+### scope功能包
+
+#### 使用说明
+1.拷贝config.py.example文件为config.py，并修改配置参数。
+```
+cp config.py.example config.py
+```
+2.运行
+单次请求多个文件：
+```python
+python tests/test_nnscope.py
+```
+批量多次请求
+```bash
+Not provided
+```
+## 功能集合
+### 曲线分割功能
+
+#### 运行示例代码
+```python
+python tests/test_nnscope.py
+```
+
+#### 定义实例
+```
+client = QubitNNScopeClient(url=url,api_key="")
+```
+
+#### 请求输入
+
+```python
+response = client.request(file_list=file_path_list,\
+    task_type=NNTaskName.SPECTRUM2D,curve_type=CurveType.COSINE)
+```
+- dict_list格式为：
+```json
+[
+    {
+        "bias":np.ndarray shape(A),
+        "frequency":np.ndarray shape(B),
+        "iq_avg":np.ndarray shape(B,A),
+    },
+    ...
+]
+```
+- curve_type: `CurveType.COSINE`(cosin拟合) or `CurveType.POLY`(多项式拟合)
+
+
+#### 返回值
+返回请求为response
+```python
+res = response.json()
+```
+res格式为：
+```json
+{
+    "state":'success',
+    "result":result
+}
+```
+其中result格式：
+```json
+[
+    {
+        "params_list":List[List[float]],//每条线段的多项式参数列表
+        "linepoints_list":List[List[[row_index,col_index]]],//每条线段的点坐标列表
+        "confidence_list":List[float],//每条线段的置信度
+    },//每一个npz文件的结果
+    {
+        ...
+    },
+    ...
+]
+```
+
+### 其他功能完善中
+
+

{qubitclient-0.0.0.1 → qubitclient-0.0.3.0}/README.md

@@ -8,27 +8,49 @@ QubitClient 是用于使用Qubit服务的示例。
 
 近期更新:
 
+- **增加scope功能包**: 增加多种任务功能(20251022).
 - **增加曲线类型**: 增加cosin类型曲线拟合(20250606).
 - **构建基础项目:** 基础功能与结构构建.    
 
 
 # 使用
+
+### scope功能包
+
 #### 使用说明
 1.拷贝config.py.example文件为config.py，并修改配置参数。
 ```
 cp config.py.example config.py
 ```
 2.运行
-```Python
-python client_demo.py
+单次请求多个文件：
+```python
+python tests/test_nnscope.py
+```
+批量多次请求
+```bash
+Not provided
+```
+## 功能集合
+### 曲线分割功能
+
+#### 运行示例代码
+```python
+python tests/test_nnscope.py
+```
+
+#### 定义实例
+```
+client = QubitNNScopeClient(url=url,api_key="")
 ```
 
 #### 请求输入
 
 ```python
-response = client.request(file_list=dict_list)
+response = client.request(file_list=file_path_list,\
+    task_type=NNTaskName.SPECTRUM2D,curve_type=CurveType.COSINE)
 ```
-dict_list格式为：
+- dict_list格式为：
 ```json
 [
     {
@@ -39,6 +61,7 @@ dict_list格式为：
     ...
 ]
 ```
+- curve_type: `CurveType.COSINE`(cosin拟合) or `CurveType.POLY`(多项式拟合)
 
 
 #### 返回值
@@ -68,12 +91,6 @@ res格式为：
 ]
 ```
 
-### 坐标映射
-```python
-points = result[0]["linepoints_list"][0]
-reflection_points = client.convert_axis(points, bias,frequency)
-```
-`points`格式:`List[[row_index,col_index],...]`,表示单条线段的点坐标.<br>
-`bias`格式:`np.ndarray shape(A)`，与上述bias相同.<br>
-`frequency`格式:`np.ndarray shape(B)`，与上述frequency相同.<br>
+### 其他功能完善中
+
 

qubitclient-0.0.3.0/pyproject.toml

@@ -0,0 +1,16 @@
+[project]
+name = "qubitclient"
+version = "0.0.3.0"
+description = "qubit analysis client"
+authors = [
+    { name = "Yaqiang Sun", email = "sunyaking@163.com" },
+]
+license = {text = "GPL-3.0"}
+readme = "README.md"
+requires-python = ">=3.10, <3.13"
+dependencies = []
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["qubitclient*"]  # match qubitscope and qubitscope.*
+exclude = ["tests", "tests.*", "tmp", "tmp.*"]

qubitclient-0.0.3.0/qubitclient/__init__.py

@@ -0,0 +1,6 @@
+from .nnscope.nnscope_api.curve.curve_type import CurveType  # noqa: F401
+from .scope.scope import QubitScopeClient
+from .nnscope.nnscope import QubitNNScopeClient
+from .scope.task import TaskName
+from .nnscope.task import NNTaskName
+from .nnscope.nnscope_api.QubitSeg import QubitSegClient

qubitclient-0.0.3.0/qubitclient/nnscope/nnscope.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2025 yaqiang.sun.
+# This source code is licensed under the license found in the LICENSE file
+# in the root directory of this source tree.
+#########################################################################
+# Author: yaqiangsun
+# Created Time: 2025/10/20 18:13:37
+########################################################################
+
+
+import os
+# import cv2
+import numpy as np
+import sys
+# 获取当前文件的绝对路径，向上两层就是项目根目录
+project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+if project_root not in sys.path:
+    sys.path.insert(0, project_root)
+# 
+# `scope_api_client`: this package is generated by `openapi-python-client`
+
+from .task import run_task
+import logging
+import numpy as np
+
+
+
+logging.basicConfig(level=logging.INFO)
+
+
+class QubitNNScopeClient(object):
+    def __init__(self, url, api_key):
+        self.url = url
+        self.api_key = api_key
+
+    def request(self, file_list:list[str|dict[str,np.ndarray]|np.ndarray],task_type:str="s21peak",*args,**kwargs):
+        if len(file_list)>0:
+            response = run_task(file_list=file_list,url=self.url,api_key=self.api_key,task_type=task_type,*args,**kwargs)
+        else:
+            raise ValueError("file_list must not be empty")
+        return response
+    def get_result(self,response):
+        if response.status_code == 200:
+            logging.info("Result: %s", response.json())
+            result = response.json()
+            result = result["result"]
+            return result
+        else:
+            logging.error("Error: %s %s", response.status_code, response.text)
+            return []
+    

{qubitclient-0.0.0.1/qubitclient → qubitclient-0.0.3.0/qubitclient/nnscope/nnscope_api}/QubitSeg.py

@@ -10,10 +10,10 @@
 import logging
 import numpy as np
 
-from qubitclient.utils.request_tool import file_request,file_request_with_dict
-from qubitclient.utils.result_parser import parser_result
-from qubitclient.utils.result_parser import convet_axis
-from qubitclient.curve.curve_type import CurveType
+from qubitclient.nnscope.utils.request_tool import file_request,file_request_with_dict
+from qubitclient.nnscope.utils.result_parser import parser_result
+from qubitclient.nnscope.utils.result_parser import convet_axis
+from .curve.curve_type import CurveType
 
 
 logging.basicConfig(level=logging.INFO)
@@ -23,13 +23,13 @@ class QubitSegClient(object):
     def __init__(self, url, api_key,curve_type:CurveType=None):
         self.url = url
         self.api_key = api_key
-        self.confidence_type = curve_type
+        self.curve_type = curve_type
     def request(self, file_list:list[str|dict[str,np.ndarray]]):
         if len(file_list)>0:
             if type(file_list[0]) == str:
-                response = file_request(file_path_list=file_list,url=self.url,api_key=self.api_key,curve_type=self.confidence_type)
+                response = file_request(file_path_list=file_list,url=self.url,api_key=self.api_key,curve_type=self.curve_type)
             elif type(file_list[0]) == dict:# 多个content字典
-                response = file_request_with_dict(dict_list=file_list,url=self.url,api_key=self.api_key,curve_type=self.confidence_type)
+                response = file_request_with_dict(dict_list=file_list,url=self.url,api_key=self.api_key,curve_type=self.curve_type)
             else:
                 raise ValueError("file_list must be a list of str or dict")
         else:

qubitclient-0.0.3.0/qubitclient/nnscope/nnscope_api/curve/curve_type.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2025 yaqiang.sun.
+# This source code is licensed under the license found in the LICENSE file
+# in the root directory of this source tree.
+#########################################################################
+# Author: yaqiangsun
+# Created Time: 2025/06/06 16:52:53
+########################################################################
+
+
+from enum import Enum
+
+class CurveType(str, Enum):
+    COSINE = "cosin"
+    POLY = "poly"

qubitclient-0.0.3.0/qubitclient/nnscope/task.py

@@ -0,0 +1,130 @@
+
+import os
+import requests
+
+import io
+import numpy as np
+
+
+from qubitclient.nnscope.utils.data_convert import convert_spectrum_npy2npz,convert_spectrum_dict2npz
+
+# load from npz file path
+def load_from_npz_path(file_path_list:list[str]):
+    files = []
+    npydata = {}
+    npydata['id'] = 0
+    image_qs = {}
+    index = 0
+    for file_path in file_path_list:
+        if file_path.endswith('.npz'):
+            index+=1
+            with np.load(file_path, allow_pickle=True) as data:  # 修改：添加 allow_pickle=True 参数
+                # file_contents[file_name] = dict(data)  # 将 .npz 文件内容转换为字典
+                content = dict(data)  # 将 .npz 文件内容转换为字典
+                image_qs[str(index)] = (content['iq_avg'],content['bias'],content['frequency'])
+    npydata['image'] = image_qs
+    with io.BytesIO() as buffer:
+        np.savez(buffer, **npydata)
+        bytes_obj = buffer.getvalue()
+    files.append(("request", ("None.npz", bytes_obj, "application/octet-stream")))
+    return files
+def load_from_npy_path(file_path_list:list[str]):
+    files = []
+    for file_path in file_path_list:
+        if file_path.endswith('.npy'):
+            data = np.load(file_path, allow_pickle=True)
+            data = data.item() if isinstance(data, np.ndarray) else data
+            with io.BytesIO() as buffer:
+                np.savez(buffer, **data)
+                bytes_obj = buffer.getvalue()
+            files.append(("request", ("None.npz", bytes_obj, "application/octet-stream")))
+    return files
+def load_from_npz_dict(dict_list:list[dict]):
+    files = []
+    npydata = {}
+    npydata['id'] = 0
+    image_qs = {}
+    for index,dict_obj in enumerate(dict_list):
+        image_qs[str(index)] = (dict_obj['iq_avg'], dict_obj['bias'], dict_obj['frequency'])
+    npydata['image'] = image_qs
+    with io.BytesIO() as buffer:
+        np.savez(buffer, **npydata)
+        bytes_obj = buffer.getvalue()
+    files.append(("request", ("None.npz", bytes_obj, "application/octet-stream")))
+    return files
+def load_from_npy_dict(dict_list:list[dict]):
+    files = []
+    for dict_obj in dict_list:
+        with io.BytesIO() as buffer:
+            np.savez(buffer, **dict_obj)
+            bytes_obj = buffer.getvalue()
+        files.append(("request", ("None.npz",bytes_obj, "application/octet-stream")))
+    return files
+def request_task(files,url,api_key,curve_type:str=None):
+    headers = {'Authorization': f'Bearer {api_key}'}  # 添加API密钥到请求头
+    data = {
+            "curve_type":curve_type.value if curve_type else None
+    }
+    response = requests.post(url, files=files, headers=headers,data=data)
+    return response
+def load_files(filepath_list: list[str|dict[str,np.ndarray]|np.ndarray]):
+    if len(filepath_list)<=0:
+        return []
+    else:
+        if isinstance(filepath_list[0], dict):
+            if "image" in filepath_list[0]:
+                return load_from_npy_dict(filepath_list)
+            else:
+                return load_from_npz_dict(filepath_list)
+        elif isinstance(filepath_list[0], np.ndarray):
+            filepath_list = [filepath_list[i].item() for i in range(len(filepath_list))]
+            return load_files(filepath_list)
+        elif isinstance(filepath_list[0], str):
+            if filepath_list[0].endswith('.npz'):
+                return load_from_npz_path(filepath_list)
+            elif filepath_list[0].endswith('.npy'):
+                return load_from_npy_path(filepath_list)
+            else:
+                return []
+
+
+
+DEFINED_TASKS = {}
+def task_register(func):
+    DEFINED_TASKS[func.__name__.lower()] = func
+    return func
+
+def run_task(file_list: list[str|dict[str,np.ndarray]|np.ndarray],url,api_key,task_type:str,*args,**kwargs):
+    files = load_files(file_list)
+    response = DEFINED_TASKS[task_type.value](files,url,api_key,*args,**kwargs)
+    return response
+
+
+@task_register
+def test(files):
+    
+    return "hello"
+
+@task_register
+def spectrum2d(files,url,api_key,curve_type):
+    spectrum2d_url = url + "/seglines"
+    response = request_task(files,spectrum2d_url,api_key,curve_type)
+    return response
+
+from enum import Enum, unique
+@unique
+class NNTaskName(Enum):
+    # S21PEAK = "s21peak"
+    # OPTPIPULSE = "optpipulse"
+    # RABI = "rabi"
+    # RABICOS = "rabicos"
+    # S21VFLUX = "s21vflux"
+    # SINGLESHOT = "singleshot"
+    # SPECTRUM = "spectrum"
+    # T1FIT = "t1fit"
+    # T2FIT = "t2fit"
+    SPECTRUM2D = "spectrum2d"
+
+
+
+

qubitclient-0.0.3.0/qubitclient/nnscope/utils/data_convert.py

@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2025 yaqiang.sun.
+# This source code is licensed under the license found in the LICENSE file
+# in the root directory of this source tree.
+#########################################################################
+# Author: yaqiangsun
+# Created Time: 2025/10/24 15:54:07
+########################################################################
+
+
+import numpy as np
+import io
+import os
+import numpy as np
+import cv2
+
+
+def load_npz_file(file_path):
+    with np.load(file_path, allow_pickle=True) as data:  # 修改：添加 allow_pickle=True 参数
+        # file_contents[file_name] = dict(data)  # 将 .npz 文件内容转换为字典
+        content = dict(data)  # 将 .npz 文件内容转换为字典
+    return content
+def convert_data_to_image(npz_content):
+    content = npz_content
+    iq_avg = content["iq_avg"]  # 二维数据
+    iq_avg_normalized = convert_complex_map__to_image(iq_avg=iq_avg)
+    return iq_avg_normalized
+def convert_complex_map__to_image(iq_avg):
+    # 检查并转置
+    rows, cols = iq_avg.shape
+    if rows < cols:
+        iq_avg = iq_avg.T  # 转置矩阵
+
+
+    # 取相位
+    phase = np.angle(iq_avg)
+    phase_normalized = ((phase + np.pi) / (2 * np.pi)) * 255
+    # 纵向归一化
+    phase_mean = phase_normalized.mean(axis=0, keepdims=True)   # 形状(1,30)
+    ppase_std = phase_normalized.std(axis=0, keepdims=True)     # 形状(1,30)
+    phase_normalized = (phase_normalized - phase_mean) / (ppase_std+1e-8)
+    # phase_normalized = phase_normalized.astype(np.uint8)
+    # 全局归一化
+    phase_normalized = cv2.normalize(phase_normalized, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U)
+
+    # 取幅度
+    iq_avg = np.abs(iq_avg)
+    
+    # iq_avg = phase_normalized
+    # 纵向归一化
+    # mean = iq_avg.mean(axis=0, keepdims=True)   # 形状(1,30)
+    # std = iq_avg.std(axis=0, keepdims=True)     # 形状(1,30)
+    # iq_avg = (iq_avg - mean) / (std+1e-8)
+    # 幅度全局归一化
+    iq_avg_normalized = cv2.normalize(iq_avg, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U)
+    # return iq_avg_normalized
+
+    #取幅度的梯度
+    gradient_y, gradient_x = np.gradient(iq_avg)
+    gradient_y = np.abs(gradient_y)
+    gradient_y_normalized = cv2.normalize(gradient_y, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U)
+    
+    # iq_avg_normalized = cv2.merge([iq_avg_normalized, phase_normalized, gradient_y_normalized])
+    iq_avg_normalized = cv2.merge([iq_avg_normalized, iq_avg_normalized, iq_avg_normalized])
+    return iq_avg_normalized
+
+    
+def load_npz_to_image(file_path):
+    npz_content = load_npz_file(file_path)
+    image = convert_data_to_image(npz_content)
+    return image
+
+def convert_spectrum_npy2npz(npy_file_path:str):
+    data = np.load(npy_file_path, allow_pickle=True)
+    data = data.item() if isinstance(data, np.ndarray) else data
+    dict_list, name_list = convert_spectrum_dict2npz(data,npy_file_path)
+    return dict_list, name_list
+def convert_spectrum_dict2npz(data:dict,npy_file_path:str="None.npy"):
+    if not isinstance(data, dict) or 'image' not in data:
+            raise ValueError("数据格式无效，缺少 'image' 键")
+    image = data["image"]
+    q_list = image.keys()
+
+    dict_list = []
+    name_list = []
+
+    for idx, q_name in enumerate(q_list):
+        image_q = image[q_name]
+
+        data = image_q[0]
+        if data.ndim != 2:
+            raise ValueError("数据格式无效，data不是二维数组")
+        data = np.array(data)
+        data = np.abs(data)
+        height_axis = image_q[1]
+        width_axis = image_q[2]
+        new_dict = {}
+        new_dict["iq_avg"] = data
+        new_dict["frequency"] = image_q[2]
+        new_dict["bias"] = image_q[1]
+
+        npz_file_path = npy_file_path.replace(".npy", f"{q_name}.npz")
+        dict_list.append(new_dict)
+        name_list.append(npz_file_path)
+        # npz_file_path = npz_file_path.replace("npyfile","npyconverted")
+        # np.savez(npz_file_path,**new_dict)
+        # np.savez(npz_file_path,iq_avg=image_q[0],frequency=image_q[2],bias=image_q[1])
+    return dict_list, name_list
+
+if __name__ == '__main__':
+    npy_file_path = "tmp/npyfile/tmp0ffc025b.py_4905.npy"
+    convert_spectrum_npy2npz(npy_file_path)
+
+    image = load_npz_to_image("tmp/npyconverted/tmp0ffc025b.py_4905Q6.npz")

qubitclient-0.0.3.0/qubitclient/nnscope/utils/data_parser.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2025 yaqiang.sun.
+# This source code is licensed under the license found in the LICENSE file
+# in the root directory of this source tree.
+#########################################################################
+# Author: yaqiangsun
+# Created Time: 2025/04/11 17:58:29
+########################################################################
+
+import os
+import numpy as np
+import cv2
+
+
+def load_npz_file(file_path):
+    with np.load(file_path, allow_pickle=True) as data:
+        content = dict(data)
+    return content
+def convert_data_to_image(npz_content):
+    content = npz_content
+    iq_avg = content["iq_avg"]
+    rows, cols = iq_avg.shape
+    if rows < cols:
+        iq_avg = iq_avg.T
+    iq_avg = np.abs(iq_avg)
+    iq_avg_normalized = cv2.normalize(iq_avg, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U)
+    return iq_avg_normalized
+
+def load_npz_to_image(file_path):
+    npz_content = load_npz_file(file_path)
+    image = convert_data_to_image(npz_content)
+    return image
+
+def load_npz_to_images(file_path_list):
+    images = []
+    for file_path in file_path_list:
+        print(file_path)
+        image = load_npz_to_image(file_path)
+        images.append(image)
+        # cv2.imwrite("tmp/client/test.jpg",image)
+    return images

qubitclient-0.0.3.0/qubitclient/nnscope/utils/request_tool.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2025 yaqiang.sun.
+# This source code is licensed under the license found in the LICENSE file
+# in the root directory of this source tree.
+#########################################################################
+# Author: yaqiangsun
+# Created Time: 2025/04/15 10:31:23
+########################################################################
+import os
+import requests
+import io
+import numpy as np
+from qubitclient.nnscope.nnscope_api.curve.curve_type import CurveType
+
+
+def file_request(file_path_list,url,api_key,curve_type:CurveType=None):
+    files = []
+    for file_path in file_path_list:
+        if file_path.endswith('.npz'):
+            file_name = os.path.basename(file_path)
+            files.append(("request", (file_name, open(file_path, "rb"), "image/jpeg")))
+    headers = {'Authorization': f'Bearer {api_key}'}  # 添加API密钥到请求头
+    data = {
+            "curve_type":curve_type.value if curve_type else None
+    }
+    response = requests.post(url, files=files, headers=headers,data=data)
+    return response
+
+def file_request_with_dict(dict_list,url,api_key,curve_type:str=None):
+    files = []
+    for index,dict_obj in enumerate(dict_list):
+        with io.BytesIO() as buffer:
+            np.savez(buffer, **dict_obj)
+            bytes_obj = buffer.getvalue()
+        files.append(("request", ("None"+str(index)+".npz", bytes_obj, "application/octet-stream")))
+    headers = {'Authorization': f'Bearer {api_key}'}  # 添加API密钥到请求头
+    data = {
+            "curve_type":curve_type.value if curve_type else None
+    }
+    response = requests.post(url, files=files, headers=headers,data=data)
+    return response