File tree Expand file tree Collapse file tree 3 files changed +10
-11
lines changed
Expand file tree Collapse file tree 3 files changed +10
-11
lines changed Original file line number Diff line number Diff line change @@ -2317,10 +2317,10 @@ def get_annotations(
23172317 if isinstance (project , str ):
23182318 project , folder = self .controller .get_project_folder_by_path (project )
23192319 else :
2320- project , folder = (
2321- self .controller .get_project_by_id ( project_id = project ). data ,
2322- None ,
2323- )
2320+ project = self . controller . get_project_by_id ( project_id = project ). data
2321+ folder = self .controller .get_folder_by_id (
2322+ project_id = project . id , folder_id = project . folder_id
2323+ ). data
23242324 response = self .controller .annotations .list (project , folder , items )
23252325 if response .errors :
23262326 raise AppException (response .errors )
Original file line number Diff line number Diff line change @@ -1114,7 +1114,7 @@ def execute(self):
11141114 reporter = Reporter (log_info = False ),
11151115 project = self ._project ,
11161116 folder = self ._folder ,
1117- item_names = [self ._video_name ],
1117+ items = [self ._video_name ],
11181118 service_provider = self ._service_provider ,
11191119 ).execute ()
11201120 if response .data :
@@ -1628,8 +1628,6 @@ def execute(self):
16281628 try :
16291629 annotations = run_async (self .run_workers (large_items , small_items ))
16301630 except Exception as e :
1631- # todo remove
1632- raise e
16331631 logger .error (e )
16341632 self ._response .errors = AppException ("Can't get annotations." )
16351633 return self ._response
@@ -1663,9 +1661,10 @@ def __init__(
16631661 self ._big_file_queue = None
16641662
16651663 def validate_items (self ):
1666- self ._item_names = GetAnnotations .items_duplication_validation (
1667- self .reporter , self ._item_names
1668- )
1664+ if self ._item_names :
1665+ self ._item_names = GetAnnotations .items_duplication_validation (
1666+ self .reporter , self ._item_names
1667+ )
16691668
16701669 @property
16711670 def destination (self ) -> str :
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ def test_recursive_upload(self):
3535 self .PROJECT_NAME , self .second_folder_path , recursive_subfolders = True
3636 )
3737 self .assertEqual (2 , len (uploaded ))
38- self .assertEqual (2 , len (duplicated ))
38+ self .assertEqual (0 , len (duplicated ))
3939
4040 def test_non_recursive_annotations_folder (self ):
4141 sa .upload_images_from_folder_to_project (
You can’t perform that action at this time.
0 commit comments