chore: update variable name

face_recognition/face_cluster_updater.py

@@ -2,7 +2,7 @@
 import json
 
 from seafevents.db import init_db_session_class
-from seafevents.face_recognition.face_recognition_manager import face_recognition_manager
+from seafevents.face_recognition.face_recognition_manager import FaceRecognitionManager
 from seafevents.repo_data import repo_data
 from seafevents.utils import get_opt_from_conf_or_env
 from seafevents.mq import get_mq
@@ -12,8 +12,7 @@
 
 class RepoFaceClusterUpdater(object):
     def __init__(self, config):
-        face_recognition_manager.init(config)
-        self._face_recognition_manager = face_recognition_manager
+        self._face_recognition_manager = FaceRecognitionManager(config)
         self._session = init_db_session_class(config)
         self.mq_server = '127.0.0.1'
         self.mq_port = 6379

face_recognition/face_recognition_manager.py

@@ -23,19 +23,14 @@
 
 class FaceRecognitionManager(object):
 
-    def __init__(self):
-        self._db_session_class = None
-        self.metadata_server_api = None
+    def __init__(self, config):
+        self._db_session_class = init_db_session_class(config)
+        self.metadata_server_api = MetadataServerAPI('seafevents')
         self.image_embedding_api = None
 
-    def init(self, config):
         self._parse_config(config)
 
     def _parse_config(self, config):
-        self._db_session_class = init_db_session_class(config)
-        self.metadata_server_api = MetadataServerAPI('seafevents')
-        self.image_embedding_api = None
-
         ai_section_name = 'AI'
         if config.has_section(ai_section_name):
             image_embedding_service_url = get_opt_from_conf_or_env(config, ai_section_name, 'image_embedding_service_url')
@@ -263,9 +258,7 @@ def save_face_cluster_message_to_user_notification(self, repo_id, username):
             session.execute(text(sql))
             session.commit()
 
-    def update_cover_face_photo(self, repo_id, people_id, obj_id):
+    def update_people_cover_photo(self, repo_id, people_id, obj_id):
         face_image = get_image_face(repo_id, obj_id, self.image_embedding_api, center=None)
         filename = f'{people_id}.jpg'
         save_face(repo_id, face_image, filename, replace=True)
-
-face_recognition_manager = FaceRecognitionManager()

repo_metadata/index_worker.py

@@ -11,7 +11,7 @@
 from seafevents.utils import get_opt_from_conf_or_env
 from seafevents.db import init_db_session_class
 from seafevents.repo_metadata.metadata_server_api import MetadataServerAPI
-from seafevents.face_recognition.face_recognition_manager import face_recognition_manager
+from seafevents.face_recognition.face_recognition_manager import FaceRecognitionManager
 
 
 logger = logging.getLogger(__name__)
@@ -44,8 +44,7 @@ def __init__(self, config):
         self._parse_config(config)
 
         self.mq = get_mq(self.mq_server, self.mq_port, self.mq_password)
-        face_recognition_manager.init(config)
-        self.face_recognition_manager = face_recognition_manager
+        self.face_recognition_manager = FaceRecognitionManager(config)
         self.set_signal()
 
     def _parse_config(self, config):

repo_metadata/script/update_face_recognition.py

@@ -4,7 +4,7 @@
 import sys
 
 from seafevents.db import init_db_session_class
-from seafevents.face_recognition.face_recognition_manager import face_recognition_manager
+from seafevents.face_recognition.face_recognition_manager import FaceRecognitionManager
 from seafevents.repo_metadata.utils import get_face_recognition_enabled_repo_list, get_faces_rows
 from seafevents.repo_metadata.constants import FACES_TABLE
 from seafevents.app.config import get_config
@@ -88,7 +88,7 @@ def main():
 
     seafevents_conf = os.environ.get('EVENTS_CONFIG_FILE')
     config = get_config(seafevents_conf)
-    face_recognition_manager.init(config)
+    face_recognition_manager = FaceRecognitionManager(config)
     session = init_db_session_class(config)
     update_face_info(face_recognition_manager, session)
 

repo_metadata/slow_task_handler.py

@@ -8,7 +8,7 @@
 from seafevents.mq import get_mq
 from seafevents.utils import get_opt_from_conf_or_env
 from seafevents.repo_metadata.metadata_server_api import MetadataServerAPI
-from seafevents.face_recognition.face_recognition_manager import face_recognition_manager
+from seafevents.face_recognition.face_recognition_manager import FaceRecognitionManager
 from seafevents.repo_metadata.utils import add_file_details
 from seafevents.db import init_db_session_class
 
@@ -21,8 +21,7 @@ class SlowTaskHandler(object):
 
     def __init__(self, config):
         self.metadata_server_api = MetadataServerAPI('seafevents')
-        face_recognition_manager.init(config)
-        self.face_recognition_manager = face_recognition_manager
+        self.face_recognition_manager = FaceRecognitionManager(config)
 
         self.should_stop = threading.Event()
         self.mq_server = '127.0.0.1'

seafevent_server/request_handler.py

@@ -9,7 +9,6 @@
 from seafevents.seasearch.index_task.index_task_manager import index_task_manager
 from seafevents.repo_metadata.metadata_server_api import MetadataServerAPI
 from seafevents.repo_metadata.utils import add_file_details
-from seafevents.face_recognition.face_recognition_manager import face_recognition_manager
 
 app = Flask(__name__)
 logger = logging.getLogger(__name__)
@@ -272,7 +271,7 @@ def add_convert_wiki_task():
     return {'task_id': task_id}, 200
 
 
-@app.route('/update-cover-face-photo', methods=['POST'])
+@app.route('/update-people-cover-photo', methods=['POST'])
 def update_cover_photo():
     is_valid, error = check_auth_token(request)
     if not is_valid:
@@ -296,7 +295,7 @@ def update_cover_photo():
         return {'error_msg': 'obj_id invalid.'}, 400
 
     try:
-        face_recognition_manager.update_cover_face_photo(repo_id, people_id, obj_id)
+        app.face_recognition_manager.update_people_cover_photo(repo_id, people_id, obj_id)
     except Exception as e:
         logger.error(e)
         return make_response((e, 500))

seafevent_server/seafevent_server.py

@@ -5,6 +5,7 @@
 from seafevents.seafevent_server.task_manager import task_manager
 from seafevents.seafevent_server.export_task_manager import event_export_task_manager
 from seafevents.seasearch.index_task.index_task_manager import index_task_manager
+from seafevents.face_recognition.face_recognition_manager import FaceRecognitionManager
 
 
 class SeafEventServer(Thread):
@@ -18,6 +19,7 @@ def __init__(self, app, config):
 
         task_manager.run()
         event_export_task_manager.run()
+        application.face_recognition_manager = FaceRecognitionManager(config)
         self._server = WSGIServer((self._host, int(self._port)), application)
 
         index_task_manager.init(config)