nkululeko 0.95.6__py3-none-any.whl → 0.95.8__py3-none-any.whl

nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.95.6"
+VERSION="0.95.8"
 SAMPLING_RATE = 16000

nkululeko/data/dataset.py

@@ -294,12 +294,21 @@ class Dataset:
                 # try to get the gender values
                 if "gender" in source_df:
                     df_local["gender"] = source_df["gender"]
-                    got_gender = True
+                else:
+                    # try to get the gender via the speaker description
+                    gender_map = db['speaker'].get().to_dict()['gender']
+                    df_local['gender'] = df_local['speaker'].map(gender_map).astype(str)
+                got_gender = True
             except (KeyError, ValueError, audformat.errors.BadKeyError):
                 pass
             try:
                 # try to get the age values
-                df_local["age"] = source_df["age"].astype(int)
+                if "age" in source_df:
+                    df_local["age"] = source_df["age"].astype(int)
+                else:
+                    # try to get the age via the speaker description
+                    age_map = db['speaker'].get().to_dict()['age']
+                    df_local['age'] = df_local['speaker'].map(age_map).astype(int)
                 got_age = True
             except (KeyError, ValueError, audformat.errors.BadKeyError):
                 pass

nkululeko/explore.py

@@ -65,6 +65,7 @@ def main():
     try:
         # load the experiment
         expr.load(f"{util.get_save_name()}")
+        expr.util.set_config(config)
         needs_feats = True
         experiment_loaded = True
     except FileNotFoundError:

nkululeko/plots.py

@@ -9,6 +9,7 @@ from scipy import stats
 import seaborn as sns
 from sklearn.manifold import TSNE
 
+import audeer
 from audmetric import concordance_cc as ccc
 
 import nkululeko.glob_conf as glob_conf
@@ -27,7 +28,10 @@ class Plots:
         self.with_ccc = eval(self.util.config_val("PLOT", "ccc", "False"))
         self.type_s = "samples"
 
-    def plot_distributions_speaker(self, df):
+    def plot_distributions_speaker(self, df: pd.DataFrame):
+        if df.empty:
+            self.util.warn("plot_distributions_speaker: empty DataFrame, nothing to plot")
+            return
         self.type_s = "speaker"
         df_speakers = pd.DataFrame()
         pd.options.mode.chained_assignment = None  # default='warn'
@@ -86,7 +90,10 @@ class Plots:
 
         self.plot_distributions(df_speakers, type_s="speakers")
 
-    def plot_distributions(self, df, type_s="samples"):
+    def plot_distributions(self, df: pd.DataFrame, type_s: str = "samples"):
+        if df.empty:
+            self.util.warn("plot_distributions: empty DataFrame, nothing to plot")
+            return
         class_label, df = self._check_binning("class_label", df)
         value_counts_conf = self.util.config_val("EXPL", "value_counts", False)
         if not isinstance(value_counts_conf, str):
@@ -218,7 +225,7 @@ class Plots:
 
     def save_plot(self, ax, caption, header, filename, type_s):
         # one up because of the runs
-        fig_dir = os.path.dirname(self.util.get_path("fig_dir"))
+        fig_dir = audeer.path(self.util.get_path("fig_dir"), "..")
         fig_plots = ax.figure
         # avoid warning
         # plt.tight_layout()

nkululeko/utils/util.py

@@ -189,8 +189,11 @@ class Util:
 
     def is_categorical(self, pd_series):
         """Check if a dataframe column is categorical."""
