Fix logs

Author: VaghinakDev

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

@@ -23,7 +23,8 @@
 from lib.infrastructure.repositories import ConfigRepository
 
 
-controller = Controller.get_default()
+controller = Controller()
+controller.retrieve_configs(constances.CONFIG_FILE_LOCATION)
 
 
 class CLIFacade(BaseInterfaceFacade):

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

@@ -2416,7 +2416,7 @@ def add_annotation_comment_to_image(
     image_name: NotEmptyStr,
     comment_text: NotEmptyStr,
     comment_coords: List[float],
-    comment_author: NotEmptyStr,
+    comment_author: EmailStr,
     resolved: Optional[StrictBool] = False,
 ):
     """Add a comment to SuperAnnotate format annotation JSON

src/superannotate/lib/app/mixp/decorators.py

@@ -88,8 +88,8 @@ def __call__(self, *args, **kwargs):
             else:
                 raise Exception(
                     "SuperAnnotate config file not found."
-                    f" Please provide correct config file location to sa.init(<path>) or use "
-                    f"CLI's superannotate init to generate default location config file."
+                    " Please provide correct config file location to sa.init(<path>) or use "
+                    "CLI's superannotate init to generate default location config file."
                 )
         except Exception as e:
             self._success = False

src/superannotate/lib/app/mixp/utils/parsers.py

@@ -1226,4 +1226,4 @@ def get_annotations_per_frame(*args, **kwargs):
     return {
         "event_name": "get_annotations_per_frame",
         "properties": {"Project": project, "fps": fps},
-    }
+    }

src/superannotate/lib/core/data_handlers.py

@@ -8,13 +8,12 @@
 from typing import Dict
 from typing import List
 
-from superannotate_schemas.schemas.classes import AnnotationClass
-from superannotate_schemas.schemas.classes import Attribute
-from superannotate_schemas.schemas.classes import AttributeGroup
-
 import lib.core as constances
 from lib.core.enums import ClassTypeEnum
 from lib.core.reporter import Reporter
+from superannotate_schemas.schemas.classes import AnnotationClass
+from superannotate_schemas.schemas.classes import Attribute
+from superannotate_schemas.schemas.classes import AttributeGroup
 
 
 class BaseDataHandler(metaclass=ABCMeta):

src/superannotate/lib/core/reporter.py

@@ -63,7 +63,8 @@ def finish_progress(self):
         self.progress_bar.close()
 
     def update_progress(self, value: int = 1):
-        self.progress_bar.update(value)
+        if self.progress_bar:
+            self.progress_bar.update(value)
 
     def generate_report(self) -> str:
         report = ""

src/superannotate/lib/core/serviceproviders.py

@@ -5,6 +5,7 @@
 from typing import List
 from typing import Tuple
 
+from lib.core.reporter import Reporter
 from lib.core.service_types import ServiceResponse
 
 
@@ -304,5 +305,12 @@ def get_limitations(
         raise NotImplementedError
 
     @abstractmethod
-    def get_annotations(self, project_id: int, team_id: int, folder_id: int, items: List[str]) -> List[dict]:
+    def get_annotations(
+            self,
+            project_id: int,
+            team_id: int,
+            folder_id: int,
+            items: List[str],
+            reporter: Reporter
+    ) -> List[dict]:
         raise NotImplementedError

src/superannotate/lib/core/usecases/annotations.py

@@ -514,12 +514,24 @@ def validate_item_names(self):
                 self._item_names = item_names
 
     def execute(self):
+        items_count = len(self._item_names)
+        self.reporter.log_info(
+            f"Getting {items_count} annotations from "
+            f"{self._project.name}{f'/{self._folder.name}' if self._folder else ''}."
+        )
+        self.reporter.start_progress(items_count)
         annotations = self._client.get_annotations(
             team_id=self._project.team_id,
             project_id=self._project.uuid,
             folder_id=self._folder.uuid,
-            items=self._item_names
+            items=self._item_names,
+            reporter=self.reporter
         )
+        received_items_count = len(annotations)
+        if items_count > received_items_count:
+            self.reporter.log_warning(
+                f"Could not find annotations for {items_count - received_items_count}/{items_count} items."
+            )
         self._response.data = annotations
         return self._response
 
@@ -549,14 +561,16 @@ def execute(self):
             item_names=[self._video_name],
             backend_service_provider=self._client
         ).execute()
+        generator = VideoFrameGenerator(response.data[0], fps=self._fps)
+        self.reporter.log_info(f"Getting annotations for {generator.frames_count} frames from {self._video_name}.")
         if response.errors:
             self._response.errors = response.errors
             return self._response
         if not response.data:
             self._response.errors = AppException(f"Video {self._video_name} not found.")
         annotations = response.data
         if annotations:
-            self._response.data = list(VideoFrameGenerator(response.data[0], fps=self._fps))
+            self._response.data = list(generator)
         else:
             self._response.data = []
         return self._response

src/superannotate/lib/core/usecases/projects.py

@@ -1,6 +1,5 @@
 import copy
 from collections import defaultdict
-from typing import Iterable
 from typing import List
 from typing import Type
 

src/superannotate/lib/core/video_convertor.py

@@ -41,7 +41,7 @@ def __init__(self, annotation_data: dict, fps: int):
         self.fps = fps
         self.ratio = 1000 * 1000 / fps
         self._frame_id = 1
-        self._frames_count = self.duration * fps
+        self.frames_count = self.duration * fps
         self.annotations: dict = {}
         self._mapping = {}
         self._process()
@@ -141,5 +141,5 @@ def _process(self):
                         )
 
     def __iter__(self):
-        for frame_no in range(1, int(self._frames_count) + 1):
+        for frame_no in range(1, int(self.frames_count) + 1):
             yield self.get_frame(frame_no).dict()