fix(dependencies): upgrade hyfi to 1.2.7

entelecheia · Jul 16, 2023 · 82ab4e6 · 82ab4e6
1 parent 7e331d2
commit 82ab4e6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 126 deletions.
diff --git a/.copier-hyfi-config.yaml b/.copier-hyfi-config.yaml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; do NOT edit manually
-_commit: v0.4.4
+_commit: v0.4.5
 _src_path: gh:entelecheia/hyfi-template
 package_name: corprep
 project_name: corporate-reputation

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.6"
+hyfi = "^1.2.7"
 ekonlpy = "^1.1.7"
 
 [tool.poetry.group.dev]

diff --git a/src/corprep/conf/mode/__init__.yaml b/src/corprep/conf/mode/__init__.yaml
@@ -4,7 +4,7 @@ resolve: true
 verbose: false
 ignore_warnings: true
 logging_level: ${oc.env:HYFI_LOG_LEVEL,WARNING}
-hydra_log_dir: ${oc.select:project.path.project_logs, ${oc.select:task.path.task_logs, ${alt:${oc.env:HYFI_GLOBAL_ROOT,null},${__home_path__:}/.hyfi}/logs}}/hydra
+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
 
 hydra:
   job:

diff --git a/tests/notebook/tests.ipynb b/tests/notebook/tests.ipynb
@@ -14,18 +14,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/home/yj.lee/.venvs/corporate-reputation/lib/python3.8/site-packages/tqdm/auto.py:21: TqdmWarning: IProgress not found. Please update jupyter and ipywidgets. See https://ipywidgets.readthedocs.io/en/stable/user_install.html\n",
-      "  from .autonotebook import tqdm as notebook_tqdm\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "from corprep import HyFI"
    ]
@@ -42,90 +33,30 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {
     "id": "BzxPwsOVPWef"
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "HyFI version: 1.2.2\n",
-      " 1.2.2\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "version = HyFI.__version__\n",
     "print(\"HyFI version:\", version)\n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/tmp/ipykernel_4181793/1741726459.py:1: PydanticDeprecatedSince20: The `dict` method is deprecated; use `model_dump` instead. Deprecated in Pydantic V2.0 to be removed in V3.0. See Pydantic V2 Migration Guide at https://errors.pydantic.dev/2.0.2/migration/\n",
-      "  HyFI.dotenv().dict()\n"
-     ]
-    },
-    {
-     "data": {
-      "text/plain": [
-       "{'DOTENV_FILENAME': '.env',\n",
-       " 'DOTENV_DIR': '',\n",
-       " 'DOTENV_PATH': '',\n",
-       " 'HYFI_RESOURCE_DIR': '',\n",
-       " 'HYFI_GLOBAL_ROOT': '',\n",
-       " 'HYFI_GLOBAL_WORKSPACE_NAME': 'workspace',\n",
-       " 'HYFI_PROJECT_NAME': '',\n",
-       " 'HYFI_PROJECT_DESC': '',\n",
-       " 'HYFI_PROJECT_ROOT': '',\n",
-       " 'HYFI_PROJECT_WORKSPACE_NAME': 'workspace',\n",
-       " 'HYFI_LOG_LEVEL': 'WARNING',\n",
-       " 'HYFI_VERBOSE': False,\n",
-       " 'HYFI_NUM_WORKERS': 1,\n",
-       " 'CACHED_PATH_CACHE_ROOT': '',\n",
-       " 'CUDA_DEVICE_ORDER': 'PCI_BUS_ID',\n",
-       " 'CUDA_VISIBLE_DEVICES': '',\n",
-       " 'WANDB_PROJECT': '',\n",
-       " 'WANDB_DISABLED': '',\n",
-       " 'WANDB_DIR': '',\n",
-       " 'WANDB_NOTEBOOK_NAME': '',\n",
-       " 'WANDB_SILENT': False,\n",
-       " 'LABEL_STUDIO_SERVER': '',\n",
-       " 'KMP_DUPLICATE_LIB_OK': 'True',\n",
-       " 'TOKENIZERS_PARALLELISM': False}"
-      ]
-     },
-     "execution_count": 3,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
     "HyFI.dotenv().dict()\n"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "The system workspace root is /mnt/nvme1n1p2/home/yj.lee/workspace and the user is yj.lee.\n",
-      "\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "# Test expanding $PWD and $USER variables\n",
     "posix_expr = \"The system workspace root is $WORKSPACE_ROOT and the user is $USER.\"\n",
@@ -160,49 +91,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "INFO:hyfi.utils.notebooks:Google Colab not detected.\n",
-      "INFO:hyfi.utils.notebooks:Extension autotime not found. Install it first.\n",
-      "DEBUG:hyfi.core.config:HyFiConfig initialized with hyfi_config_module=corprep.conf, hyfi_config_path=pkg://corprep.conf, hyfi_user_config_path=.\n",
-      "INFO:hyfi.composer:Composing `ProjectConfig` class with `__init__` config in `project` group.\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "INFO:hyfi.composer:Composing `JobLibConfig` class with `__init__` config in `joblib` group.\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "INFO:hyfi.composer:Composing `PathConfig` class with `__init__` config in `path` group.\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "DEBUG:hydra.core.utils:Setting JobRuntime:name=app\n",
-      "INFO:hyfi.joblib:initialized batcher with <hyfi.joblib.batch.batcher.Batcher object at 0x7fa7fecddb80>\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "project_dir: /home/yj.lee/.hyfi/workspace/projects/hyfi\n",
-      "project_workspace_dir: /home/yj.lee/.hyfi/workspace/projects/hyfi/workspace\n",
-      " /home/yj.lee/.hyfi/workspace/projects/hyfi\n",
-      "project_workspace_dir: /home/yj.lee/.hyfi/workspace/projects/hyfi/workspace\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "if HyFI.is_colab():\n",
     "    HyFI.mount_google_drive()\n",