A lightweight yet powerful audio-to-MIDI converter with pitch bend detection
Python audiolightweightmachine-learningmidimusicpitch-detectionpolyphonicpythontranscriptiontypescript
More informative error
David Rubinstein4f8292cd3861
diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.ymlindex b881f3e..141b019 100644--- a/.github/workflows/tox.yml+++ b/.github/workflows/tox.yml@@ -43,6 +43,6 @@ jobs:run: tox -c tox.ini -e check-formatting,lint,mypyif: matrix.py == '3.8'- name: Run test suite- run: tox -c tox.ini -e py,manifest+ run: tox -c tox.ini -e py,manifest,full- name: Check that basic-pitch can be run as a commandlinerun: pip3 install -e . && basic-pitch --helpdiff --git a/basic_pitch/inference.py b/basic_pitch/inference.pyindex 0fd7c76..f2900c2 100644--- a/basic_pitch/inference.py+++ b/basic_pitch/inference.py@@ -18,6 +18,7 @@import csvimport enumimport json+import loggingimport osimport pathlibfrom typing import Any, Dict, Iterable, List, Optional, Sequence, Tuple, Union, cast@@ -72,44 +73,78 @@ class Model:ONNX = enum.auto()def __init__(self, model_path: Union[pathlib.Path, str]):+ present = []if TF_PRESENT:+ present.append("TensorFlow")try:self.model_type = Model.MODEL_TYPES.TENSORFLOW- self.model = tf.saved_model.load(model_path)+ self.model = tf.saved_model.load(str(model_path))return- except Exception:- pass+ except Exception as e:+ if os.path.isdir(model_path) and {"saved_model.pb", "variables"} & set(os.listdir(model_path)):+ logging.warning(+ "Could not load TensorFlow saved model %s even "+ "though it looks like a saved model file with error %s. "+ "Are you sure it's a TensorFlow saved model?",+ model_path,+ e.__repr__(),+ )if CT_PRESENT:+ present.append("CoreML")try:self.model_type = Model.MODEL_TYPES.COREMLself.model = ct.models.MLModel(str(model_path))return- except Exception:- pass+ except Exception as e:+ if str(model_path).endswith(".mlpackage"):+ logging.warning(+ "Could not load CoreML file %s even "+ "though it looks like a CoreML file with error %s. "+ "Are you sure it's a TFLite file?",+ model_path,+ e.__repr__(),+ )if TFLITE_PRESENT:+ present.append("TensorFlowLite")try:self.model_type = Model.MODEL_TYPES.TFLITE- self.interpreter = tflite.Interpreter(model_path=model_path)- self.interpreter.allocate_tensors()+ self.interpreter = tflite.Interpreter(str(model_path))self.model = self.interpreter.get_signature_runner()return- except Exception:- pass+ except Exception as e:+ if str(model_path).endswith(".tflite"):+ logging.warning(+ "Could not load TensorFlowLite file %s even "+ "though it looks like a TFLite file with error %s. "+ "Are you sure it's a TFLite file?",+ model_path,+ e.__repr__(),+ )if ONNX_PRESENT:+ present.append("ONNX")try:self.model_type = Model.MODEL_TYPES.ONNX- self.model = ort.InferenceSession(model_path)+ self.model = ort.InferenceSession(str(model_path), providers=["CPUExecutionProvider"])return- except Exception:- pass+ except Exception as e:+ if str(model_path).endswith(".onnx"):+ logging.warning(+ "Could not load ONNX file %s even "+ "though it looks like a ONNX file with error %s. "+ "Are you sure it's a ONNX file?",+ model_path,+ e.__repr__(),+ )raise ValueError(f"File {model_path} cannot be loaded into either ""TensorFlow, CoreML, TFLite or ONNX. "- "Please check if it is a supported and valid serialized model"+ "Please check if it is a supported and valid serialized model "+ "and that one of these packages are installed. On this system, "+ f"{present} is installed.")def predict(self, x: npt.NDArray[np.float32]) -> Dict[str, npt.NDArray[np.float32]]:@@ -118,7 +153,7 @@ class Model:elif self.model_type == Model.MODEL_TYPES.COREML:return cast(ct.models.MLModel, self.model.predict({"input": x.tolist()})) # type: ignoreelif self.model_type == Model.MODEL_TYPES.TFLITE:- return cast(tflite.Interpreter, self.model)(x) # type: ignore+ return cast(tflite.SignatureRunner, self.model)(x) # type: ignoreelif self.model_type == Model.MODEL_TYPES.ONNX:return cast(ort.InferenceSession, self.model).run( # type: ignore["note", "onset", "contour"], {"input": x}