unitlab 2.1.2__tar.gz → 2.1.4__tar.gz

{unitlab-2.1.2/src/unitlab.egg-info → unitlab-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.1.2
+Version: 2.1.4
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai

{unitlab-2.1.2 → unitlab-2.1.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="unitlab",
-    version="2.1.2",
+    version="2.1.4",
     license="MIT",
     author="Unitlab Inc.",
     author_email="team@unitlab.ai",

{unitlab-2.1.2 → unitlab-2.1.4}/src/unitlab/client.py

@@ -244,38 +244,13 @@ class UnitlabClient:
 
         asyncio.run(main())
 
-    def create_dataset(self, name, annotation_type, categories, license_id=None):
-        response = self._post(
-            "/api/sdk/datasets/create/",
-            data={
-                "name": name,
-                "annotation_type": annotation_type,
-                "classes": [
-                    {"name": category["name"], "value": category["id"]}
-                    for category in categories
-                ],
-                "license": license_id,
-            },
-        )
-        return response["pk"]
-
-    def finalize_dataset(self, dataset_id):
+    def _finalize_dataset(self, dataset_id):
         return self._post(f"/api/sdk/datasets/{dataset_id}/finalize/")
 
-    def dataset_upload(
-        self,
-        name,
-        annotation_type,
-        annotation_path,
-        data_path,
-        license_id=None,
-        batch_size=15,
+    def _dataset_data_upload(
+        self, dataset_id, upload_handler: DatasetUploadHandler, batch_size=15
     ):
-        handler = DatasetUploadHandler(annotation_type, annotation_path, data_path)
-        dataset_id = self.create_dataset(
-            name, annotation_type, handler.categories, license_id=license_id
-        )
-        image_ids = handler.getImgIds()
+        image_ids = upload_handler.getImgIds()
         url = urllib.parse.urljoin(
             self.api_url, f"/api/sdk/datasets/{dataset_id}/upload/"
         )
@@ -294,7 +269,7 @@ class UnitlabClient:
                                 )
                             ]:
                                 tasks.append(
-                                    handler.upload_image(session, url, image_id)
+                                    upload_handler.upload_image(session, url, image_id)
                                 )
                             for f in asyncio.as_completed(tasks):
                                 try:
@@ -305,4 +280,55 @@ class UnitlabClient:
                         raise e
 
         asyncio.run(main())
-        self.finalize_dataset(dataset_id)
+
+    def dataset_upload(
+        self,
+        name,
+        annotation_type,
+        annotation_path,
+        data_path,
+        license_id=None,
+        batch_size=15,
+    ):
+        upload_handler = DatasetUploadHandler(
+            annotation_type, annotation_path, data_path
+        )
+        dataset_id = self._post(
+            "/api/sdk/datasets/create/",
+            data={
+                "name": name,
+                "annotation_type": annotation_type,
+                "classes": [
+                    {"name": category["name"], "value": category["id"]}
+                    for category in upload_handler.categories
+                ],
+                "license": license_id,
+            },
+        )["pk"]
+        self._dataset_data_upload(dataset_id, upload_handler, batch_size=batch_size)
+        self._finalize_dataset(dataset_id)
+
+    def dataset_update(self, pk, annotation_path, data_path, batch_size=15):
+        dataset = self._get(f"api/sdk/datasets/{pk}/")
+        upload_handler = DatasetUploadHandler(
+            dataset["annotation_type"], annotation_path, data_path
+        )
+        new_dataset = self._post(
+            f"/api/sdk/datasets/{pk}/update/",
+            data={
+                "classes": [
+                    {"name": category["name"], "value": category["id"]}
+                    for category in sorted(
+                        upload_handler.loadCats(upload_handler.getCatIds()),
+                        key=lambda x: x["id"],
+                    )
+                ]
+            },
+        )
+        upload_handler.original_category_referecences = {
+            int(k): v for k, v in new_dataset["original_category_referecences"].items()
+        }
+        self._dataset_data_upload(
+            new_dataset["pk"], upload_handler, batch_size=batch_size
+        )
+        self._finalize_dataset(new_dataset["pk"])

{unitlab-2.1.2 → unitlab-2.1.4}/src/unitlab/dataset.py

@@ -1,4 +1,5 @@
 import asyncio
+import copy
 import itertools
 import json
 import logging
@@ -39,18 +40,6 @@ class COCO:
                     self.data_path
                 )
             )
