Merge pull request #712 from superannotateai/FRIDAY_3118

Friday 3118

Author: VaghinakDev

.gitignore

@@ -13,6 +13,7 @@ __pycache__/
 # Distribution / packaging
 .Python
 build/
+
 develop-eggs/
 dist/
 downloads/

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: 'https://github.com/asottile/reorder_python_imports'
-    rev: v2.3.0
+    rev: v3.13.0
     hooks:
       - id: reorder-python-imports
         exclude: src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters
@@ -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,W605
+          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712,E123,E131,F821,E121,W605,E402
   - repo: 'https://github.com/asottile/pyupgrade'
     rev: v2.4.3
     hooks:
@@ -48,6 +48,19 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
         files: \.rst$
+#  - repo: https://github.com/pre-commit/mirrors-mypy
+#    rev: v1.11.2
+#    hooks:
+#      - id: mypy
+#        additional_dependencies: [ types-six ]
+#  - repo: 'https://github.com/PyCQA/pylint'
+#    rev: v2.13.9
+#    hooks:
+#      - id: pylint
+#        name: Python Linter (pylint)
+#        exclude: tests/|src/lib/app/converters/|src/lib/app/analytics/|src/lib/app/input_converters/
+#        args:
+#          - '--disable=R0903,C0111,C0301,W0703,R0914,R0801,R0913,E0401,W0511,C0413,R0902,C0103,W0201,C0209,W1203,W0707,C0415,W0611'
 #  - repo: 'https://github.com/asottile/dead'
 #    rev: v1.3.0
 #    hooks:

.pylintrc

@@ -0,0 +1,2 @@
+[VARIABLES]
+good-names=i,j,k,e,x,y,z,a,b,f,sa

docs/source/api_reference/api_item.rst

@@ -5,6 +5,7 @@ Items
 
 .. automethod:: superannotate.SAClient.query
 .. automethod:: superannotate.SAClient.get_item_by_id
+.. automethod:: superannotate.SAClient.list_items
 .. automethod:: superannotate.SAClient.search_items
 .. automethod:: superannotate.SAClient.attach_items
 .. automethod:: superannotate.SAClient.copy_items

docs/source/api_reference/api_metadata.rst

@@ -28,6 +28,21 @@ Project metadata example:
    }
 
 
+----------
+
+Folder metadata
+_________________
+
+Folder metadata example:
+
+.. code-block:: python
+
+   {
+    "name": "Example folder",
+    "status": "NotStarted"
+   }
+
+
 ----------
 
 Setting metadata
@@ -114,8 +129,6 @@ Image metadata example:
    {
       "name": "000000000001.jpg",
       "annotation_status": "Completed",
-      "prediction_status": "NotStarted",
-      "segmentation_status": "NotStarted",
       "annotator_id": None,
       "annotator_name": None,
       "qa_id": None,

docs/source/api_reference/api_project.rst

@@ -22,5 +22,7 @@ Projects
 .. automethod:: superannotate.SAClient.add_contributors_to_project
 .. automethod:: superannotate.SAClient.get_project_settings
 .. automethod:: superannotate.SAClient.set_project_default_image_quality_in_editor
+.. automethod:: superannotate.SAClient.set_project_steps
+.. automethod:: superannotate.SAClient.get_project_steps
 .. automethod:: superannotate.SAClient.set_project_workflow
 .. automethod:: superannotate.SAClient.get_project_workflow

pytest.ini

@@ -4,4 +4,3 @@ log_cli=true
 python_files = test_*.py
 ;pytest_plugins = ['pytest_profiling']
 ;addopts = -n auto --dist=loadscope
-

setup.py

@@ -6,13 +6,14 @@
 
 
 def get_version():
-    init = open(
+    with 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)
+    ) as f:
+        init = f.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()
@@ -22,6 +23,8 @@ def get_version():
 with open("requirements.txt") as f:
     requirements.extend(f.read().splitlines())
 
