nkululeko 0.81.1__tar.gz → 0.81.2__tar.gz

{nkululeko-0.81.1 → nkululeko-0.81.2}/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+Version 0.81.2
+--------------
+* added a parselmouth.Praat error if pitch out of range
+* changed file path for demo_predictor
+
 Version 0.81.1
 --------------
 * fixed bugs in demo module 

{nkululeko-0.81.1/nkululeko.egg-info → nkululeko-0.81.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.81.1
+Version: 0.81.2
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -321,6 +321,11 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.81.2
+--------------
+* added a parselmouth.Praat error if pitch out of range
+* changed file path for demo_predictor
+
 Version 0.81.1
 --------------
 * fixed bugs in demo module 

{nkululeko-0.81.1 → nkululeko-0.81.2}/nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.81.1"
+VERSION="0.81.2"
 SAMPLING_RATE = 16000

{nkululeko-0.81.1 → nkululeko-0.81.2}/nkululeko/data/dataset.py

@@ -162,7 +162,10 @@ class Dataset:
                     if column not in [self.target, "age", "speaker", "gender"]:
                         df[column] = df_target[column]
             except audformat.core.errors.BadKeyError:
-                pass
+                if not self.is_labeled:
+                    self.util.error(
+                        f"Giving up: no target ({self.target}) column found"
+                    )
 
         if self.is_labeled:
             # remember the target in case they get labelencoded later

{nkululeko-0.81.1 → nkululeko-0.81.2}/nkululeko/demo_predictor.py

@@ -1,3 +1,4 @@
+import os
 import pandas as pd
 import numpy as np
 import audiofile
@@ -52,13 +53,16 @@ class Demo_predictor:
                                 file_list.append(line)
                 for file_name in file_list:
                     test_folder = glob_conf.config["DATA"]["test_folder"]
-                    file_path = test_folder + file_name.strip()
+                    file_path = os.path.join(test_folder, file_name.strip())
                     sig, sr = audiofile.read(file_path)
                     print(f"predicting file {file_path}")
                     res_dict = self.predict_signal(sig, sr)
-                    df_tmp = pd.DataFrame(res_dict, index=[file_path])
+                    df_tmp = pd.DataFrame(res_dict, index=[file_name.strip()])
                     df_res = pd.concat([df_res, df_tmp], ignore_index=False)
                 df_res = df_res.set_index(df_res.index.rename("file"))
+                # save only filename and prediction (df_tmp) by default
+                # drop other columns
+                # df_res = df_res[["predicted"]]
                 if self.outfile is not None:
                     df_res.to_csv(self.outfile)
                 else:

{nkululeko-0.81.1 → nkululeko-0.81.2}/nkululeko/feat_extract/feinberg_praat.py

@@ -294,8 +294,8 @@ def compute_features(file_index):
                 f4_median,
             ) = measureFormants(sound, 75, 300)
             #        file_list.append(wave_file) # make an ID list
-        except statistics.StatisticsError as se:
-            print(f"error on file {wave_file}: {se}")
+        except (statistics.StatisticsError, parselmouth.PraatError) as errors:
+            print(f"error on file {wave_file}: {errors}")
 
         duration_list.append(duration)  # make duration list
         mean_F0_list.append(meanF0)  # make a mean F0 list

{nkululeko-0.81.1 → nkululeko-0.81.2/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.81.1
+Version: 0.81.2
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -321,6 +321,11 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.81.2
+--------------
+* added a parselmouth.Praat error if pitch out of range
+* changed file path for demo_predictor
+
 Version 0.81.1
 --------------
 * fixed bugs in demo module