diff --git a/src/nodes/db/hash_dir.py b/src/nodes/db/hash_dir.py index 139b1e2..5e9ca54 100644 --- a/src/nodes/db/hash_dir.py +++ b/src/nodes/db/hash_dir.py @@ -133,7 +133,7 @@ def hash_dir(directory_path: str) -> dict: # ============================================================================== # Command-Line Tool for Testing and Operation -# python -m source.db.hash_dir +# python -m src.nodes.db.hash_dir # ============================================================================== if __name__ == "__main__": # Local imports to avoid top-level pollution diff --git a/tool/batch_convert.py b/tool/batch_convert.py index 670f10c..8424b56 100755 --- a/tool/batch_convert.py +++ b/tool/batch_convert.py @@ -12,14 +12,15 @@ import argparse import json import os import re +from seconohe.logger import logger_set_standalone import subprocess import sys # Local imports import bootstrap # noqa: F401 -from source.db.hash import get_hash -from source.db.models_db import load_known_models, save_known_models, get_db_filename -from source.utils.logger import main_logger, logger_set_standalone -from source.utils.misc import cli_add_verbose +from src.nodes import main_logger +from src.nodes.db.hash import get_hash +from src.nodes.db.models_db import load_known_models, save_known_models, get_db_filename +from src.nodes.utils.misc import cli_add_verbose def parse_converter_output(output): @@ -38,7 +39,7 @@ def parse_converter_output(output): def main(args): - logger_set_standalone(args) + logger_set_standalone(main_logger, args) # 1. Load the JSON metadata file model_db = load_known_models(args.json_file) if model_db is None: diff --git a/tool/demucs2safetensors.py b/tool/demucs2safetensors.py index 6aa092c..f933c7d 100755 --- a/tool/demucs2safetensors.py +++ b/tool/demucs2safetensors.py @@ -14,7 +14,7 @@ import argparse import json from pathlib import Path from safetensors.torch import save_file -from seconohe.logger import debugl +from seconohe.logger import debugl, logger_set_standalone import sys import torch from typing import Dict @@ -27,13 +27,13 @@ try: except Exception: with_demuc_lib = False import bootstrap # noqa: F401 -from source.utils.misc import cli_add_verbose, FractionEncoder -from source.utils.logger import main_logger, logger_set_standalone -from source.db.models_db import cli_add_db, get_download_url, ModelsDB -from source.db.hash import get_hash -import source.inference.Demucs as local_demucs_module -import source.inference.HDemucs as local_hdemucs_module -import source.inference.HTDemucs as local_htdemucs_module +from src.nodes import main_logger +from src.nodes.utils.misc import cli_add_verbose, FractionEncoder +from src.nodes.db.models_db import cli_add_db, get_download_url, ModelsDB +from src.nodes.db.hash import get_hash +import src.nodes.inference.Demucs as local_demucs_module +import src.nodes.inference.HDemucs as local_hdemucs_module +import src.nodes.inference.HTDemucs as local_htdemucs_module MODULES_MAP = {'demucs': local_demucs_module, 'demucs.demucs': local_demucs_module, 'demucs.hdemucs': local_hdemucs_module, @@ -214,7 +214,7 @@ if __name__ == '__main__': cli_add_verbose(parser) args = parser.parse_args() - logger_set_standalone(args) + logger_set_standalone(main_logger, args) main_logger.info("⚙️ PyTorch Demucs to Safetensors converter\n") # Get information about the YAML file in our database diff --git a/tool/onnx2safetensors.py b/tool/onnx2safetensors.py index fe51caa..a0cdaa3 100755 --- a/tool/onnx2safetensors.py +++ b/tool/onnx2safetensors.py @@ -13,16 +13,17 @@ import json import numpy as np import onnx import os +from safetensors.torch import save_file +from seconohe.logger import logger_set_standalone import sys import torch from torch import nn # Local imports import bootstrap # noqa: F401 -from safetensors.torch import save_file -from source.utils.load_class import import_model_class -from source.utils.logger import main_logger, logger_set_standalone -from source.utils.misc import cli_add_verbose -from source.db.models_db import get_download_url +from src.nodes import main_logger +from src.nodes.utils.load_class import import_model_class +from src.nodes.utils.misc import cli_add_verbose +from src.nodes.db.models_db import get_download_url class OnnxGraph: @@ -227,7 +228,7 @@ if __name__ == "__main__": cli_add_verbose(parser) args = parser.parse_args() - logger_set_standalone(args) + logger_set_standalone(main_logger, args) if args.metadata is not None: try: args.metadata = json.loads(args.metadata) diff --git a/tool/show_class.py b/tool/show_class.py index fe76389..549dfd9 100755 --- a/tool/show_class.py +++ b/tool/show_class.py @@ -7,13 +7,14 @@ # Tool to show PyTorch class i.e: # python tool/show_class.py -m source/inference/MDX_Net.py:MDX_Net import argparse +from seconohe.logger import logger_set_standalone import sys from torch import nn # Local imports import bootstrap # noqa: F401 -from source.utils.logger import main_logger, logger_set_standalone -from source.utils.load_class import import_model_class -from source.utils.misc import cli_add_verbose +from src.nodes import main_logger +from src.nodes.utils.load_class import import_model_class +from src.nodes.utils.misc import cli_add_verbose def load_class(args): @@ -131,7 +132,7 @@ if __name__ == "__main__": parser.add_argument('-S', '--no_show', action='store_false', help="Don't print the structure.") args = parser.parse_args() - logger_set_standalone(args) + logger_set_standalone(main_logger, args) model = load_class(args) if args.no_show: show(model) diff --git a/tool/show_db.py b/tool/show_db.py index 170a332..863b78b 100755 --- a/tool/show_db.py +++ b/tool/show_db.py @@ -9,13 +9,14 @@ # Run it using: python tool/show_db.py import argparse import pprint +from seconohe.logger import logger_set_standalone import sys # Local imports import bootstrap # noqa: F401 -from source.db.hash_dir import hash_dir -from source.db.models_db import load_known_models, cli_add_models_and_db, save_known_models, get_models -from source.utils.logger import main_logger, logger_set_standalone -from source.utils.misc import cli_add_verbose +from src.nodes import main_logger +from src.nodes.db.hash_dir import hash_dir +from src.nodes.db.models_db import load_known_models, cli_add_models_and_db, save_known_models, get_models +from src.nodes.utils.misc import cli_add_verbose # Do nothing, you can apply some change here @@ -64,7 +65,7 @@ def apply_process(model_db): def main(args): - logger_set_standalone(args) + logger_set_standalone(main_logger, args) # 1. Load the JSON metadata file model_db = load_known_models(args.json_file) if model_db is None: diff --git a/tool/show_metadata.py b/tool/show_metadata.py index 8d09bee..7698d3e 100755 --- a/tool/show_metadata.py +++ b/tool/show_metadata.py @@ -9,12 +9,13 @@ import argparse import json from pprint import pprint +from seconohe.logger import logger_set_standalone # Local imports import bootstrap # noqa: F401 -from source.utils.logger import main_logger, logger_set_standalone -from source.utils.misc import cli_add_verbose, json_object_hook -from source.inference.get_model import get_metadata -from source.inference.demucs_log_helper import DemucsModelInfo +from src.nodes import main_logger +from src.nodes.utils.misc import cli_add_verbose, json_object_hook +from src.nodes.inference.get_model import get_metadata +from src.nodes.inference.demucs_log_helper import DemucsModelInfo def show_metadata(args): @@ -47,5 +48,5 @@ if __name__ == "__main__": cli_add_verbose(parser) args = parser.parse_args() - logger_set_standalone(args) + logger_set_standalone(main_logger, args) show_metadata(args) diff --git a/tool/show_onnx.py b/tool/show_onnx.py index 53c6026..d03ad4e 100755 --- a/tool/show_onnx.py +++ b/tool/show_onnx.py @@ -11,11 +11,12 @@ import numpy as np import onnx from onnx import shape_inference # Import the shape inference module import torch +from seconohe.logger import logger_set_standalone import sys # Local imports import bootstrap # noqa: F401 -from source.utils.logger import main_logger, logger_set_standalone -from source.utils.misc import cli_add_verbose +from src.nodes import main_logger +from src.nodes.utils.misc import cli_add_verbose def print_onnx_nodes_and_weights(onnx_model_path): @@ -205,7 +206,7 @@ if __name__ == "__main__": cli_add_verbose(parser) args = parser.parse_args() - logger_set_standalone(args) + logger_set_standalone(main_logger, args) if args.run and not args.no_show: main_logger.error("-r can't be used when -S is specified") sys.exit(1) diff --git a/tool/uvr_hash.py b/tool/uvr_hash.py index 5e8798e..0d0c101 100755 --- a/tool/uvr_hash.py +++ b/tool/uvr_hash.py @@ -8,10 +8,11 @@ # python tool/uvr_hash.py model.onnx import argparse import os +from seconohe.logger import logger_set_standalone # Local imports import bootstrap # noqa: F401 -from source.utils.logger import main_logger, logger_set_standalone -from source.db.hash import get_hash +from src.nodes import main_logger +from src.nodes.db.hash import get_hash def main(): @@ -36,7 +37,7 @@ def main(): args = parser.parse_args() args.verbose = 0 - logger_set_standalone(args) + logger_set_standalone(main_logger, args) # Process each file provided on the command line for filepath in args.files: