Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
b6e6317
changes in entities to backend response independent
Apr 27, 2023
5d79b22
changes in class entity logic
May 2, 2023
6e562b1
Merge pull request #605 from superannotateai/1935_serializers
nareksa May 2, 2023
a01dcd8
jsonschema upgrade
VaghinakDev May 2, 2023
793f7c0
Fix merge conflict
VaghinakDev May 2, 2023
884a496
Merge branch 'develop' into HEAD
VaghinakDev May 2, 2023
caafaac
Merge branch 'friday' into 1939_jsonschema
VaghinakDev May 2, 2023
2e97079
Issue fix
VaghinakDev May 3, 2023
10315fa
tod
VaghinakDev May 2, 2023
b72137d
Merge pull request #606 from superannotateai/1939_jsonschema
VaghinakDev May 3, 2023
f467ae2
jsonschema upgrade
VaghinakDev May 2, 2023
15cb6fc
Merge pull request #607 from superannotateai/392_per_frame
VaghinakDev May 3, 2023
6650887
fix unit tests
VaghinakDev May 3, 2023
5e21d9d
Remove SAServer
VaghinakDev May 3, 2023
3c06c21
Remove SAServer
VaghinakDev May 3, 2023
ba1bca0
requirements upgrade
May 3, 2023
cd01c8b
Merge branch 'friday' into 1944_dependencies
VaghinakDev May 4, 2023
a14ad12
Merge pull request #608 from superannotateai/1944_dependencies
VaghinakDev May 4, 2023
fd18915
service response serialzier update
VaghinakDev May 5, 2023
0980bcc
upgrade requests lib
May 12, 2023
602e380
Update __init__.py
nareksa May 12, 2023
c7a8f5a
Update __init__.py
nareksa May 12, 2023
1b39762
Update __init__.py
VaghinakDev May 12, 2023
042ae28
Remoed count and is_multiselect from classes
May 19, 2023
f45a0b6
added tests for document projects
VaghinakDev May 22, 2023
58a84d0
fix in http_client paginate function
May 22, 2023
27fa100
Merge pull request #609 from superannotateai/1962_default_key
nareksa May 22, 2023
4b25c51
Merge pull request #610 from superannotateai/doc_approve_test
nareksa May 22, 2023
97a3ed2
Merge pull request #612 from superannotateai/1966_fix
nareksa May 23, 2023
2d0e2b7
Update __init__.py
nareksa May 23, 2023
980ed1f
fixed issue add duplicate items to subset
May 24, 2023
4b25321
Merge pull request #613 from superannotateai/1964_fix
nareksa May 24, 2023
29fed50
Update __init__.py
nareksa May 24, 2023
455afb4
fixed logs issue add duplicate items to subset
May 24, 2023
4ef9a3e
Update __init__.py
nareksa May 25, 2023
24fb61c
Updated export_annotation
VaghinakDev May 25, 2023
b4d4c21
change download_annotations files path logic and remove postfixes
May 25, 2023
bd58bc2
Merge pull request #615 from superannotateai/1950_download_annotations
nareksa May 26, 2023
a080beb
removed _objects, _pixel postfixes in download_image_annotations and …
May 26, 2023
84b7de6
added import_annotations test cases
May 30, 2023
356ae15
Merge pull request #614 from superannotateai/1970_export
nareksa May 30, 2023
9c7dbc3
Merge pull request #616 from superannotateai/1969_import
nareksa May 30, 2023
6d72892
added download_annotations path expanduser logic, changed convert_pro…
May 31, 2023
b975864
Merge pull request #617 from superannotateai/1950_download_annotations
nareksa May 31, 2023
a89ea55
Added export tests
VaghinakDev May 31, 2023
3d50b44
Merge pull request #618 from superannotateai/export_test
nareksa May 31, 2023
5fb7be4
fix in tests
May 31, 2023
26ffd92
Update __init__.py
nareksa May 31, 2023
f4c20a3
Added changelog
VaghinakDev Jun 1, 2023
520750e
fix in export upload s3 test
Jun 1, 2023
231a808
Merge pull request #620 from superannotateai/changelog_update
nareksa Jun 1, 2023
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
21 changes: 18 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,33 @@ History

All release highlights of this project will be documented in this file.

4.4.13 - June 04, 2023
_______________________

**Updated**

- ``SAClient.download_annotations()`` Replaced `___objects.json` and `___pixel.json` postfixes to `.json`.
- ``SAClient.set_approval_statuses()`` Added Document project support.
- ``SAClient.convert_project_type()`` Added required argument `convert_to`.
- ``SAClient.import_annotation()`` Replaced `___objects.json` and `___pixel.json` postfixes to `.json`.
- ``SAClient.download_export()`` Replaced `___objects.json` and `___pixel.json` postfixes to `.json`.

**Removed**

- ``SAClient.convert_json_version()`` method.

4.4.12 - April 23, 2023
______________________
_______________________

**Updated**

- ``SAClient.get_annotations_per_frame()`` Added interpolation of polygonal and polyline annotations.

**Fixed**

- ``SAClient.add_contributors_to_project()`` method.
- ``SAClient.run_prediction()`` method.

**Removed**

- ``SAClient.create_project_from_metadata()`` method.
Expand Down
16 changes: 13 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Welcome to the SuperAnnotate Python Software Development Kit (SDK), which enable
Resources
---------------

- API Reference and User Guide available on `Read the Docs <https://superannotate.readthedocs.io/en/stable/superannotate.sdk.html>`__
- API Reference and User Guide available on `Read the Docs <https://superannotate.readthedocs.io/en/stable/index.html>`__
- `Platform documentation <https://doc.superannotate.com/>`__


