unitlab 2.0.5__tar.gz → 2.0.6__tar.gz

{unitlab-2.0.5/src/unitlab.egg-info → unitlab-2.0.6}/PKG-INFO

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

{unitlab-2.0.5 → unitlab-2.0.6}/setup.py

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

{unitlab-2.0.5 → unitlab-2.0.6}/src/unitlab/client.py

@@ -74,7 +74,7 @@ class UnitlabClient:
                 )
             logger.info("Found a Unitlab API key in your environment.")
         if api_url is None:
-            self.api_url = os.environ.get("UNITLAB_BASE_URL", "https://api.unitlab.ai")
+            api_url = os.environ.get("UNITLAB_BASE_URL", "https://api.unitlab.ai")
 
         self.api_key = api_key
         self.api_url = api_url
@@ -144,53 +144,54 @@ class UnitlabClient:
         if not os.path.isdir(directory):
             raise ValueError(f"Directory {directory} does not exist")
 
+        files = [
+            file
+            for files_list in (
+                glob.glob(os.path.join(directory, "") + extension)
+                for extension in ["*jpg", "*png", "*jpeg", "*webp"]
+            )
+            for file in files_list
+        ]
+        filtered_files = []
+        for file in files:
+            file_size = os.path.getsize(file) / 1024 / 1024
+            if file_size > 6:
+                logger.warning(
+                    f"File {file} is too large ({file_size:.4f} megabytes) skipping, max size is 6 MB"
+                )
+                continue
+            filtered_files.append(file)
+
+        num_files = len(filtered_files)
+        num_batches = (num_files + batch_size - 1) // batch_size
+
         async def post_file(
             session: aiohttp.ClientSession, file: str, project_id: str, retries=3
         ):
-            for _ in range(retries):
-                try:
-                    with open(file, "rb") as f:
-                        response = await session.request(
-                            "POST",
-                            url=urllib.parse.urljoin(
-                                self.api_url, "/api/sdk/upload-data/"
-                            ),
-                            data=aiohttp.FormData(
-                                fields={"project": project_id, "file": f}
-                            ),
-                        )
-                        response.raise_for_status()
-                        return 1
-                except aiohttp.client_exceptions.ServerDisconnectedError as e:
-                    logger.warning(f"Error: {e}: Retrying...")
-                    await asyncio.sleep(0.1)
-                    continue
-                except Exception as e:
-                    logger.error(f"Error uploading file {file} - {e}")
-                    return 0
-
-        async def main():
-            files = [
-                file
-                for files_list in (
-                    glob.glob(os.path.join(directory, "") + extension)
-                    for extension in ["*jpg", "*png", "*jpeg", "*webp"]
+            async with aiofiles.open(file, "rb") as f:
+                form_data = aiohttp.FormData()
+                form_data.add_field("project", project_id)
+                form_data.add_field(
+                    "file", await f.read(), filename=os.path.basename(file)
                 )
-                for file in files_list
-            ]
-            filtered_files = []
-            for file in files:
-                file_size = os.path.getsize(file) / 1024 / 1024
-                if file_size > 6:
-                    logger.warning(
-                        f"File {file} is too large ({file_size:.4f} megabytes) skipping, max size is 6 MB"
-                    )
-                    continue
-                filtered_files.append(file)
-
-            num_files = len(filtered_files)
-            num_batches = (num_files + batch_size - 1) // batch_size
+                for _ in range(retries):
+                    try:
+                        await asyncio.sleep(0.1)
+                        async with session.post(
+                            urllib.parse.urljoin(self.api_url, "/api/sdk/upload-data/"),
+                            data=form_data,
+                        ) as response:
+                            response.raise_for_status()
+                            return 1
+                    except aiohttp.ServerDisconnectedError as e:
+                        logger.warning(f"Server disconnected: {e}, Retrying...")
+                        await asyncio.sleep(0.1)
+                        continue
+                    except Exception as e:
+                        logger.error(f"Error uploading file {file} - {e}")
+                        return 0
 
+        async def main():
             logger.info(f"Uploading {num_files} files to project {project_id}")
             with tqdm.tqdm(total=num_files, ncols=80) as pbar:
                 async with aiohttp.ClientSession(

{unitlab-2.0.5 → unitlab-2.0.6}/src/unitlab/dataset.py

@@ -131,7 +131,7 @@ class COCO:
                     if ann["area"] > areaRng[0] and ann["area"] < areaRng[1]
                 ]
             )
-        if not iscrowd == None:
+        if iscrowd:
             ids = [ann["id"] for ann in anns if ann["iscrowd"] == iscrowd]
         else:
             ids = [ann["id"] for ann in anns]
@@ -200,7 +200,7 @@ class COCO:
         """
         if self._is_array_like(ids):
             return [self.anns[id] for id in ids]
-        elif type(ids) == int:
+        elif isinstance(ids, int):
             return [self.anns[ids]]
 
     def loadCats(self, ids=[]):
@@ -211,7 +211,7 @@ class COCO:
         """
         if self._is_array_like(ids):
             return [self.cats[id] for id in ids]
-        elif type(ids) == int:
+        elif isinstance(ids, int):
             return [self.cats[ids]]
 
     def loadImgs(self, ids=[]):
@@ -222,7 +222,7 @@ class COCO:
         """
         if self._is_array_like(ids):
             return [self.imgs[id] for id in ids]
-        elif type(ids) == int:
+        elif isinstance(ids, int):
             return [self.imgs[ids]]
 
 
@@ -279,23 +279,27 @@ class DatasetUploadHandler(COCO):
             return
         return getattr(self, f"get_{self.annotation_type}_payload")(anns)
 
-    async def upload_image(self, session, url, image_id):
+    async def upload_image(self, session, url, image_id, retries=3):
         image = self.loadImgs(image_id)[0]
         file_name = image["file_name"]
         payload = self.get_payload(image_id)
         if payload:
-            try:
-                async with aiofiles.open(
-                    os.path.join(self.data_path, file_name), "rb"
-                ) as f:
-                    form_data = aiohttp.FormData()
-                    form_data.add_field("file", await f.read(), filename=file_name)
-                    form_data.add_field("result", self.get_payload(image_id))
-                    # rate limiting
-                    await asyncio.sleep(0.1)
-                    async with session.post(url, data=form_data) as response:
-                        response.raise_for_status()
-                        return 1
-            except Exception as e:
-                logger.error(f"Error uploading file {file_name} - {e}")
+            async with aiofiles.open(
+                os.path.join(self.data_path, file_name), "rb"
+            ) as f:
+                form_data = aiohttp.FormData()
+                form_data.add_field("file", await f.read(), filename=file_name)
+                form_data.add_field("result", self.get_payload(image_id))
+                for _ in range(retries):
+                    try:
+                        await asyncio.sleep(0.1)
+                        async with session.post(url, data=form_data) as response:
+                            response.raise_for_status()
+                            return 1
+                    except aiohttp.ServerDisconnectedError as e:
+                        logger.warning(f"Server disconnected - {e}, retrying...")
+                        await asyncio.sleep(0.1)
+                        continue
+                    except Exception as e:
+                        logger.error(f"Error uploading file {file_name} - {e}")
         return 0

{unitlab-2.0.5 → unitlab-2.0.6/src/unitlab.egg-info}/PKG-INFO

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