Change the entry point name/location

As per request by Sam Stepanyan

nettacker/api/engine.py

@@ -17,7 +17,6 @@ from api.core import (
     languages_to_country,
     api_key_is_valid,
 )
-from core.utils.common import now
 from flask import Flask, jsonify
 from flask import request as flask_request
 from flask import render_template, abort, Response, make_response
@@ -28,6 +27,7 @@ from nettacker.config import Config
 from nettacker.core.app import Nettacker
 from nettacker.core.die import die_failure
 from nettacker.core.messages import messages as _
+from nettacker.core.utils.common import now
 from nettacker.database.db import (
     create_connection,
     get_logs_by_scan_id,

nettacker/core/app.py

@@ -7,9 +7,6 @@ from threading import Thread
 
 import multiprocess
 import numpy
-from database.mysql import mysql_create_database, mysql_create_tables
-from database.postgresql import postgres_create_database
-from database.sqlite import sqlite_create_tables
 
 from nettacker import logger
 from nettacker.config import Config, version_info
@@ -32,6 +29,9 @@ from nettacker.core.socks_proxy import set_socks_proxy
 from nettacker.core.utils import common as utils
 from nettacker.core.utils.common import wait_for_threads_to_finish
 from nettacker.database.db import find_events, remove_old_logs
+from nettacker.database.mysql import mysql_create_database, mysql_create_tables
+from nettacker.database.postgresql import postgres_create_database
+from nettacker.database.sqlite import sqlite_create_tables
 from nettacker.logger import TerminalCodes
 
 log = logger.get_logger()

nettacker/core/graph.py

@@ -5,12 +5,12 @@ import json
 from datetime import datetime
 
 import texttable
-from core.utils.common import merge_logs_to_list, now
 
 from nettacker import logger
 from nettacker.config import version_info
 from nettacker.core.die import die_failure
 from nettacker.core.messages import messages as _
+from nettacker.core.utils.common import merge_logs_to_list, now
 from nettacker.database.db import get_logs_by_scan_id, submit_report_to_db
 
 log = logger.get_logger()

nettacker/core/lib/base.py

@@ -6,10 +6,10 @@ from abc import ABC
 from datetime import datetime
 
 import yaml
-from core.utils.common import merge_logs_to_list
 
 from nettacker.config import Config
 from nettacker.core.messages import messages as _
+from nettacker.core.utils.common import merge_logs_to_list
 from nettacker.database.db import find_temp_events, submit_temp_logs_to_db, submit_logs_to_db
 from nettacker.logger import get_logger, TerminalCodes
 

nettacker/core/lib/http.py

@@ -7,9 +7,9 @@ import re
 import time
 
 import aiohttp
-from core.utils.common import replace_dependent_response, reverse_and_regex_condition
 
 from nettacker.core.lib.base import BaseEngine
+from nettacker.core.utils.common import replace_dependent_response, reverse_and_regex_condition
 
 
 async def perform_request_action(action, request_options):

nettacker/core/lib/socket.py

@@ -10,9 +10,8 @@ import ssl
 import struct
 import time
 
-from core.utils.common import reverse_and_regex_condition
-
 from nettacker.core.lib.base import BaseEngine, BaseLibrary
+from nettacker.core.utils.common import reverse_and_regex_condition
 
 log = logging.getLogger(__name__)
 

nettacker/logger.py

@@ -2,7 +2,7 @@ import sys
 from enum import Enum
 from functools import cached_property
 
-from core.utils import time
+from nettacker.core.utils import time
 
 
 class TerminalCodes(Enum):