-        return pd_series.dtype.name == "object" or isinstance(
-            pd_series.dtype, pd.CategoricalDtype
+        return (
+            pd_series.dtype.name == "object"
+            or pd_series.dtype.name == "bool"
+            or isinstance(pd_series.dtype, pd.CategoricalDtype)
+            or isinstance(pd_series.dtype, pd.BooleanDtype)
         )
 
     def get_name(self):

{nkululeko-0.95.6.dist-info → nkululeko-0.95.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nkululeko
-Version: 0.95.6
+Version: 0.95.8
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt

{nkululeko-0.95.6.dist-info → nkululeko-0.95.8.dist-info}/RECORD

@@ -4,14 +4,14 @@ nkululeko/aug_train.py,sha256=wpiHCJ7zsW38kumg3ypwXZe2HQrhUblAnv7P2QeJnAc,3525
 nkululeko/augment.py,sha256=3RzaxB3gRxovgJVjHXi0glprW01J7RaHhUkqotW2T3U,2955
 nkululeko/balance.py,sha256=r7opXbrqAipm2euPPaOmLlA5J10p2bHQgO5kWk2x9ro,8702
 nkululeko/cacheddataset.py,sha256=XFpWZmbJRg0pvhnIgYf0TkclxllD-Fctu-Ol0PF_00c,969
-nkululeko/constants.py,sha256=jC8e4ENKUF9damz-8BUpeu-yQdmouspc5ZJsg5VwyJs,39
+nkululeko/constants.py,sha256=9cVRluLqakiiCBPe3kAeJizsgpn2LUbgdAs0Y9scIEM,39
 nkululeko/demo-ft.py,sha256=iD9Pzp9QjyAv31q1cDZ75vPez7Ve8A4Cfukv5yfZdrQ,770
 nkululeko/demo.py,sha256=tu7Al2l5MCLVegkDC-NE2wcuc_YE7NRbgOlPW3yhGEs,4940
 nkululeko/demo_feats.py,sha256=BvZjeNFTlERIRlq34OHM4Z96jdDQAhB01BGQAUcX9dM,2026
 nkululeko/demo_predictor.py,sha256=lDF-xOxRdEAclOmbepAYg-BQXQdGkHfq2n74PTIoop8,4872
 nkululeko/ensemble.py,sha256=71V-rre61H3J4sh7lu-OTo4I2_g7mm_rQxwW1ARDHgY,12782
 nkululeko/experiment.py,sha256=BAc220lktt_tvifl-m-ZIPO7Nwi-HzDBNyTfjPDbQkE,38397
-nkululeko/explore.py,sha256=aDVHwuo-lkih7VZrbb_zFKg5fowSrAIcx0V9wf0SRGo,4175
+nkululeko/explore.py,sha256=PjNcLuPdvWqCqYXUvGhd0hBijIhzdyi3ED1RF6o5Gjk,4212
 nkululeko/export.py,sha256=U-V4acxtuL6qKt6oAsVcM5TTeWogYUJ3GU-lA6rq6d4,4336
 nkululeko/feature_extractor.py,sha256=CsKmBoxwNClRGu20ox_eCxMG4u_1OH8Y83FYw7GfUwA,4230
 nkululeko/file_checker.py,sha256=xJY0Q6w47pnmgJVK5rcAKPYBrCpV7eBT4_3YBzTx-H8,3454
@@ -24,7 +24,7 @@ nkululeko/nkuluflag.py,sha256=_83LqLr2bSHjnVJuPeSAHCIyuiIbRxgpFKW6CwanWFM,3728
 nkululeko/nkululeko.py,sha256=6ALPMMIz6l0O3IRaP0q4b59ZUxpfzNqLQUqZMf5t3Zo,1976
 nkululeko/optim.py,sha256=Pn_02irXYJJmNG1yWA9GImHirpbXXywV61MalZb2wVA,1658
 nkululeko/optimizationrunner.py,sha256=UfWU_gOPaHUVjvYaw3AoF9HoDGYxIjbCyTGmi1PVu3s,44283
-nkululeko/plots.py,sha256=lUxgyoriYTwdpHZvBBQ4e41v77deQrt0PcRDLJWijys,27503
+nkululeko/plots.py,sha256=DnTJHmz50vphnTiazCy2J6k0wP0-MRWir7gj7i_WKXM,27808
 nkululeko/predict.py,sha256=PWv1Pc39lrxqqIWrYszVk5SL37dDL93CHgcruItNID8,2211
 nkululeko/resample.py,sha256=rn3-M1A-iwVGibfQNGyeYNa7briD24lIN9Szq_1uTJo,5194
 nkululeko/runmanager.py,sha256=YtGQP0UyyQTKkilncB1XYM-T8oatzGcZEOcj5SorjJw,8902
@@ -58,7 +58,7 @@ nkululeko/autopredict/whisper_transcriber.py,sha256=DWDvpRaV5KmUF18ojPEvxnVXm_h_
 nkululeko/autopredict/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nkululeko/autopredict/tests/test_whisper_transcriber.py,sha256=ilas6j3OUvq_xnQCRZgytQCtyrpNU6tvG5a8kPvVKBQ,5085
 nkululeko/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nkululeko/data/dataset.py,sha256=2-I7d91M9f296SANYiL4eTZmcXKs-nj1vqsUEXpp-cA,42461
+nkululeko/data/dataset.py,sha256=uj4rtcAoiEUpoZv8dlgrdzBuUdFrXtU7Pai6wSHY2xU,42997
 nkululeko/data/dataset_csv.py,sha256=AIbtB6pGk5BSQGIgfokZ7tEGFjmuOq5w2XumRSimVWs,4833
 nkululeko/feat_extract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nkululeko/feat_extract/feats_agender.py,sha256=onfAQ6-xx_mFMJXEF1IX8cHBmGtGeX6weJmxbkfh1_o,3184
@@ -133,10 +133,10 @@ nkululeko/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nkululeko/utils/files.py,sha256=SrrYaU7AB80MZHiV1jcB0h_zigvYLYgSVNTXV4ao38g,4593
 nkululeko/utils/stats.py,sha256=3Fyx8q8BSKYmiufT6OkRug9RATWmGrr9BaX_y8jziWo,3074
 nkululeko/utils/unzip.py,sha256=G68f5120TjwACZC3bQcneMniddnwubPbBdMc2L5KBOo,1206
-nkululeko/utils/util.py,sha256=yHgzfj-8ncgCvyrrrH_NDWCh6VmhAqVYY6Vlgyg-c6E,18585
-nkululeko-0.95.6.dist-info/licenses/LICENSE,sha256=0zGP5B_W35yAcGfHPS18Q2B8UhvLRY3dQq1MhpsJU_U,1076
-nkululeko-0.95.6.dist-info/METADATA,sha256=fNK6XplFh2R-uBVMhUR9R4XhIp3Ebx8SX0BUZ8Cldvk,21998
-nkululeko-0.95.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nkululeko-0.95.6.dist-info/entry_points.txt,sha256=lNTkFEdh6Kjo5o95ZAWf_0Lq-4ztGoAoMVSDuPtuyS0,442
-nkululeko-0.95.6.dist-info/top_level.txt,sha256=bf1k1YKkqcXemNX_cUgoyKqQ3_GVErPqAY-53J36jkM,19
-nkululeko-0.95.6.dist-info/RECORD,,
+nkululeko/utils/util.py,sha256=s7Hd7Ju1r3_WCw8gLD9YK4O6k3S_WhFcN2-XZBSctSM,18705
+nkululeko-0.95.8.dist-info/licenses/LICENSE,sha256=0zGP5B_W35yAcGfHPS18Q2B8UhvLRY3dQq1MhpsJU_U,1076
+nkululeko-0.95.8.dist-info/METADATA,sha256=ye2EpYXgbMMRD1L1KnUqjbFO5W7--glJKj-1yBmHCX8,21998
+nkululeko-0.95.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nkululeko-0.95.8.dist-info/entry_points.txt,sha256=lNTkFEdh6Kjo5o95ZAWf_0Lq-4ztGoAoMVSDuPtuyS0,442
+nkululeko-0.95.8.dist-info/top_level.txt,sha256=bf1k1YKkqcXemNX_cUgoyKqQ3_GVErPqAY-53J36jkM,19
+nkululeko-0.95.8.dist-info/RECORD,,