+with open("README.rst") as f:
+    long_description = f.read()
 
 setup(
     name="superannotate",
@@ -38,7 +41,7 @@ def get_version():
     author="SuperAnnotate AI",
     author_email="support@superannotate.com",
     url="https://github.com/superannotateai/superannotate-python-sdk",
-    long_description=open("README.rst").read(),
+    long_description=long_description,
     long_description_content_type="text/x-rst",
     install_requires=requirements,
     setup_requires=["wheel"],

src/superannotate/__init__.py

@@ -3,23 +3,23 @@
 import sys
 
 
-__version__ = "4.4.24"
+__version__ = "4.4.25dev1"
 
+os.environ.update({"sa_version": __version__})
 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_project_type  # noqa
-from superannotate.lib.app.exceptions import AppException  # 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.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
-import superannotate.lib.core.enums as enums  # noqa
+import requests
+from lib.core import enums
+from packaging.version import parse
+from lib.core import PACKAGE_VERSION_UPGRADE
+from lib.core import PACKAGE_VERSION_INFO_MESSAGE
+from lib.core import PACKAGE_VERSION_MAJOR_UPGRADE
+from lib.core.exceptions import AppException
+from lib.app.input_converters import convert_project_type
+from lib.app.input_converters import export_annotation
+from lib.app.input_converters import import_annotation
+from lib.app.interface.sdk_interface import SAClient
+
 
 SESSIONS = {}
 
@@ -30,7 +30,6 @@
     # Utils
     "enums",
     "AppException",
-    # converters
     "import_annotation",
     "export_annotation",
     "convert_project_type",
@@ -62,5 +61,5 @@ def log_version_info():
             logging.warning(PACKAGE_VERSION_UPGRADE.format(local_version, pip_version))
 
 
-if not os.environ.get("SA_VERSION_CHECK", "True").lower() == "false":
+if os.environ.get("SA_VERSION_CHECK", "True").lower() != "false":
     log_version_info()

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

@@ -9,9 +9,9 @@
 
 import lib.core as constances
 import pandas as pd
-from lib.app.exceptions import AppException
 from lib.core import PIXEL_ANNOTATION_POSTFIX
 from lib.core import VECTOR_ANNOTATION_POSTFIX
+from lib.core.exceptions import AppException
 
 logger = logging.getLogger("sa")
 
@@ -210,16 +210,16 @@ def aggregate_annotations_as_df(self):
             constances.ProjectType.PIXEL,
         ):
             return self.aggregate_image_annotations_as_df(annotation_paths)
-        elif self.project_type is constances.ProjectType.VIDEO:
+        if self.project_type is constances.ProjectType.VIDEO:
             return self.aggregate_video_annotations_as_df(annotation_paths)
-        elif self.project_type is constances.ProjectType.DOCUMENT:
+        if self.project_type is constances.ProjectType.DOCUMENT:
             return self.aggregate_document_annotations_as_df(annotation_paths)
-        else:
-            raise AppException(
-                f"The function is not supported for {self.project_type.name} projects."
-            )
+        raise AppException(
+            f"The function is not supported for {self.project_type.name} projects."
+        )
 
-    def __add_attributes_to_raws(self, raws, attributes, element_raw):
+    @staticmethod
+    def __add_attributes_to_raws(raws, attributes, element_raw):
         for attribute_id, attribute in enumerate(attributes):
             attribute_raw = copy.copy(element_raw)
             attribute_raw.attributeId = attribute_id
@@ -366,8 +366,8 @@ def aggregate_document_annotations_as_df(self, annotation_paths: List[str]):
         return df.where(pd.notnull(df), None)
 
     def aggregate_image_annotations_as_df(self, annotations_paths: List[str]):
-
-        classes_json = json.load(open(self.classes_path))
+        with open(self.classes_path) as f:
+            classes_json = json.load(f)
         class_name_to_color = {}
         class_group_name_to_values = {}
         rows = []