Merge pull request #394 from superannotateai/friday

Friday

Author: VaghinakDev

docs/source/superannotate.sdk.rst

@@ -61,6 +61,8 @@ Exports
 _______
 
 .. autofunction:: superannotate.prepare_export
+.. autofunction:: superannotate.get_annotations
+.. autofunction:: superannotate.get_annotations_per_frame
 .. _ref_download_export:
 .. autofunction:: superannotate.download_export
 .. autofunction:: superannotate.get_exports

pytest.ini

@@ -2,4 +2,4 @@
 minversion = 3.0
 log_cli=true
 python_files = test_*.py
-addopts = -n auto --dist=loadscope
+;addopts = -n auto --dist=loadscope

requirements.txt

@@ -18,4 +18,5 @@ mixpanel==4.8.3
 pydantic>=1.8.2
 pydantic[email]
 setuptools~=57.4.0
-superannotate_schemas
+aiohttp==3.8.1
+

requirements_dev.txt

@@ -1,8 +1,2 @@
-Sphinx==3.1.2
-tox==3.24.2
-pytest==6.2.4
-pytest-xdist==2.3.0
-pytest-parallel==0.1.0
-pytest-rerunfailures==10.2
-sphinx_rtd_theme==1.0.0
+superannotate_schemas>=1.0.38.b1
 

requirements_extra.txt

@@ -1,2 +1,7 @@
 Sphinx==3.1.2
 tox==3.24.2
+pytest==6.2.4
+pytest-xdist==2.3.0
+pytest-parallel==0.1.0
+pytest-rerunfailures==10.2
+sphinx_rtd_theme==1.0.0

requirements_prod.txt

@@ -0,0 +1 @@
+superannotate_schemas=1.0.39

setup.py

@@ -1,25 +1,24 @@
 import sys
 
+from packaging.version import parse
 from setuptools import find_packages, setup
 
 
 with open('src/superannotate/version.py') as f:
     version = f.read().rstrip()[15:-1]
 
+requirements_path = "requirements_{}.txt".format('dev' if parse(version).is_prerelease else 'prod')
+requirements = []
 
-with open('requirements.txt') as f:
-    requirements = f.read()
-requirements = requirements.splitlines()
+with open(requirements_path) as f:
+    requirements.extend(f.read().splitlines())
 
-if sys.platform == 'linux':
-    with open('requirements_extra.txt') as f:
-        requirements_extra = f.read()
-
-    requirements_extra = requirements_extra.splitlines()
-    requirements += requirements_extra
+with open("requirements.txt") as f:
+    requirements.extend(f.read().splitlines())
 
 with open('README.md') as f:
     readme = f.read()
+
 readme = "\n".join(readme.split('\n')[2:])
 
 

src/superannotate/__init__.py

@@ -4,8 +4,8 @@
 
 import requests
 import superannotate.lib.core as constances
-from superannotate.lib import get_default_controller
 from packaging.version import parse
+from superannotate.lib import get_default_controller
 from superannotate.lib.app.analytics.class_analytics import class_distribution
 from superannotate.lib.app.exceptions import AppException
 from superannotate.lib.app.input_converters.conversion import convert_json_version
@@ -50,6 +50,7 @@
 from superannotate.lib.app.interface.sdk_interface import download_image
 from superannotate.lib.app.interface.sdk_interface import download_image_annotations
 from superannotate.lib.app.interface.sdk_interface import download_model
+from superannotate.lib.app.interface.sdk_interface import get_annotations
 from superannotate.lib.app.interface.sdk_interface import get_exports
 from superannotate.lib.app.interface.sdk_interface import get_folder_metadata
 from superannotate.lib.app.interface.sdk_interface import get_image_annotations
@@ -107,7 +108,6 @@
 )
 from superannotate.lib.app.interface.sdk_interface import validate_annotations
 from superannotate.logger import get_default_logger
-from superannotate.lib.infrastructure.controller import Controller
 from superannotate.version import __version__
 
 
@@ -128,6 +128,8 @@
     "class_distribution",
     "aggregate_annotations_as_df",
     "get_exports",
+    # annotations
+    "get_annotations",
     # converters
     "convert_json_version",
     "import_annotation",

src/superannotate/lib/__init__.py

@@ -9,4 +9,3 @@
 def get_default_controller():
     from lib.infrastructure.controller import Controller
     return Controller.get_default()
-

src/superannotate/lib/app/analytics/aggregators.py

@@ -1,13 +1,13 @@
 import copy
 import json
-from dataclasses import dataclass
 from pathlib import Path
 from typing import List
 from typing import Optional
 from typing import Union
 
 import lib.core as constances
 import pandas as pd
+from dataclasses import dataclass
 from lib.app.exceptions import AppException
 from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from lib.core import PIXEL_ANNOTATION_POSTFIX