black/lint

tethysplatform · Oct 7, 2024 · 390ce1b · 390ce1b
1 parent aa0914e
commit 390ce1b
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 15 deletions.
diff --git a/tests/unit_tests/test_tethys_compute/test_tasks.py b/tests/unit_tests/test_tethys_compute/test_tasks.py
@@ -19,29 +19,37 @@ def setUp(self):
     def tearDown(self):
         pass
 
-    @mock.patch('tethys_compute.tasks._run_after_delay', new_callable=mock.MagicMock)
-    @mock.patch('tethys_compute.tasks.asyncio.create_task')
+    @mock.patch("tethys_compute.tasks._run_after_delay", new_callable=mock.MagicMock)
+    @mock.patch("tethys_compute.tasks.asyncio.create_task")
     def test_create_task(self, mock_aio_ct, mock_run_delay):
         mock_func = mock.MagicMock()
         mock_coro = mock.MagicMock()
         mock_run_delay.return_value = mock_coro
         tethys_compute_tasks.create_task(mock_func)
         mock_aio_ct.assert_called_with(mock_coro)
-        mock_run_delay.assert_called_with(mock_func, delay=0, periodic=False, count=None)
+        mock_run_delay.assert_called_with(
+            mock_func, delay=0, periodic=False, count=None
+        )
 
     @mock.patch("tethys_compute.tasks.logger")
     async def test_run_after_delay(self, mock_log):
-        await tethys_compute_tasks._run_after_delay(noop, delay=0, periodic=False, count=None)
+        await tethys_compute_tasks._run_after_delay(
+            noop, delay=0, periodic=False, count=None
+        )
         mock_log.info.assert_called()
 
     @mock.patch("tethys_compute.tasks.logger")
     @mock.patch("tethys_compute.tasks.asyncio.sleep")
     async def test_run_after_delay_periodic(self, mock_sleep, mock_log):
-        await tethys_compute_tasks._run_after_delay(noop, delay=30, periodic=True, count=2)
+        await tethys_compute_tasks._run_after_delay(
+            noop, delay=30, periodic=True, count=2
+        )
         mock_sleep.assert_called_with(30)
         mock_log.info.assert_called()
 
     @mock.patch("tethys_compute.tasks.logger")
     async def test_run_after_delay_exception(self, mock_log):
-        await tethys_compute_tasks._run_after_delay(raise_error, delay=0, periodic=False, count=None)
+        await tethys_compute_tasks._run_after_delay(
+            raise_error, delay=0, periodic=False, count=None
+        )
         self.assertEqual(mock_log.info.call_count, 2)
diff --git a/tests/unit_tests/test_tethys_compute/test_views/test_update_status.py b/tests/unit_tests/test_tethys_compute/test_views/test_update_status.py
@@ -49,19 +49,25 @@ async def test_update_job_status(self, mock_tethysjob, mock_json_response, _):
     @mock.patch("tethys_compute.views.update_status.create_task")
     @mock.patch("tethys_compute.views.update_status.logger")
     @mock.patch("tethys_compute.views.update_status.JsonResponse")
-    async def test_update_job_status_with_delay(self, mock_json_response, mock_log, mock_ct):
+    async def test_update_job_status_with_delay(
+        self, mock_json_response, mock_log, mock_ct
+    ):
         mock_request = mock.MagicMock(GET={"delay": "1"})
         mock_job_id = mock.MagicMock()
 
         await tethys_compute_update_status.update_job_status(mock_request, mock_job_id)
         mock_json_response.assert_called_once_with({"success": "scheduled"})
         mock_log.debug.assert_called_once()
-        mock_ct.assert_called_with(tethys_compute_update_status._update_job_status, mock_job_id, delay=1)
+        mock_ct.assert_called_with(
+            tethys_compute_update_status._update_job_status, mock_job_id, delay=1
+        )
 
     @mock.patch("tethys_compute.views.update_status.create_task")
     @mock.patch("tethys_compute.views.update_status.logger")
     @mock.patch("tethys_compute.views.update_status.JsonResponse")
