Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
870c9a7
initial changes
VaghinakDev Oct 4, 2022
1c64404
Repositories deleted
VaghinakDev Oct 5, 2022
3589c00
fixing minor issues with add_to_subset
VahagnTKA Oct 7, 2022
7b9d097
changing inti to init and using relative imports
VahagnTKA Oct 7, 2022
37f6137
delete annotation class now works with AnnotationClassEntity everywhere
VahagnTKA Oct 7, 2022
a5e96c2
restructuring datetime isoformat, removing meta, making is_pinned a bool
VahagnTKA Oct 7, 2022
71ae8e3
checking if folder or image exist before trying to upload annotations
VahagnTKA Oct 7, 2022
9c81a1b
adding dispatchers to response serializers
VahagnTKA Oct 7, 2022
2a92d35
Merge pull request #510 from superannotateai/refactor
VaghinakDev Oct 12, 2022
15ee68f
fixing refactoring issues
VahagnTKA Oct 12, 2022
313a034
Merge pull request #511 from superannotateai/refactor
VaghinakDev Oct 13, 2022
3c786f6
fixing subset creation
VahagnTKA Oct 13, 2022
66fff8c
adding non verbose list and folder search in add_items_to_subset
VahagnTKA Oct 13, 2022
7c406be
Added upload_annotations, deprication msg for upload_preanntoations, …
VaghinakDev Oct 13, 2022
9818381
Merge branch 'friday' into friday_1250
VaghinakDev Oct 13, 2022
5c0be72
make validate
VahagnTKA Oct 13, 2022
b11d2e7
Merge pull request #513 from superannotateai/refactor
VaghinakDev Oct 13, 2022
b319ee8
Merge pull request #512 from superannotateai/friday_1250
VaghinakDev Oct 13, 2022
8f55231
fix exclude set creation
VaghinakDev Oct 13, 2022
cc0e905
Added empty array handeling (get_annotations)
VaghinakDev Oct 13, 2022
9b17d3b
fixed create_custom_fields
VaghinakDev Oct 13, 2022
3ee6336
Fixed get_item_metadat
VaghinakDev Oct 14, 2022
09844e0
Fixed invite_contributors_to_team
VaghinakDev Oct 14, 2022
b3fab1d
Fixed copy_items
VaghinakDev Oct 14, 2022
ac6b36b
Fixed add_annotation_bbox/comment/point_to image
VaghinakDev Oct 14, 2022
d342cea
Merge pull request #514 from superannotateai/friday_1416
VaghinakDev Oct 14, 2022
f6a4d1a
Merge pull request #515 from superannotateai/friday_1409
VaghinakDev Oct 14, 2022
c1e8d80
Merge pull request #516 from superannotateai/friday_1423
VaghinakDev Oct 14, 2022
e4a103b
Merge pull request #517 from superannotateai/friday_1421
VaghinakDev Oct 14, 2022
75dfd67
Merge pull request #518 from superannotateai/friday_1422
VaghinakDev Oct 14, 2022
2d03529
Merge pull request #519 from superannotateai/friday_1420
VaghinakDev Oct 14, 2022
45b05c6
fix copy_items
VaghinakDev Oct 14, 2022
e9f7caa
Merge fixes
VaghinakDev Oct 14, 2022
4bc5ca4
fix add contributors
VaghinakDev Oct 14, 2022
fd8fbe4
fixed get_project
VaghinakDev Oct 14, 2022
cf634aa
Fixed invite contributors
VaghinakDev Oct 14, 2022
494e465
Fixed project create
VaghinakDev Oct 14, 2022
d9df7dc
Fix logs
VaghinakDev Oct 14, 2022
e6d6f10
Fixed folder metadata
VaghinakDev Oct 14, 2022
62dde2d
Fixed folder list
VaghinakDev Oct 14, 2022
56186ad
Fixed project metadata
VaghinakDev Oct 14, 2022
c101f7f
Fixed folder search
VaghinakDev Oct 14, 2022
1b46064
Fix annotations download
VaghinakDev Oct 14, 2022
3375e3e
fix assign items
VaghinakDev Oct 14, 2022
99288d1
Fix folders download
VaghinakDev Oct 14, 2022
5e1d026
fix folder search
VaghinakDev Oct 14, 2022
21d4a0a
Fixed query builder
VaghinakDev Oct 17, 2022
6c1c024
Fix folders delete
VaghinakDev Oct 17, 2022
8820ff6
Fix annotations upload
VaghinakDev Oct 18, 2022
7462c0b
Fixed annotations download
VaghinakDev Oct 18, 2022
b39d1c7
Fix anntoations uplaod
VaghinakDev Oct 18, 2022
7bb70eb
Update __init__.py
VaghinakDev Oct 19, 2022
1f7653a
Update __init__.py
VaghinakDev Oct 19, 2022
8922781
Fix annotatoins upload order
VaghinakDev Oct 20, 2022
eb89d0a
Merge branch 'friday' of https://github.com/superannotateai/superanno…
VaghinakDev Oct 20, 2022
d56a717
Update __init__.py
VaghinakDev Oct 20, 2022
4923edc
Docs update
VaghinakDev Oct 20, 2022
1cb59ac
Merge branch 'develop' into friday
VaghinakDev Oct 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/source/superannotate.sdk.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ ________
.. automethod:: superannotate.SAClient.upload_images_to_project
.. automethod:: superannotate.SAClient.attach_items_from_integrated_storage
.. automethod:: superannotate.SAClient.upload_image_to_project
.. automethod:: superannotate.SAClient.upload_annotations
.. automethod:: superannotate.SAClient.delete_annotations
.. _ref_upload_images_from_folder_to_project:
.. automethod:: superannotate.SAClient.upload_images_from_folder_to_project
Expand Down
3 changes: 2 additions & 1 deletion src/superannotate/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import sys


