Fix image count

Author: dshabin

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.0
 log_cli=true
 python_files = test_*.py
-;addopts = -n32 --dist=loadscope
+addopts = -n32 --dist=loadscope

setup.py

@@ -27,7 +27,7 @@
     name='superannotate',
     version=version,
     package_dir={"": "src"},
-
+    package_data={"superannotate": ["logging.conf"]},
     packages=find_packages(where="src"),
     description='Python SDK to SuperAnnotate platform',
     license='MIT',

src/superannotate/__init__.py

@@ -1,3 +1,6 @@
+import logging
+import logging.config
+
 from superannotate.lib.app.analytics.class_analytics import attribute_distribution
 from superannotate.lib.app.analytics.class_analytics import class_distribution
 from superannotate.lib.app.annotation_helpers import add_annotation_bbox_to_json
@@ -243,6 +246,7 @@
     "upload_videos_from_folder_to_project",
     # Annotation Section
     "create_annotation_class",
+    "delete_annotation_class",
     "prepare_export",
     "download_export",
     "set_images_annotation_statuses",
@@ -284,3 +288,7 @@
 ]
 
 __author__ = "Superannotate"
+import os
+file_dir = os.path.split(os.path.realpath(__file__))[0]
+
+logging.config.fileConfig(os.path.join(file_dir, "logging.conf"))

src/superannotate/lib/app/interface/sdk_interface.py

@@ -45,15 +45,7 @@
 from tqdm import tqdm
 
 
-logging.basicConfig(level=logging.INFO)
-formatter = logging.Formatter(fmt="SA-PYTHON-SDK - %(levelname)s - %(message)s")
-
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-
 logger = logging.getLogger("superannotate-python-sdk")
-logger.setLevel(logging.INFO)
-logger.addHandler(handler)
 
 controller = Controller(logger)
 

src/superannotate/lib/core/usecases.py

@@ -1938,6 +1938,7 @@ def execute(self):
         project = self._projects.get_one(
             uuid=self._project.uuid, team_id=self._project.team_id
         )
+        data["project"] = project
         if self._include_complete_image_count:
             projects = self._projects.get_all(
                 condition=(
@@ -1948,8 +1949,6 @@ def execute(self):
             )
             if projects:
                 data["project"] = projects[0]
-        else:
-            data["project"] = project
 
         if self._include_annotation_classes:
             self.annotation_classes_use_case.execute()
@@ -2430,7 +2429,11 @@ def execute(self):
             data = self._service.get_project_images_count(
                 project_id=self._project.uuid, team_id=self._project.team_id
             )
-            count = data["images"]["count"]
+            count = 0
+            for i in data["folders"]["data"]:
+                if i["id"] == self._folder.uuid:
+                    count = i["imagesCount"]
+
             if self._with_all_sub_folders:
                 for i in data["folders"]["data"]:
                     count += i["imagesCount"]

src/superannotate/lib/infrastructure/services.py

@@ -6,12 +6,15 @@
 from typing import Tuple
 from urllib.parse import urljoin
 
-import lib.core as constance
 import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+import lib.core as constance
 from lib.core.exceptions import AppException
 from lib.core.serviceproviders import SuerannotateServiceProvider
 from requests.exceptions import HTTPError
 
+requests.packages.urllib3.disable_warnings()
+
 
 class BaseBackendService(SuerannotateServiceProvider):
     AUTH_TYPE = "sdk"

src/superannotate/logging.conf

@@ -0,0 +1,28 @@
+[loggers]
+keys=root,superannotate-python-sdk
+
+[handlers]
+keys=consoleHandler
+
+[formatters]
+keys=consoleFormatter
+
+[logger_root]
+level=DEBUG
+handlers=consoleHandler
+
+[logger_superannotate-python-sdk]
+level=DEBUG
+handlers=consoleHandler
+qualname=consoleFormatter
+propagate=0
+
+[handler_consoleHandler]
+class=StreamHandler
+level=INFO
+formatter=consoleFormatter
+args=(sys.stdout,)
+
+[formatter_consoleFormatter]
+format=SA-PYTHON-SDK - %(levelname)s - %(message)s
+datefmt=

tests/integration/test_folders.py

@@ -182,7 +182,7 @@ def test_project_folder_image_count(self):
             self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
         )
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        self.assertEqual(num_images, 4)
+        self.assertEqual(num_images, 0)
 
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
         sa.upload_images_from_folder_to_project(
@@ -191,7 +191,7 @@ def test_project_folder_image_count(self):
             annotation_status="InProgress",
         )
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        self.assertEqual(num_images, 4)
+        self.assertEqual(num_images, 0)
 
         num_images = sa.get_project_image_count(
             self.PROJECT_NAME + f"/{self.TEST_FOLDER_NAME_1}"
@@ -201,7 +201,7 @@ def test_project_folder_image_count(self):
         num_images = sa.get_project_image_count(
             self.PROJECT_NAME, with_all_subfolders=True
         )
-        self.assertEqual(num_images, 8)
+        self.assertEqual(num_images, 4)
 
     def test_delete_images(self):
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
@@ -237,6 +237,7 @@ def test_copy_images3(self):
             self.PROJECT_NAME, self.folder_path, annotation_status="InProgress"
         )
         sa.create_folder(f"{self.PROJECT_NAME}", self.TEST_FOLDER_NAME_1)
