From 83c7943f8a73e45a44067fdb0c619eee7d3e1306 Mon Sep 17 00:00:00 2001
From: Dariusz L <dl122@wp.pl>
Date: Thu, 6 Aug 2026 21:28:17 +0200
Subject: [PATCH] Unify CivitAI version requests

---
 core/sources/civitai.py        | 20 +++++-------
 tests/test_source_internals.py | 59 ++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/core/sources/civitai.py b/core/sources/civitai.py
index 34f84bd..134f6ed 100644
--- a/core/sources/civitai.py
+++ b/core/sources/civitai.py
@@ -2401,28 +2401,24 @@ def resolve_civitai_version_custom_result(
     if not version_id:
         return None
 
-    headers = {}
-    if api_key:
-        headers["Authorization"] = f"Bearer {api_key}"
-
     try:
-        response = requests.get(
+        data = execute_provider_json_request(
+            "CivitAI custom URL version lookup",
             f"https://civitai.com/api/v1/model-versions/{version_id}",
-            headers=headers,
+            api_key=api_key,
             timeout=20,
+            max_attempts=1,
+            raise_on_error=False,
         )
-        try:
-            if response.status_code != 200:
-                return None
-            data = response.json()
-        finally:
-            response.close()
     except Exception as e:
         log.warning(
             f"CivitAI custom URL version lookup failed: version_id={version_id}, error={e}"
         )
         return None
 
+    if not isinstance(data, dict):
+        return None
+
     model_block = data.get("model") if isinstance(data.get("model"), dict) else {}
     model_id = data.get("modelId") or data.get("model_id") or model_block.get("id")
     if model_id:
diff --git a/tests/test_source_internals.py b/tests/test_source_internals.py
index 77efc9c..ffd444d 100644
--- a/tests/test_source_internals.py
+++ b/tests/test_source_internals.py
@@ -58,6 +58,7 @@ from core.sources.civitai import (
     get_model_info_for_file,
     parse_civitai_url,
     resolve_urn,
+    resolve_civitai_version_custom_result,
     search_civitai,
     search_civitai_for_file,
 )
@@ -132,6 +133,64 @@ class CivitaiResultBuilderTests(unittest.TestCase):
         self.assertEqual(10 * 1024, result["size"])
 
 
+class CivitaiCustomVersionLookupTests(unittest.TestCase):
+
+    def test_version_lookup_uses_shared_json_request_contract(self):
+        with (
+            patch(
+                "core.sources.civitai.execute_provider_json_request",
+                return_value={"modelId": 123},
+            ) as request_json,
+            patch(
+                "core.sources.civitai.get_civitai_model_details",
+                return_value={"model_id": 123},
+            ) as get_details,
+            patch(
+                "core.sources.civitai.build_civitai_custom_result",
+                return_value={"source": "civitai", "version_id": 456},
+            ),
+        ):
+            result = resolve_civitai_version_custom_result(
+                456,
+                expected_filename="model.safetensors",
+                api_key="secret",
+            )
+
+        self.assertEqual({"source": "civitai", "version_id": 456}, result)
+        request_json.assert_called_once_with(
+            "CivitAI custom URL version lookup",
+            "https://civitai.com/api/v1/model-versions/456",
+            api_key="secret",
+            timeout=20,
+            max_attempts=1,
+            raise_on_error=False,
+        )
+        get_details.assert_called_once_with(123, 456, "secret")
+
+    def test_version_lookup_returns_none_without_json_payload(self):
+        with (
+            patch(
+                "core.sources.civitai.execute_provider_json_request",
+                return_value=None,
+            ) as request_json,
+            patch("core.sources.civitai.get_civitai_model_details") as get_details,
+        ):
+            result = resolve_civitai_version_custom_result(456)
+
+        self.assertIsNone(result)
+        request_json.assert_called_once()
+        get_details.assert_not_called()
+
+    def test_version_lookup_handles_adapter_exception(self):
+        with patch(
+            "core.sources.civitai.execute_provider_json_request",
+            side_effect=RuntimeError("network failure"),
+        ):
+            result = resolve_civitai_version_custom_result(456)
+
+        self.assertIsNone(result)
+
+
 class CivarchiveResultBuilderTests(unittest.TestCase):
 
     def test_normalized_version_builder_preserves_search_result_contract(self):