fix(dependencies): upgrade hyfi to 1.2.13

entelecheia · Jul 17, 2023 · d1b7658 · d1b7658
1 parent 8689fd9
commit d1b7658
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 24 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -14,7 +14,7 @@ corprep = 'corprep.__cli__:main'
 
 [tool.poetry.dependencies]
 python = ">=3.8.1,<3.12"
-hyfi = "^1.2.10"
+hyfi = "^1.2.13"
 ekonlpy = "^1.1.7"
 
 [tool.poetry.group.dev]

diff --git a/src/corprep/conf/mode/__init__.yaml b/src/corprep/conf/mode/__init__.yaml
@@ -3,12 +3,12 @@ debug_mode: false
 resolve: true
 verbose: false
 ignore_warnings: true
-logging_level: ${oc.env:HYFI_LOG_LEVEL,WARNING}
-hydra_log_dir: ${oc.select:project.global_hyfi_root, ${alt:${oc.env:HYFI_GLOBAL_ROOT,null},${__home_path__:}/.hyfi}}/${oc.select:project.global_workspace_name, ${alt:${oc.env:HYFI_GLOBAL_WORKSPACE_NAME,null},workspace}}/logs/hydra
+logging_level: WARNING
+hydra_log_dir: ${oc.select:project.global_hyfi_root, ${alt:${oc.env:HYFI_GLOBAL_ROOT,null},${__home_path__:}}}/${oc.select:project.global_workspace_name, ${alt:${oc.env:HYFI_GLOBAL_WORKSPACE_NAME,null},.hyfi}}/logs/hydra
 
 hydra:
   job:
-    name: ${oc.select:project.project_name, ${oc.select:task.project.project_name, ${alt:${oc.env:HYFI_PROJECT_NAME,null},hyfi-project}}}
+    name: ${oc.select:project.project_name, ${oc.select:task.project.project_name, ${alt:${oc.env:HYFI_PROJECT_NAME,null},hyfi}}}
     chdir: true
   run:
     dir: ${hydra_log_dir}/${hydra.job.name}/${now:%Y-%m-%d}/${now:%Y-%m-%d_%H-%M-%S}

diff --git a/src/corprep/conf/path/__init__.yaml b/src/corprep/conf/path/__init__.yaml
@@ -9,9 +9,9 @@ hyfi: ${__hyfi_path__:}
 resources: ${alt:${oc.env:HYFI_RESOURCE_DIR,null},${.hyfi}/resources}
 runtime: ${get_original_cwd:}
 # global paths
-global_hyfi_root: ${oc.select:..global_hyfi_root,${alt:${oc.env:HYFI_GLOBAL_ROOT,null},${__home_path__:}/.hyfi}}
-global_workspace_name: ${oc.select:..global_workspace_name,${alt:${oc.env:HYFI_GLOBAL_WORKSPACE_NAME,null},workspace}}
+global_hyfi_root: ${oc.select:..global_hyfi_root,${alt:${oc.env:HYFI_GLOBAL_ROOT,null},${__home_path__:}}}
+global_workspace_name: ${oc.select:..global_workspace_name,${alt:${oc.env:HYFI_GLOBAL_WORKSPACE_NAME,null},.hyfi}}
 # project specific paths
-project_name: ${oc.select:..project_name,${alt:${oc.env:HYFI_PROJECT_NAME,null},hyfi-project}}
+project_name: ${oc.select:..project_name,${alt:${oc.env:HYFI_PROJECT_NAME,null},hyfi}}
 project_root: ${oc.select:..project_root,${alt:${oc.env:HYFI_PROJECT_ROOT,null},${get_original_cwd:}}}
-project_workspace_name: ${oc.select:..project_workspace_name,${alt:${oc.env:HYFI_PROJECT_WORKSPACE_NAME,null},${.global_workspace_name}}}
+project_workspace_name: ${oc.select:..project_workspace_name,${alt:${oc.env:HYFI_PROJECT_WORKSPACE_NAME,null},workspace}}
diff --git a/src/corprep/conf/path/__task__.yaml b/src/corprep/conf/path/__task__.yaml
@@ -1,5 +1,2 @@
-defaults:
-  - dirnames: __init__
-
 task_name: ${oc.select:..task_name,__test__}
 task_root: ${oc.select:..task_root,workspace}
