unitlab 2.1.1__tar.gz → 2.1.3__tar.gz

{unitlab-2.1.1/src/unitlab.egg-info → unitlab-2.1.3}/PKG-INFO

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

{unitlab-2.1.1 → unitlab-2.1.3}/setup.py

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

{unitlab-2.1.1 → unitlab-2.1.3}/src/unitlab/client.py

@@ -93,7 +93,7 @@ class UnitlabClient:
         self.close()
 
     def _get_headers(self):
-        return {"Authorization": f"Api-Key {self.api_key}"} if self.api_key else None
+        return {"Authorization": f"Api-Key {self.api_key}"}
 
     @utils.handle_exceptions
     def _get(self, endpoint):
@@ -102,10 +102,10 @@ class UnitlabClient:
         )
 
     @utils.handle_exceptions
-    def _post(self, endpoint, data):
+    def _post(self, endpoint, data=None):
         return self.api_session.post(
             urllib.parse.urljoin(self.api_url, endpoint),
-            json=data,
+            json=data or {},
             headers=self._get_headers(),
         )
 
@@ -259,6 +259,9 @@ class UnitlabClient:
         )
         return response["pk"]
 
+    def finalize_dataset(self, dataset_id):
+        return self._post(f"/api/sdk/datasets/{dataset_id}/finalize/")
+
     def dataset_upload(
         self,
         name,
@@ -302,4 +305,4 @@ class UnitlabClient:
                         raise e
 
         asyncio.run(main())
-        self.dataset_download(dataset_id, "COCO")
+        self.finalize_dataset(dataset_id)

{unitlab-2.1.1 → unitlab-2.1.3}/src/unitlab/dataset.py

@@ -39,18 +39,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(
@@ -284,30 +272,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")

{unitlab-2.1.1 → unitlab-2.1.3}/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,

{unitlab-2.1.1 → unitlab-2.1.3/src/unitlab.egg-info}/PKG-INFO

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