Merge pull request #25 from Lurking987/Lurking987-improve-api-handling-FindMarker

Improve API handling

Author: Lurking987

plugins/Find Marker For Tag Images/Find Marker For Tag Images.py

@@ -2,52 +2,26 @@
 import json
 import random
 import time
-import requests
 import stashapi.log as log
 from stashapi.stashapp import StashInterface
 
 def main():
-    # 1. READ CONFIG FROM STASH
     try:
-        # Read the JSON configuration passed by Stash
         input_data = json.loads(sys.stdin.read())
-        server_info = input_data.get("server_connection", {})
-        
-        # Automatically get the base URL and API Key from Stash itself
-        base_url = f"{server_info.get('Scheme', 'http')}://{server_info.get('Host', 'localhost')}:{server_info.get('Port', 9999)}"
-        api_key = server_info.get('ApiKey', '')
-        
-        # Initialize the official Stash Interface
-        stash = StashInterface(server_info)
+        stash = StashInterface(input_data["server_connection"])
     except Exception as e:
         log.error(f"Failed to initialize plugin connection: {e}")
         return
 
-    endpoint_url = f"{base_url}/graphql"
-    headers = {'Content-Type': 'application/json'}
-    if api_key:
-        headers['ApiKey'] = api_key
-
-    # Helper function for GraphQL
-    def call_gql(query, variables=None):
-        try:
-            response = requests.post(endpoint_url, json={'query': query, 'variables': variables}, headers=headers, timeout=10)
-            return response.json().get("data", {})
-        except Exception as e:
-            log.error(f"GQL Error: {e}")
-            return {}
-
-    # 2. START PROCESSING
     start_time = time.time()
-    
+
     tags_query = """
     query { findTags(tag_filter: {marker_count: {modifier: GREATER_THAN, value: 0}}, filter: {per_page: -1}) {
         tags { id name }
     }}
     """
-    tags_data = call_gql(tags_query)
-    tags = tags_data.get("findTags", {}).get("tags", [])
-    
+    tags = stash.call_GQL(tags_query).get("findTags", {}).get("tags", [])
+
     if not tags:
         log.info("No tags with markers found.")
         return
@@ -57,31 +31,25 @@ def call_gql(query, variables=None):
 
     for idx, tag in enumerate(tags, 1):
         tag_id = tag['id']
-        
-        # Find markers for this tag
+
         marker_query = """
         query($id: ID!) { findSceneMarkers(scene_marker_filter: {tags: {value: [$id], modifier: INCLUDES}}, filter: {per_page: -1}) {
             scene_markers { id scene { id } }
         }}
         """
-        markers_data = call_gql(marker_query, {"id": tag_id})
-        markers = markers_data.get("findSceneMarkers", {}).get("scene_markers", [])
-        
+        markers = stash.call_GQL(marker_query, {"id": tag_id}).get("findSceneMarkers", {}).get("scene_markers", [])
+
         if markers:
             marker = random.choice(markers)
-            # Use the dynamic base_url
+            server = input_data["server_connection"]
+            base_url = f"{server.get('Scheme', 'http')}://{server.get('Host', 'localhost')}:{server.get('Port', 9999)}"
             stream_url = f"{base_url}/scene/{marker['scene']['id']}/scene_marker/{marker['id']}/stream"
 
-            # RESET & UPDATE
-            clear_mut = "mutation($id: ID!) { tagUpdate(input: { id: $id, image: \"\" }) { id } }"
-            call_gql(clear_mut, {"id": tag_id})
-            
-            update_mut = "mutation($id: ID!, $img: String!) { tagUpdate(input: { id: $id, image: $img }) { id } }"
-            call_gql(update_mut, {"id": tag_id, "img": stream_url})
+            stash.call_GQL("mutation($id: ID!) { tagUpdate(input: { id: $id, image: \"\" }) { id } }", {"id": tag_id})
+            stash.call_GQL("mutation($id: ID!, $img: String!) { tagUpdate(input: { id: $id, image: $img }) { id } }", {"id": tag_id, "img": stream_url})
 
-        # 3. UPDATE STASH UI PROGRESS BAR
         log.progress(idx / total)
-        
+
         if idx % 10 == 0:
             elapsed = time.time() - start_time
             eta = int((elapsed / idx) * (total - idx))

plugins/Find Marker For Tag Images/Find Marker For Tag Images.yml

@@ -1,6 +1,6 @@
 name: Find Marker For Tag Images
 description: Associates random marker video endpoints as tag cover images.
-version: 1.0
+version: 1.1
 url: https://github.com/Lurking987/stash-plugins/tree/main/plugins/Find%20Marker%20For%20Tag%20Images
 exec:
   - python

plugins/Find Marker For Tag Images/manifest

@@ -2,8 +2,8 @@ id: Find Marker For Tag Images
 name: Assign Matching Random Marker Preview Video to Tag Images
 metadata:
   description: Script to find markers that match a tag and picks a random preview as the tag image
-version: 1.0
-date: "2026-02-25 20:20:00"
+version: 1.1
+date: "2026-04-12 09:42:00"
 requires: []
 source_repository: 
 files: