Merge pull request #197 from fastlabel/feature/refine-api-parameter-usage

Updated to filter parameters before requesting API

Author: takahiro-tamenishi

fastlabel/__init__.py

@@ -936,7 +936,7 @@ def create_image_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = name
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
         if tags:
             payload["tags"] = tags
 
@@ -992,7 +992,7 @@ def create_integrated_image_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = file_path
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
         if tags:
             payload["tags"] = tags
 
@@ -1054,7 +1054,7 @@ def create_image_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -1114,7 +1114,7 @@ def create_integrated_image_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -1204,7 +1204,7 @@ def create_sequential_image_task(
         if priority is not None:
             payload["priority"] = priority
         if annotations:
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
         if tags:
             payload["tags"] = tags
 
@@ -1273,7 +1273,7 @@ def create_video_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = name
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
         if tags:
             payload["tags"] = tags
 
@@ -1340,7 +1340,7 @@ def create_video_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -1402,7 +1402,7 @@ def create_text_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = name
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
         if tags:
             payload["tags"] = tags
 
@@ -1462,7 +1462,7 @@ def create_text_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -1528,7 +1528,7 @@ def create_audio_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = name
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
         if tags:
             payload["tags"] = tags
 
@@ -1592,7 +1592,7 @@ def create_audio_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -1707,7 +1707,7 @@ def create_pcd_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = name
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
         if tags:
             payload["tags"] = tags
 
@@ -1797,7 +1797,7 @@ def create_sequential_pcd_task(
         if priority is not None:
             payload["priority"] = priority
         if annotations:
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
         if tags:
             payload["tags"] = tags
 
@@ -1901,7 +1901,7 @@ def update_image_task(
                 # Since the content name is not passed in the sdk update api,
                 # the content will be filled on the server side.
                 annotation["content"] = ""
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
 
         self.__fill_assign_users(payload, **kwargs)
 
@@ -1949,7 +1949,7 @@ def update_image_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -2001,7 +2001,7 @@ def update_sequential_image_task(
         if tags:
             payload["tags"] = tags
         if annotations:
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
 
         self.__fill_assign_users(payload, **kwargs)
 
@@ -2053,7 +2053,7 @@ def update_video_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = ""
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
 
         self.__fill_assign_users(payload, **kwargs)
 
@@ -2101,7 +2101,7 @@ def update_video_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -2155,7 +2155,7 @@ def update_text_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = ""
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
 
         self.__fill_assign_users(payload, **kwargs)
 
@@ -2203,7 +2203,7 @@ def update_text_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -2257,7 +2257,7 @@ def update_audio_task(
         if annotations:
             for annotation in annotations:
                 annotation["content"] = ""
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
 
         self.__fill_assign_users(payload, **kwargs)
 
@@ -2305,7 +2305,7 @@ def update_audio_classification_task(
         if priority is not None:
             payload["priority"] = priority
         if attributes:
-            payload["attributes"] = attributes
+            payload["attributes"] = delete_extra_attributes_parameter(attributes)
         if tags:
             payload["tags"] = tags
 
@@ -2361,7 +2361,7 @@ def update_pcd_task(
                 # Since the content name is not passed in the sdk update api,
                 # the content will be filled on the server side.
                 annotation["content"] = ""
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
 
         self.__fill_assign_users(payload, **kwargs)
 
@@ -2415,7 +2415,7 @@ def update_sequential_pcd_task(
                 # Since the content name is not passed in the sdk update api,
                 # the content will be filled on the server side.
                 annotation["content"] = ""
-            payload["annotations"] = annotations
+            payload["annotations"] = delete_extra_annotations_parameter(annotations)
 
         self.__fill_assign_users(payload, **kwargs)
 
@@ -4299,3 +4299,24 @@ def get_histories(
             params["limit"] = limit
 
         return self.api.get_request(endpoint, params=params)
+
+def delete_extra_annotations_parameter(annotations: list) -> list:
+    for annotation in annotations:
+        annotation.pop("id", None)
+        annotation.pop("title", None)
+        annotation.pop("color", None)
+        for keypoint in annotation.get("keypoints", []):
+            keypoint.pop("edges", None)
+            keypoint.pop("name", None)
+        annotation["attributes"] = delete_extra_attributes_parameter(
+            annotation.get("attributes", [])
+        )
+    return annotations
+
+
+def delete_extra_attributes_parameter(attributes: list) -> list:
+    for attribute in attributes:
+        attribute.pop("title", None)
+        attribute.pop("name", None)
+        attribute.pop("type", None)
+    return attributes

fastlabel/converters.py

@@ -845,7 +845,9 @@ def execute_coco_to_fastlabel(coco: dict, annotation_type: str) -> dict:
     coco_categories_keypoints = {}
     for c in coco["categories"]:
         coco_categories[c["id"]] = c["name"] if c.get("name") else c["supercategory"]
-        coco_categories_keypoints[c["id"]] = c["keypoints"] if c.get("keypoints") else []
+        coco_categories_keypoints[c["id"]] = (
+            c["keypoints"] if c.get("keypoints") else []
+        )
 
     coco_annotations = coco["annotations"]
 
@@ -1136,3 +1138,4 @@ def _get_coco_annotation_attributes(annotation: dict) -> Dict[str, AttributeValu
     for attribute in attributes:
         coco_attributes[attribute["key"]] = attribute["value"]
     return coco_attributes
+