Merge pull request #622 from superannotateai/develop

Develop

Author: VaghinakDev

CHANGELOG.rst

@@ -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.

README.rst

@@ -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/>`__
 
 
@@ -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
 -------------------

docs/source/api_reference/helpers.rst

@@ -13,7 +13,6 @@ _________________________________________________________________
 .. autofunction:: superannotate.import_annotation
 .. autofunction:: superannotate.export_annotation
 .. autofunction:: superannotate.convert_project_type
-.. autofunction:: superannotate.convert_json_version
 
 ----------
 

docs/source/cli_client.rst

@@ -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

docs/source/index.rst

@@ -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
 

docs/source/sa_server.rst

@@ -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

requirements.txt

@@ -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

requirements_extra.txt

@@ -1,26 +1,20 @@
 import logging
 import os
 import sys
-import typing
-
-__version__ = "4.4.12"
 
+__version__ = "4.4.13b1"
 
 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
@@ -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",

src/superannotate/__init__.py

@@ -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",