revive (#191)

aniketmaurya · web-flow · commit 469caf679768 · 2023-02-20T01:14:42.000+05:30
* update

* remove loguru

* format

* fix ci

* update

* update

* fix ci

* update

* update

* fixes

* update docs deps

* fixes

* fix versions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,15 +13,15 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.9", "3.10"]
         include:
           - os: ubuntu-latest
             path: ~/.cache/pip
           - os: macos-latest
             path: ~/Library/Caches/pip
     env:
       OS: ${{ matrix.os }}
-      PYTHON: '3.8'
+      PYTHON: '3.10'
 
 
     steps:
diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml
@@ -5,14 +5,14 @@ on: push
 jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@master
-      - name: Set up Python 3.9
+      - name: Set up Python 3.10
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Install pypa/build
         run: >-
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 default_language_version:
-  python: python3.8
+  python: python3.10
 
 ci:
   autofix_prs: true
@@ -24,7 +24,7 @@ repos:
         name: "Black: The uncompromising Python code formatter"
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
         name: "Sort Imports"
@@ -65,10 +65,11 @@ repos:
         language: system
         pass_filenames: false
 
+
   - repo: https://github.com/kynan/nbstripout
     rev: 0.6.1
     hooks:
       - id: nbstripout
         args:
           - --max-size=500k
-          - --strip-empty-cells
+          - --drop-empty-cells
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,18 +1,17 @@
-git+https://github.com/gradsflow/gradsflow@main
-mkdocs>=1.2.2
-mkdocs-material>=7.2.4
-mkdocs-material-extensions==1.0.1
-mkdocs-git-revision-date-localized-plugin==0.9.2
-mkdocs-macros-plugin==0.6.0
-mkdocs-autorefs>=0.2.1
-mkdocstrings>=0.15.2
+# git+https://github.com/gradsflow/gradsflow@main
+mkdocs==1.4.2
+mkdocstrings==0.20.0
+mkdocs-material==8.5.11
+mkdocstrings-python==0.8.3
+mkdocs-material-extensions==1.1.1
+mkdocs-git-revision-date-localized-plugin==1.1.0
+mkdocs-macros-plugin==0.7.0
+mkdocs-autorefs==0.4.1
+mkdocs-jupyter==0.22.0
 tags-macros-plugin @ git+https://github.com/jldiaz/mkdocs-plugin-tags.git@d26e2f124e4f3471639d426459e281080988fe7a
-mkdocs-jupyter>=0.18.0
-mkdocs-meta-descriptions-plugin
+mkdocs-meta-descriptions-plugin==2.2.0
 jupyter_contrib_nbextensions
 comet_ml
 lightning-flash[image,text]>=0.5.1
 wandb
-notebook>=6.1.5 # not directly required, pinned by Snyk to avoid a vulnerability
-pygments>=2.7.4 # not directly required, pinned by Snyk to avoid a vulnerability
 tensorboard
diff --git a/gradsflow/__init__.py b/gradsflow/__init__.py
@@ -14,10 +14,9 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+import logging
 from os import environ as _environ
 
-_environ["LOGURU_LEVEL"] = _environ.get("LOGURU_LEVEL") or _environ.get("LOG_LEVEL", "WARNING")
-
 from gradsflow.autotasks.autoclassification.image import AutoImageClassifier
 from gradsflow.autotasks.autoclassification.text import AutoTextClassifier
 from gradsflow.autotasks.autosummarization import AutoSummarization
@@ -29,3 +28,4 @@
 from gradsflow.tuner.tuner import Tuner
 
 __version__ = "0.0.8.post1"
+logging.basicConfig(level=_environ.get("LOG_LEVEL", "WARNING"))
diff --git a/gradsflow/autotasks/autoclassification/text/text.py b/gradsflow/autotasks/autoclassification/text/text.py
@@ -13,11 +13,14 @@
 #  limitations under the License.
 
 
+import logging
+
 import torch
-from loguru import logger
 
 from gradsflow.autotasks.engine.autoclassifier import AutoClassifier
 
+logger = logging.getLogger(__name__)
+
 
 # noinspection PyTypeChecker
 class AutoTextClassifier(AutoClassifier):
diff --git a/gradsflow/autotasks/engine/automodel.py b/gradsflow/autotasks/engine/automodel.py
@@ -70,7 +70,6 @@ def __init__(
         prune: bool = True,
         backend: Optional[str] = None,
     ):
-
         self.analysis = None
         self.prune = prune
         self.n_trials = n_trials
@@ -174,7 +173,6 @@ def hp_tune(
         return analysis
 
     def _get_best_model(self, analysis):
-
         best_model = self.build_model(self.analysis.best_config)
         best_ckpt_path = analysis.best_checkpoint
         best_ckpt_path = best_ckpt_path + "/filename"
diff --git a/gradsflow/autotasks/engine/backend.py b/gradsflow/autotasks/engine/backend.py
@@ -81,7 +81,6 @@ def _gf_objective(self, search_space: Dict, trainer_config: Dict, **_):
     def _lightning_objective(
         self, config: Dict, trainer_config: Dict, gpu: Optional[float] = 0, finetune: bool = False
     ):
-
         val_check_interval = 1.0
         if self.max_steps:
             val_check_interval = max(self.max_steps - 1, 1.0)
diff --git a/gradsflow/callbacks/gpu.py b/gradsflow/callbacks/gpu.py
@@ -12,11 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from loguru import logger
+
+import logging
 
 from gradsflow.callbacks.base import Callback
 from gradsflow.utility.imports import requires
 
+logger = logging.getLogger(__name__)
+
 
 class EmissionTrackerCallback(Callback):
     """
diff --git a/gradsflow/callbacks/logger.py b/gradsflow/callbacks/logger.py
@@ -12,15 +12,17 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+import logging
 import os
 from pathlib import Path
 
 import pandas as pd
-from loguru import logger
 
 from gradsflow.callbacks.base import Callback
 from gradsflow.utility.common import to_item
 
+logger = logging.getLogger(__name__)
+
 
 class CSVLogger(Callback):
     """
diff --git a/gradsflow/callbacks/wandb.py b/gradsflow/callbacks/wandb.py
@@ -12,14 +12,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+import logging
 import os
 from typing import Dict, List, Optional
 
-from loguru import logger
-
 from gradsflow.callbacks.base import Callback
 from gradsflow.utility.imports import is_installed, requires
 
+logger = logging.getLogger(__name__)
+
 if is_installed("wandb"):
     import wandb
 
diff --git a/gradsflow/data/autodata.py b/gradsflow/data/autodata.py
@@ -11,11 +11,11 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+import logging
 import warnings
 from typing import Callable, Dict, Optional, Union
 
 from accelerate import Accelerator
-from loguru import logger
 from torch.utils.data import DataLoader, Dataset
 
 from gradsflow.data.base import BaseAutoDataset
@@ -24,6 +24,8 @@
 from ..utility.common import default_device
 from .mixins import DataMixin
 
+logger = logging.getLogger(__name__)
+
 pl = None
 if is_installed("pytorch_lightning"):
     import pytorch_lightning as pl
diff --git a/gradsflow/models/exceptions.py b/gradsflow/models/exceptions.py
@@ -11,7 +11,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-from loguru import logger
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class EpochCancel(Exception):
diff --git a/gradsflow/models/model.py b/gradsflow/models/model.py
@@ -11,11 +11,11 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+import logging
 import os
 from typing import Any, Callable, Dict, List, Optional, Union
 
 import torch
-from loguru import logger
 from torch import nn
 from torchmetrics import Metric
 
@@ -29,6 +29,7 @@
 from gradsflow.models.tracker import Tracker
 from gradsflow.utility.common import listify, module_to_cls_index
 
+logger = logging.getLogger(__name__)
 METRICS_TYPE = Union[str, Metric, List[Union[str, Metric]], None]
 
 
diff --git a/gradsflow/models/tracker.py b/gradsflow/models/tracker.py
@@ -11,16 +11,18 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
+import logging
 from dataclasses import dataclass
 from typing import Dict, List, Optional
 
-from loguru import logger
 from rich import box
 from rich.table import Table
 
 from gradsflow.core.base import TrackingValues
 from gradsflow.utility.common import GDict, to_item
 
+logger = logging.getLogger(__name__)
+
 
 @dataclass(init=False)
 class BaseTracker:
diff --git a/gradsflow/models/utils.py b/gradsflow/models/utils.py
@@ -21,7 +21,7 @@
 
 from gradsflow.utility.common import filter_list, module_to_cls_index
 
-SCALAR = Union[torch.Tensor, np.float, float, int]
+SCALAR = Union[torch.Tensor, np.float64, float, int]
 _nn_classes = module_to_cls_index(nn)
 _tm_classes = module_to_cls_index(torchmetrics, lower_key=False)
 
diff --git a/gradsflow/tuner/automodel.py b/gradsflow/tuner/automodel.py
@@ -12,12 +12,12 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 import inspect
+import logging
 import os
 from enum import Enum
 from typing import Any, Dict, Optional, Union
 
 import ray
-from loguru import logger
 from ray import tune
 from ray.tune.sample import Domain
 from torch import nn
@@ -28,6 +28,8 @@
 from gradsflow.models.model import METRICS_TYPE
 from gradsflow.tuner.tuner import ComplexObject, Tuner
 
+logger = logging.getLogger(__name__)
+
 
 class State(Enum):
     TUNER = "tuner"
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,9 +1,9 @@
 site_name: GradsFlow
 site_description: "An open-source AutoML Library based on PyTorch"
 site_author: Aniket Maurya
-copyright: 'Copyright &copy; 2021 GradsFlow'
+copyright: 'Copyright &copy; 2023 GradsFlow'
 
-banner_url: https://ik.imagekit.io/gradsflow/logo/v2/gf-logo-geadsflow-orange-white-bg_y5v0LNPvdeM.png
+#banner_url: https://ik.imagekit.io/gradsflow/logo/v2/gf-logo-geadsflow-orange-white-bg_y5v0LNPvdeM.png
 repo_url: https://github.com/gradsflow/gradsflow/
 repo_name: gradsflow/gradsflow
 
diff --git a/setup.cfg b/setup.cfg
@@ -25,20 +25,19 @@ keywords = AutoML, Pytorch, Deep Learning
 
 [options]
 packages = find:
-python_requires = >=3.7
+python_requires = >=3.8
 install_requires =
-    torch >=1.4
+    torch >=1.13.1
     torchvision
     ray[default,tune] >=1.8.0
-    timm
+    timm>=0.6.12
+    rich>=13.3.1
     accelerate >=0.5.0
     smart_open >=5.1,<=5.2.1
-    rich
-    loguru >=0.5
-    torchmetrics >=0.5.0
+    torchmetrics >=0.11.1
 
 [options.extras_require]
-dev = lightning-flash[image,text] >=0.5.1; codecarbon >=1.2.0; comet_ml; wandb
+dev = lightning-flash[image,text] >=0.5.1; codecarbon >=1.2.0; comet_ml; wandb; tensorboard
 test = pytest; coverage; pytest-sugar
 
 [options.packages.find] #optional
