oocana 0.16.3__py3-none-any.whl → 0.16.5__py3-none-any.whl

oocana/context.py

@@ -42,9 +42,10 @@ class Context:
     __tmp_dir: str
     __package_name: str | None = None
     _logger: Optional[logging.Logger] = None
+    __pkg_dir: str
 
     def __init__(
-        self, inputs: Dict[str, Any], blockInfo: BlockInfo, mainframe: Mainframe, store, outputs, session_dir: str, tmp_dir: str, package_name: str
+        self, inputs: Dict[str, Any], blockInfo: BlockInfo, mainframe: Mainframe, store, outputs, session_dir: str, tmp_dir: str, package_name: str, pkg_dir: str
     ) -> None:
 
         self.__block_info = blockInfo
@@ -61,6 +62,7 @@ class Context:
         self.__session_dir = session_dir
         self.__tmp_dir = tmp_dir
         self.__package_name = package_name
+        self.__pkg_dir = pkg_dir
 
     @property
     def logger(self) -> logging.Logger:
@@ -90,6 +92,12 @@ class Context:
         """
         return os.path.join(self.__tmp_dir, self.__package_name) if self.__package_name else self.__tmp_dir
 
+    @property
+    def pkg_dir(self) -> str:
+        """a directory for the current package, all blocks in the this package will share the same directory. this directory will be cleaned if this session finish successfully, otherwise it will be kept for debugging or other purpose.
+        """
+        return self.__pkg_dir
+
     @property
     def keepAlive(self):
         return self.__keep_alive

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.3.dist-info → oocana-0.16.5.dist-info}/METADATA

@@ -1,10 +1,9 @@
 Metadata-Version: 2.1
 Name: oocana
-Version: 0.16.3
+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.3.dist-info → oocana-0.16.5.dist-info}/RECORD

@@ -1,13 +1,13 @@
-oocana-0.16.3.dist-info/METADATA,sha256=20SZh3gMN4GZ_Jop-Im8xcLXutV2f_TRltqr5EJ8lZo,287
-oocana-0.16.3.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-oocana-0.16.3.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+oocana-0.16.5.dist-info/METADATA,sha256=YHY9ozLT5p_kcR2WKJnZLX908HaWBUje-xGUyoBZCfw,221
+oocana-0.16.5.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+oocana-0.16.5.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 oocana/__init__.py,sha256=zMrQ1asZoRE91-BShf1v2ibdThaMc07YtZt5iNbbxsg,281
-oocana/context.py,sha256=vdWg7oJOCPv7qFdMNBtYZ4y79il58gFUuighdSlbymA,12762
-oocana/data.py,sha256=ex042cqPHxqyRI8nuQBCguL1aLKX-7GGDughc-EAPqY,2939
+oocana/context.py,sha256=9hVS9jSpetgwVgg-hBWlYRL8qpSr-uN5kSBvTV8KTNw,13151
+oocana/data.py,sha256=0KpJyckz_X5JbrncBRFbOaU00CxcDx2UYHk6xuH1Poc,2890
 oocana/handle_data.py,sha256=p0iEvdsVV3BqcelM8rvq0a_VPI52SeahaGCszfhZ0TI,1927
 oocana/mainframe.py,sha256=Jixk9PjvJh7PnYwPGqOR5viwcOHWfaPhEiQFNHxHCxw,5219
 oocana/preview.py,sha256=sAKcVUFmOMvrzYLrvqAxd26SppSvK1qJqRTHdAS-KDc,1959
 oocana/schema.py,sha256=8LwMaW4eXa3EmKxR4kzyTOpZiClMRMMsMA6f9CXodW4,4332
 oocana/service.py,sha256=dPCcScQfMBlEjIodFnKU17-HlbBzrQbQK6CNRw7SmOE,2442
 oocana/throtter.py,sha256=xTldm2OZ5uYPiyC6Aatug4FJAoMylPjtXftxHvSr_50,1104
-oocana-0.16.3.dist-info/RECORD,,
+oocana-0.16.5.dist-info/RECORD,,

{oocana-0.16.3.dist-info → oocana-0.16.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.3)
+Generator: pdm-backend (2.4.4)
 Root-Is-Purelib: true
 Tag: py3-none-any