From 88e7e34908307e28152f847a34af7ae266477c35 Mon Sep 17 00:00:00 2001
From: Chris Chamberlain <chrisbc@artisan.co.nz>
Date: Thu, 4 Jul 2024 17:14:48 +1200
Subject: [PATCH] detox;

---
 solvis_graphql_api/composite_solution/cached.py | 9 ++++++---
 tests/test_composite_corupture_sections.py      | 3 ++-
 tests/test_composite_rupture_sections.py        | 1 +
 tests/test_rupture_sorting_function.py          | 1 +
 tests/test_ruptures_and_pagination.py           | 2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/solvis_graphql_api/composite_solution/cached.py b/solvis_graphql_api/composite_solution/cached.py
index 66a9bfd..ad2ea49 100644
--- a/solvis_graphql_api/composite_solution/cached.py
+++ b/solvis_graphql_api/composite_solution/cached.py
@@ -12,10 +12,12 @@
 import nzshm_model
 import solvis
 from solvis.inversion_solution.typing import InversionSolutionProtocol
-# from solvis_store.query import get_fault_name_rupture_ids, get_location_radius_rupture_ids
 
 from .filter_set_logic_options import SetOperationEnum, _solvis_join
 
+# from solvis_store.query import get_fault_name_rupture_ids, get_location_radius_rupture_ids
+
+
 if TYPE_CHECKING:
     import shapely.geometry.polygon.Polygon
     from nzshm_model.source_logic_tree.logic_tree import SourceLogicTree
@@ -27,6 +29,7 @@
 # we want to use the solvis-store cache normally, override this in testing
 RESOLVE_LOCATIONS_INTERNALLY = True  # if DEPLOYMENT_STAGE == 'TEST' else True
 
+
 @lru_cache
 def get_location_polygon(radius_km: float, lon: float, lat: float) -> "shapely.geometry.polygon.Polygon":
     return solvis.geometry.circle_polygon(radius_m=radius_km * 1000, lon=lon, lat=lat)
@@ -72,7 +75,7 @@ def get_rupture_ids_for_fault_names_stored(
     rupture_set_id = ruptset_ids[0]
     union = False if filter_set_options_dict["multiple_faults"] == SetOperationEnum.INTERSECTION else True
 
-    rupture_id_set: Set[int] = get_fault_name_rupture_ids(rupture_set_id, fault_names, union)
+    rupture_id_set: Set[int] = get_fault_name_rupture_ids(rupture_set_id, fault_names, union)  # type: ignore # noqa
     return rupture_id_set
 
 
@@ -142,7 +145,7 @@ def get_rupture_ids_for_location_radius_stored(
     union = False if filter_set_options_dict["multiple_locations"] == SetOperationEnum.INTERSECTION else True
     # print("filter_dataframe_by_radius_stored", radius_km)
     # print("get_rupture_ids_for_location_radius_stored", radius_km)
-    rupture_ids: Iterator[int] = get_location_radius_rupture_ids(
+    rupture_ids: Iterator[int] = get_location_radius_rupture_ids(  # type: ignore # noqa
         rupture_set_id=rupture_set_id, locations=location_ids, radius=radius_km, union=union
     )
     return rupture_ids
diff --git a/tests/test_composite_corupture_sections.py b/tests/test_composite_corupture_sections.py
index 3e704cd..7208208 100644
--- a/tests/test_composite_corupture_sections.py
+++ b/tests/test_composite_corupture_sections.py
@@ -43,10 +43,11 @@
 def client():
     return Client(schema_root)
 
+
 @pytest.mark.skip('no')
 @patch(
     'solvis_graphql_api.composite_solution.cached.get_fault_name_rupture_ids',
-          lambda *args, **kwargs: [n for n in range(350, 390)]
+    lambda *args, **kwargs: [n for n in range(350, 390)],
 )
 @patch('solvis_graphql_api.composite_solution.cached.RESOLVE_LOCATIONS_INTERNALLY', True)
 class TestFilterRptureSections:
diff --git a/tests/test_composite_rupture_sections.py b/tests/test_composite_rupture_sections.py
index 52a7290..f014dda 100644
--- a/tests/test_composite_rupture_sections.py
+++ b/tests/test_composite_rupture_sections.py
@@ -37,6 +37,7 @@
 def client():
     return Client(schema_root)
 
+
 @pytest.mark.skip('no')
 # @patch(
 #     'solvis_graphql_api.composite_solution.cached.get_location_radius_rupture_ids',
diff --git a/tests/test_rupture_sorting_function.py b/tests/test_rupture_sorting_function.py
index 1cb7b95..1ec32d0 100644
--- a/tests/test_rupture_sorting_function.py
+++ b/tests/test_rupture_sorting_function.py
@@ -10,6 +10,7 @@
 MODEL_ID = "NSHM_v1.0.4"
 FAULT_SYSTEM = "HIK"
 
+
 @pytest.mark.skip('no')
 @patch(
     'solvis_graphql_api.composite_solution.cached.get_location_radius_rupture_ids',
diff --git a/tests/test_ruptures_and_pagination.py b/tests/test_ruptures_and_pagination.py
index 9361a0c..5b92a1d 100644
--- a/tests/test_ruptures_and_pagination.py
+++ b/tests/test_ruptures_and_pagination.py
@@ -8,6 +8,7 @@
 
 from solvis_graphql_api.schema import schema_root
 
+
 @patch('solvis_graphql_api.composite_solution.cached.RESOLVE_LOCATIONS_INTERNALLY', True)
 class TestRupturePagination(unittest.TestCase):
     def setUp(self):
@@ -108,6 +109,7 @@ def test_get_page_two(self):
         assert len(rupts['edges']) == 3
         assert from_global_id(rupts['edges'][0]['cursor']) == ("RuptureDetailConnectionCursor", "4")
 
+
 @patch('solvis_graphql_api.composite_solution.cached.RESOLVE_LOCATIONS_INTERNALLY', True)
 class TestRuptureDetailResolver(unittest.TestCase):
     def setUp(self):