Merge pull request #340 from skier233/main

AI Tagger code refactoring bug fix
stashapp · Jun 14, 2024 · c2cbbe9 · c2cbbe9
2 parents 0caa188 + a5fc841
commit c2cbbe9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/plugins/AITagger/ai_server.py b/plugins/AITagger/ai_server.py
@@ -4,6 +4,8 @@
 import config
 import stashapi.log as log
 
+current_videopipeline = None
+
 # ----------------- AI Server Calling Functions -----------------
 
 async def post_api_async(session, endpoint, payload):

diff --git a/plugins/AITagger/ai_tagger.py b/plugins/AITagger/ai_tagger.py
@@ -62,7 +62,6 @@ def install(package):
 semaphore = asyncio.Semaphore(config.CONCURRENT_TASK_LIMIT)
 progress = 0
 increment = 0.0
-current_videopipeline = None
 
 # ----------------- Main Execution -----------------
 
@@ -177,7 +176,7 @@ async def __tag_scene(scene):
     async with semaphore:
         scenePath = scene['files'][0]['path']
         sceneId = scene['id']
-        log.info("files result:" + str(scene['files'][0]))
+        log.debug("files result:" + str(scene['files'][0]))
         phash = scene['files'][0].get('fingerprint', None)
         duration = scene['files'][0].get('duration', None)
         if duration is None:

diff --git a/plugins/AITagger/ai_video_result.py b/plugins/AITagger/ai_video_result.py
@@ -120,7 +120,7 @@ def already_contains_model(self, model_config):
         toReturn = (correspondingModelInfo is not None and correspondingModelInfo.version == model_config.pipeline_version and
                             correspondingModelInfo.ai_model_config.frame_interval == model_config.frame_interval and
                             correspondingModelInfo.ai_model_config.threshold == model_config.threshold)
-        log.info(f"Already contains model: {toReturn}, {correspondingModelInfo is not None}, {correspondingModelInfo.version == model_config.pipeline_version}, {correspondingModelInfo.ai_model_config.frame_interval == model_config.frame_interval}, {correspondingModelInfo.ai_model_config.threshold == model_config.threshold}")
+        log.debug(f"Already contains model: {toReturn}, {correspondingModelInfo is not None}, {correspondingModelInfo.version == model_config.pipeline_version}, {correspondingModelInfo.ai_model_config.frame_interval == model_config.frame_interval}, {correspondingModelInfo.ai_model_config.threshold == model_config.threshold}")
         return toReturn
 
     def __str__(self):
@@ -180,7 +180,7 @@ def from_csv_file(cls, csv_file, scene_id, phash, duration):
             for row in reader:
                 frame_index = float(row[0])
                 if last_frame_index is not None and frame_interval is None:
-                    log.info(f"Calculating frame interval: {frame_index} - {last_frame_index}")
+                    log.debug(f"Calculating frame interval: {frame_index} - {last_frame_index}")
                     frame_interval = frame_index - last_frame_index
                 for tag_name in row[1:]:  # Skip the first column (frame_indexes)
                     if tag_name:  # If the cell is not empty

diff --git a/plugins/AITagger/config.py b/plugins/AITagger/config.py
@@ -1,5 +1,5 @@
 CREATE_MARKERS = True
-FRAME_INTERVAL = 0.5
+FRAME_INTERVAL = 2
 IMAGE_THRESHOLD = 0.5
 
 API_BASE_URL = 'http://localhost:8000'