oocana 0.16.4__tar.gz → 0.16.5__tar.gz

{oocana-0.16.4 → oocana-0.16.5}/PKG-INFO

@@ -1,10 +1,9 @@
 Metadata-Version: 2.1
 Name: oocana
-Version: 0.16.4
+Version: 0.16.5
 Summary: python implement of oocana to give a context for oocana block
 License: MIT
 Requires-Python: >=3.9
 Requires-Dist: paho-mqtt>=2
 Requires-Dist: simplejson>=3.19.2
-Requires-Dist: typing-extensions>=4.12.2; python_version < "3.11"
 

{oocana-0.16.4 → oocana-0.16.5}/oocana/data.py

@@ -29,17 +29,10 @@ class JobDict(TypedDict):
     job_id: str
 
 class BlockDict(TypedDict):
-
-    try:
-        # NotRequired, Required was added in version 3.11
-        from typing import NotRequired, Required, TypedDict  # type: ignore
-    except ImportError:
-        from typing_extensions import NotRequired, Required, TypedDict
-
     session_id: str
     job_id: str
     stacks: list
-    block_path: NotRequired[str]
+    block_path: str | None # better to use NotRequired here, but it is not supported in python 3.10 and type_extensions requires high version, For compatibility, use None instead of NotRequired.
 
 # dataclass 默认字段必须一一匹配
 # 如果多一个或者少一个字段，就会报错。
@@ -84,7 +77,7 @@ class BlockInfo:
                 "session_id": self.session_id,
                 "job_id": self.job_id,
                 "stacks": self.stacks,
-            }
+            } # type: ignore[return-value]
 
         return {
             "session_id": self.session_id,

{oocana-0.16.4 → oocana-0.16.5}/pyproject.toml

@@ -1,11 +1,10 @@
 [project]
 name = "oocana"
-version = "0.16.4"
+version = "0.16.5"
 description = "python implement of oocana to give a context for oocana block"
 dependencies = [
     "paho-mqtt>=2",
     "simplejson>=3.19.2",
-    "typing-extensions>=4.12.2; python_version < '3.11'",
 ]
 requires-python = ">=3.9"
 

{oocana-0.16.4 → oocana-0.16.5}/tests/test_data.py

@@ -71,5 +71,21 @@ class TestData(unittest.TestCase):
         key_serialize_block_info = data.dumps({"key": block_info})
         self.assertEqual(key_serialize_block_info, '{"key": {"session_id": "session_id_one", "job_id": "job_id_one", "stacks": ["stack1", "stack2"], "block_path": "block_path_one"}}')
 
+        with self.assertRaises(TypeError):
+            json_dumps(block_info)
+
+    def test_dataclass_dumps_with_none(self):
+        block_info_dict = {
+            "session_id": "session_id_one",
+            "job_id": "job_id_one",
+            "stacks": ["stack1", "stack2"],
+            "block_path": None,
+            "extra": "extra"
+        }
+
+        block_info = data.BlockInfo(**block_info_dict)
+        serialize_block_info = data.dumps(block_info.block_dict())
+        self.assertEqual(serialize_block_info, '{"session_id": "session_id_one", "job_id": "job_id_one", "stacks": ["stack1", "stack2"]}')
+
         with self.assertRaises(TypeError):
             json_dumps(block_info)