Create cache directory#601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jan-janssen merged 8 commits into from
Mar 23, 2025
Merged

Create cache directory #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb3f2e6
Create cache directory
jan-janssen Mar 9, 2025
34b40b1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 9, 2025
71d2023
fixes
jan-janssen Mar 9, 2025
eceb2a6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 9, 2025
5e80e91
more fixes
jan-janssen Mar 9, 2025
e3598ce
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 9, 2025
7ae04ec
set job name based on file name
jan-janssen Mar 9, 2025
11955c0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion executorlib/cache/queue_spawner.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,9 @@ def execute_with_pysqa(
if k in resource_dict:
del resource_dict[k]
if "job_name" not in resource_dict:
resource_dict["job_name"] = "pysqa"
resource_dict["job_name"] = os.path.basename(
os.path.dirname(os.path.abspath(cwd))
)
submit_kwargs.update(resource_dict)
queue_id = qa.submit_job(**submit_kwargs)
dump(file_name=file_name, data_dict={"queue_id": queue_id})
Expand Down
15 changes: 10 additions & 5 deletions executorlib/cache/shared.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,13 @@ def execute_tasks_h5(
resource_dict=task_resource_dict,
)
if task_key not in memory_dict:
if task_key + ".h5out" not in os.listdir(cache_directory):
file_name = os.path.join(cache_directory, task_key + ".h5in")
if not (
task_key in os.listdir(cache_directory)
and "cache.h5out"
in os.listdir(os.path.join(cache_directory, task_key))
):
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
Comment on lines +114 to +115

@coderabbitaicoderabbitaiBotMar 9, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

The file structure change is inconsistent with _check_task_output function

The code changes introduce a new directory structure for caching, where each task has its own subdirectory. While these lines correctly implement the new structure, the _check_task_output function (line 198) still looks for output files in the old location.

You need to update the _check_task_output function to work with the new directory structure:

def _check_task_output(
task_key: str, future_obj: Future, cache_directory: str
) -> Future:
"""
Check the output of a task and set the result of the future object if available.
Args:
task_key (str): The key of the task.
future_obj (Future): The future object associated with the task.
cache_directory (str): The directory where the HDF5 files are stored.
Returns:
Future: The updated future object.
"""
- file_name = os.path.join(cache_directory, task_key + ".h5out")+ file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
if exec_flag:
future_obj.set_result(result)
return future_obj

Also applies to: 139-139, 142-142

dump(file_name=file_name, data_dict=data_dict)
if not disable_dependencies:
task_dependent_lst = [
Expand All@@ -131,10 +136,10 @@ def execute_tasks_h5(
resource_dict=task_resource_dict,
config_directory=pysqa_config_directory,
backend=backend,
cache_directory=cache_directory,
cache_directory=os.path.join(cache_directory, task_key),
)
file_name_dict[task_key] = os.path.join(
cache_directory, task_key + ".h5out"
cache_directory, task_key, "cache.h5out"
)
memory_dict[task_key] = task_dict["future"]
future_queue.task_done()
Expand DownExpand Up@@ -190,7 +195,7 @@ def _check_task_output(
Future: The updated future object.

"""
file_name = os.path.join(cache_directory, task_key + ".h5out")
file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
Expand Down
9 changes: 6 additions & 3 deletions executorlib/interactive/shared.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,12 @@ def _execute_task_with_cache(
fn_kwargs=task_dict["kwargs"],
resource_dict=task_dict.get("resource_dict", {}),
)
os.makedirs(cache_directory, exist_ok=True)
file_name = os.path.join(cache_directory, task_key + ".h5out")
if task_key + ".h5out" not in os.listdir(cache_directory):
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not (
task_key in os.listdir(cache_directory)
and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
):
f = task_dict.pop("future")
if f.set_running_or_notify_cancel():
try:
Expand Down
21 changes: 12 additions & 9 deletions executorlib/standalone/hdf.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,13 +104,16 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:

def get_cache_data(cache_directory: str) -> list[dict]:
file_lst = []
for file_name in os.listdir(cache_directory):
with h5py.File(os.path.join(cache_directory, file_name), "r") as hdf:
file_content_dict = {
key: cloudpickle.loads(np.void(hdf["/" + key]))
for key in group_dict.values()
if key in hdf
}
file_content_dict["filename"] = file_name
file_lst.append(file_content_dict)
for task_key in os.listdir(cache_directory):
file_name = os.path.join(cache_directory, task_key, "cache.h5out")
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
if os.path.exists(file_name):
with h5py.File(file_name, "r") as hdf:
file_content_dict = {
key: cloudpickle.loads(np.void(hdf["/" + key]))
for key in group_dict.values()
if key in hdf
}
file_content_dict["filename"] = file_name
file_lst.append(file_content_dict)
return file_lst
21 changes: 12 additions & 9 deletions tests/test_cache_shared.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ def test_execute_function_mixed(self):
fn_args=[1],
fn_kwargs={"b": 2},
)
file_name = os.path.join(cache_directory, task_key + ".h5in")
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
dump(file_name=file_name, data_dict=data_dict)
backend_execute_task_in_file(file_name=file_name)
future_obj = Future()
Expand All@@ -41,11 +42,11 @@ def test_execute_function_mixed(self):
self.assertTrue(future_obj.done())
self.assertEqual(future_obj.result(), 3)
self.assertTrue(
get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
> 0.0
)
future_file_obj = FutureItem(
file_name=os.path.join(cache_directory, task_key + ".h5out")
file_name=os.path.join(cache_directory, task_key, "cache.h5out")
)
self.assertTrue(future_file_obj.done())
self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -58,7 +59,8 @@ def test_execute_function_args(self):
fn_args=[1, 2],
fn_kwargs={},
)
file_name = os.path.join(cache_directory, task_key + ".h5in")
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
dump(file_name=file_name, data_dict=data_dict)
backend_execute_task_in_file(file_name=file_name)
future_obj = Future()
Expand All@@ -68,11 +70,11 @@ def test_execute_function_args(self):
self.assertTrue(future_obj.done())
self.assertEqual(future_obj.result(), 3)
self.assertTrue(
get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
> 0.0
)
future_file_obj = FutureItem(
file_name=os.path.join(cache_directory, task_key + ".h5out")
file_name=os.path.join(cache_directory, task_key, "cache.h5out")
)
self.assertTrue(future_file_obj.done())
self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -85,7 +87,8 @@ def test_execute_function_kwargs(self):
fn_args=[],
fn_kwargs={"a": 1, "b": 2},
)
file_name = os.path.join(cache_directory, task_key + ".h5in")
file_name = os.path.join(cache_directory, task_key, "cache.h5in")
os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
dump(file_name=file_name, data_dict=data_dict)
backend_execute_task_in_file(file_name=file_name)
future_obj = Future()
Expand All@@ -95,11 +98,11 @@ def test_execute_function_kwargs(self):
self.assertTrue(future_obj.done())
self.assertEqual(future_obj.result(), 3)
self.assertTrue(
get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
> 0.0
)
future_file_obj = FutureItem(
file_name=os.path.join(cache_directory, task_key + ".h5out")
file_name=os.path.join(cache_directory, task_key, "cache.h5out")
)
self.assertTrue(future_file_obj.done())
self.assertEqual(future_file_obj.result(), 3)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Create cache directory#601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jan-janssen
merged 8 commits into

from

Mar 23, 2025
 Merged


Create cache directory
#601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
eb3f2e6

Create cache directory


jan-janssen Mar 9, 2025
34b40b1

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
71d2023

fixes


jan-janssen Mar 9, 2025
eceb2a6

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
5e80e91

more fixes


jan-janssen Mar 9, 2025
e3598ce

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
7ae04ec

set job name based on file name


jan-janssen Mar 9, 2025
11955c0

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 3 additions & 1 deletion
executorlib/cache/queue_spawner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,9 @@ def execute_with_pysqa(
 if k in resource_dict:
 del resource_dict[k]
 if "job_name" not in resource_dict:
 resource_dict["job_name"] = "pysqa"
 resource_dict["job_name"] = os.path.basename(
 os.path.dirname(os.path.abspath(cwd))
 )
 submit_kwargs.update(resource_dict)
 queue_id = qa.submit_job(**submit_kwargs)
 dump(file_name=file_name, data_dict={"queue_id": queue_id})
Expand Down

15 changes: 10 additions & 5 deletions
executorlib/cache/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,13 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 )
 if task_key not in memory_dict:
 if task_key + ".h5out" not in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out"
 in os.listdir(os.path.join(cache_directory, task_key))
 ):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")

Comment on lines

+114
 to 
+115

@coderabbitaicoderabbitaiBotMar 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue
The file structure change is inconsistent with _check_task_output function
The code changes introduce a new directory structure for caching, where each task has its own subdirectory. While these lines correctly implement the new structure, the _check_task_output function (line 198) still looks for output files in the old location.
You need to update the _check_task_output function to work with the new directory structure:
def _check_task_output(
task_key: str, future_obj: Future, cache_directory: str
) -> Future:
"""
Check the output of a task and set the result of the future object if available.
Args:
task_key (str): The key of the task.
future_obj (Future): The future object associated with the task.
cache_directory (str): The directory where the HDF5 files are stored.
Returns:
Future: The updated future object.
"""
- file_name = os.path.join(cache_directory, task_key + ".h5out")+ file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
if exec_flag:
future_obj.set_result(result)
return future_obj
Also applies to: 139-139, 142-142
 dump(file_name=file_name, data_dict=data_dict)
 if not disable_dependencies:
 task_dependent_lst = [
Expand All@@ -131,10 +136,10 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 config_directory=pysqa_config_directory,
 backend=backend,
 cache_directory=cache_directory,
 cache_directory=os.path.join(cache_directory, task_key),
 )
 file_name_dict[task_key] = os.path.join(
 cache_directory, task_key + ".h5out"
 cache_directory, task_key, "cache.h5out"
 )
 memory_dict[task_key] = task_dict["future"]
 future_queue.task_done()
Expand DownExpand Up@@ -190,7 +195,7 @@ def _check_task_output(
 Future: The updated future object.

 """
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not os.path.exists(file_name):
 return future_obj
 exec_flag, result = get_output(file_name=file_name)
Expand Down

9 changes: 6 additions & 3 deletions
executorlib/interactive/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,12 @@ def _execute_task_with_cache(
 fn_kwargs=task_dict["kwargs"],
 resource_dict=task_dict.get("resource_dict", {}),
 )
 os.makedirs(cache_directory, exist_ok=True)
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 if task_key + ".h5out" not in os.listdir(cache_directory):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
 ):
 f = task_dict.pop("future")
 if f.set_running_or_notify_cancel():
 try:
Expand Down

21 changes: 12 additions & 9 deletions
executorlib/standalone/hdf.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,13 +104,16 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:

def get_cache_data(cache_directory: str) -> list[dict]:
 file_lst = []
 for file_name in os.listdir(cache_directory):
 with h5py.File(os.path.join(cache_directory, file_name), "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 for task_key in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 if os.path.exists(file_name):
 with h5py.File(file_name, "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 return file_lst

21 changes: 12 additions & 9 deletions
tests/test_cache_shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ def test_execute_function_mixed(self):
 fn_args=[1],
 fn_kwargs={"b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -41,11 +42,11 @@ def test_execute_function_mixed(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -58,7 +59,8 @@ def test_execute_function_args(self):
 fn_args=[1, 2],
 fn_kwargs={},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -68,11 +70,11 @@ def test_execute_function_args(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -85,7 +87,8 @@ def test_execute_function_kwargs(self):
 fn_args=[],
 fn_kwargs={"a": 1, "b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -95,11 +98,11 @@ def test_execute_function_kwargs(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Create cache directory#601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jan-janssen
merged 8 commits into

from

Mar 23, 2025
 Merged


Create cache directory
#601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
eb3f2e6

Create cache directory


jan-janssen Mar 9, 2025
34b40b1

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
71d2023

fixes


jan-janssen Mar 9, 2025
eceb2a6

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
5e80e91

more fixes


jan-janssen Mar 9, 2025
e3598ce

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
7ae04ec

set job name based on file name


jan-janssen Mar 9, 2025
11955c0

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 3 additions & 1 deletion
executorlib/cache/queue_spawner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,9 @@ def execute_with_pysqa(
 if k in resource_dict:
 del resource_dict[k]
 if "job_name" not in resource_dict:
 resource_dict["job_name"] = "pysqa"
 resource_dict["job_name"] = os.path.basename(
 os.path.dirname(os.path.abspath(cwd))
 )
 submit_kwargs.update(resource_dict)
 queue_id = qa.submit_job(**submit_kwargs)
 dump(file_name=file_name, data_dict={"queue_id": queue_id})
Expand Down

15 changes: 10 additions & 5 deletions
executorlib/cache/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,13 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 )
 if task_key not in memory_dict:
 if task_key + ".h5out" not in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out"
 in os.listdir(os.path.join(cache_directory, task_key))
 ):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")

Comment on lines

+114
 to 
+115

@coderabbitaicoderabbitaiBotMar 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue
The file structure change is inconsistent with _check_task_output function
The code changes introduce a new directory structure for caching, where each task has its own subdirectory. While these lines correctly implement the new structure, the _check_task_output function (line 198) still looks for output files in the old location.
You need to update the _check_task_output function to work with the new directory structure:
def _check_task_output(
task_key: str, future_obj: Future, cache_directory: str
) -> Future:
"""
Check the output of a task and set the result of the future object if available.
Args:
task_key (str): The key of the task.
future_obj (Future): The future object associated with the task.
cache_directory (str): The directory where the HDF5 files are stored.
Returns:
Future: The updated future object.
"""
- file_name = os.path.join(cache_directory, task_key + ".h5out")+ file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
if exec_flag:
future_obj.set_result(result)
return future_obj
Also applies to: 139-139, 142-142
 dump(file_name=file_name, data_dict=data_dict)
 if not disable_dependencies:
 task_dependent_lst = [
Expand All@@ -131,10 +136,10 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 config_directory=pysqa_config_directory,
 backend=backend,
 cache_directory=cache_directory,
 cache_directory=os.path.join(cache_directory, task_key),
 )
 file_name_dict[task_key] = os.path.join(
 cache_directory, task_key + ".h5out"
 cache_directory, task_key, "cache.h5out"
 )
 memory_dict[task_key] = task_dict["future"]
 future_queue.task_done()
Expand DownExpand Up@@ -190,7 +195,7 @@ def _check_task_output(
 Future: The updated future object.

 """
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not os.path.exists(file_name):
 return future_obj
 exec_flag, result = get_output(file_name=file_name)
Expand Down

9 changes: 6 additions & 3 deletions
executorlib/interactive/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,12 @@ def _execute_task_with_cache(
 fn_kwargs=task_dict["kwargs"],
 resource_dict=task_dict.get("resource_dict", {}),
 )
 os.makedirs(cache_directory, exist_ok=True)
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 if task_key + ".h5out" not in os.listdir(cache_directory):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
 ):
 f = task_dict.pop("future")
 if f.set_running_or_notify_cancel():
 try:
Expand Down

21 changes: 12 additions & 9 deletions
executorlib/standalone/hdf.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,13 +104,16 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:

def get_cache_data(cache_directory: str) -> list[dict]:
 file_lst = []
 for file_name in os.listdir(cache_directory):
 with h5py.File(os.path.join(cache_directory, file_name), "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 for task_key in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 if os.path.exists(file_name):
 with h5py.File(file_name, "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 return file_lst

21 changes: 12 additions & 9 deletions
tests/test_cache_shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ def test_execute_function_mixed(self):
 fn_args=[1],
 fn_kwargs={"b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -41,11 +42,11 @@ def test_execute_function_mixed(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -58,7 +59,8 @@ def test_execute_function_args(self):
 fn_args=[1, 2],
 fn_kwargs={},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -68,11 +70,11 @@ def test_execute_function_args(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -85,7 +87,8 @@ def test_execute_function_kwargs(self):
 fn_args=[],
 fn_kwargs={"a": 1, "b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -95,11 +98,11 @@ def test_execute_function_kwargs(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Create cache directory#601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jan-janssen
merged 8 commits into

from

Mar 23, 2025
 Merged


Create cache directory
#601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
eb3f2e6

Create cache directory


jan-janssen Mar 9, 2025
34b40b1

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
71d2023

fixes


jan-janssen Mar 9, 2025
eceb2a6

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
5e80e91

more fixes


jan-janssen Mar 9, 2025
e3598ce

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
7ae04ec

set job name based on file name


jan-janssen Mar 9, 2025
11955c0

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 3 additions & 1 deletion
executorlib/cache/queue_spawner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,9 @@ def execute_with_pysqa(
 if k in resource_dict:
 del resource_dict[k]
 if "job_name" not in resource_dict:
 resource_dict["job_name"] = "pysqa"
 resource_dict["job_name"] = os.path.basename(
 os.path.dirname(os.path.abspath(cwd))
 )
 submit_kwargs.update(resource_dict)
 queue_id = qa.submit_job(**submit_kwargs)
 dump(file_name=file_name, data_dict={"queue_id": queue_id})
Expand Down

15 changes: 10 additions & 5 deletions
executorlib/cache/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,13 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 )
 if task_key not in memory_dict:
 if task_key + ".h5out" not in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out"
 in os.listdir(os.path.join(cache_directory, task_key))
 ):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")

Comment on lines

+114
 to 
+115

@coderabbitaicoderabbitaiBotMar 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue
The file structure change is inconsistent with _check_task_output function
The code changes introduce a new directory structure for caching, where each task has its own subdirectory. While these lines correctly implement the new structure, the _check_task_output function (line 198) still looks for output files in the old location.
You need to update the _check_task_output function to work with the new directory structure:
def _check_task_output(
task_key: str, future_obj: Future, cache_directory: str
) -> Future:
"""
Check the output of a task and set the result of the future object if available.
Args:
task_key (str): The key of the task.
future_obj (Future): The future object associated with the task.
cache_directory (str): The directory where the HDF5 files are stored.
Returns:
Future: The updated future object.
"""
- file_name = os.path.join(cache_directory, task_key + ".h5out")+ file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
if exec_flag:
future_obj.set_result(result)
return future_obj
Also applies to: 139-139, 142-142
 dump(file_name=file_name, data_dict=data_dict)
 if not disable_dependencies:
 task_dependent_lst = [
Expand All@@ -131,10 +136,10 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 config_directory=pysqa_config_directory,
 backend=backend,
 cache_directory=cache_directory,
 cache_directory=os.path.join(cache_directory, task_key),
 )
 file_name_dict[task_key] = os.path.join(
 cache_directory, task_key + ".h5out"
 cache_directory, task_key, "cache.h5out"
 )
 memory_dict[task_key] = task_dict["future"]
 future_queue.task_done()
Expand DownExpand Up@@ -190,7 +195,7 @@ def _check_task_output(
 Future: The updated future object.

 """
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not os.path.exists(file_name):
 return future_obj
 exec_flag, result = get_output(file_name=file_name)
Expand Down

9 changes: 6 additions & 3 deletions
executorlib/interactive/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,12 @@ def _execute_task_with_cache(
 fn_kwargs=task_dict["kwargs"],
 resource_dict=task_dict.get("resource_dict", {}),
 )
 os.makedirs(cache_directory, exist_ok=True)
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 if task_key + ".h5out" not in os.listdir(cache_directory):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
 ):
 f = task_dict.pop("future")
 if f.set_running_or_notify_cancel():
 try:
Expand Down

21 changes: 12 additions & 9 deletions
executorlib/standalone/hdf.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,13 +104,16 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:

def get_cache_data(cache_directory: str) -> list[dict]:
 file_lst = []
 for file_name in os.listdir(cache_directory):
 with h5py.File(os.path.join(cache_directory, file_name), "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 for task_key in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 if os.path.exists(file_name):
 with h5py.File(file_name, "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 return file_lst

21 changes: 12 additions & 9 deletions
tests/test_cache_shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ def test_execute_function_mixed(self):
 fn_args=[1],
 fn_kwargs={"b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -41,11 +42,11 @@ def test_execute_function_mixed(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -58,7 +59,8 @@ def test_execute_function_args(self):
 fn_args=[1, 2],
 fn_kwargs={},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -68,11 +70,11 @@ def test_execute_function_args(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -85,7 +87,8 @@ def test_execute_function_kwargs(self):
 fn_args=[],
 fn_kwargs={"a": 1, "b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -95,11 +98,11 @@ def test_execute_function_kwargs(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Create cache directory#601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jan-janssen
merged 8 commits into

from

Mar 23, 2025
 Merged


Create cache directory
#601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
eb3f2e6

Create cache directory


jan-janssen Mar 9, 2025
34b40b1

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
71d2023

fixes


jan-janssen Mar 9, 2025
eceb2a6

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
5e80e91

more fixes


jan-janssen Mar 9, 2025
e3598ce

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
7ae04ec

set job name based on file name


jan-janssen Mar 9, 2025
11955c0

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 3 additions & 1 deletion
executorlib/cache/queue_spawner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,9 @@ def execute_with_pysqa(
 if k in resource_dict:
 del resource_dict[k]
 if "job_name" not in resource_dict:
 resource_dict["job_name"] = "pysqa"
 resource_dict["job_name"] = os.path.basename(
 os.path.dirname(os.path.abspath(cwd))
 )
 submit_kwargs.update(resource_dict)
 queue_id = qa.submit_job(**submit_kwargs)
 dump(file_name=file_name, data_dict={"queue_id": queue_id})
Expand Down

15 changes: 10 additions & 5 deletions
executorlib/cache/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,13 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 )
 if task_key not in memory_dict:
 if task_key + ".h5out" not in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out"
 in os.listdir(os.path.join(cache_directory, task_key))
 ):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")

Comment on lines

+114
 to 
+115

@coderabbitaicoderabbitaiBotMar 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue
The file structure change is inconsistent with _check_task_output function
The code changes introduce a new directory structure for caching, where each task has its own subdirectory. While these lines correctly implement the new structure, the _check_task_output function (line 198) still looks for output files in the old location.
You need to update the _check_task_output function to work with the new directory structure:
def _check_task_output(
task_key: str, future_obj: Future, cache_directory: str
) -> Future:
"""
Check the output of a task and set the result of the future object if available.
Args:
task_key (str): The key of the task.
future_obj (Future): The future object associated with the task.
cache_directory (str): The directory where the HDF5 files are stored.
Returns:
Future: The updated future object.
"""
- file_name = os.path.join(cache_directory, task_key + ".h5out")+ file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
if exec_flag:
future_obj.set_result(result)
return future_obj
Also applies to: 139-139, 142-142
 dump(file_name=file_name, data_dict=data_dict)
 if not disable_dependencies:
 task_dependent_lst = [
Expand All@@ -131,10 +136,10 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 config_directory=pysqa_config_directory,
 backend=backend,
 cache_directory=cache_directory,
 cache_directory=os.path.join(cache_directory, task_key),
 )
 file_name_dict[task_key] = os.path.join(
 cache_directory, task_key + ".h5out"
 cache_directory, task_key, "cache.h5out"
 )
 memory_dict[task_key] = task_dict["future"]
 future_queue.task_done()
Expand DownExpand Up@@ -190,7 +195,7 @@ def _check_task_output(
 Future: The updated future object.

 """
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not os.path.exists(file_name):
 return future_obj
 exec_flag, result = get_output(file_name=file_name)
Expand Down

9 changes: 6 additions & 3 deletions
executorlib/interactive/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,12 @@ def _execute_task_with_cache(
 fn_kwargs=task_dict["kwargs"],
 resource_dict=task_dict.get("resource_dict", {}),
 )
 os.makedirs(cache_directory, exist_ok=True)
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 if task_key + ".h5out" not in os.listdir(cache_directory):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
 ):
 f = task_dict.pop("future")
 if f.set_running_or_notify_cancel():
 try:
Expand Down

21 changes: 12 additions & 9 deletions
executorlib/standalone/hdf.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,13 +104,16 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:

def get_cache_data(cache_directory: str) -> list[dict]:
 file_lst = []
 for file_name in os.listdir(cache_directory):
 with h5py.File(os.path.join(cache_directory, file_name), "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 for task_key in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 if os.path.exists(file_name):
 with h5py.File(file_name, "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 return file_lst

21 changes: 12 additions & 9 deletions
tests/test_cache_shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ def test_execute_function_mixed(self):
 fn_args=[1],
 fn_kwargs={"b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -41,11 +42,11 @@ def test_execute_function_mixed(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -58,7 +59,8 @@ def test_execute_function_args(self):
 fn_args=[1, 2],
 fn_kwargs={},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -68,11 +70,11 @@ def test_execute_function_args(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -85,7 +87,8 @@ def test_execute_function_kwargs(self):
 fn_args=[],
 fn_kwargs={"a": 1, "b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -95,11 +98,11 @@ def test_execute_function_kwargs(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Create cache directory#601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jan-janssen
merged 8 commits into

from

Mar 23, 2025
 Merged


Create cache directory
#601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
eb3f2e6

Create cache directory


jan-janssen Mar 9, 2025
34b40b1

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
71d2023

fixes


jan-janssen Mar 9, 2025
eceb2a6

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
5e80e91

more fixes


jan-janssen Mar 9, 2025
e3598ce

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
7ae04ec

set job name based on file name


jan-janssen Mar 9, 2025
11955c0

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 3 additions & 1 deletion
executorlib/cache/queue_spawner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,9 @@ def execute_with_pysqa(
 if k in resource_dict:
 del resource_dict[k]
 if "job_name" not in resource_dict:
 resource_dict["job_name"] = "pysqa"
 resource_dict["job_name"] = os.path.basename(
 os.path.dirname(os.path.abspath(cwd))
 )
 submit_kwargs.update(resource_dict)
 queue_id = qa.submit_job(**submit_kwargs)
 dump(file_name=file_name, data_dict={"queue_id": queue_id})
Expand Down

15 changes: 10 additions & 5 deletions
executorlib/cache/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,13 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 )
 if task_key not in memory_dict:
 if task_key + ".h5out" not in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out"
 in os.listdir(os.path.join(cache_directory, task_key))
 ):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")

Comment on lines

+114
 to 
+115

@coderabbitaicoderabbitaiBotMar 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue
The file structure change is inconsistent with _check_task_output function
The code changes introduce a new directory structure for caching, where each task has its own subdirectory. While these lines correctly implement the new structure, the _check_task_output function (line 198) still looks for output files in the old location.
You need to update the _check_task_output function to work with the new directory structure:
def _check_task_output(
task_key: str, future_obj: Future, cache_directory: str
) -> Future:
"""
Check the output of a task and set the result of the future object if available.
Args:
task_key (str): The key of the task.
future_obj (Future): The future object associated with the task.
cache_directory (str): The directory where the HDF5 files are stored.
Returns:
Future: The updated future object.
"""
- file_name = os.path.join(cache_directory, task_key + ".h5out")+ file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
if exec_flag:
future_obj.set_result(result)
return future_obj
Also applies to: 139-139, 142-142
 dump(file_name=file_name, data_dict=data_dict)
 if not disable_dependencies:
 task_dependent_lst = [
Expand All@@ -131,10 +136,10 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 config_directory=pysqa_config_directory,
 backend=backend,
 cache_directory=cache_directory,
 cache_directory=os.path.join(cache_directory, task_key),
 )
 file_name_dict[task_key] = os.path.join(
 cache_directory, task_key + ".h5out"
 cache_directory, task_key, "cache.h5out"
 )
 memory_dict[task_key] = task_dict["future"]
 future_queue.task_done()
Expand DownExpand Up@@ -190,7 +195,7 @@ def _check_task_output(
 Future: The updated future object.

 """
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not os.path.exists(file_name):
 return future_obj
 exec_flag, result = get_output(file_name=file_name)
Expand Down

9 changes: 6 additions & 3 deletions
executorlib/interactive/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,12 @@ def _execute_task_with_cache(
 fn_kwargs=task_dict["kwargs"],
 resource_dict=task_dict.get("resource_dict", {}),
 )
 os.makedirs(cache_directory, exist_ok=True)
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 if task_key + ".h5out" not in os.listdir(cache_directory):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
 ):
 f = task_dict.pop("future")
 if f.set_running_or_notify_cancel():
 try:
Expand Down

21 changes: 12 additions & 9 deletions
executorlib/standalone/hdf.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,13 +104,16 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:

def get_cache_data(cache_directory: str) -> list[dict]:
 file_lst = []
 for file_name in os.listdir(cache_directory):
 with h5py.File(os.path.join(cache_directory, file_name), "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 for task_key in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 if os.path.exists(file_name):
 with h5py.File(file_name, "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 return file_lst

21 changes: 12 additions & 9 deletions
tests/test_cache_shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ def test_execute_function_mixed(self):
 fn_args=[1],
 fn_kwargs={"b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -41,11 +42,11 @@ def test_execute_function_mixed(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -58,7 +59,8 @@ def test_execute_function_args(self):
 fn_args=[1, 2],
 fn_kwargs={},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -68,11 +70,11 @@ def test_execute_function_args(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -85,7 +87,8 @@ def test_execute_function_kwargs(self):
 fn_args=[],
 fn_kwargs={"a": 1, "b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -95,11 +98,11 @@ def test_execute_function_kwargs(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Create cache directory#601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jan-janssen
merged 8 commits into

from

Mar 23, 2025
 Merged


Create cache directory
#601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
eb3f2e6

Create cache directory


jan-janssen Mar 9, 2025
34b40b1

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
71d2023

fixes


jan-janssen Mar 9, 2025
eceb2a6

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
5e80e91

more fixes


jan-janssen Mar 9, 2025
e3598ce

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
7ae04ec

set job name based on file name


jan-janssen Mar 9, 2025
11955c0

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 3 additions & 1 deletion
executorlib/cache/queue_spawner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,9 @@ def execute_with_pysqa(
 if k in resource_dict:
 del resource_dict[k]
 if "job_name" not in resource_dict:
 resource_dict["job_name"] = "pysqa"
 resource_dict["job_name"] = os.path.basename(
 os.path.dirname(os.path.abspath(cwd))
 )
 submit_kwargs.update(resource_dict)
 queue_id = qa.submit_job(**submit_kwargs)
 dump(file_name=file_name, data_dict={"queue_id": queue_id})
Expand Down

15 changes: 10 additions & 5 deletions
executorlib/cache/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,13 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 )
 if task_key not in memory_dict:
 if task_key + ".h5out" not in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out"
 in os.listdir(os.path.join(cache_directory, task_key))
 ):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")

Comment on lines

+114
 to 
+115

@coderabbitaicoderabbitaiBotMar 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue
The file structure change is inconsistent with _check_task_output function
The code changes introduce a new directory structure for caching, where each task has its own subdirectory. While these lines correctly implement the new structure, the _check_task_output function (line 198) still looks for output files in the old location.
You need to update the _check_task_output function to work with the new directory structure:
def _check_task_output(
task_key: str, future_obj: Future, cache_directory: str
) -> Future:
"""
Check the output of a task and set the result of the future object if available.
Args:
task_key (str): The key of the task.
future_obj (Future): The future object associated with the task.
cache_directory (str): The directory where the HDF5 files are stored.
Returns:
Future: The updated future object.
"""
- file_name = os.path.join(cache_directory, task_key + ".h5out")+ file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
if exec_flag:
future_obj.set_result(result)
return future_obj
Also applies to: 139-139, 142-142
 dump(file_name=file_name, data_dict=data_dict)
 if not disable_dependencies:
 task_dependent_lst = [
Expand All@@ -131,10 +136,10 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 config_directory=pysqa_config_directory,
 backend=backend,
 cache_directory=cache_directory,
 cache_directory=os.path.join(cache_directory, task_key),
 )
 file_name_dict[task_key] = os.path.join(
 cache_directory, task_key + ".h5out"
 cache_directory, task_key, "cache.h5out"
 )
 memory_dict[task_key] = task_dict["future"]
 future_queue.task_done()
Expand DownExpand Up@@ -190,7 +195,7 @@ def _check_task_output(
 Future: The updated future object.

 """
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not os.path.exists(file_name):
 return future_obj
 exec_flag, result = get_output(file_name=file_name)
Expand Down

9 changes: 6 additions & 3 deletions
executorlib/interactive/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,12 @@ def _execute_task_with_cache(
 fn_kwargs=task_dict["kwargs"],
 resource_dict=task_dict.get("resource_dict", {}),
 )
 os.makedirs(cache_directory, exist_ok=True)
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 if task_key + ".h5out" not in os.listdir(cache_directory):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
 ):
 f = task_dict.pop("future")
 if f.set_running_or_notify_cancel():
 try:
Expand Down

21 changes: 12 additions & 9 deletions
executorlib/standalone/hdf.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,13 +104,16 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:

def get_cache_data(cache_directory: str) -> list[dict]:
 file_lst = []
 for file_name in os.listdir(cache_directory):
 with h5py.File(os.path.join(cache_directory, file_name), "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 for task_key in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 if os.path.exists(file_name):
 with h5py.File(file_name, "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 return file_lst

21 changes: 12 additions & 9 deletions
tests/test_cache_shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ def test_execute_function_mixed(self):
 fn_args=[1],
 fn_kwargs={"b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -41,11 +42,11 @@ def test_execute_function_mixed(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -58,7 +59,8 @@ def test_execute_function_args(self):
 fn_args=[1, 2],
 fn_kwargs={},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -68,11 +70,11 @@ def test_execute_function_args(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -85,7 +87,8 @@ def test_execute_function_kwargs(self):
 fn_args=[],
 fn_kwargs={"a": 1, "b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -95,11 +98,11 @@ def test_execute_function_kwargs(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Create cache directory#601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jan-janssen
merged 8 commits into

from

Mar 23, 2025
 Merged


Create cache directory
#601
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
eb3f2e6

Create cache directory


jan-janssen Mar 9, 2025
34b40b1

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
71d2023

fixes


jan-janssen Mar 9, 2025
eceb2a6

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
5e80e91

more fixes


jan-janssen Mar 9, 2025
e3598ce

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025
7ae04ec

set job name based on file name


jan-janssen Mar 9, 2025
11955c0

[pre-commit.ci] auto fixes from pre-commit.com hooks


pre-commit-ci[bot] Mar 9, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 3 additions & 1 deletion
executorlib/cache/queue_spawner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,9 @@ def execute_with_pysqa(
 if k in resource_dict:
 del resource_dict[k]
 if "job_name" not in resource_dict:
 resource_dict["job_name"] = "pysqa"
 resource_dict["job_name"] = os.path.basename(
 os.path.dirname(os.path.abspath(cwd))
 )
 submit_kwargs.update(resource_dict)
 queue_id = qa.submit_job(**submit_kwargs)
 dump(file_name=file_name, data_dict={"queue_id": queue_id})
Expand Down

15 changes: 10 additions & 5 deletions
executorlib/cache/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,8 +106,13 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 )
 if task_key not in memory_dict:
 if task_key + ".h5out" not in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out"
 in os.listdir(os.path.join(cache_directory, task_key))
 ):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")

Comment on lines

+114
 to 
+115

@coderabbitaicoderabbitaiBotMar 9, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue
The file structure change is inconsistent with _check_task_output function
The code changes introduce a new directory structure for caching, where each task has its own subdirectory. While these lines correctly implement the new structure, the _check_task_output function (line 198) still looks for output files in the old location.
You need to update the _check_task_output function to work with the new directory structure:
def _check_task_output(
task_key: str, future_obj: Future, cache_directory: str
) -> Future:
"""
Check the output of a task and set the result of the future object if available.
Args:
task_key (str): The key of the task.
future_obj (Future): The future object associated with the task.
cache_directory (str): The directory where the HDF5 files are stored.
Returns:
Future: The updated future object.
"""
- file_name = os.path.join(cache_directory, task_key + ".h5out")+ file_name = os.path.join(cache_directory, task_key, "cache.h5out")
if not os.path.exists(file_name):
return future_obj
exec_flag, result = get_output(file_name=file_name)
if exec_flag:
future_obj.set_result(result)
return future_obj
Also applies to: 139-139, 142-142
 dump(file_name=file_name, data_dict=data_dict)
 if not disable_dependencies:
 task_dependent_lst = [
Expand All@@ -131,10 +136,10 @@ def execute_tasks_h5(
 resource_dict=task_resource_dict,
 config_directory=pysqa_config_directory,
 backend=backend,
 cache_directory=cache_directory,
 cache_directory=os.path.join(cache_directory, task_key),
 )
 file_name_dict[task_key] = os.path.join(
 cache_directory, task_key + ".h5out"
 cache_directory, task_key, "cache.h5out"
 )
 memory_dict[task_key] = task_dict["future"]
 future_queue.task_done()
Expand DownExpand Up@@ -190,7 +195,7 @@ def _check_task_output(
 Future: The updated future object.

 """
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not os.path.exists(file_name):
 return future_obj
 exec_flag, result = get_output(file_name=file_name)
Expand Down

9 changes: 6 additions & 3 deletions
executorlib/interactive/shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,9 +148,12 @@ def _execute_task_with_cache(
 fn_kwargs=task_dict["kwargs"],
 resource_dict=task_dict.get("resource_dict", {}),
 )
 os.makedirs(cache_directory, exist_ok=True)
 file_name = os.path.join(cache_directory, task_key + ".h5out")
 if task_key + ".h5out" not in os.listdir(cache_directory):
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 if not (
 task_key in os.listdir(cache_directory)
 and "cache.h5out" in os.listdir(os.path.join(cache_directory, task_key))
 ):
 f = task_dict.pop("future")
 if f.set_running_or_notify_cancel():
 try:
Expand Down

21 changes: 12 additions & 9 deletions
executorlib/standalone/hdf.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -104,13 +104,16 @@ def get_queue_id(file_name: Optional[str]) -> Optional[int]:

def get_cache_data(cache_directory: str) -> list[dict]:
 file_lst = []
 for file_name in os.listdir(cache_directory):
 with h5py.File(os.path.join(cache_directory, file_name), "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 for task_key in os.listdir(cache_directory):
 file_name = os.path.join(cache_directory, task_key, "cache.h5out")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 if os.path.exists(file_name):
 with h5py.File(file_name, "r") as hdf:
 file_content_dict = {
 key: cloudpickle.loads(np.void(hdf["/" + key]))
 for key in group_dict.values()
 if key in hdf
 }
 file_content_dict["filename"] = file_name
 file_lst.append(file_content_dict)
 return file_lst

21 changes: 12 additions & 9 deletions
tests/test_cache_shared.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,8 @@ def test_execute_function_mixed(self):
 fn_args=[1],
 fn_kwargs={"b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -41,11 +42,11 @@ def test_execute_function_mixed(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -58,7 +59,8 @@ def test_execute_function_args(self):
 fn_args=[1, 2],
 fn_kwargs={},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -68,11 +70,11 @@ def test_execute_function_args(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand All@@ -85,7 +87,8 @@ def test_execute_function_kwargs(self):
 fn_args=[],
 fn_kwargs={"a": 1, "b": 2},
 )
 file_name = os.path.join(cache_directory, task_key + ".h5in")
 file_name = os.path.join(cache_directory, task_key, "cache.h5in")
 os.makedirs(os.path.join(cache_directory, task_key), exist_ok=True)
 dump(file_name=file_name, data_dict=data_dict)
 backend_execute_task_in_file(file_name=file_name)
 future_obj = Future()
Expand All@@ -95,11 +98,11 @@ def test_execute_function_kwargs(self):
 self.assertTrue(future_obj.done())
 self.assertEqual(future_obj.result(), 3)
 self.assertTrue(
 get_runtime(file_name=os.path.join(cache_directory, task_key + ".h5out"))
 get_runtime(file_name=os.path.join(cache_directory, task_key, "cache.h5out"))
 > 0.0
 )
 future_file_obj = FutureItem(
 file_name=os.path.join(cache_directory, task_key + ".h5out")
 file_name=os.path.join(cache_directory, task_key, "cache.h5out")
 )
 self.assertTrue(future_file_obj.done())
 self.assertEqual(future_file_obj.result(), 3)
Expand Down