Merge pull request #477 from superannotateai/friday

Friday

Author: VaghinakDev

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
         name: Style Guide Enforcement (flake8)
         args:
           - '--max-line-length=120'
-          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712,E123,E131,F821,E121
+          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712,E123,E131,F821,E121,W605
   - repo: 'https://github.com/asottile/pyupgrade'
     rev: v2.4.3
     hooks:

docs/source/superannotate.sdk.rst

@@ -79,6 +79,17 @@ ______
 
 ----------
 
+Custom Metadata
+______
+
+.. automethod:: superannotate.SAClient.create_custom_fields
+.. automethod:: superannotate.SAClient.get_custom_fields
+.. automethod:: superannotate.SAClient.delete_custom_fields
+.. automethod:: superannotate.SAClient.upload_custom_values
+.. automethod:: superannotate.SAClient.delete_custom_values
+
+----------
+
 Subsets
 ______
 
@@ -96,8 +107,6 @@ ______
 .. automethod:: superannotate.SAClient.upload_image_annotations
 .. automethod:: superannotate.SAClient.copy_image
 .. automethod:: superannotate.SAClient.pin_image
-.. automethod:: superannotate.SAClient.assign_images
-.. automethod:: superannotate.SAClient.delete_images
 .. automethod:: superannotate.SAClient.add_annotation_bbox_to_image
 .. automethod:: superannotate.SAClient.add_annotation_point_to_image
 .. automethod:: superannotate.SAClient.add_annotation_comment_to_image

pytest.ini

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

setup.py

@@ -1,11 +1,20 @@
-from packaging.version import parse
+import os
+import re
+
 from setuptools import find_packages, setup
 
 
-with open('src/superannotate/version.py') as f:
-    version = f.read().rstrip()[15:-1]
+def get_version():
+    init = open(os.path.join(os.path.dirname(__file__), 'src', 'superannotate', '__init__.py')).read()
+    version_re = re.compile(r'''__version__ = ["']((\d+)\.(\d+)\.(\d+)((dev(\d+))?(b(\d+))?))['"]''')
+    return version_re.search(init).group(1)
+
+
+sdk_version = get_version()
+
+
+requirements_path = "requirements_{}.txt".format('dev' if 'dev' in sdk_version else 'prod')
 
-requirements_path = "requirements_{}.txt".format('dev' if parse(version).is_prerelease else 'prod')
 requirements = []
 
 with open("requirements.txt") as f:
@@ -23,14 +32,13 @@
 
 setup(
     name='superannotate',
-    version=version,
+    version=sdk_version,
     package_dir={"": "src"},
     package_data={"superannotate": ["logging.conf"]},
     packages=find_packages(where="src"),
     description='Python SDK to SuperAnnotate platform',
     license='MIT',
     author='SuperAnnotate AI',
-    author_email='vaghinak@superannotate.com',
     url='https://github.com/superannotateai/superannotate-python-sdk',
     long_description=readme,
     long_description_content_type='text/markdown',
@@ -40,5 +48,17 @@
     entry_points={
         'console_scripts': ['superannotatecli = superannotate.lib.app.bin.superannotate:main']
     },
-    python_requires='>=3.6'
+    classifiers=[
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+    ],
+    project_urls={
+        'Documentation': 'https://superannotate.readthedocs.io/en/stable/',
+    },
+    python_requires='>=3.7'
 )

src/superannotate/__init__.py

@@ -1,6 +1,8 @@
 import os
 import sys
 
+__version__ = "4.4.1dev10"
+
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 
 import logging.config  # noqa
@@ -19,7 +21,6 @@
 from superannotate.lib.core import PACKAGE_VERSION_MAJOR_UPGRADE  # noqa
 from superannotate.lib.core import PACKAGE_VERSION_UPGRADE  # noqa
 from superannotate.logger import get_default_logger  # noqa
-from superannotate.version import __version__  # noqa
 import superannotate.lib.core.enums as enums  # noqa
 
 SESSIONS = {}

src/superannotate/lib/app/interface/base_interface.py

@@ -16,7 +16,7 @@
 from lib.infrastructure.controller import Controller
 from lib.infrastructure.repositories import ConfigRepository
 from mixpanel import Mixpanel
-from version import __version__
+from superannotate import __version__
 
 
 class BaseInterfaceFacade:
@@ -26,7 +26,11 @@ def __init__(self, token: str = None, config_path: str = None):
         version = os.environ.get("SA_VERSION", "v1")
         _token, _config_path = None, None
         _host = os.environ.get("SA_URL", constants.BACKEND_URL)
-        _ssl_verify = bool(os.environ.get("SA_SSL", True))
+        _ssl_verify = not os.environ.get("SA_SSL", "True").lower() in (
+            "false",
+            "f",
+            "0",
+        )
         if token:
             _token = Controller.validate_token(token=token)
         elif config_path:
@@ -37,6 +41,9 @@ def __init__(self, token: str = None, config_path: str = None):
                 _token, _host, _ssl_verify = self._retrieve_configs(
                     constants.CONFIG_PATH
                 )
+        _host = _host if _host else constants.BACKEND_URL
+        _ssl_verify = True if _ssl_verify is None else _ssl_verify
+
         self._token, self._host = _token, _host
         self.controller = Controller(_token, _host, _ssl_verify, version)
         BaseInterfaceFacade.REGISTRY.append(self)