rename directory

m3dev · Feb 23, 2024 · 66b0361 · 66b0361
1 parent a5252c8
commit 66b0361
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 21 deletions.
diff --git a/gokart/collision_lock/run_with_lock.py → ...conflict_prevention_lock/run_with_lock.py b/gokart/collision_lock/run_with_lock.py → ...conflict_prevention_lock/run_with_lock.py
diff --git a/gokart/collision_lock/redis_lock.py → ...ion_lock/task_conflict_prevention_lock.py b/gokart/collision_lock/redis_lock.py → ...ion_lock/task_conflict_prevention_lock.py
diff --git a/gokart/target.py b/gokart/target.py
@@ -12,7 +12,14 @@
 import pandas as pd
 from tqdm import tqdm
 
-from gokart.collision_lock.redis_lock import RedisParams, make_redis_params, wrap_with_dump_lock, wrap_with_load_lock, wrap_with_remove_lock, wrap_with_run_lock
+from gokart.conflict_prevention_lock.task_conflict_prevention_lock import (
+    RedisParams,
+    make_redis_params,
+    wrap_with_dump_lock,
+    wrap_with_load_lock,
+    wrap_with_remove_lock,
+    wrap_with_run_lock,
+)
 from gokart.file_processor import FileProcessor, make_file_processor
 from gokart.object_storage import ObjectStorage
 from gokart.zip_client_util import make_zip_client

diff --git a/gokart/task.py b/gokart/task.py
@@ -11,7 +11,7 @@
 from luigi.parameter import ParameterVisibility
 
 import gokart
-from gokart.collision_lock.redis_lock import make_redis_params
+from gokart.conflict_prevention_lock.task_conflict_prevention_lock import make_redis_params
 from gokart.file_processor import FileProcessor
 from gokart.pandas_type_config import PandasTypeConfigMap
 from gokart.parameter import ExplicitBoolParameter, ListTaskInstanceParameter, TaskInstanceParameter

diff --git a/test/collision_lock/test_redis_lock.py b/test/collision_lock/test_redis_lock.py
@@ -5,7 +5,7 @@
 
 import fakeredis
 
