superannotate 4.4.24.dev2__tar.gz → 4.4.25.dev2__tar.gz

{superannotate-4.4.24.dev2/src/superannotate.egg-info → superannotate-4.4.25.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: superannotate
-Version: 4.4.24.dev2
+Version: 4.4.25.dev2
 Summary: Python SDK to SuperAnnotate platform
 Home-page: https://github.com/superannotateai/superannotate-python-sdk
 Author: SuperAnnotate AI

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/setup.py

@@ -6,13 +6,14 @@ from setuptools import setup
 
 
 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 @@ requirements = []
 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 @@ setup(
     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"],

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/__init__.py

@@ -3,23 +3,23 @@ import os
 import sys
 
 
-__version__ = "4.4.24dev2"
+__version__ = "4.4.25dev2"
 
+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 @@ __all__ = [
     # 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()

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/analytics/aggregators.py

@@ -9,9 +9,9 @@ from typing import Union
 
 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 @@ class DataAggregator:
             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 @@ class DataAggregator:
         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 = []

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/analytics/common.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 import pandas as pd
 import plotly.express as px
-from lib.app.exceptions import AppException
+from lib.core.exceptions import AppException
 
 
 logger = logging.getLogger("sa")

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/common.py

@@ -54,8 +54,8 @@ def id2rgb(id_map):
 
 
 def write_to_json(output_path, json_data):
-    with open(output_path, "w") as fw:
-        json.dump(json_data, fw, indent=2)
+    with open(output_path, "w") as f:
+        json.dump(json_data, f, indent=2)
 
 
 MAX_IMAGE_SIZE = 100 * 1024 * 1024  # 100 MB limit

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/helpers.py

@@ -8,10 +8,10 @@ from typing import Union
 import boto3
 import numpy as np
 import pandas as pd
-from superannotate.lib.app.exceptions import AppException
-from superannotate.lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
-from superannotate.lib.core import PIXEL_ANNOTATION_POSTFIX
-from superannotate.lib.core import VECTOR_ANNOTATION_POSTFIX
+from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
+from lib.core import PIXEL_ANNOTATION_POSTFIX
+from lib.core import VECTOR_ANNOTATION_POSTFIX
+from lib.core.exceptions import AppException
 
 
 def get_annotation_paths(folder_path, s3_bucket=None, recursive=False):
@@ -77,50 +77,6 @@ def get_s3_annotation_paths(folder_path, s3_bucket, annotation_paths, recursive)
     return list(set(annotation_paths))
 
 
-def convert_column_to_lowercase(df, column_name):
-    actual_column_name = next(
-        (col for col in df.columns if col.lower() == column_name.lower()), None
-    )
-    if actual_column_name:
-        df = df.rename(columns={actual_column_name: column_name})
-    else:
-        raise Exception(f"Column '{column_name}' not found.")
-    return df
-
-
-def truncate_long_names(name, length=120):
-    if len(name) > length:
-        return name[:length]
-    else:
-        return name
-
-
-def get_gen_ai_csv_data(csv_path):
-    def serializer_name(val):
-        if not str(val).strip():
-            val = str(uuid.uuid4())
-        val = truncate_long_names(val)
-        return val
-
-    def df_preprocessing(df):
-        """
-        Convert the name column to lowercase
-        Fill all empty cells with empty strings
-        Truncating the name column or generating UUID for empties
-        :param df:
-        :return: df
-        """
-        df = convert_column_to_lowercase(df, "_item_name")
-        df = df.fillna("")
-        df["_item_name"] = df["_item_name"].apply(serializer_name)
-        return df
-
-    df = pd.read_csv(csv_path, engine="python", quotechar='"', dtype=str)
-    df = df.drop(columns=["_folder"], errors="ignore")
-    df = df_preprocessing(df)
-    return df.to_dict(orient="records")
-
-
 def get_name_url_duplicated_from_csv(csv_path):
     image_data = pd.read_csv(csv_path, dtype=str)
     image_data.replace({pd.NA: None}, inplace=True)
@@ -167,5 +123,5 @@ def wrap_error(errors_list: List[Tuple[str, str]]) -> str:
         _tabulation = tabulation - len(key)
         if not key:
             key, value, _tabulation = value, "", 0
-        msgs.append("{}{}{}".format(key, " " * _tabulation, value))
+        msgs.append(f'{key}{ " " * _tabulation}{value}')
     return "\n".join(msgs)

superannotate-4.4.25.dev2/src/superannotate/lib/app/input_converters/__init__.py

@@ -0,0 +1,10 @@
+from lib.app.input_converters.conversion import convert_project_type
+from lib.app.input_converters.conversion import export_annotation
+from lib.app.input_converters.conversion import import_annotation
+
+
+__all__ = [
+    "convert_project_type",
+    "export_annotation",
+    "import_annotation",
+]

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/input_converters/conversion.py

@@ -8,10 +8,10 @@ from argparse import Namespace
 from pathlib import Path
 from typing import Union
 
-from lib.app.exceptions import AppException
 from lib.app.interface.base_interface import Tracker
 from lib.core import LIMITED_FUNCTIONS
 from lib.core.enums import ProjectType
+from lib.core.exceptions import AppException
 from typing_extensions import Literal
 
 from .export_from_sa_conversions import export_from_sa
@@ -198,7 +198,7 @@ def export_annotation(
         ProjectType.VIDEO.name,
         ProjectType.DOCUMENT.name,
     ]:
-        raise AppException(LIMITED_FUNCTIONS[ProjectType.get_value(project_type)])
+        raise AppException(LIMITED_FUNCTIONS[ProjectType(project_type).value])
 
     params_info = [
         (input_dir, "input_dir", (str, Path)),

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/input_converters/converters/baseStrategy.py

@@ -140,8 +140,7 @@ class baseStrategy:
     def __init__(self, args):
         if args.dataset_format not in ("COCO", "VOC"):
             logger.warning(
-                "Beta feature. %s to SuperAnnotate annotation format converter is in BETA state."
-                % args.dataset_format
+                f"Beta feature. {args.dataset_format} to SuperAnnotate annotation format converter is in BETA state."
             )
         self.project_type = args.project_type
         self.dataset_name = args.dataset_name

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/input_converters/converters/coco_converters/coco_converter.py

@@ -81,7 +81,8 @@ class CocoBaseStrategy(baseStrategy):
         }
         return out_json
 
-    def convert_from_old_sa_to_new(self, old_json_data, project_type):
+    @staticmethod
+    def convert_from_old_sa_to_new(old_json_data, project_type):
 
         new_json_data = {"metadata": {}, "instances": [], "tags": [], "comments": []}
 
@@ -272,8 +273,10 @@ class CocoBaseStrategy(baseStrategy):
 
         return image_info
 
-    def _create_sa_classes(self, json_path):
-        json_data = json.load(open(json_path))
+    @staticmethod
+    def _create_sa_classes(json_path):
+        with open(json_path, encoding="utf-8") as f:
+            json_data = json.load(f)
         classes_list = json_data["categories"]
 
         classes = []

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/input_converters/sa_conversion.py

@@ -6,8 +6,8 @@ from pathlib import Path
 
 import cv2
 import numpy as np
-from lib.app.exceptions import AppException
 from lib.core import DEPRICATED_DOCUMENT_VIDEO_MESSAGE
+from lib.core.exceptions import AppException
 
 from ..common import blue_color_generator
 from ..common import hex_to_rgb

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/interface/base_interface.py

@@ -23,7 +23,6 @@ from lib.infrastructure.controller import Controller
 from lib.infrastructure.utils import extract_project_folder
 from lib.infrastructure.validators import wrap_error
 from mixpanel import Mixpanel
-from superannotate import __version__
 
 
 class BaseInterfaceFacade:
@@ -134,7 +133,7 @@ class Tracker:
             "SDK": True,
             "Team": team_name,
             "User Email": user_email,
-            "Version": __version__,
+            "Version": os.environ["sa_version"],
             "Python version": platform.python_version(),
             "Python interpreter type": platform.python_implementation(),
         }
@@ -170,7 +169,7 @@ class Tracker:
         for key, value in kwargs.items():
             if key == "self":
                 continue
-            elif key == "token":
+            if key == "token":
                 properties["sa_token"] = str(bool(value))
             elif key == "config_path":
                 properties[key] = str(bool(value))

{superannotate-4.4.24.dev2 → superannotate-4.4.25.dev2}/src/superannotate/lib/app/interface/cli_interface.py

@@ -88,7 +88,7 @@ class CLIFacade:
         project: str,
         folder: str,
         extensions: str = constances.DEFAULT_IMAGE_EXTENSIONS,
-        set_annotation_status: str = constances.AnnotationStatus.NOT_STARTED.name,
+        set_annotation_status: str = None,
         exclude_file_patterns=constances.DEFAULT_FILE_EXCLUDE_PATTERNS,
         recursive_subfolders=False,
         image_quality_in_editor=None,
@@ -243,7 +243,7 @@ class CLIFacade:
         target_fps=None,
         recursive=False,
         extensions=constances.DEFAULT_VIDEO_EXTENSIONS,
-        set_annotation_status=constances.AnnotationStatus.NOT_STARTED.name,
+        set_annotation_status=None,
         start_time=0.0,
         end_time=None,
     ):