Merge pull request #366 from superannotateai/friday

Friday

Author: dshabin

.devcontainer/devcontainer.json

@@ -1,4 +1,18 @@
 repos:
+  - repo: 'https://github.com/asottile/reorder_python_imports'
+    rev: v2.3.0
+    hooks:
+      - id: reorder-python-imports
+        exclude: src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters
+        name: 'Reorder Python imports (src, tests)'
+        args:
+          - '--application-directories'
+          - app
+  - repo: 'https://github.com/python/black'
+    rev: 19.10b0
+    hooks:
+      - id: black
+        name: Code Formatter (black)
   - repo: 'https://gitlab.com/pycqa/flake8'
     rev: 3.8.2
     hooks:
@@ -7,7 +21,7 @@ repos:
         name: Style Guide Enforcement (flake8)
         args:
           - '--max-line-length=120'
-          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712
+          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712,E123,E131,F821,E121
   - repo: 'https://github.com/asottile/pyupgrade'
     rev: v2.4.3
     hooks:
@@ -16,26 +30,12 @@ repos:
         name: Upgrade syntax for newer versions of the language (pyupgrade)
         args:
           - '--py37-plus'
-  - repo: 'https://github.com/asottile/reorder_python_imports'
-    rev: v2.3.0
-    hooks:
-      - id: reorder-python-imports
-        exclude: src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters
-        name: 'Reorder Python imports (src, tests)'
-        args:
-          - '--application-directories'
-          - app
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
     rev: v3.1.0
     hooks:
       - id: check-byte-order-marker
       - id: trailing-whitespace
       - id: end-of-file-fixer
-  - repo: 'https://github.com/python/black'
-    rev: 19.10b0
-    hooks:
-      - id: black
-        name: Uncompromising Code Formatter (black)
 #  - repo: 'https://github.com/asottile/dead'
 #    rev: v1.3.0
 #    hooks:

.pre-commit-config.yaml

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

pytest.ini

@@ -17,4 +17,5 @@ fire==0.4.0
 mixpanel==4.8.3
 pydantic>=1.8.2
 pydantic[email]
-setuptools~=57.4.0
+setuptools~=57.4.0
+superannotate_schemas

requirements.txt

@@ -4,4 +4,5 @@ pytest==6.2.4
 pytest-xdist==2.3.0
 pytest-parallel==0.1.0
 pytest-rerunfailures==10.2
-sphinx_rtd_theme==1.0.0
+sphinx_rtd_theme==1.0.0
+

requirements_dev.txt

@@ -1,7 +1,6 @@
 import logging.config
 import os
 import sys
-from os.path import expanduser
 
 import requests
 import superannotate.lib.core as constances
@@ -107,6 +106,7 @@
     upload_videos_from_folder_to_project,
 )
 from superannotate.lib.app.interface.sdk_interface import validate_annotations
+from superannotate.logger import get_default_logger
 from superannotate.version import __version__
 
 __all__ = [
@@ -208,48 +208,13 @@
 WORKING_DIR = os.path.split(os.path.realpath(__file__))[0]
 sys.path.append(WORKING_DIR)
 logging.getLogger("botocore").setLevel(logging.CRITICAL)
-
-logging.config.dictConfig(
-    {
-        "version": 1,
-        "disable_existing_loggers": False,
-        "handlers": {
-            "console": {
-                "class": "logging.StreamHandler",
-                "level": "INFO",
-                "formatter": "consoleFormatter",
-                "stream": "ext://sys.stdout",
-            },
-            "fileHandler": {
-                "class": "logging.handlers.RotatingFileHandler",
-                "level": "DEBUG",
-                "formatter": "fileFormatter",
-                "filename": expanduser(constances.LOG_FILE_LOCATION),
-                "mode": "a",
-                "maxBytes": 5 * 1024 * 1024,
-                "backupCount": 5,
-            },
-        },
-        "formatters": {
-            "consoleFormatter": {
-                "format": "SA-PYTHON-SDK - %(levelname)s - %(message)s",
-            },
-            "fileFormatter": {
-                "format": "SA-PYTHON-SDK - %(levelname)s - %(asctime)s - %(message)s"
-            },
-        },
-        "root": {  # root logger
-            "level": "DEBUG",
-            "handlers": ["console", "fileHandler"],
-        },
-    }
-)
+logger = get_default_logger()
 
 
 def log_version_info():
     local_version = parse(__version__)
     if local_version.is_prerelease:
-        logging.info(constances.PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
+        logger.info(constances.PACKAGE_VERSION_INFO_MESSAGE.format(__version__))
     req = requests.get("https://pypi.python.org/pypi/superannotate/json")
     if req.ok:
         releases = req.json().get("releases", [])
@@ -259,13 +224,13 @@ def log_version_info():
             if not ver.is_prerelease or local_version.is_prerelease:
                 pip_version = max(pip_version, ver)
         if pip_version.major > local_version.major:
-            logging.warning(
+            logger.warning(
                 constances.PACKAGE_VERSION_MAJOR_UPGRADE.format(
                     local_version, pip_version
                 )
             )
         elif pip_version > local_version:
-            logging.warning(
+            logger.warning(
                 constances.PACKAGE_VERSION_UPGRADE.format(local_version, pip_version)
             )
 

src/superannotate/__init__.py

@@ -1,6 +1,5 @@
 import copy
 import json
-import logging
 from pathlib import Path
 from typing import List
 from typing import Optional
@@ -13,8 +12,9 @@
 from lib.core import ATTACHED_VIDEO_ANNOTATION_POSTFIX
 from lib.core import PIXEL_ANNOTATION_POSTFIX
 from lib.core import VECTOR_ANNOTATION_POSTFIX
+from superannotate.logger import get_default_logger
 
-logger = logging.getLogger("root")
+logger = get_default_logger()
 
 
 @dataclass

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

@@ -1,15 +1,15 @@
-import logging
 from pathlib import Path
 
 import pandas as pd
 import plotly.express as px
 from lib.app.mixp.decorators import Trackable
 from superannotate.lib.app.exceptions import AppException
 from superannotate.lib.core import DEPRICATED_DOCUMENT_VIDEO_MESSAGE
+from superannotate.logger import get_default_logger
 
 from .common import aggregate_image_annotations_as_df
 
-logger = logging.getLogger()
+logger = get_default_logger()
 
 
 @Trackable

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

@@ -1,14 +1,14 @@
 import json
-import logging
 from pathlib import Path
 
 import pandas as pd
 import plotly.express as px
 from lib.app.exceptions import AppException
 from lib.core import DEPRICATED_DOCUMENT_VIDEO_MESSAGE
+from superannotate.logger import get_default_logger
 
 
-logger = logging.getLogger("root")
+logger = get_default_logger()
 
 
 def aggregate_image_annotations_as_df(
@@ -412,9 +412,7 @@ def image_consensus(df, image_name, annot_type):
     """
 
     try:
-        from shapely.geometry import box
-        from shapely.geometry import Point
-        from shapely.geometry import Polygon
+        from shapely.geometry import Point, Polygon, box
     except ImportError:
         raise ImportError(
             "To use superannotate.benchmark or superannotate.consensus functions please install "

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

@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
-import logging
-
 import fire
 from lib.app.interface.cli_interface import CLIFacade
+from superannotate.logger import get_default_logger
 
-logger = logging.getLogger()
+logger = get_default_logger()
 
 
 def main():