Merge pull request #9 from esologic/remove_complexity_change

Remove complexity change

Author: esologic

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+0.20.0 - (2022-03-29)
+------------------
+
+* In `music_into_models.py projection-file-blend`, the notion of connecting overlay appearances
+with audio activity has been removed, meaning `--complexity-change-rolling-sum-window` and 
+`--complexity-change-threshold` are disabled. This functionality was underdeveloped, and didn't 
+really work in a predictable way. The functionality will still be there in 
+`projection_file_blend_api`, just not accessible via the CLI.
+* In the same script, if `--phash-distance`, `--bbox-distance` and `--track-length` aren't provided, 
+overlays won't be computed in the resulting videos.
+
+
 0.19.0 - (2022-03-06)
 ------------------
 

gance/image_sources/video_common.py

@@ -278,6 +278,7 @@ def write_frame(frame: RGBInt8ImageType) -> None:
             temp_video_path = Path(file.name)
             yield from setup_iteration(temp_video_path)
             file.flush()
+            LOGGER.info(f"Finalizing {video_path}")
             add_wavs_to_video(
                 video_path=temp_video_path, audio_paths=audio_paths, output_path=video_path
             )

gance/network_interface/network_functions.py

@@ -2,7 +2,7 @@
 Functions to be able to load networks from disk and interact with them.
 Working with these networks can be messy and this module tries to only expose the important things.
 """
-
+import json
 import logging
 import multiprocessing
 import os
@@ -17,6 +17,8 @@
 
 import numpy as np
 import PIL
+import pydantic
+from pydantic import BaseModel, FilePath
 from typing_extensions import Protocol
 
 from gance import process_common
@@ -623,3 +625,61 @@ def network_indices(self: "MultiNetwork") -> List[int]:
         :return: Indices
         """
         return [index for index, _ in enumerate(self._network_paths)]
+
+    @property
+    def network_paths(self: "MultiNetwork") -> List[Path]:
+        """
+        Exposes the network paths for reading.
+        :return: Paths to the network files
+        """
+        return self._network_paths
+
+
+def parse_network_paths(
+    networks_directory: Optional[str], networks: Optional[List[str]], networks_json: Optional[str]
+) -> List[Path]:
+    """
+    Given the user's input from the CLI, get a list of the networks to be used in the run.
+    :param networks_directory: A string representing a path to a directory that contains network
+    files. Optionally given.
+    :param networks: Paths (as strings) leading directly to networks. Optionally given.
+    :param networks_json: Path to a json file with a list of network paths.
+    :return: Path objects leading to the networks. Sorted by filename.
+    :raises ValueError: If something goes wrong with a parse.
+    """
+
+    all_networks = []
+
+    if networks_directory is not None:
+        networks_directory_path = Path(networks_directory)
+        all_networks += sorted_networks_in_directory(networks_directory=networks_directory_path)
+
+    if networks is not None:
+        all_networks += list(map(Path, networks))
+
+    if networks_json is not None:
+        LOGGER.info(f"Loading network JSON: {networks_json}")
+        try:
+            with open(networks_json) as f:
+                all_networks += list(map(Path, NetworksFile(**json.load(f)).networks))
+        except pydantic.error_wrappers.ValidationError as e:
+            raise ValueError("Ran into formatting problem with networks JSON.") from e
+        except Exception as e:
+            raise ValueError("Couldn't open networks JSON.") from e
+
+    if not all_networks:
+        raise ValueError("No networks given, cannot continue.")
+
+    LOGGER.info("Discovered networks: ")
+    for path in all_networks:
+        LOGGER.info(f"\t{path}")
+
+    return all_networks
+
+
+class NetworksFile(BaseModel):
+    """
+    Describes a `NetworksFile`, a .json file full paths to pickled StyleGAN networks.
+    """
+
+    networks: List[FilePath]