Expand All @@ -33,8 +33,18 @@ Authentication
# by token
sa_client = SAClient(token='<team token>')
# by config file
# default path is ~/.superannotate/config.json
sa_client = SAClient(config_path='~/.superannotate/dev_config.json')
# default path is ~/.superannotate/config.ini
sa_client = SAClient(config_path='~/.superannotate/dev_config.ini')


config.ini example
---------------
.. code-block:: python

[DEFAULT]
SA_TOKEN = <Token>
LOGGING_LEVEL = INFO


Using superannotate
-------------------
Expand Down
1 change: 0 additions & 1 deletion docs/source/api_reference/helpers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ _________________________________________________________________
.. autofunction:: superannotate.import_annotation
.. autofunction:: superannotate.export_annotation
.. autofunction:: superannotate.convert_project_type
.. autofunction:: superannotate.convert_json_version

----------

Expand Down
14 changes: 0 additions & 14 deletions docs/source/cli_client.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,6 @@ To initialize CLI (and SDK) with team token:
----------


.. _ref_create_server:

Creating a server
~~~~~~~~~~~~~~~~~~

This will create a directory by the given name in your current or provided directory:

.. code-block:: bash

superannotatecli create-server --name <directory_name> --path <directory_path>

----------


.. _ref_create_project:

Creating a project
Expand Down
1 change: 0 additions & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
User guide <userguide/index>
API Reference <api_reference/index>
CLI Reference <cli_client>
SA Server <sa_server>
History <changelog_link>
LICENSE.rst

Expand Down
118 changes: 0 additions & 118 deletions docs/source/sa_server.rst

This file was deleted.

32 changes: 12 additions & 20 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
pydicom>=2.0.0
boto3>=1.14.53
requests==2.28.2
requests-toolbelt>=0.9.1
aiohttp>=3.8.1
pydantic~=1.10
aiohttp~=3.8
boto3~=1.26
opencv-python~=4.7
packaging~=23.1
plotly~=5.14
email-validator~=2.0
pandas~=1.3
ffmpeg-python~=0.2
pillow~=9.5
aiofiles==23.1.0
requests==2.30.0
tqdm==4.64.0
pillow==9.4.0
matplotlib>=3.3.1
xmltodict==0.12.0
opencv-python>=4.4.0.42
wheel>=0.40.0
packaging>=20.4
plotly>=4.1.0
ffmpeg-python>=0.2.0
fire==0.4.0
mixpanel==4.8.3
pydantic>=1.10.7
setuptools>=57.4.0
email-validator>=1.0.3
jsonschema==3.2.0
pandas>=1.1.4
aiofiles==0.8.0
Werkzeug==2.2.3
Jinja2==3.1.2
20 changes: 11 additions & 9 deletions requirements_extra.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
Sphinx==6.1.3
Jinja2==3.1.2
tox==4.4.5
setuptools~=67.7
wheel~=0.40
Sphinx==6.2.1
tox==4.5.1
sphinx_rtd_theme==1.2.0
furo==2022.12.7
jaraco.tidelift==1.5.0
furo==2023.3.27
jaraco.tidelift==1.5.1
sphinx-notfound-page==0.8.3
sphinx_inline_tabs==2022.1.2b11
pytest==7.2.1
pytest-xdist==3.2.0
sphinx_inline_tabs==2023.4.21
pytest==7.3.1
pytest-xdist==3.2.1
pytest-parallel==0.1.1
pytest-cov==4.0.0
pytest-rerunfailures==10.2
pytest-rerunfailures==11.1.2
jsoncomparison==1.1.0
17 changes: 1 addition & 16 deletions src/superannotate/__init__.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
import logging
import os
import sys
import typing

__version__ = "4.4.12"

__version__ = "4.4.13dev5"

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

import logging.config # noqa
import requests # noqa
from packaging.version import parse # noqa
from superannotate.lib.app.input_converters import convert_json_version # noqa
from superannotate.lib.app.input_converters import convert_project_type # noqa
from superannotate.lib.app.exceptions import AppException # noqa
from superannotate.lib.app.input_converters import convert_json_version # noqa
from superannotate.lib.app.input_converters import convert_project_type # noqa
from superannotate.lib.app.input_converters import export_annotation # noqa
from superannotate.lib.app.input_converters import import_annotation # noqa
from superannotate.lib.app.interface.sdk_interface import SAClient # noqa
from superannotate.lib.app.server import SAServer # noqa
from superannotate.lib.app.server.utils import setup_app # noqa
from superannotate.lib.core import PACKAGE_VERSION_INFO_MESSAGE # noqa
from superannotate.lib.core import PACKAGE_VERSION_MAJOR_UPGRADE # noqa
from superannotate.lib.core import PACKAGE_VERSION_UPGRADE # noqa
Expand All @@ -29,22 +23,13 @@
SESSIONS = {}


def create_app(apps: typing.List[str] = None) -> SAServer:
setup_app(apps)
server = SAServer()
return server


__all__ = [
"__version__",
"SAClient",
"SAServer",
"create_app",
# Utils
"enums",
"AppException",
# converters
"convert_json_version",
"import_annotation",
"export_annotation",
"convert_project_type",
Expand Down
2 changes: 0 additions & 2 deletions src/superannotate/lib/app/input_converters/__init__.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
from .conversion import convert_json_version
from .conversion import convert_project_type
from .conversion import export_annotation
from .conversion import import_annotation


__all__ = [
"convert_json_version",
"convert_project_type",
"export_annotation",
"import_annotation",
Expand Down
Loading