qubitclient 0.0.1__tar.gz → 0.0.3.0__tar.gz

{qubitclient-0.0.1/qubitclient.egg-info → qubitclient-0.0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qubitclient
-Version: 0.0.1
+Version: 0.0.3.0
 Summary: qubit analysis client
 Home-page: https://github.com/yaqiangsun/QubitClient
 Author: Yaqiang Sun
@@ -32,12 +32,7 @@ QubitClient 是用于使用Qubit服务的示例。
 # 使用
 
 ### scope功能包
-#### 运行示例代码
-```python
-python demo/scope_demo.py
-```
 
-### 曲线分割功能
 #### 使用说明
 1.拷贝config.py.example文件为config.py，并修改配置参数。
 ```
@@ -45,25 +40,33 @@ cp config.py.example config.py
 ```
 2.运行
 单次请求多个文件：
-```bash
-python client_demo.py
+```python
+python tests/test_nnscope.py
 ```
 批量多次请求
 ```bash
-python script/test.py
+Not provided
 ```
+## 功能集合
+### 曲线分割功能
+
+#### 运行示例代码
+```python
+python tests/test_nnscope.py
+```
+
 #### 定义实例
 ```
-client = QubitSegClient(url=url, api_key=api_key,curve_type=CurveType.POLY)
+client = QubitNNScopeClient(url=url,api_key="")
 ```
-curve_type: CurveType.COSINE(cosin拟合) or CurveType.POLY(多项式拟合)
 
 #### 请求输入
 
 ```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
 [
     {
@@ -74,6 +77,7 @@ dict_list格式为：
     ...
 ]
 ```
+- curve_type: `CurveType.COSINE`(cosin拟合) or `CurveType.POLY`(多项式拟合)
 
 
 #### 返回值
@@ -103,4 +107,6 @@ res格式为：
 ]
 ```
 
+### 其他功能完善中
+
 

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

@@ -16,12 +16,7 @@ QubitClient 是用于使用Qubit服务的示例。
 # 使用
 
 ### scope功能包
-#### 运行示例代码
-```python
-python demo/scope_demo.py
-```
 
-### 曲线分割功能
 #### 使用说明
 1.拷贝config.py.example文件为config.py，并修改配置参数。
 ```
@@ -29,25 +24,33 @@ cp config.py.example config.py
 ```
 2.运行
 单次请求多个文件：
-```bash
-python client_demo.py
+```python
+python tests/test_nnscope.py
 ```
 批量多次请求
 ```bash
-python script/test.py
+Not provided
 ```
+## 功能集合
+### 曲线分割功能
+
+#### 运行示例代码
+```python
+python tests/test_nnscope.py
+```
+
 #### 定义实例
 ```
-client = QubitSegClient(url=url, api_key=api_key,curve_type=CurveType.POLY)
+client = QubitNNScopeClient(url=url,api_key="")
 ```
-curve_type: CurveType.COSINE(cosin拟合) or CurveType.POLY(多项式拟合)
 
 #### 请求输入
 
 ```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
 [
     {
@@ -58,6 +61,7 @@ dict_list格式为：
     ...
 ]
 ```
+- curve_type: `CurveType.COSINE`(cosin拟合) or `CurveType.POLY`(多项式拟合)
 
 
 #### 返回值
@@ -87,4 +91,6 @@ res格式为：
 ]
 ```
 
+### 其他功能完善中
+
 

{qubitclient-0.0.1 → qubitclient-0.0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qubitclient"
-version = "0.0.1"
+version = "0.0.3.0"
 description = "qubit analysis client"
 authors = [
     { name = "Yaqiang Sun", email = "sunyaking@163.com" },

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.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)

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.1/qubitclient → qubitclient-0.0.3.0/qubitclient/nnscope}/utils/data_convert.py

@@ -73,9 +73,9 @@ def load_npz_to_image(file_path):
 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)
+    dict_list, name_list = convert_spectrum_dict2npz(data,npy_file_path)
     return dict_list, name_list
-def convert_spectrum_dict2npz(data:dict):
+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"]
@@ -88,6 +88,8 @@ def convert_spectrum_dict2npz(data:dict):
         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]

{qubitclient-0.0.1/qubitclient → qubitclient-0.0.3.0/qubitclient/nnscope}/utils/request_tool.py

@@ -10,7 +10,7 @@ import os
 import requests
 import io
 import numpy as np
-from qubitclient.curve.curve_type import CurveType
+from qubitclient.nnscope.nnscope_api.curve.curve_type import CurveType
 
 
 def file_request(file_path_list,url,api_key,curve_type:CurveType=None):

{qubitclient-0.0.1 → qubitclient-0.0.3.0}/qubitclient/scope/scope_api/api/defined_tasks/optpipulse_api_v1_tasks_scope_optpipulse_post.py

@@ -72,11 +72,11 @@ def sync_detailed(
 ) -> Response[Union[Any, HTTPValidationError]]:
     r"""Optpipulse
 
-     t2 fit
+     Common peak detection for optimizing pi pulse
 
     Args:
         files: 上传的.npy文件列表
-        type: 任务类型，默认为\"s21peak\"
+        type: 任务类型，默认为\"optpipulse\"
 
     Returns:
         dict: 包含检测结果的字典
@@ -113,11 +113,11 @@ def sync(
 ) -> Optional[Union[Any, HTTPValidationError]]:
     r"""Optpipulse
 
-     t2 fit
+     Common peak detection for optimizing pi pulse
 
     Args:
         files: 上传的.npy文件列表
-        type: 任务类型，默认为\"s21peak\"
+        type: 任务类型，默认为\"optpipulse\"
 
     Returns:
         dict: 包含检测结果的字典
@@ -149,11 +149,11 @@ async def asyncio_detailed(
 ) -> Response[Union[Any, HTTPValidationError]]:
     r"""Optpipulse
 
-     t2 fit
+     Common peak detection for optimizing pi pulse
 
     Args:
         files: 上传的.npy文件列表
-        type: 任务类型，默认为\"s21peak\"
+        type: 任务类型，默认为\"optpipulse\"
 
     Returns:
         dict: 包含检测结果的字典
@@ -188,11 +188,11 @@ async def asyncio(
 ) -> Optional[Union[Any, HTTPValidationError]]:
     r"""Optpipulse
 
-     t2 fit
+     Common peak detection for optimizing pi pulse
 
     Args:
         files: 上传的.npy文件列表
-        type: 任务类型，默认为\"s21peak\"
+        type: 任务类型，默认为\"optpipulse\"
 
     Returns:
         dict: 包含检测结果的字典

qubitclient-0.0.3.0/qubitclient/scope/scope_api/api/defined_tasks/spectrum2d_api_v1_tasks_scope_spectrum2d_post.py

@@ -0,0 +1,218 @@
+from http import HTTPStatus
+from typing import Any, Optional, Union
+
+import httpx
+
+from ... import errors
+from ...client import AuthenticatedClient, Client
+from ...models.body_spectrum_2d_api_v1_tasks_scope_spectrum_2d_post import BodySpectrum2DApiV1TasksScopeSpectrum2DPost
+from ...models.http_validation_error import HTTPValidationError
+from ...types import UNSET, Response, Unset
+
+
+def _get_kwargs(
+    *,
+    body: BodySpectrum2DApiV1TasksScopeSpectrum2DPost,
+    type_: Union[Unset, str] = "spectrum2d",
+) -> dict[str, Any]:
+    headers: dict[str, Any] = {}
+
+    params: dict[str, Any] = {}
+
+    params["type"] = type_
+
+    params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
+
+    _kwargs: dict[str, Any] = {
+        "method": "post",
+        "url": "/api/v1/tasks/scope/spectrum2d",
+        "params": params,
+    }
+
+    _kwargs["files"] = body.to_multipart()
+
+    _kwargs["headers"] = headers
+    return _kwargs
+
+
+def _parse_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Optional[Union[Any, HTTPValidationError]]:
+    if response.status_code == 200:
+        response_200 = response.json()
+        return response_200
+
+    if response.status_code == 422:
+        response_422 = HTTPValidationError.from_dict(response.json())
+
+        return response_422
+
+    if client.raise_on_unexpected_status:
+        raise errors.UnexpectedStatus(response.status_code, response.content)
+    else:
+        return None
+
+
+def _build_response(
+    *, client: Union[AuthenticatedClient, Client], response: httpx.Response
+) -> Response[Union[Any, HTTPValidationError]]:
+    return Response(
+        status_code=HTTPStatus(response.status_code),
+        content=response.content,
+        headers=response.headers,
+        parsed=_parse_response(client=client, response=response),
+    )
+
+
+def sync_detailed(
+    *,
+    client: Union[AuthenticatedClient, Client],
+    body: BodySpectrum2DApiV1TasksScopeSpectrum2DPost,
+    type_: Union[Unset, str] = "spectrum2d",
+) -> Response[Union[Any, HTTPValidationError]]:
+    r"""Spectrum2D
+
+     spectrum2d
+
+    Args:
+        files: 上传的.npy文件列表
+        type: 任务类型，默认为\"spectrum2d\"
+
+    Returns:
+        dict: 包含检测结果的字典
+
+    Args:
+        type_ (Union[Unset, str]): 任务类型 Default: 'spectrum2d'.
+        body (BodySpectrum2DApiV1TasksScopeSpectrum2DPost):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[Union[Any, HTTPValidationError]]
+    """
+
+    kwargs = _get_kwargs(
+        body=body,
+        type_=type_,
+    )
+
+    response = client.get_httpx_client().request(
+        **kwargs,
+    )
+
+    return _build_response(client=client, response=response)
+
+
+def sync(
+    *,
+    client: Union[AuthenticatedClient, Client],
+    body: BodySpectrum2DApiV1TasksScopeSpectrum2DPost,
+    type_: Union[Unset, str] = "spectrum2d",
+) -> Optional[Union[Any, HTTPValidationError]]:
+    r"""Spectrum2D
+
+     spectrum2d
+
+    Args:
+        files: 上传的.npy文件列表
+        type: 任务类型，默认为\"spectrum2d\"
+
+    Returns:
+        dict: 包含检测结果的字典
+
+    Args:
+        type_ (Union[Unset, str]): 任务类型 Default: 'spectrum2d'.
+        body (BodySpectrum2DApiV1TasksScopeSpectrum2DPost):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Union[Any, HTTPValidationError]
+    """
+
+    return sync_detailed(
+        client=client,
+        body=body,
+        type_=type_,
+    ).parsed
+
+
+async def asyncio_detailed(
+    *,
+    client: Union[AuthenticatedClient, Client],
+    body: BodySpectrum2DApiV1TasksScopeSpectrum2DPost,
+    type_: Union[Unset, str] = "spectrum2d",
+) -> Response[Union[Any, HTTPValidationError]]:
+    r"""Spectrum2D
+
+     spectrum2d
+
+    Args:
+        files: 上传的.npy文件列表
+        type: 任务类型，默认为\"spectrum2d\"
+
+    Returns:
+        dict: 包含检测结果的字典
+
+    Args:
+        type_ (Union[Unset, str]): 任务类型 Default: 'spectrum2d'.
+        body (BodySpectrum2DApiV1TasksScopeSpectrum2DPost):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Response[Union[Any, HTTPValidationError]]
+    """
+
+    kwargs = _get_kwargs(
+        body=body,
+        type_=type_,
+    )
+
+    response = await client.get_async_httpx_client().request(**kwargs)
+
+    return _build_response(client=client, response=response)
+
+
+async def asyncio(
+    *,
+    client: Union[AuthenticatedClient, Client],
+    body: BodySpectrum2DApiV1TasksScopeSpectrum2DPost,
+    type_: Union[Unset, str] = "spectrum2d",
+) -> Optional[Union[Any, HTTPValidationError]]:
+    r"""Spectrum2D
+
+     spectrum2d
+
+    Args:
+        files: 上传的.npy文件列表
+        type: 任务类型，默认为\"spectrum2d\"
+
+    Returns:
+        dict: 包含检测结果的字典
+
+    Args:
+        type_ (Union[Unset, str]): 任务类型 Default: 'spectrum2d'.
+        body (BodySpectrum2DApiV1TasksScopeSpectrum2DPost):
+
+    Raises:
+        errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
+        httpx.TimeoutException: If the request takes longer than Client.timeout.
+
+    Returns:
+        Union[Any, HTTPValidationError]
+    """
+
+    return (
+        await asyncio_detailed(
+            client=client,
+            body=body,
+            type_=type_,
+        )
+    ).parsed

{qubitclient-0.0.1 → qubitclient-0.0.3.0}/qubitclient/scope/scope_api/models/__init__.py

@@ -6,6 +6,7 @@ from .body_rabicos_api_v1_tasks_scope_rabicospeak_post import BodyRabicosApiV1Ta
 from .body_s21_peak_api_v1_tasks_scope_s21_peak_post import BodyS21PeakApiV1TasksScopeS21PeakPost
 from .body_s21_vflux_api_v1_tasks_scope_s21_vflux_post import BodyS21VfluxApiV1TasksScopeS21VfluxPost
 from .body_singleshot_api_v1_tasks_scope_singleshot_post import BodySingleshotApiV1TasksScopeSingleshotPost
+from .body_spectrum_2d_api_v1_tasks_scope_spectrum_2d_post import BodySpectrum2DApiV1TasksScopeSpectrum2DPost
 from .body_spectrum_api_v1_tasks_scope_spectrum_post import BodySpectrumApiV1TasksScopeSpectrumPost
 from .body_t1_fit_api_v1_tasks_scope_t1_fit_post import BodyT1FitApiV1TasksScopeT1FitPost
 from .body_t1_fit_api_v1_tasks_scope_t2_fit_post import BodyT1FitApiV1TasksScopeT2FitPost
@@ -19,6 +20,7 @@ __all__ = (
     "BodyS21PeakApiV1TasksScopeS21PeakPost",
     "BodyS21VfluxApiV1TasksScopeS21VfluxPost",
     "BodySingleshotApiV1TasksScopeSingleshotPost",
+    "BodySpectrum2DApiV1TasksScopeSpectrum2DPost",
     "BodySpectrumApiV1TasksScopeSpectrumPost",
     "BodyT1FitApiV1TasksScopeT1FitPost",
     "BodyT1FitApiV1TasksScopeT2FitPost",