Skip to content

Commit 9589a16

Browse files
authored
Merge pull request #342 from superannotateai/develop
Release candidate
2 parents 3f2d7c5 + 02d11ff commit 9589a16

File tree

72 files changed

+1452
-4095
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1452
-4095
lines changed

docs/source/superannotate.sdk.rst

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ ________
3434
.. autofunction:: superannotate.get_folder_metadata
3535
.. autofunction:: superannotate.create_folder
3636
.. autofunction:: superannotate.delete_folders
37-
.. autofunction:: superannotate.rename_folder
3837
.. autofunction:: superannotate.upload_images_to_project
3938
.. autofunction:: superannotate.attach_image_urls_to_project
4039
.. autofunction:: superannotate.upload_images_from_public_urls_to_project
41-
.. autofunction:: superannotate.upload_images_from_s3_bucket_to_project
4240
.. autofunction:: superannotate.attach_document_urls_to_project
4341
.. autofunction:: superannotate.upload_image_to_project
4442
.. autofunction:: superannotate.delete_annotations
@@ -51,10 +49,7 @@ ________
5149
.. autofunction:: superannotate.upload_annotations_from_folder_to_project
5250
.. autofunction:: superannotate.upload_preannotations_from_folder_to_project
5351
.. autofunction:: superannotate.share_project
54-
.. autofunction:: superannotate.unshare_project
5552
.. autofunction:: superannotate.get_project_settings
56-
.. autofunction:: superannotate.set_project_settings
57-
.. autofunction:: superannotate.get_project_default_image_quality_in_editor
5853
.. autofunction:: superannotate.set_project_default_image_quality_in_editor
5954
.. autofunction:: superannotate.get_project_workflow
6055
.. autofunction:: superannotate.set_project_workflow
@@ -79,32 +74,21 @@ ______
7974
.. autofunction:: superannotate.search_images
8075
.. autofunction:: superannotate.search_images_all_folders
8176
.. autofunction:: superannotate.get_image_metadata
82-
.. autofunction:: superannotate.get_image_bytes
8377
.. autofunction:: superannotate.download_image
8478
.. autofunction:: superannotate.set_image_annotation_status
8579
.. autofunction:: superannotate.set_images_annotation_statuses
8680
.. autofunction:: superannotate.get_image_annotations
87-
.. autofunction:: superannotate.get_image_preannotations
8881
.. autofunction:: superannotate.download_image_annotations
89-
.. autofunction:: superannotate.download_image_preannotations
9082
.. autofunction:: superannotate.upload_image_annotations
9183
.. autofunction:: superannotate.copy_image
9284
.. autofunction:: superannotate.copy_images
93-
.. autofunction:: superannotate.move_image
9485
.. autofunction:: superannotate.move_images
9586
.. autofunction:: superannotate.pin_image
9687
.. autofunction:: superannotate.assign_images
97-
.. autofunction:: superannotate.delete_image
9888
.. autofunction:: superannotate.delete_images
9989
.. autofunction:: superannotate.add_annotation_bbox_to_image
100-
.. autofunction:: superannotate.add_annotation_polygon_to_image
101-
.. autofunction:: superannotate.add_annotation_polyline_to_image
10290
.. autofunction:: superannotate.add_annotation_point_to_image
103-
.. autofunction:: superannotate.add_annotation_ellipse_to_image
104-
.. autofunction:: superannotate.add_annotation_template_to_image
105-
.. autofunction:: superannotate.add_annotation_cuboid_to_image
10691
.. autofunction:: superannotate.add_annotation_comment_to_image
107-
.. autofunction:: superannotate.create_fuse_image
10892

10993
----------
11094

@@ -114,7 +98,6 @@ __________________
11498
.. autofunction:: superannotate.create_annotation_class
11599
.. _ref_create_annotation_classes_from_classes_json:
116100
.. autofunction:: superannotate.create_annotation_classes_from_classes_json
117-
.. autofunction:: superannotate.get_annotation_class_metadata
118101
.. autofunction:: superannotate.search_annotation_classes
119102
.. autofunction:: superannotate.download_annotation_classes_json
120103
.. autofunction:: superannotate.delete_annotation_class
@@ -126,21 +109,15 @@ _________________
126109

127110
.. autofunction:: superannotate.get_team_metadata
128111
.. autofunction:: superannotate.invite_contributor_to_team
129-
.. autofunction:: superannotate.delete_contributor_to_team_invitation
130112
.. autofunction:: superannotate.search_team_contributors
131113

132114
----------
133115

134116
Neural Network
135117
_______________
136118

137-
.. autofunction:: superannotate.delete_model
138119
.. autofunction:: superannotate.download_model
139-
.. autofunction:: superannotate.plot_model_metrics
140120
.. autofunction:: superannotate.run_prediction
141-
.. autofunction:: superannotate.run_segmentation
142-
.. autofunction:: superannotate.run_training
143-
.. autofunction:: superannotate.stop_model_training
144121
.. autofunction:: superannotate.search_models
145122

