physicsLab 1.6.1__tar.gz → 1.6.2__tar.gz

{physicslab-1.6.1 → physicslab-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: physicsLab
-Version: 1.6.1
+Version: 1.6.2
 Summary: Python API for Quantum-Physics App
 Home-page: https://github.com/GoodenoughPhysicsLab/physicsLab
 Author: Arendelle

{physicslab-1.6.1 → physicslab-1.6.2}/physicsLab/web/api.py

@@ -6,8 +6,11 @@
 '''
 
 import os
+import sys
+import types
 import asyncio
 import requests
+import functools
 import threading
 
 from concurrent.futures import thread
@@ -38,16 +41,21 @@ def _check_response(response: requests.Response, err_callback: Optional[Callable
     )
 
 async def _async_wrapper(func: Callable, *args, **kwargs):
-    # run_in_executor会注册_python_exit到threading._threading_atexits
-    # 而_python_exit调用join会导致win上的异常无法及时被抛出
+    # run_in_executor 会注册 _python_exit 到 threading._threading_atexits
     _res = await asyncio.get_running_loop().run_in_executor(None, func, *args, **kwargs)
 
-    # NOTE: 依赖于asyncio与concurrent.futures.thread的实现细节
-    _threading_atexits = []
-    for fn in threading._threading_atexits:
-        if fn.func is not thread._python_exit:
-            _threading_atexits.append(fn)
-    threading._threading_atexits = _threading_atexits
+    # python3.14之前, threading.Thread.join 在 Windows 上会阻塞异常的传播
+    # 也就是说, 在join结束之前, Python无法及时抛出 KeyboardInterrupt
+    # 而 python 并未提供公开的方法操作 threading._threading_atexit
+    # NOTE: 依赖于 asyncio 与 concurrent.futures.thread 的实现细节
+    if sys.version_info < (3, 14) and hasattr(threading, "_threading_atexits"):
+        _threading_atexits = []
+        for fn in threading._threading_atexits:
+            if isinstance(fn, types.FunctionType) and fn is not thread._python_exit:
+                _threading_atexits.append(fn)
+            elif isinstance(fn, functools.partial) and fn.func is not thread._python_exit:
+                _threading_atexits.append(fn)
+        threading._threading_atexits = _threading_atexits
 
     return _res
 

{physicslab-1.6.1 → physicslab-1.6.2}/physicsLab.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: physicsLab
-Version: 1.6.1
+Version: 1.6.2
 Summary: Python API for Quantum-Physics App
 Home-page: https://github.com/GoodenoughPhysicsLab/physicsLab
 Author: Arendelle

{physicslab-1.6.1 → physicslab-1.6.2}/physicsLab.egg-info/SOURCES.txt

@@ -50,8 +50,4 @@ physicsLab/music/music.py
 physicsLab/web/__init__.py
 physicsLab/web/_async_tool.py
 physicsLab/web/api.py
-physicsLab/web/webutils.py
-test_pl/__init__.py
-test_pl/base.py
-test_pl/test_physicsLab.py
-test_pl/test_pl_web.py
+physicsLab/web/webutils.py

{physicslab-1.6.1 → physicslab-1.6.2}/physicsLab.egg-info/top_level.txt

@@ -1,2 +1 @@
 physicsLab
-test_pl

{physicslab-1.6.1 → physicslab-1.6.2}/setup.py

@@ -3,7 +3,7 @@ import setuptools
 
 setuptools.setup(
     name="physicsLab",
-    version="1.6.1",
+    version="1.6.2",
     license="MIT",
     author="Arendelle",
     author_email="2381642961@qq.com",
@@ -11,7 +11,7 @@ setuptools.setup(
     long_description="show description in [github](https://github.com/GoodenoughPhysicsLab/physicsLab)",
     long_description_content_type="text/markdown",
     url="https://github.com/GoodenoughPhysicsLab/physicsLab",
-    packages=setuptools.find_packages(),
+    packages=setuptools.find_packages(include=["physicsLab", "physicsLab.*"]),
     install_requires=["mido", "typing-extensions", "requests", "colorama"],
     classifiers=[
         "Programming Language :: Python :: 3",

physicslab-1.6.1/test_pl/__init__.py

@@ -1,2 +0,0 @@
-from .test_physicsLab import BasicTest
-from .test_pl_web import WebTest

physicslab-1.6.1/test_pl/base.py

@@ -1,32 +0,0 @@
-from unittest import TestCase
-from physicsLab import *
-
-USE_VIZTRACER: bool = False
-
-if USE_VIZTRACER:
-    from viztracer import VizTracer
-
-class TestError(Exception):
-    def __init__(self, err_msg: str = "Test fail", no_pop: bool=False) -> None:
-        self.err_msg: str = err_msg
-        self.no_pop = no_pop
-
-    def __str__(self) -> str:
-        if not self.no_pop:
-            get_current_experiment().exit()
-        return self.err_msg
-
-class PLTestBase(TestCase):
-    if USE_VIZTRACER:
-        @classmethod
-        def setUpClass(cls):
-            tracer = VizTracer()
-            tracer.start()
-
-            cls.tracer = tracer
-
-        @classmethod
-        def tearDownClass(cls):
-            tracer = cls.tracer
-            tracer.stop()
-            tracer.save() # also takes output_file as an optional argument

physicslab-1.6.1/test_pl/test_physicsLab.py

@@ -1,348 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-from .base import *
-from physicsLab.lib import *
-from physicsLab.Experiment import _ExperimentStack
-
-def my_test_dec(method: Callable):
-    def result(*args, **kwarg):
-        method(*args, **kwarg)
-
-        if len(_ExperimentStack.data) != 0:
-            print(f"File {os.path.abspath(__file__)}, line {method.__code__.co_firstlineno} : "
-                  f"test fail due to len(stack_Experiment) != 0")
-            _ExperimentStack.data.clear()
-            raise TestError
-    return result
-
-class BasicTest(PLTestBase):
-    @my_test_dec
-    def test_experiment1(self):
-        expe: Experiment = Experiment().crt("__test__", force_crt=True)
-        a = Yes_Gate(0, 0, 0)
-        self.assertEqual(count_elements(expe), 1)
-        self.assertEqual(a.get_position(), (0, 0, 0))
-        crt_wire(a.o, a.i)
-        self.assertEqual(count_wires(), 1)
-        clear_wires()
-        self.assertEqual(count_wires(), 0)
-        self.assertEqual(count_elements(expe), 1)
-        crt_wire(a.o, a.i)
-        crt_element(expe, 'Logic Input')
-        self.assertEqual(count_elements(expe), 2)
-        get_element_from_position(expe, 0, 0, 0)
-        expe.exit()
-
-    @my_test_dec
-    def test_read_Experiment(self):
-        expe: Experiment = Experiment().crt("__test__", force_crt=True)
-
-        self.assertEqual(count_elements(expe), 0)
-        self.assertEqual(count_wires(), 0)
-        Logic_Input(0, 0, 0)
-        expe.write()
-
-        exp2: Experiment = Experiment().open("__test__")
-        read_plsav(exp2)
-        self.assertEqual(count_elements(exp2), 1)
-        exp2.delete()
-
-    @my_test_dec
-    def test_crt_Experiment(self):
-        try:
-            exp: Experiment = Experiment().crt("__test__", force_crt=True)
-            exp.write()
-            Experiment().crt("__test__") # will fail
-        except ExperimentHasExistError:
-            Experiment("__test__").delete()
-        else:
-            raise TestError
-
-    @my_test_dec
-    def test_crt_wire(self):
-        with experiment("__test__", is_exit=True, force_crt=True):
-            a = Or_Gate(0, 0, 0)
-            crt_wire(a.o, a.i_up, "red")
-            self.assertEqual(count_wires(), 1)
-
-            del_wire(a.o, a.i_up)
-            self.assertEqual(count_wires(), 0)
-
-    def test_same_crt_wire(self):
-        with experiment("__test__", is_exit=True, force_crt=True):
-            a = Or_Gate(0, 0, 0)
-            crt_wire(a.o, a.i_up, "red")
-            crt_wire(a.i_up, a.o, "blue")
-            self.assertEqual(count_wires(), 1)
-
-    @my_test_dec
-    def test_union_Sum(self):
-        expe: Experiment = Experiment().crt("__test__", force_crt=True)
-        lib.Sum(0, -1, 0, bitnum=64)
-        self.assertEqual(count_elements(expe), 64)
-        self.assertEqual(count_wires(), 63)
-        clear_elements(expe)
-        self.assertEqual(count_wires(), 0)
-        self.assertEqual(count_elements(expe), 0)
-        expe.exit()
-
-    @my_test_dec
-    def test_get_Element(self):
-        expe: Experiment = Experiment().crt("__test__", force_crt=True)
-        Or_Gate(0, 0, 0)
-        crt_wire(
-            get_element_from_position(expe, 0, 0, 0).o,
-            get_element_from_index(expe, index=1).i_up
-        )
-        crt_wire(
-            get_element_from_position(expe, 0, 0, 0).i_low,
-            get_element_from_index(expe, index=1).o
-        )
-        self.assertEqual(count_wires(), 2)
-        expe.exit()
-
-    # 测逝用例未写完
-    @my_test_dec
-    def test_set_O(self):
-        expe: Experiment = Experiment().crt("__test__", force_crt=True)
-        set_O(-1, -1, 0)
-        for x in range(10):
-            for y in range(10):
-                Yes_Gate(x, y, 0, True)
-        self.assertEqual(count_elements(expe), 100)
-        expe.exit()
-
-    @my_test_dec
-    def test_errors(self):
-        try:
-            with experiment("__test__", delete=True, force_crt=True):
-                pass # 确保__test__实验不存在
-            Experiment().open('__test__') # do not exist
-        except ExperimentNotExistError:
-            pass
-        else:
-            raise TestError
-
-    # 测试元件坐标系2
-    @my_test_dec
-    def test_aTest(self):
-        expe: Experiment = Experiment().crt("__test__", force_crt=True)
-        set_elementXYZ(True)
-        set_O(-1, -1, 0)
-        for x in range(10):
-            for y in range(10):
-                Yes_Gate(x, y, 0)
-        for x in range(10):
-            for y in [y * 2 + 10 for y in range(5)]:
-                Multiplier(x, y, 0)
-
-        crt_wire(get_element_from_index(expe, 1).o, get_element_from_position(expe, 0, 1, 0).i)
-        get_element_from_index(expe, 2).i - get_element_from_index(expe, 3).o - get_element_from_index(expe, 4).i
-        self.assertEqual(count_wires(), 3)
-        self.assertEqual(count_elements(expe), 150)
-        expe.exit()
-
-    @my_test_dec
-    def test_open_many_Experiment(self):
-        exp: Experiment = Experiment().crt("__test__", force_crt=True)
-        with experiment('__test__', is_exit=True, force_crt=True) as expe:
-            Logic_Input(0, 0, 0)
-            self.assertEqual(1, count_elements(expe))
-        exp.exit()
-
-    @my_test_dec
-    def test_with_and_coverPosition(self):
-        with experiment("__test__", is_exit=True, force_crt=True) as expe:
-            Logic_Input(0, 0, 0)
-            Or_Gate(0, 0, 0)
-            self.assertEqual(len(get_element_from_position(expe, 0, 0, 0)), 2)
-
-    @my_test_dec
-    def test_del_Element(self):
-        with experiment("__test__", is_exit=True, force_crt=True) as expe:
-            Logic_Input(0, 0, 0).o - Or_Gate(0, 0, 0).o
-            del_element(expe, get_element_from_index(expe, 2))
-            self.assertEqual(count_elements(expe), 1)
-            self.assertEqual(count_wires(), 0)
-
-    # 测逝模块化电路连接导线
-    @my_test_dec
-    def test_wires(self):
-        with experiment("__test__", is_exit=True, elementXYZ=True, force_crt=True) as expe:
-            a = lib.Inputs(0, 0, 0, bitnum=8)
-            b = lib.Outputs(0.6, 0, 0, bitnum=8, elementXYZ=False)
-            Logic_Output(0.6, 0, 0.1, elementXYZ=False)
-            c = lib.D_WaterLamp(1, 0, 0, bitnum=8)
-            crt_wires(b.inputs, c.outputs)
-            self.assertEqual(25, count_elements(expe))
-            self.assertEqual(23, count_wires())
-            del_wires(c.outputs, b.inputs)
-            self.assertEqual(15, count_wires())
-
-    # 测逝模块化加法电路
-    @my_test_dec
-    def test_union_Sum2(self):
-        with experiment("__test__", is_exit=True, elementXYZ=True, force_crt=True):
-            a = lib.Inputs(-1, 0, 0, bitnum=8)
-            b = lib.Inputs(-2, 0, 0, bitnum=8)
-            c = lib.Sum(0, 0, 0, bitnum=8)
-            d = lib.Outputs(1, 0, 0, bitnum=8)
-            a.outputs - c.inputs1
-            b.outputs - c.inputs2
-            c.outputs - d.inputs
-
-    # 测试打开实验类型与文件不吻合
-    @my_test_dec
-    def test_ExperimentType(self):
-        with experiment("__test__", experiment_type=ExperimentType.Electromagnetism, is_exit=True, force_crt=True):
-            try:
-                Positive_Charge(0, 0, 0)
-                Logic_Input(0, 0, 0)
-            except ExperimentTypeError:
-                pass
-            else:
-                raise TestError
-
-    @my_test_dec
-    def test_ExperimentType3(self):
-        with experiment("__test__", experiment_type=ExperimentType.Circuit, is_exit=True, force_crt=True):
-            Logic_Input(0, 0, 0)
-        with experiment("__test__", experiment_type=ExperimentType.Celestial, is_exit=True, force_crt=True):
-            pass
-        with experiment("__test__", experiment_type=ExperimentType.Electromagnetism, is_exit=True, force_crt=True):
-            pass
-
-    @my_test_dec
-    def test_electromagnetism(self):
-        with experiment("__test__", is_exit=True, experiment_type=ExperimentType.Electromagnetism, force_crt=True) as expe:
-            Negative_Charge(-0.1, 0, 0)
-            Positive_Charge(0.1, 0, 0)
-            self.assertEqual(count_elements(expe), 2)
-            try:
-                count_wires()
-            except ExperimentTypeError:
-                pass
-            else:
-                raise TestError
-
-    @my_test_dec
-    def test_union_Sub(self):
-        with experiment("__test__", is_exit=True, elementXYZ=True, force_crt=True) as expe:
-            a = lib.Sub(0, 0, 0, bitnum=8, fold=False)
-            crt_wires(lib.Inputs(-3, 0, 0, bitnum=8).outputs, a.minuend)
-            crt_wires(lib.Inputs(-2, 0, 0, bitnum=8).outputs, a.subtrahend)
-            crt_wires(lib.Outputs(2, 0, 0, bitnum=9).inputs, a.outputs)
-            self.assertEqual(count_elements(expe), 42)
-            self.assertEqual(count_wires(), 41)
-
-            lib.Sub(-5, 0, 0, bitnum=4)
-
-    # 测试简单乐器设置音高的三种方法
-    @my_test_dec
-    def test_Simple_Instrument(self):
-        with experiment("__test__", is_exit=True, elementXYZ=True, force_crt=True):
-            a = Simple_Instrument(0, 0, 0, pitch=48)
-            a = Simple_Instrument(0, 0, 0).set_tonality(48)
-            a = Simple_Instrument(0, 0, 0, pitch="C3")
-            a = Simple_Instrument(0, 0, 0).set_tonality("C3")
-            Logic_Input(-1, 0, 0).o - a.i
-            a.o - Ground_Component(1, 0, 0).i
-
-    @my_test_dec
-    def test_getElementError(self):
-        with experiment("__test__", is_exit=True, force_crt=True) as expe:
-            Logic_Input(0, 0, 0)
-            try:
-                get_element_from_index(expe, 2)
-            except ElementNotFound:
-                pass
-            else:
-                raise TestError
-
-    @my_test_dec
-    def test_unionMusic(self):
-        music.Note(2)
-        try:
-            music.Note(0)
-        except TypeError:
-            pass
-        else:
-            raise TestError
-
-    @my_test_dec
-    def test_is_bigElement(self):
-        with experiment("__test__", force_crt=True, is_exit=True):
-            self.assertEqual(Logic_Output.is_bigElement, False)
-            self.assertEqual(Multiplier.is_bigElement, True)
-            self.assertEqual(Or_Gate.is_bigElement, False)
-            self.assertEqual(Logic_Input(0, 0, 0).is_bigElement, False)
-            self.assertEqual(Full_Adder(0, 0, 0).is_bigElement, True)
-            self.assertEqual(Xor_Gate(0, 0, 0).is_bigElement, False)
-
-    @my_test_dec
-    def test_musicPlayer(self):
-        with experiment("__test__", is_exit=True, force_crt=True):
-            l = (0, 2, 4, 5, 7, 9, 11)
-
-            t = music.Piece()
-            for i in range(7):
-                for j in l:
-                    n = music.Note(1, pitch=12 * i + j + 21)
-                    t.append(n)
-                    n.append(music.Note(1, pitch=12 * i + j + 23))
-            t.release(-1, -1, 0)
-
-    @my_test_dec
-    def test_mutiple_notes_in_Simple_Instrument(self):
-        with experiment("__test__", force_crt=True, is_exit=True):
-            Simple_Instrument(0, 0, 0).add_note(67) # type: ignore
-
-    @my_test_dec
-    def test_merge_Experiment(self):
-        with experiment("__test__", force_crt=True, is_exit=True) as expe:
-            Logic_Input(0, 0, 0).o - Logic_Output(1, 0, 0, elementXYZ=True).i
-
-            with experiment("_Test", force_crt=True, is_exit=True) as exp2:
-                Logic_Output(0, 0, 0.1)
-                exp2.merge(expe, 1, 0, 0, elementXYZ=True)
-
-                self.assertEqual(count_elements(exp2), 3)
-
-    @my_test_dec
-    def test_link_wire_in_two_experiment(self):
-        with experiment("__test__", force_crt=True, is_exit=True):
-            a = Logic_Input(0, 0, 0)
-            with experiment("_Test", force_crt=True, is_exit=True):
-                b = Logic_Output(0, 0, 0)
-                try:
-                    a.o - b.i
-                except ExperimentError:
-                    pass
-                else:
-                    raise TestError
-
-    @my_test_dec
-    def test_merge_Experiment2(self):
-        with experiment("__test__", force_crt=True, is_exit=True) as exp:
-            e = Yes_Gate(0, 0, 0)
-            e.i - e.o
-
-            with experiment("_Test", force_crt=True, is_exit=True) as exp2:
-                Logic_Output(0, 0, 0.1)
-                exp2.merge(exp, 1, 0, 0, elementXYZ=True)
-                a = get_element_from_position(exp2, 1, 0, 0)
-                a.i - a.o
-
-                self.assertEqual(count_elements(exp2), 2)
-                self.assertEqual(count_wires(), 1)
-
-    @my_test_dec
-    def test_crt_self_wire(self):
-        with experiment("__test__", force_crt=True, is_exit=True) as exp:
-            e = Logic_Output(0, 0, 0)
-            try:
-                e.i - e.i
-            except ExperimentError:
-                pass
-            else:
-                raise TestError

physicslab-1.6.1/test_pl/test_pl_web.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from .base import *
-
-class WebTest(PLTestBase):
-    def setUp(self) -> None: # test_login
-        # NOTE: 暴露token与auth_code是危险的行为
-        # 但 @AMDYES 主动暴露了自己的token与auth_code
-        # 详见 <discussion=674ab7f4ce449cb493ced3a7>转让此号</discussion>
-        self.user = web.User(
-            token="yYReEg0oCtGlVmJqQwFr1zZXhL9NAvBH",
-            auth_code="nENz1xlrueQUmkqjYZKtCG9SI53vF8Xc"
-        )
-
-    # TODO: 异步跑这些测试
-    def test_get_start_page(self):
-        web.get_start_page()
-
-    def test_get_library(self):
-        self.user.get_library()
-
-    def test_query_experiments(self):
-        self.user.query_experiments()
-
-    def test_get_experiment(self):
-        self.user.get_experiment("642cf37a494746375aae306a", Category.Discussion)