__version__ = "4.4.5b1"
__version__ = "4.4.5b2"


sys.path.append(os.path.split(os.path.realpath(__file__))[0])

Expand Down
11 changes: 0 additions & 11 deletions src/superannotate/lib/app/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,3 @@ def tqdm_converter(total_num, images_converted, images_not_converted, finish_eve
else:
pbar.update(total_num - pbar.n)
break


def get_annotation_json_name(image_name, project_type):
if project_type == "Vector":
return image_name + "___objects.json"
else:
return image_name + "___pixel.json"


def get_annotation_png_name(image_name):
return image_name + "___save.png"
6 changes: 0 additions & 6 deletions src/superannotate/lib/app/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,3 @@ class PathError(AppException):
"""
User input Error
"""


class EmptyOutputError(AppException):
"""
Empty Output Error
"""
25 changes: 0 additions & 25 deletions src/superannotate/lib/app/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,17 @@
import uuid
from pathlib import Path
from typing import List
from typing import Optional
from typing import Tuple
from typing import Union

import boto3
import pandas as pd
from superannotate.lib.app.exceptions import AppException
from superannotate.lib.app.exceptions import PathError
from superannotate.lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
from superannotate.lib.core import PIXEL_ANNOTATION_POSTFIX
from superannotate.lib.core import VECTOR_ANNOTATION_POSTFIX


def split_project_path(project_path: str) -> Tuple[str, Optional[str]]:
path = Path(project_path)
if len(path.parts) > 3:
raise PathError("There can be no sub folders in the project")
elif len(path.parts) == 2:
project_name, folder_name = path.parts
else:
project_name, folder_name = path.name, ""

return project_name, folder_name


def extract_project_folder(user_input: Union[str, dict]) -> Tuple[str, Optional[str]]:
if isinstance(user_input, str):
return split_project_path(user_input)
elif isinstance(user_input, dict):
project_path = user_input.get("name")
if not project_path:
raise PathError("Invalid project path")
return split_project_path(user_input["name"])
raise PathError("Invalid project path")


def get_annotation_paths(folder_path, s3_bucket=None, recursive=False):
annotation_paths = []
if s3_bucket:
Expand Down
2 changes: 1 addition & 1 deletion src/superannotate/lib/app/interface/base_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
from typing import Tuple

import lib.core as constants
from lib.app.helpers import extract_project_folder
from lib.app.interface.types import validate_arguments
from lib.core import CONFIG
from lib.core.exceptions import AppException
from lib.infrastructure.controller import Controller
from lib.infrastructure.repositories import ConfigRepository
from lib.infrastructure.utils import extract_project_folder
from mixpanel import Mixpanel
from superannotate import __version__

Expand Down
2 changes: 1 addition & 1 deletion src/superannotate/lib/app/interface/cli_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

import lib.core as constances
from lib import __file__ as lib_path
from lib.app.helpers import split_project_path
from lib.app.input_converters.conversion import import_annotation
from lib.app.interface.sdk_interface import SAClient
from lib.core.entities import ConfigEntity
from lib.infrastructure.repositories import ConfigRepository
from lib.infrastructure.utils import split_project_path


class CLIFacade:
Expand Down
Loading