-    async def test_update_job_status_with_delay_exception(self, mock_json_response, mock_log, mock_ct):
+    async def test_update_job_status_with_delay_exception(
+        self, mock_json_response, mock_log, mock_ct
+    ):
         mock_request = mock.MagicMock(GET={"delay": "1"})
         mock_job_id = mock.MagicMock()
         mock_ct.side_effect = Exception
@@ -73,7 +79,9 @@ async def test_update_job_status_with_delay_exception(self, mock_json_response,
     @mock.patch("tethys_compute.views.update_status.logger")
     @mock.patch("tethys_compute.views.update_status.JsonResponse")
     @mock.patch("tethys_compute.views.update_status.TethysJob")
-    async def test_update_job_statusException(self, mock_tethysjob, mock_json_response, mock_log):
+    async def test_update_job_statusException(
+        self, mock_tethysjob, mock_json_response, mock_log
+    ):
         mock_request = mock.MagicMock(GET={})
         mock_job_id = mock.MagicMock()
         mock_tethysjob.objects.get_subclass.side_effect = Exception

diff --git a/tests/unit_tests/test_tethys_portal/test_urls.py b/tests/unit_tests/test_tethys_portal/test_urls.py
@@ -151,14 +151,17 @@ def test_urlpatterns_update_job_status(self):
         url = reverse("update_job_status", kwargs={"job_id": "JI001"})
         resolver = resolve(url)
         self.assertEqual("/update-job-status/JI001/", url)
-        self.assertEqual("tethys_compute.views.update_status.update_job_status", resolver._func_path)
+        self.assertEqual(
+            "tethys_compute.views.update_status.update_job_status", resolver._func_path
+        )
 
     def test_urlpatterns_update_dask_job_status(self):
         url = reverse("update_dask_job_status", kwargs={"key": "123456789"})
         resolver = resolve(url)
         self.assertEqual("/update-dask-job-status/123456789/", url)
         self.assertEqual(
-            "tethys_compute.views.update_status.update_dask_job_status", resolver._func_path
+            "tethys_compute.views.update_status.update_dask_job_status",
+            resolver._func_path,
         )
 
     @override_settings(REGISTER_CONTROLLER="test")
@@ -362,14 +365,17 @@ def test_urlpatterns_update_job_status(self):
         url = reverse("update_job_status", kwargs={"job_id": "JI001"})
         resolver = resolve(url)
         self.assertEqual("/test/prefix/update-job-status/JI001/", url)
-        self.assertEqual("tethys_compute.views.update_status.update_job_status", resolver._func_path)
+        self.assertEqual(
+            "tethys_compute.views.update_status.update_job_status", resolver._func_path
+        )
 
     def test_urlpatterns_update_dask_job_status(self):
         url = reverse("update_dask_job_status", kwargs={"key": "123456789"})
         resolver = resolve(url)
         self.assertEqual("/test/prefix/update-dask-job-status/123456789/", url)
         self.assertEqual(
-            "tethys_compute.views.update_status.update_dask_job_status", resolver._func_path
+            "tethys_compute.views.update_status.update_dask_job_status",
+            resolver._func_path,
         )
 
     @override_settings(REGISTER_CONTROLLER="test")

diff --git a/tethys_compute/tasks.py b/tethys_compute/tasks.py
@@ -30,7 +30,9 @@ async def _run_after_delay(func, /, *args, delay, periodic, count, **kwargs):
         if asyncio.iscoroutine(result):
             await result
     except Exception as e:
-        logger.info(f'The following error occurred while running the task "{func}": {e}')
+        logger.info(
+            f'The following error occurred while running the task "{func}": {e}'
+        )
     if periodic and (count is None or count > 0):
         if isinstance(count, int):
             count -= 1

diff --git a/tethys_compute/views/__init__.py b/tethys_compute/views/__init__.py
@@ -1,3 +1,14 @@
+"""
+********************************************************************************
+* Name: tethys_compute/views/__init__.py
+* Author: Scott Christensen
+* Created On: October 2024
+* Copyright: (c) Tethys Geospatial Foundation 2024
+* License: BSD 2-Clause
+********************************************************************************
+"""
+
+# flake8: noqa
 from .dask_dashboard import dask_dashboard
 from .update_status import (
     get_job,