sonusai 1.0.3__tar.gz → 1.0.5__tar.gz

{sonusai-1.0.3 → sonusai-1.0.5}/PKG-INFO

@@ -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 → sonusai-1.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sonusai"
-version = "1.0.3"
+version = "1.0.5"
 description = "Framework for building deep neural network models for sound, speech, and voice AI"
 authors = ["Chris Eddington <chris@aaware.com>", "Jason Calderwood <jason@aaware.com>"]
 maintainers = ["Chris Eddington <chris@aaware.com>", "Jason Calderwood <jason@aaware.com>"]

{sonusai-1.0.3 → sonusai-1.0.5}/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: