remove unecessary "parsed" attribute

Author: tonylampada

roboflow/util/folderparser.py

@@ -126,19 +126,17 @@ def _filterIndividualAnnotations(image, annotation, format):
                 "iscrowd": 0,
             }
             imgReference = imgReferences[0]
-            _annotation = {
-                "name": "annotation.coco.json",
-                "parsedType": "coco",
-                "parsed": {
+            _annotation = {"name": "annotation.coco.json"}
+            _annotation["rawText"] = json.dumps(
+                {
                     "info": parsed["info"],
                     "licenses": parsed["licenses"],
                     "categories": parsed["categories"],
                     "images": [imgReference],
                     "annotations": [a for a in parsed["annotations"] if a["image_id"] == imgReference["id"]]
                     or [fake_annotation],
-                },
-            }
-            _annotation["rawText"] = json.dumps(_annotation["parsed"])
+                }
+            )
             return _annotation
     elif format == "createml":
         imgReferences = [i for i in parsed if i["image"] == image["name"]]
@@ -148,8 +146,6 @@ def _filterIndividualAnnotations(image, annotation, format):
             imgReference = imgReferences[0]
             _annotation = {
                 "name": "annotation.createml.json",
-                "parsedType": "createml",
-                "parsed": [imgReference],
                 "rawText": json.dumps([imgReference]),
             }
             return _annotation
@@ -159,11 +155,6 @@ def _filterIndividualAnnotations(image, annotation, format):
             headers = parsed["headers"]
             _annotation = {
                 "name": "annotation.csv",
-                "parsedType": "csv",
-                "parsed": {
-                    "headers": headers,
-                    "lines": imgLines,
-                },
                 "rawText": "".join([headers] + imgLines),
             }
             return _annotation

tests/util/test_folderparser.py

@@ -18,15 +18,16 @@ def test_parse_sharks_coco(self):
         parsed = folderparser.parsefolder(sharksfolder)
         testImagePath = "/train/sharks_mp4-20_jpg.rf.90ba2e8e9ca0613f71359efb7ed48b26.jpg"
         testImage = [i for i in parsed["images"] if i["file"] == testImagePath][0]
-        assert len(testImage["annotationfile"]["parsed"]["annotations"]) == 5
+        assert len(json.loads(testImage["annotationfile"]["rawText"])["annotations"]) == 5
 
     def test_parse_sharks_createml(self):
         sharksfolder = f"{thisdir}/../datasets/sharks-tiny-createml"
         parsed = folderparser.parsefolder(sharksfolder)
         testImagePath = "/train/sharks_mp4-20_jpg.rf.5359121123e86e016401ea2731e47949.jpg"
         testImage = [i for i in parsed["images"] if i["file"] == testImagePath][0]
-        assert len(testImage["annotationfile"]["parsed"]) == 1
-        imgReference = testImage["annotationfile"]["parsed"][0]
+        imgParsedAnnotations = json.loads(testImage["annotationfile"]["rawText"])
+        assert len(imgParsedAnnotations) == 1
+        imgReference = imgParsedAnnotations[0]
         assert len(imgReference["annotations"]) == 5
 
     def test_parse_sharks_yolov9(self):
@@ -44,10 +45,9 @@ def test_parse_mosquitos_csv(self):
         testImagePath = "/train_10308.jpeg"
         testImage = [i for i in parsed["images"] if i["file"] == testImagePath][0]
         assert testImage["annotationfile"]["name"] == "annotation.csv"
-        headers = testImage["annotationfile"]["parsed"]["headers"]
-        lines = testImage["annotationfile"]["parsed"]["lines"]
-        assert headers == "img_fName,img_w,img_h,class_label,bbx_xtl,bbx_ytl,bbx_xbr,bbx_ybr\n"
-        assert lines == ["train_10308.jpeg,1058,943,japonicus/koreicus,28,187,908,815\n"]
+        expected = "img_fName,img_w,img_h,class_label,bbx_xtl,bbx_ytl,bbx_xbr,bbx_ybr\n"
+        expected += "train_10308.jpeg,1058,943,japonicus/koreicus,28,187,908,815\n"
+        assert testImage["annotationfile"]["rawText"] == expected
 
 
 def _assertJsonMatchesFile(actual, filename):