Merge pull request #163 from dvm-shlee/main

[hotpatch] resolving typing issue for python version < 3.10

brkraw/api/pvobj/base.py

@@ -1,8 +1,10 @@
+from __future__ import annotations
 import os
 import zipfile
 from collections import OrderedDict
 from collections import defaultdict
 from .parameters import Parameter
+from typing import Optional
 
 class BaseMethods:
     """
@@ -163,7 +165,7 @@ def __getattr__(self, key):
     def contents(self):
         return self._contents
 
-    def get_fid(self, scan_id:int|None = None):
+    def get_fid(self, scan_id:Optional[int] = None):
         try:
             pvobj = self.get_scan(scan_id) if hasattr(self, 'get_scan') else self
         except KeyError:
@@ -175,7 +177,7 @@ def get_fid(self, scan_id:int|None = None):
         raise FileNotFoundError(f"The required file '{' or '.join(fid_files)}' does not exist. "
                                 "Please check the dataset and ensure the file is in the expected location.")
 
-    def get_2dseq(self, scan_id:int|None = None, reco_id:int|None = None):
+    def get_2dseq(self, scan_id:Optional[int] = None, reco_id:Optional[int] = None):
         try:
             if scan_id and hasattr(self, 'get_scan'):
                 pvobj = self.get_scan(scan_id).get_reco(reco_id)

brkraw/api/pvobj/pvscan.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
 import os
 from collections import OrderedDict
+from typing import Optional
 from .base import BaseMethods
 from .pvreco import PvReco
 
@@ -22,7 +24,7 @@ class PvScan(BaseMethods):
         avail (list): A list of available items.
         contents (dict): A dictionary of pvscan contents.
     """
-    def __init__(self, scan_id: int|None, pathes, contents=None, recos=None):
+    def __init__(self, scan_id: Optional[int], pathes, contents=None, recos=None):
         """
         Initialize a Dataset object.