diff --git a/src/corprep/conf/path/dirnames/__init__.yaml b/src/corprep/conf/path/dirnames/__init__.yaml
@@ -1,7 +1,7 @@
 # directory names
 inputs: inputs
 outputs: outputs
-archive: archive
+archives: archives
 datasets: datasets
 models: models
 modules: modules
@@ -10,6 +10,6 @@ logs: logs
 cache: .cache
 tmp: tmp
 # to reuse the same config file for different runs
-config_dirname: configs
+configs: configs
 config_yaml: config.yaml
 config_json: config.json
diff --git a/src/corprep/conf/pipeline/__test_dataframe__.yaml b/src/corprep/conf/pipeline/__test_dataframe__.yaml
@@ -12,5 +12,5 @@ steps:
     verbose: true
   - uses: pipe3
     with:
-      data_file: workspace/processed/ESG_ratings_raw.parquet
+      data_file: datasets/processed/ESG_ratings_raw.parquet
     verbose: true
diff --git a/src/corprep/conf/pipeline/datasets.yaml b/src/corprep/conf/pipeline/datasets.yaml
@@ -7,6 +7,6 @@ steps:
   - uses: pipe1
     with:
       raw_dataset_dir: ${__home_path__:}/workspace/datasets/raw/daum_news_20230707
-      dataset_path: processed/daum_news_20230707
+      dataset_path: datasets/processed/daum_news_20230707
       verbose: true
     verbose: true
diff --git a/src/corprep/conf/project/__init__.yaml b/src/corprep/conf/project/__init__.yaml
@@ -4,12 +4,12 @@ defaults:
   - /path: __init__
 
 _config_name_: __init__
-project_name: ${alt:${oc.env:HYFI_PROJECT_NAME,null},hyfi-project}
+project_name: ${alt:${oc.env:HYFI_PROJECT_NAME,null},${oc.select:about.__package_name__,hyfi}}
 project_description: ${oc.env:HYFI_PROJECT_DESC,""}
 project_root: ${alt:${oc.env:HYFI_PROJECT_ROOT,null},${.global_hyfi_root}/${.global_workspace_name}/projects/${.project_name}}
-project_workspace_name: ${alt:${oc.env:HYFI_PROJECT_WORKSPACE_NAME,null},${.global_workspace_name}}
-global_hyfi_root: ${alt:${oc.env:HYFI_GLOBAL_ROOT,null},${__home_path__:}/.hyfi}
-global_workspace_name: ${alt:${oc.env:HYFI_GLOBAL_WORKSPACE_NAME,null},workspace}
+project_workspace_name: ${alt:${oc.env:HYFI_PROJECT_WORKSPACE_NAME,null},workspace}
+global_hyfi_root: ${alt:${oc.env:HYFI_GLOBAL_ROOT,null},${__home_path__:}}
+global_workspace_name: ${alt:${oc.env:HYFI_GLOBAL_WORKSPACE_NAME,null},.hyfi}
 num_workers: ${oc.env:HYFI_NUM_WORKERS,1}
 use_huggingface_hub: false
 use_wandb: false

diff --git a/src/corprep/conf/project/__test__.yaml b/src/corprep/conf/project/__test__.yaml
@@ -4,5 +4,6 @@ defaults:
 project_name: __test__
 project_description: A test project for HyFI
 global_hyfi_root: ${get_original_cwd:}
+global_workspace_name: workspace
 num_workers: 2
 verbose: true
diff --git a/src/corprep/conf/task/__init__.yaml b/src/corprep/conf/task/__init__.yaml
@@ -5,7 +5,7 @@ defaults:
 _config_name_: __init__
 project: ${oc.select:project,null}
 task_name: __init__
-task_root: ${oc.select:project.path.project_workspace_root,workspace}
+task_root: ${oc.select:project.project_root,.}/${oc.select:project.project_workspace_name,workspace}
 autoload: false
 version: ${__version__:}
 verbose: ${oc.select:project.verbose,false}