Merge pull request #136 from kurusugawa-computer/update-parser

parser.py: jsonをloadするメソッドを追加

Author: yuji38kwmt

annofabapi/__version__.py

@@ -1 +1 @@
-__version__ = '0.27.8'
+__version__ = '0.27.9'

annofabapi/parser.py

@@ -94,6 +94,12 @@ def parse(self) -> SimpleAnnotation:
         JSONファイルをパースする。
         """
 
+    @abc.abstractmethod
+    def load_json(self) -> Any:
+        """
+        JSONファイルをloadします。
+        """
+
 
 class FullAnnotationParser(abc.ABC):
     """
@@ -181,10 +187,11 @@ def __init__(self, zip_file: zipfile.ZipFile, json_file_path: str):
         super().__init__(json_file_path)
 
     def parse(self) -> SimpleAnnotation:
+        return SimpleAnnotation.from_dict(self.load_json())  # type: ignore
+
+    def load_json(self) -> Any:
         with self.__zip_file.open(self.json_file_path) as entry:
-            anno_dict: dict = json.load(entry)
-            # mypyの "has no attribute "from_dict" " をignore
-            return SimpleAnnotation.from_dict(anno_dict)  # type: ignore
+            return json.load(entry)
 
     def open_outer_file(self, data_uri: str):
         outer_file_path = _trim_extension(self.json_file_path) + "/" + data_uri
@@ -213,9 +220,11 @@ def __init__(self, json_file_path: Path):
         super().__init__(str(json_file_path))
 
     def parse(self) -> SimpleAnnotation:
+        return SimpleAnnotation.from_dict(self.load_json())  # type: ignore
+
+    def load_json(self) -> Any:
         with open(self.json_file_path, encoding="utf-8") as f:
-            anno_dict: dict = json.load(f)
-            return SimpleAnnotation.from_dict(anno_dict)  # type: ignore
+            return json.load(f)
 
     def open_outer_file(self, data_uri: str):
         outer_file_path = _trim_extension(self.json_file_path) + "/" + data_uri

tests/test_local_parser.py

@@ -72,6 +72,10 @@ def test_simple_annotation_zip(self):
             assert type(simple_annotation) == SimpleAnnotation
             index += 1
 
+            dict_simple_annotation = parser.load_json()
+            assert type(dict_simple_annotation) == dict
+            assert "details" in dict_simple_annotation
+
         assert index == 4
 
         with zipfile.ZipFile(zip_path) as zip_file: