sonusai 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

sonusai/mixture/generation.py

@@ -130,6 +130,7 @@ def initialize_db(location: str, test: bool = False) -> None:
     snr_gain FLOAT NOT NULL,
     snr_random BOOLEAN NOT NULL,
     start INTEGER NOT NULL,
+    UNIQUE(effects, file_id, pre_tempo, repeat, snr, snr_gain, snr_random, start),
     FOREIGN KEY(file_id) REFERENCES source_file (id))
     """)
 
@@ -436,27 +437,7 @@ def populate_mixture_table(
 
     # Populate source table
     if logging:
-        logger.info("Populating source table")
-    sources: list[tuple[str, int, float, bool, float, float, bool, int]] = []
-    for mixture in mixtures:
-        for source in mixture.all_sources.values():
-            entry = from_source(source)
-            if entry not in sources:
-                sources.append(entry)
-    for source in track(sources, disable=not show_progress):
-        con.execute(
-            """
-        INSERT INTO source (effects, file_id, pre_tempo, repeat, snr, snr_gain, snr_random, start)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-            source,
-        )
-
-    con.commit()
-
-    # Populate mixture table
-    if logging:
-        logger.info("Populating mixture table")
+        logger.info("Populating mixture and source tables")
     for mixture in track(mixtures, disable=not show_progress):
         m_id = int(mixture.name) + 1
         con.execute(
@@ -468,6 +449,14 @@ def populate_mixture_table(
         )
 
         for source in mixture.all_sources.values():
+            con.execute(
+                """
+            INSERT OR IGNORE INTO source (effects, file_id, pre_tempo, repeat, snr, snr_gain, snr_random, start)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+            """,
+                from_source(source),
+            )
+
             source_id = con.execute(
                 """
                 SELECT id
@@ -486,7 +475,7 @@ def populate_mixture_table(
             con.execute("INSERT INTO mixture_source (mixture_id, source_id) VALUES (?, ?)", (m_id, source_id))
 
     if logging:
-        logger.info("Closing mixture table")
+        logger.info("Closing mixture and source tables")
     con.commit()
     con.close()
 
@@ -577,7 +566,7 @@ def _initialize_mixture_gains(mixdb: MixtureDatabase, mixture: Mixture, sources_
             # Special case for zeroing out noise data
             mixture.all_sources[category].snr_gain = 0
         elif category != "primary":
-            if sources_energy["primary"] == 0:
+            if sources_energy["primary"] == 0 or sources_energy[category] == 0:
                 # Avoid divide-by-zero
                 mixture.all_sources[category].snr_gain = 1
             else:

{sonusai-1.0.3.dist-info → sonusai-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sonusai
-Version: 1.0.3
+Version: 1.0.5
 Summary: Framework for building deep neural network models for sound, speech, and voice AI
 Home-page: https://aaware.com
 License: GPL-3.0-only

{sonusai-1.0.3.dist-info → sonusai-1.0.5.dist-info}/RECORD

@@ -54,7 +54,7 @@ sonusai/mixture/data_io.py,sha256=DV48sFcP2Qp3NBzvcnlptQOXU3aUEcAeLuh3XOtC5jI,53
 sonusai/mixture/db_datatypes.py,sha256=VvNtbOgt5WSeSnBoVcNGC5gs_7hX_38pDUPjy5KRbG4,1471
 sonusai/mixture/effects.py,sha256=ghMO-WiSMQc1CvafD0wkt_DGsM2A6Hi_oZS6j-jeZh8,11784
 sonusai/mixture/feature.py,sha256=7GJvFhfqeqerfjy9Vq9aKt-cecgYblK0IypNNo5hgwY,2285
-sonusai/mixture/generation.py,sha256=j19nxSo8bbPS9BtZfWQnMTRtGxoNPFi_tClT3pdeCUM,32433
+sonusai/mixture/generation.py,sha256=rsn2BO95UoXR_tX1IjcwCeYqVPzkohxQSTt5FsMKyhg,32179
 sonusai/mixture/helpers.py,sha256=dmyHwf1C5dZjYOd11kVV16KI33CaM-dU_fyaxOrrKt8,11642
 sonusai/mixture/ir_delay.py,sha256=aiC23HMWQ08-v5wORgMx1_DOJSdh4kunULqiQ-SGuMo,2026
 sonusai/mixture/ir_effects.py,sha256=PqiqD4PS42-7kD6ESnsZi2a3tnKCFa4E0xqUujRBvGg,2152
@@ -132,7 +132,7 @@ sonusai/utils/tokenized_shell_vars.py,sha256=EDrrAgz5lJ0RBAjLcTJt1MeyjhbNZiqXkym
 sonusai/utils/write_audio.py,sha256=IHzrJoFtFcea_J6wo6QSiojRkgnNOzAEcg-z0rFV7nU,810
 sonusai/utils/yes_or_no.py,sha256=0h1okjXmDNbJp7rZJFR2V-HFU1GJDm3YFTUVmYExkOU,263
 sonusai/vars.py,sha256=m8pdgfR4A6A9TCGf_rok6jPAT5BgrEsYXTSISIh1nrI,1163
-sonusai-1.0.3.dist-info/METADATA,sha256=LvPP2llUQlVVR4SGlYeM5LaGzbKQkg4U3KHPLcrEVLk,2652
-sonusai-1.0.3.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-sonusai-1.0.3.dist-info/entry_points.txt,sha256=zMNjEphEPO6B3cD1GNpit7z-yA9tUU5-j3W2v-UWstU,92
-sonusai-1.0.3.dist-info/RECORD,,
+sonusai-1.0.5.dist-info/METADATA,sha256=Q1nZTGYPe4eF4Zs8HEQWp5dKsINA8_CmHUQxfT57uJM,2652
+sonusai-1.0.5.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+sonusai-1.0.5.dist-info/entry_points.txt,sha256=zMNjEphEPO6B3cD1GNpit7z-yA9tUU5-j3W2v-UWstU,92
+sonusai-1.0.5.dist-info/RECORD,,