-        if self.annotation_type not in [
-            "img_bbox",
-            "img_semantic_segmentation",
-            "img_instance_segmentation",
-            "img_polygon",
-            "img_keypoints",
-        ]:
-            raise ValueError(
-                "Invalid annotation type '{}'. Supported types are: ['img_bbox', 'img_semantic_segmentation', 'img_polygon', 'img_keypoints']".format(
-                    self.annotation_type
-                )
-            )
         for required_key in ["images", "annotations", "categories"]:
             if required_key not in self.dataset.keys():
                 raise KeyError(
@@ -91,7 +80,9 @@ class COCO:
         self.catToImgs = catToImgs
         self.imgs = imgs
         self.cats = cats
-        self.categories = sorted(self.loadCats(self.getCatIds()), key=lambda x: x["id"])
+        self.categories = sorted(
+            copy.deepcopy(self.loadCats(self.getCatIds())), key=lambda x: x["id"]
+        )
         self.classes = [cat["name"] for cat in self.categories]
         self.original_category_referecences = dict()
         for i, category in enumerate(self.categories):
@@ -284,30 +275,16 @@ class DatasetUploadHandler(COCO):
         )
 
     def get_img_instance_segmentation_payload(self, anns):
-        predicted_classes = set()
-        annotations = []
-        for ann in anns:
-            annotations.append(
-                {
-                    "segmentation": ann["segmentation"],
-                    "category_id": self.original_category_referecences.get(
-                        ann["category_id"]
-                    ),
-                }
-            )
-            predicted_classes.add(
-                self.original_category_referecences.get(ann["category_id"])
-            )
-        return json.dumps(
-            {
-                "annotations": annotations,
-                "predicted_classes": list(predicted_classes),
-                "classes": self.classes,
-            }
-        )
+        return self.get_img_semantic_segmentation_payload(anns)
 
     def get_img_polygon_payload(self, anns):
-        logger.warning("Not implemented yet")
+        return self.get_img_semantic_segmentation_payload(anns)
+
+    def get_img_line_payload(self, anns):
+        return self.get_img_semantic_segmentation_payload(anns)
+
+    def get_img_point_payload(self, anns):
+        return self.get_img_semantic_segmentation_payload(anns)
 
     def get_img_skeleton_payload(self, anns):
         logger.warning("Not implemented yet")
@@ -347,6 +324,9 @@ class DatasetUploadHandler(COCO):
                             raise SubscriptionError(
                                 "You have reached the maximum number of datasources for your subscription."
                             )
+                        elif response.status == 400:
+                            logger.error(await response.text())
+                            return 0
                         response.raise_for_status()
                         return 1
                 except SubscriptionError as e:

{unitlab-2.1.2 → unitlab-2.1.4}/src/unitlab/main.py

@@ -32,9 +32,11 @@ class DownloadType(str, Enum):
 
 class AnnotationType(str, Enum):
     IMG_BBOX = "img_bbox"
-    IMG_POLYGON = "img_polygon"
     IMG_SEMANTIC_SEGMENTATION = "img_semantic_segmentation"
     IMG_INSTANCE_SEGMENTATION = "img_instance_segmentation"
+    IMG_POLYGON = "img_polygon"
+    IMG_LINE = "img_line"
+    IMG_POINT = "img_point"
     IMG_SKELETON = "img_skeleton"
 
 
@@ -104,10 +106,7 @@ def dataset_upload(
         help_prompt = ", ".join(
             f"{idx}: {license['name']}" for idx, license in enumerate(licenses)
         )
-        chosen_license = typer.prompt(
-            f"Select license {help_prompt}",
-            type=LicenseEnum,
-        )
+        chosen_license = typer.prompt(f"Select license {help_prompt}", type=LicenseEnum)
     client.dataset_upload(
         name,
         annotation_type.value,
@@ -117,6 +116,18 @@ def dataset_upload(
     )
 
 
+@dataset_app.command(name="update", help="Update dataset")
+def dataset_update(
+    pk: UUID,
+    api_key: API_KEY,
+    annotation_path: Annotated[Path, typer.Option(help="Path to the COCO json file")],
+    data_path: Annotated[
+        Path, typer.Option(help="Directory containing the data to be uploaded")
+    ],
+):
+    get_client(api_key).dataset_update(pk, annotation_path, data_path)
+
+
 @dataset_app.command(name="download", help="Download dataset")
 def dataset_download(
     pk: UUID,

{unitlab-2.1.2 → unitlab-2.1.4/src/unitlab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unitlab
-Version: 2.1.2
+Version: 2.1.4
 Home-page: https://github.com/teamunitlab/unitlab-sdk
 Author: Unitlab Inc.
 Author-email: team@unitlab.ai