music21 nto compatible with cache

Author: martianbug

README.md

@@ -18,7 +18,7 @@ which will download musif and all its necessary dependencies.
 ## jSymbolic and music21 features
 Currently, musif is able to process and integrate jsymbolic as well as basic music21 features. If jsymbolic features are selected, Java JRE >= 8 must be installed in your OS and the `JAVA_HOME` environment variable is correctly set. `jSymbolic` will be downloaded automatically at the first run. You can force the download of `jSymbolic` and the check of Java installation by running `python -m musif.extract.features.jsymbolic`.
 
-*Important*: right now jSymbolic features are NOT guaranteed to be compatible with musif's cache system, unlike some music21 stock features. 
+*Important*: right now music21 and jSymbolic features are NOT guaranteed to be compatible with musif's cache system, unlike some music21 stock features. 
 
 In case of problems when installing Java or getting it to work as a command, these sites might be helpful:
 https://www.theserverside.com/blog/Coffee-Talk-Java-News-Stories-and-Opinions/How-do-I-install-Java-on-Ubuntu
@@ -35,8 +35,7 @@ https://github.com/DIDONEproject/music_symbolic_features
 
 ## Changelog
 
-#### v1.2
-* fixed bug with muisc21 features not compatible with cache system. Now only those compatible will be computed
+#### v1.1.4
 * include MUSIF_ID
 * bug fix in dynamic features
 * include Key Signature feature

musif/extract/extract.py

@@ -26,7 +26,7 @@
 from musif.extract.utils import (cast_mixed_dtypes,
                                  extract_global_time_signature,
                                  process_musescore_file)
-from musif.logs import ldebug, lerr, linfo, lwarn, pdebug, perr, pinfo
+from musif.logs import ldebug, lerr, linfo, lwarn, pdebug, perr, pinfo, pwarn
 from musif.musescore import constants as mscore_c
 from musif.musicxml import constants as musicxml_c
 from musif.musicxml import (extract_numeric_tempo, fix_repeats, name_parts,
@@ -249,12 +249,13 @@ def __init__(self, *args, **kwargs):
         self.exclude_files = kwargs.get("exclude_files") or getattr(
             self._cfg, "exclude_files", None
         )
-        # self.regex = re.compile("from {FEATURES_MODULES}.([\w\.]+) import")
-        # creates the directory for the cache
+        if any(i in self._cfg.features for i in ("jsymbolic","music21")):
+            pwarn("\nEither music21 or jsymbolic features were requested. musif's caching system is not compatible with these, so cache will be disabled! \n")
+            self._cfg.cache_dir = None
+            
         if self._cfg.cache_dir is not None:
             pinfo("Cache activated!")
             Path(self._cfg.cache_dir).mkdir(exist_ok=True)
-
         if "jsymbolic" in self._cfg.features:
             from musif.extract.features import jsymbolic
 
@@ -361,7 +362,7 @@ def _init_score_processing(self, idx: int, filename: PurePath):
         if self._cfg.cache_dir is not None:
             cache_name = (
                 Path(self._cfg.cache_dir)
-                / filename.parent
+                # / filename.parent
                 / (filename.name + CACHE_FILE_EXTENSION)
             )
             cache_name.parent.mkdir(parents=True, exist_ok=True)

musif/extract/features/harmony/handler.py

@@ -84,7 +84,8 @@ def update_score_objects(
         )
 
     except Exception as e:
-        perr(f"Harmony problem found: {str(e)} in file {file_name}")
+        name = score_features[FILE_NAME]
+        perr(f"Harmony problem found: {str(e)} in file {name}")
 
     finally:
         score_features.update(features)

musif/extract/features/harmony/utils.py

@@ -449,13 +449,9 @@ def get_chords(harmonic_analysis):
 
     numerals_and_types = [
         str(chord) + str(types[index]).replace("Mm", "").replace("mm", "")
-        if types[index] not in ("M", "m")
-        else str(chord)
-        for index, chord in enumerate(numerals)
-    ]
+        if types[index] not in ("M", "m") else str(chord) for index, chord in enumerate(numerals)]
 
     # chords_order = sort_labels(numerals_and_types, numeral=['I', 'i', 'V', 'v', 'VII', 'vii', 'II', 'ii', 'IV', 'iv','VI','vi','III','iii'], chordtype=['', '7', '+', 'o', '%', 'M', 'm','It'], drop_duplicates=True)
-
     chords_dict = count_chords(numerals_and_types)  # ,order)
 
     # Exception for #viio chords

pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "deepdiff>=6.2.1",
 ]
 name = "musif"
-version = "1.2"
+version = "1.1.4"
 description = "Music feature extraction library from the DIDONE project"
 authors = [{ name = "Didone Project", email = "[email protected]" }]
 requires-python = ">=3.10"