146123
----------
@@ -301,7 +278,6 @@ _________________________________________________________________
301278
.. autofunction:: superannotate.import_annotation
302279
.. autofunction:: superannotate.export_annotation
303280
.. autofunction:: superannotate.convert_project_type
304-
.. autofunction:: superannotate.coco_split_dataset
305281
.. autofunction:: superannotate.convert_json_version
306282

307283

@@ -311,19 +287,9 @@ _________________________________________________________________
311287
Working with annotations
312288
________________________
313289

314-
.. _ref_add_annotation_bbox_to_json:
315-
.. autofunction:: superannotate.validate_annotations
316-
.. autofunction:: superannotate.add_annotation_bbox_to_json
317-
.. autofunction:: superannotate.add_annotation_polygon_to_json
318-
.. autofunction:: superannotate.add_annotation_polyline_to_json
319-
.. autofunction:: superannotate.add_annotation_point_to_json
320-
.. autofunction:: superannotate.add_annotation_ellipse_to_json
321-
.. autofunction:: superannotate.add_annotation_template_to_json
322-
.. autofunction:: superannotate.add_annotation_cuboid_to_json
323-
.. autofunction:: superannotate.add_annotation_comment_to_json
324290
.. _ref_aggregate_annotations_as_df:
291+
.. autofunction:: superannotate.validate_annotations
325292
.. autofunction:: superannotate.aggregate_annotations_as_df
326-
.. autofunction:: superannotate.df_to_annotations
327293

328294
----------
329295

@@ -337,6 +303,5 @@ _____________________________________________________________
337303
Utility functions
338304
--------------------------------
339305

340-
.. autofunction:: superannotate.dicom_to_rgb_sequence
341306
.. autofunction:: superannotate.consensus
342307
.. autofunction:: superannotate.benchmark

docs/source/tutorial.sdk.rst

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,6 @@ each JSON a mask image file should be present with the name
226226
:file:`"<image_name>___save.png"`. Image with :file:`<image_name>` should
227227
already be present in the project for the upload to work.
228228

229-
You can add an annotation to local annotations JSON with:
230-
231-
.. code-block:: python
232-
233-
sa.add_annotation_bbox_to_json("<path_to_json>", [10, 10, 100, 100],
234-
"Human")
235-
236-
237229

238230
Exporting projects
239231
__________________
@@ -380,33 +372,12 @@ To download image annotations:
380372
381373
sa.download_image_annotations(project, image, "<path_to_local_dir>")
382374
383-
After the image annotations are downloaded, you can add annotations to it:
384-
385-
.. code-block:: python
386-
387-
sa.add_annotation_bbox_to_json("<path_to_json>", [10, 10, 100, 100],
388-
"Human")
389-
390-
and upload back to the platform with:
375+
Upload back to the platform with:
391376

392377
.. code-block:: python
393378
394379
sa.upload_image_annotations(project, image, "<path_to_json>")
395380
396-
Last two steps can be combined into one:
397-
398-
.. code-block:: python
399-
400-
sa.add_annotation_bbox_to_image(project, image, [10, 10, 100, 100], "Human")
401-
402-
but if bulk changes are made to many images it is much faster to add all required
403-
annotations using :ref:`add_annotation_bbox_to_json
404-
<ref_add_annotation_bbox_to_json>`
405-
then upload them using
406-
:ref:`upload_annotations_from_folder_to_project
407-
<ref_upload_images_from_folder_to_project>`.
408-
409-
410381
----------
411382

412383

@@ -453,13 +424,6 @@ Example of created DataFrame:
453424
Each row represents annotation information. One full annotation with multiple
454425
attribute groups can be grouped under :code:`instanceId` field.
455426

456-
To transform back pandas DataFrame annotations to SuperAnnotate format annotation:
457-
458-
.. code-block:: python
459-
460-
sa.df_to_annotations(filtered_df, "<path_to_output_folder>")
461-
462-
463427
----------
464428

465429

@@ -486,14 +450,6 @@ Aggregated distribution is returned as pandas dataframe with columns className a
486450
Working with DICOM files
487451
_______________________________________________________
488452

489-
490-
To convert DICOM file images to JPEG images:
491-
492-
493-
.. code-block:: python
494-
495-
df = sa.dicom_to_rgb_sequence("<path_to_dicom_file>", "<path_to_output_dir>")
496-
497453
JPEG images with names :file:`<dicom_file_name>_<frame_num>.jpg` will be created
498454
in :file:`<path_to_output_dir>`. Those JPEG images can be uploaded to
499455
SuperAnnotate platform using the regular:

requirements_dev.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ tox==3.24.2
33
pytest==6.2.4
44
pytest-xdist==2.3.0
55
pytest-parallel==0.1.0
6-
pytest-rerunfailures==10.2
6+
pytest-rerunfailures==10.2
7+
sphinx_rtd_theme==1.0.0

sample_scripts/apply_preannotation.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)