-from gokart.collision_lock.redis_lock import (
+from gokart.conflict_prevention_lock.task_conflict_prevention_lock import (
     RedisClient,
     RedisParams,
     make_redis_key,
@@ -70,7 +70,7 @@ def test_use_redis(self):
             redis_port=12345,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             mock_func = MagicMock()
             redis_mock.side_effect = fakeredis.FakeRedis
             resulted = wrap_with_run_lock(func=mock_func, redis_params=redis_params)(123, b='abc')
@@ -91,7 +91,7 @@ def test_check_lock_extended(self):
             lock_extend_seconds=1,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.side_effect = fakeredis.FakeRedis
             resulted = wrap_with_run_lock(func=_sample_long_func, redis_params=redis_params)(123, b='abc')
             expected = dict(a=123, b='abc')
@@ -107,7 +107,7 @@ def test_lock_is_removed_after_func_is_finished(self):
 
         server = fakeredis.FakeServer()
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.return_value = fakeredis.FakeRedis(server=server, host=redis_params.redis_host, port=redis_params.redis_port)
             mock_func = MagicMock()
             resulted = wrap_with_run_lock(func=mock_func, redis_params=redis_params)(123, b='abc')
@@ -132,7 +132,7 @@ def test_lock_is_removed_after_func_is_finished_with_error(self):
 
         server = fakeredis.FakeServer()
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.return_value = fakeredis.FakeRedis(server=server, host=redis_params.redis_host, port=redis_params.redis_port)
             try:
                 wrap_with_run_lock(func=_sample_func_with_error, redis_params=redis_params)(a=123, b='abc')
@@ -166,7 +166,7 @@ def test_use_redis(self):
             redis_port=12345,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.side_effect = fakeredis.FakeRedis
             mock_func = MagicMock()
             wrap_with_dump_lock(func=mock_func, redis_params=redis_params, exist_check=lambda: False)(123, b='abc')
@@ -184,7 +184,7 @@ def test_if_func_is_skipped_when_cache_already_exists(self):
             redis_port=12345,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.side_effect = fakeredis.FakeRedis
             mock_func = MagicMock()
             wrap_with_dump_lock(func=mock_func, redis_params=redis_params, exist_check=lambda: True)(123, b='abc')
@@ -201,7 +201,7 @@ def test_check_lock_extended(self):
             lock_extend_seconds=1,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.side_effect = fakeredis.FakeRedis
             wrap_with_dump_lock(func=_sample_long_func, redis_params=redis_params, exist_check=lambda: False)(123, b='abc')
 
@@ -215,7 +215,7 @@ def test_lock_is_removed_after_func_is_finished(self):
 
         server = fakeredis.FakeServer()
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.return_value = fakeredis.FakeRedis(server=server, host=redis_params.redis_host, port=redis_params.redis_port)
             mock_func = MagicMock()
             wrap_with_dump_lock(func=mock_func, redis_params=redis_params, exist_check=lambda: False)(123, b='abc')
@@ -239,7 +239,7 @@ def test_lock_is_removed_after_func_is_finished_with_error(self):
 
         server = fakeredis.FakeServer()
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.return_value = fakeredis.FakeRedis(server=server, host=redis_params.redis_host, port=redis_params.redis_port)
             try:
                 wrap_with_dump_lock(func=_sample_func_with_error, redis_params=redis_params, exist_check=lambda: False)(123, b='abc')
@@ -275,7 +275,7 @@ def test_use_redis(self):
             redis_port=12345,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.side_effect = fakeredis.FakeRedis
             mock_func = MagicMock()
             resulted = wrap_with_load_lock(func=mock_func, redis_params=redis_params)(123, b='abc')
@@ -297,7 +297,7 @@ def test_check_lock_extended(self):
             lock_extend_seconds=1,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.side_effect = fakeredis.FakeRedis
             resulted = wrap_with_load_lock(func=_sample_long_func, redis_params=redis_params)(123, b='abc')
             expected = dict(a=123, b='abc')
@@ -313,7 +313,7 @@ def test_lock_is_removed_after_func_is_finished(self):
 
         server = fakeredis.FakeServer()
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.return_value = fakeredis.FakeRedis(server=server, host=redis_params.redis_host, port=redis_params.redis_port)
             mock_func = MagicMock()
             resulted = wrap_with_load_lock(func=mock_func, redis_params=redis_params)(123, b='abc')
@@ -338,7 +338,7 @@ def test_lock_is_removed_after_func_is_finished_with_error(self):
 
         server = fakeredis.FakeServer()
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.return_value = fakeredis.FakeRedis(server=server, host=redis_params.redis_host, port=redis_params.redis_port)
             try:
                 wrap_with_load_lock(func=_sample_func_with_error, redis_params=redis_params)(123, b='abc')
@@ -373,7 +373,7 @@ def test_use_redis(self):
             redis_port=12345,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.side_effect = fakeredis.FakeRedis
             mock_func = MagicMock()
             resulted = wrap_with_remove_lock(func=mock_func, redis_params=redis_params)(123, b='abc')
@@ -394,7 +394,7 @@ def test_check_lock_extended(self):
             lock_extend_seconds=1,
         )
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.side_effect = fakeredis.FakeRedis
             resulted = wrap_with_remove_lock(func=_sample_long_func, redis_params=redis_params)(123, b='abc')
             expected = dict(a=123, b='abc')
@@ -410,7 +410,7 @@ def test_lock_is_removed_after_func_is_finished(self):
 
         server = fakeredis.FakeServer()
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.return_value = fakeredis.FakeRedis(server=server, host=redis_params.redis_host, port=redis_params.redis_port)
             mock_func = MagicMock()
             resulted = wrap_with_remove_lock(func=mock_func, redis_params=redis_params)(123, b='abc')
@@ -434,7 +434,7 @@ def test_lock_is_removed_after_func_is_finished_with_error(self):
 
         server = fakeredis.FakeServer()
 
-        with patch('gokart.collision_lock.redis_lock.redis.Redis') as redis_mock:
+        with patch('gokart.conflict_prevention_lock.task_conflict_prevention_lock.redis.Redis') as redis_mock:
             redis_mock.return_value = fakeredis.FakeRedis(server=server, host=redis_params.redis_host, port=redis_params.redis_port)
             try:
                 wrap_with_remove_lock(func=_sample_func_with_error, redis_params=redis_params)(123, b='abc')

diff --git a/test/test_task_on_kart.py b/test/test_task_on_kart.py
@@ -11,7 +11,7 @@
 from luigi.util import inherits
 
 import gokart
-from gokart.collision_lock.run_with_lock import RunWithLock
+from gokart.conflict_prevention_lock.run_with_lock import RunWithLock
 from gokart.file_processor import XmlFileProcessor
 from gokart.parameter import ListTaskInstanceParameter, TaskInstanceParameter
 from gokart.target import ModelTarget, SingleFileTarget, TargetOnKart