Merge pull request #835 from superannotateai/pydantic_V2

Pydantic v2

Author: VaghinakDev

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: 'https://github.com/asottile/reorder_python_imports'
-    rev: v3.13.0
+    rev: v3.16.0
     hooks:
       - id: reorder-python-imports
         exclude: src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters
@@ -9,12 +9,12 @@ repos:
           - '--application-directories'
           - app
   - repo: 'https://github.com/python/black'
-    rev: 22.3.0
+    rev: 26.1.0
     hooks:
       - id: black
         name: Code Formatter (black)
   - repo: 'https://github.com/PyCQA/flake8'
-    rev: 6.1.0
+    rev: 7.3.0
     hooks:
       - id: flake8
         exclude:  src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters
@@ -23,15 +23,15 @@ repos:
           - '--max-line-length=120'
           - --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
+    rev: v3.21.2
     hooks:
       - id: pyupgrade
         exclude: src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters
         name: Upgrade syntax for newer versions of the language (pyupgrade)
         args:
           - '--py37-plus'
   - repo: 'https://github.com/PyCQA/doc8'
-    rev: v1.1.1
+    rev: v2.0.0
     hooks:
       - id: doc8
         name: doc8

log.txt

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

pytest.ini

@@ -1,4 +1,5 @@
-pydantic>=1.10,<3,!=2.0.*
+pydantic~=2.5
+pydantic-extra-types~=2.11
 aiohttp~=3.8
 boto3~=1.42
 opencv-python-headless~=4.7
@@ -10,4 +11,5 @@ requests~=2.32
 aiofiles~=25.1
 fire~=0.7
 mixpanel~=5.1
+typing_extensions~=4.15
 superannotate-schemas==1.0.49

requirements.txt

@@ -2,7 +2,6 @@
 import os
 import sys
 
-
 __version__ = "4.5.2"
 
 
@@ -22,7 +21,6 @@
 from superannotate.lib.app.interface.sdk_interface import SAClient
 from superannotate.lib.app.interface.sdk_interface import ItemContext
 
-
 SESSIONS = {}
 
 

src/superannotate/__init__.py

@@ -6,7 +6,6 @@
 import plotly.express as px
 from lib.core.exceptions import AppException
 
-
 logger = logging.getLogger("sa")
 
 

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

@@ -24,11 +24,11 @@ def blue_color_generator(n, hex_values=True):
         )
         hex_color = (
             "#"
-            + "{:02x}".format(bgr_color[2])
+            + f"{bgr_color[2]:02x}"
             + "{:02x}".format(
                 bgr_color[1],
             )
-            + "{:02x}".format(bgr_color[0])
+            + f"{bgr_color[0]:02x}"
         )
         if hex_values:
             hex_colors.append(hex_color)

src/superannotate/lib/app/common.py

@@ -1,7 +1,6 @@
 from lib.app.input_converters.conversion import export_annotation
 from lib.app.input_converters.conversion import import_annotation
 
-
 __all__ = [
     "export_annotation",
     "import_annotation",

src/superannotate/lib/app/input_converters/__init__.py

@@ -1,6 +1,7 @@
 """
 Main module for input converters
 """
+
 import os
 import shutil
 import tempfile
@@ -15,7 +16,6 @@
 from .export_from_sa_conversions import export_from_sa
 from .import_to_sa_conversions import import_to_sa
 
-
 ALLOWED_TASK_TYPES = [
     "panoptic_segmentation",
     "instance_segmentation",
@@ -108,7 +108,7 @@ def _passes_value_sanity(values_info):
     for value in values_info:
         if value[0] not in value[2]:
             raise AppException(
-                "'{}' should be one of the following '{}'".format(value[1], value[2])
+                f"'{value[1]}' should be one of the following '{value[2]}'"
             )
 
 

src/superannotate/lib/app/input_converters/conversion.py

@@ -1,5 +1,5 @@
-"""
-"""
+""" """
+
 import logging
 
 from .coco_converters.coco_to_sa_vector import coco_instance_segmentation_to_sa_vector