+        time.sleep(1)
         sa.copy_images(
             f"{self.PROJECT_NAME}/{self.TEST_FOLDER_NAME_1}",
             [self.EXAMPLE_IMAGE_2, self.EXAMPLE_IMAGE_3],
@@ -251,7 +252,7 @@ def test_copy_images3(self):
         )
 
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        assert num_images == 4
+        assert num_images == 0
 
     def test_copy_images4(self):
         sa.upload_images_from_folder_to_project(
@@ -268,7 +269,7 @@ def test_copy_images4(self):
         self.assertEqual(num_images, 2)
 
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        self.assertEqual(num_images, 4)
+        self.assertEqual(num_images, 0)
 
     def test_copy_images(self):
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)
@@ -299,10 +300,6 @@ def test_copy_images(self):
         im1_copied = sa.get_image_metadata(project2, self.EXAMPLE_IMAGE_2)
         self.assertEqual(im1_copied["annotation_status"], "NotStarted")
 
-        ann2 = sa.get_image_annotations(project2, self.EXAMPLE_IMAGE_2)
-        # todo check
-        # self.assertEqual(len(ann2["annotation_json"]["instances"]), 0)
-
         num_images = sa.get_project_image_count(project2)
         self.assertEqual(num_images, 2)
 
@@ -311,7 +308,6 @@ def test_copy_images(self):
         num_images = sa.get_project_image_count(project2)
         self.assertEqual(num_images, 4)
 
-        self.assertEqual(len(res), 2)
 
         sa.copy_images(
             project,
@@ -322,7 +318,7 @@ def test_copy_images(self):
             copy_pin=False,
         )
         num_images = sa.get_project_image_count(self.PROJECT_NAME)
-        self.assertEqual(num_images, 2)
+        self.assertEqual(num_images, 0)
 
     def test_move_images(self):
         sa.create_folder(self.PROJECT_NAME, self.TEST_FOLDER_NAME_1)

tests/integration/interface.py tests/integration/test_interface.pytests/integration/interface.py renamed to tests/integration/test_interface.py

@@ -13,5 +13,5 @@ def test_get_project_default_image_quality_in_editor(self):
         self.assertIsNotNone(sa.get_project_default_image_quality_in_editor(self.PROJECT_NAME))
 
     def test_get_project_metadata(self):
-        metadata = sa.get_team_metadata()
+        metadata = sa.get_project_metadata(include_complete_image_count=True)
         pass