リファクタリング

oist · May 28, 2022 · ae976ef · ae976ef
1 parent a6e898c
commit ae976ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/optinist/Snakefile b/optinist/Snakefile
@@ -1,6 +1,6 @@
 from optinist.api.dir_path import DIRPATH
 from optinist.api.utils.filepath_creater import join_filepath
-from optinist.api.snakemake.smk_dir import smk_func_input, smk_func_output, get_conda
+from optinist.api.snakemake.smk_utils import smk_input, smk_output, smk_conda
 from optinist.routers.model import FILETYPE
 
 configfile: join_filepath([DIRPATH.ROOT_DIR, 'config.yaml'])
@@ -14,22 +14,22 @@ for rule_name, details in config["rules"].items():
     if details["type"] in [FILETYPE.IMAGE, FILETYPE.CSV, FILETYPE.BEHAVIOR, FILETYPE.HDF5]:
         rule:
             input:
-                smk_func_input(details)
+                smk_input(details)
             output:
-                smk_func_output(details)
+                smk_output(details)
             params:
                 name = details
             script:
                 f"{DIRPATH.ROOT_DIR}/rules/scripts/data.py"
     else:
         rule:
             input:
-                smk_func_input(details)
+                smk_input(details)
             output:
-                smk_func_output(details)
+                smk_output(details)
             params:
                 name = details
             conda:
-                get_conda(details)
+                smk_conda(details)
             script:
                 f"{DIRPATH.ROOT_DIR}/rules/scripts/func.py"
diff --git a/optinist/api/snakemake/smk_dir.py → optinist/api/snakemake/smk_utils.py b/optinist/api/snakemake/smk_dir.py → optinist/api/snakemake/smk_utils.py
@@ -4,7 +4,7 @@
 from optinist.wrappers import wrapper_dict
 
 
-def smk_func_input(details):
+def smk_input(details):
     if details["type"] in [FILETYPE.IMAGE]:
         return [
             join_filepath([DIRPATH.INPUT_DIR, x])
@@ -19,14 +19,14 @@ def smk_func_input(details):
         ]
 
 
-def smk_func_output(details):
+def smk_output(details):
     return join_filepath([
         DIRPATH.OUTPUT_DIR,
         details["output"]
     ])
 
 
-def get_conda(details):
+def smk_conda(details):
     if details["type"] in [FILETYPE.IMAGE, FILETYPE.CSV, FILETYPE.BEHAVIOR, FILETYPE.HDF5]:
         return None