Merge branch 'release/0.16.1'

dromer · dromer · commit 1f884084c27e · 2026-06-03T11:36:05.000+02:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.16.0
+current_version = 0.16.1
 
 [bumpversion:file:pyproject.toml]
 search = {current_version}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 CHANGELOG
 =====
 
+0.16.1
+-----
+
+Bugfixes:
+
+* Allow diacritics in send/receive (#344)
+* Resolve absolute nam path (#377)
+* Fix issue with Path in jinja2 environment
+* Daisy: Don't show warning if board doesn't have display section (#349)
+
 0.16.0
 -----
 
diff --git a/hvcc/core/hv2ir/HeavyLangObject.py b/hvcc/core/hv2ir/HeavyLangObject.py
@@ -375,10 +375,10 @@ def _resolve_connection_types(self, obj_stack: Optional[set] = None) -> None:
                 c.to_object._resolve_connection_types(obj_stack)  # turtle all the way down
 
     @classmethod
-    def get_hash(cls, x: str) -> int:
+    def get_hash(cls, x: Union[str, float, int]) -> int:
         """ Compute the message element hash used by msg_getHash(). Returns a 32-bit integer.
         """
-        if isinstance(x, float) or isinstance(x, int):
+        if isinstance(x, (float, int)) and not isinstance(x, str):
             # interpret the float bytes as an unsigned integer
             return unpack("@I", pack("@f", float(x)))[0]
         elif x == "bang":
@@ -387,28 +387,27 @@ def get_hash(cls, x: str) -> int:
             # this hash is based MurmurHash2
             # http://en.wikipedia.org/wiki/MurmurHash
             # https://sites.google.com/site/murmurhash/
-            x = str(x)
+            data = x.encode("utf-8")
             m = 0x5bd1e995
             r = 24
-            h = len(x)
+            h = len(data)
             i = 0
-            while i < len(x) & ~0x3:
-                k = unpack("@I", bytes(x[i:i + 4], "utf-8"))[0]
+            while i <= len(data) - 4:
+                k = unpack("@I", data[i:i + 4])[0]
                 k = (k * m) & 0xFFFFFFFF
                 k ^= k >> r
                 k = (k * m) & 0xFFFFFFFF
                 h = (h * m) & 0xFFFFFFFF
                 h ^= k
                 i += 4
 
-            n = len(x) & 0x3
-            x = x[i:i + n]
+            n = len(data) - i
             if n >= 3:
-                h ^= (ord(x[2]) << 16) & 0xFFFFFFFF
+                h ^= (data[i + 2] << 16) & 0xFFFFFFFF
             if n >= 2:
-                h ^= (ord(x[1]) << 8) & 0xFFFFFFFF
+                h ^= (data[i + 1] << 8) & 0xFFFFFFFF
             if n >= 1:
-                h ^= ord(x[0])
+                h ^= data[i]
                 h = (h * m) & 0xFFFFFFFF
 
             h ^= h >> 13
diff --git a/hvcc/generators/c2daisy/c2daisy.py b/hvcc/generators/c2daisy/c2daisy.py
@@ -88,24 +88,19 @@ def compile(
             else:
                 header, board_info = generate_header_from_name(board)
                 display_params = {}
-                warnings.append(
-                    CompilerMsg(
-                        enum=NotificationEnum.WARNING_GENERIC,
-                        message=f"Unable to load board description from {daisy_meta.board_file}. Using fallback."
-                    )
-                )
 
             # inject display process code
             try:
                 display_process = display_processor(daisy_meta.board_file)
             except (FileNotFoundError, KeyError, ValueError):
                 display_process = board_info['displayprocess']
-                warnings.append(
-                    CompilerMsg(
-                        enum=NotificationEnum.WARNING_GENERIC,
-                        message=f"Unable to load display code from {daisy_meta.board_file}. Using fallback."
+                if display_process is not None:
+                    warnings.append(
+                        CompilerMsg(
+                            enum=NotificationEnum.WARNING_GENERIC,
+                            message=f"Unable to load display code from {board_info['name']}. Using fallback."
+                        )
                     )
-                )
 
             # remove heavy out params from externs
             externs.parameters.outParam = [
@@ -153,7 +148,7 @@ def compile(
             with open(daisy_h_path, "w") as f:
                 f.write(header)
 
-            loader = jinja2.FileSystemLoader(Path(Path(__file__).parent, 'templates'))
+            loader = jinja2.FileSystemLoader(Path(__file__).parent / 'templates')
             env = jinja2.Environment(loader=loader, trim_blocks=True, lstrip_blocks=True)
             daisy_cpp_path = Path(source_dir, f"HeavyDaisy_{patch_name}.cpp")
 
diff --git a/hvcc/generators/c2daisy/json2daisy/json2daisy.py b/hvcc/generators/c2daisy/json2daisy/json2daisy.py
@@ -2,8 +2,8 @@
 import json
 
 from importlib import resources
-from typing import Optional
 from pathlib import Path
+from typing import Optional
 
 
 def map_load(pair: list, json_defs_file: Path):
@@ -321,7 +321,7 @@ def generate_header(board_description_dict: dict) -> 'tuple[str, dict]':
         'aliases': target['aliases'],
         'channels': audio_channels,
         'has_midi': target.get('has_midi', False),
-        'displayprocess': target.get('displayprocess', '')
+        'displayprocess': target.get('displayprocess', '') if 'display' in target else None
       }
 
     return rendered_header, board_info
diff --git a/hvcc/generators/c2dpf/c2dpf.py b/hvcc/generators/c2dpf/c2dpf.py
@@ -85,8 +85,7 @@ def compile(
             env = jinja2.Environment()
             env.filters["uniqueid"] = filter_uniqueid
 
-            env.loader = jinja2.FileSystemLoader(
-                Path(Path(__file__).parent, "templates"))
+            env.loader = jinja2.FileSystemLoader(Path(__file__).parent / "templates")
 
             # generate DPF wrapper from template
             dpf_h_path = Path(source_dir, f"HeavyDPF_{patch_name}.hpp")
diff --git a/hvcc/generators/c2dpf/static/README.md b/hvcc/generators/c2dpf/static/README.md
@@ -24,7 +24,7 @@ This will result in an `bin/` folder with all binary assets.
 
 ## Metadata
 
-You will likely want to add more configuration options to your project. Create a json file as described in the [documentation](https://wasted-audio.github.io/hvcc/docs/03.gen.dpf.html#metadata).
+You will likely want to add more configuration options to your project. Create a json file as described in the [documentation](https://wasted-audio.github.io/hvcc/latest/generators/dpf/#metadata).
 
 ## Jack
 
diff --git a/hvcc/generators/c2fmod/c2fmod.py b/hvcc/generators/c2fmod/c2fmod.py
@@ -46,7 +46,7 @@ def compile(
 
         copyright_c = copyright_manager.get_copyright_for_c(copyright)
 
-        templates_dir = Path(Path(__file__).parent, "templates")
+        templates_dir = Path(__file__).parent / "templates"
         is_source_plugin = num_input_channels == 0
 
         out_dir = Path(out_dir, "fmod")
diff --git a/hvcc/generators/c2js/c2js.py b/hvcc/generators/c2js/c2js.py
@@ -197,9 +197,7 @@ def compile(
         try:
             # initialise the jinja template environment
             env = jinja2.Environment()
-            env.loader = jinja2.FileSystemLoader(Path(
-                Path(__file__).parent,
-                "template"))
+            env.loader = jinja2.FileSystemLoader(Path(__file__).parent / "template")
 
             # generate heavy js wrapper from template
             # Note: this file will be incorporated into the emscripten output
diff --git a/hvcc/generators/c2owl/c2owl.py b/hvcc/generators/c2owl/c2owl.py
@@ -104,7 +104,7 @@ def compile(
             # initialize the jinja template environment
             env = jinja2.Environment()
 
-            env.loader = jinja2.FileSystemLoader(Path(Path(__file__).parent), "templates")
+            env.loader = jinja2.FileSystemLoader(Path(__file__).parent / "templates")
 
             # construct jdata from ir
             ir_dir = Path(c_src_dir, "../ir")
diff --git a/hvcc/generators/c2pdext/c2pdext.py b/hvcc/generators/c2pdext/c2pdext.py
@@ -67,19 +67,14 @@ def compile(
         shutil.copytree(c_src_dir, out_dir)
 
         # copy over static files
-        shutil.copy(
-            Path(Path(__file__).parent, "static", "m_pd.h"),
-            f"{out_dir}/")
-        shutil.copy(
-            Path(Path(__file__).parent, "static", "Makefile.pdlibbuilder"),
-            f"{out_dir}/../")
+        shutil.copy(Path(__file__).parent / "static" / "m_pd.h", f"{out_dir}/")
+        shutil.copy(Path(__file__).parent / "static" / "Makefile.pdlibbuilder", f"{out_dir}/../")
 
         try:
             # initialise the jinja template environment
             env = jinja2.Environment()
             env.filters["max"] = filter_max
-            env.loader = jinja2.FileSystemLoader(
-                Path(Path(__file__).parent, "templates"))
+            env.loader = jinja2.FileSystemLoader(Path(__file__).parent / "templates")
 
             # generate Pd external wrapper from template
             pdext_path = Path(out_dir, f"{ext_name}.c")
diff --git a/hvcc/generators/c2wwise/c2wwise.py b/hvcc/generators/c2wwise/c2wwise.py
@@ -58,7 +58,7 @@ def compile(
         copyright_c = copyright_manager.get_copyright_for_c(copyright)
         copyright_xml = copyright_manager.get_copyright_for_xml(copyright)
 
-        templates_dir = Path(Path(__file__).parent, "templates")
+        templates_dir = Path(__file__).parent / "templates"
         is_source_plugin = num_input_channels == 0
         plugin_type = "Source" if is_source_plugin else "FX"
         plugin_id = filter_plugin_id(patch_name)
diff --git a/hvcc/generators/ir2c/HeavyObject.py b/hvcc/generators/ir2c/HeavyObject.py
@@ -164,11 +164,10 @@ def _c_buffer(cls, buffer_dict: IRBuffer) -> str:
                 buffer_dict.index)
 
     @classmethod
-    def get_hash(cls, x: Union[float, str]) -> int:
-        """ Compute the message element hash used by msg_getHash().
-        Returns a 32-bit integer.
+    def get_hash(cls, x: Union[float, str, int]) -> int:
+        """ Compute the message element hash used by msg_getHash(). Returns a 32-bit integer.
         """
-        if isinstance(x, float) or isinstance(x, int):
+        if isinstance(x, (float, int)) and not isinstance(x, str):
             # interpret the float bytes as an unsigned integer
             return unpack("@I", pack("@f", float(x)))[0]
         elif x == "bang":
@@ -177,28 +176,27 @@ def get_hash(cls, x: Union[float, str]) -> int:
             # this hash is based MurmurHash2
             # http://en.wikipedia.org/wiki/MurmurHash
             # https://sites.google.com/site/murmurhash/
-            x = str(x)
+            data = x.encode("utf-8")
             m = 0x5bd1e995
             r = 24
-            h = len(x)
+            h = len(data)
             i = 0
-            while i < len(x) & ~0x3:
-                k = unpack("@I", bytes(x[i:i + 4], encoding='utf-8'))[0]
+            while i <= len(data) - 4:
+                k = unpack("@I", data[i:i + 4])[0]
                 k = (k * m) & 0xFFFFFFFF
                 k ^= k >> r
                 k = (k * m) & 0xFFFFFFFF
                 h = (h * m) & 0xFFFFFFFF
                 h ^= k
                 i += 4
 
-            n = len(x) & 0x3
-            x = x[i:i + n]
+            n = len(data) - i
             if n >= 3:
-                h ^= (ord(x[2]) << 16) & 0xFFFFFFFF
+                h ^= (data[i + 2] << 16) & 0xFFFFFFFF
             if n >= 2:
-                h ^= (ord(x[1]) << 8) & 0xFFFFFFFF
+                h ^= (data[i + 1] << 8) & 0xFFFFFFFF
             if n >= 1:
-                h ^= ord(x[0])
+                h ^= data[i]
                 h = (h * m) & 0xFFFFFFFF
 
             h ^= h >> 13
diff --git a/hvcc/interpreters/pd2hv/PdParser.py b/hvcc/interpreters/pd2hv/PdParser.py
@@ -447,6 +447,14 @@ def finalize_array(array: HeavyObject) -> None:
                         elif Path(self.__HVLIB_DIR, f"{obj_type}.pd").is_file():
                             self.obj_counter[obj_type] += 1
                             hvlib_path = Path(self.__HVLIB_DIR, f"{obj_type}.pd")
+
+                            # make sure that the nam file argument is an absolute path
+                            if obj_type == "pdnam~":
+                                path = Path(obj_args[0])
+                                if not path.is_absolute():
+                                    path = pd_path.parent / path
+                                obj_args = [str(path)]
+
                             x = self.graph_from_file(
                                 file_path=hvlib_path,
                                 obj_args=obj_args,
diff --git a/hvcc/version.py b/hvcc/version.py
@@ -1 +1 @@
-VERSION = "0.16.0"
+VERSION = "0.16.1"
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -64,6 +64,8 @@ nav:
     - pd2gui Parser: adr/ADR-002-pd2gui-Parser.md
     - Control Rate Expr: adr/ADR-003-Control-Rate-Expr.md
     - Signal Rate Expr: adr/ADR-004-Signal-Rate-Expr.md
+    - PDNAM External: adr/ADR-005-PDNAM-External.md
+    - gui2dpf Templates: adr/ADR-006-gui2dpf-Templates.md
   - Changelog: changelog.md
   - Contributing: contributing.md
   - Code of Conduct: code_of_conduct.md
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hvcc"
-version = "0.16.0"
+version = "0.16.1"
 description = "`hvcc` is a python-based dataflow audio programming language compiler that generates C/C++ code and a variety of specific framework wrappers."
 authors = ["Enzien Audio, Wasted Audio"]
 license = "GPLv3"
diff --git a/tests/integration/daisy/LICENSE.md b/tests/integration/daisy/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Electrosmith
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/tests/integration/daisy/__init__.py b/tests/integration/daisy/__init__.py
diff --git a/tests/integration/daisy/data/integration/expected_custom.h b/tests/integration/daisy/data/integration/expected_custom.h
diff --git a/tests/integration/daisy/data/integration/expected_field.h b/tests/integration/daisy/data/integration/expected_field.h
diff --git a/tests/integration/daisy/data/integration/expected_patch.h b/tests/integration/daisy/data/integration/expected_patch.h
diff --git a/tests/integration/daisy/data/integration/expected_patch_init.h b/tests/integration/daisy/data/integration/expected_patch_init.h
diff --git a/tests/integration/daisy/data/integration/expected_petal.h b/tests/integration/daisy/data/integration/expected_petal.h
diff --git a/tests/integration/daisy/data/integration/expected_petal_125b_sm.h b/tests/integration/daisy/data/integration/expected_petal_125b_sm.h
diff --git a/tests/integration/daisy/data/integration/expected_pod.h b/tests/integration/daisy/data/integration/expected_pod.h
diff --git a/tests/integration/daisy/test_integration.py b/tests/integration/daisy/test_integration.py
@@ -2,12 +2,12 @@
 
 from pathlib import Path
 
+from hvcc.compiler import compile_dataflow
 from hvcc.generators.c2daisy.json2daisy import generate_header_from_name
 
 
 # Grabbing the absolute path to test data
 data_path = Path(Path(__file__).parent, 'data')
-print(data_path)
 
 
 class TestIntegration(unittest.TestCase):
@@ -47,3 +47,42 @@ def test_field(self):
         header, info = generate_header_from_name('field')
         with open(Path(data_path, 'integration', 'expected_field.h'), 'r') as file:
             self.assertEqual(header, file.read(), 'The output string should match "expected_field.h" exactly')
+
+
+def test_empty_display(tmp_path: Path):
+    pd_path = tmp_path / "empty_display.pd"
+    pd_path.write_text("""#N canvas 827 239 734 565 12;""")
+
+    out_path = tmp_path / Path("out_dir")
+
+    meta_path = tmp_path / "meta.json"
+    meta_path.write_text("""{"name": "empty_display", "daisy": {"board": "petal"}}""")
+
+    result = compile_dataflow(
+        in_path=pd_path,
+        out_dir=out_path,
+        patch_meta_file=meta_path,
+        generators=["daisy"],
+    )
+
+    assert len(result.root['c2daisy'].notifs.warnings) == 0
+
+
+def test_empty_display_process(tmp_path: Path):
+    pd_path = tmp_path / "empty_display_process.pd"
+    pd_path.write_text("""#N canvas 827 239 734 565 12;""")
+
+    out_path = tmp_path / Path("out_dir")
+
+    meta_path = tmp_path / "meta.json"
+    meta_path.write_text("""{"name": "empty_display_process", "daisy": {"board": "field"}}""")
+
+    result = compile_dataflow(
+        in_path=pd_path,
+        out_dir=out_path,
+        patch_meta_file=meta_path,
+        generators=["daisy"],
+    )
+
+    assert result.root['c2daisy'].notifs.warnings[0].message == \
+        "Unable to load display code from field. Using fallback."
diff --git a/tests/unit/daisy/test_unit.py b/tests/unit/daisy/test_unit.py
@@ -1,14 +1,8 @@
 import unittest
 
-from os import path
-
 from hvcc.generators.c2daisy.json2daisy import flatten_pin_dicts, flatten_index_dicts
 
 
-# Grabbing the absolute path to test data
-data_path = path.join(path.dirname(path.abspath(__file__)), 'data')
-
-
 # A simple comparison for strings / literals / dicts within dicts
 def compare_dicts(d1: dict, d2: dict) -> bool:
     for key, item in d1.items():
diff --git a/tests/unit/test_hvhash.py b/tests/unit/test_hvhash.py
diff --git a/tests/unit/test_pdparser.py b/tests/unit/test_pdparser.py
