py2pd 0.2.0__tar.gz → 0.2.1__tar.gz

{py2pd-0.2.0 → py2pd-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py2pd
-Version: 0.2.0
+Version: 0.2.1
 Summary: Roundtrip parsing and generation of pure-data patches from python
 Keywords: puredata,pd,audio,dsp,music,synthesis,patching
 Author: Shakeeb Alireza

{py2pd-0.2.0 → py2pd-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "py2pd"
-version = "0.2.0"
+version = "0.2.1"
 description = "Roundtrip parsing and generation of pure-data patches from python"
 readme = "README.md"
 requires-python = ">=3.13"

{py2pd-0.2.0 → py2pd-0.2.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "py2pd"
-version = "0.2.0"
+version = "0.2.1"
 description = "Roundtrip parsing and generation of pure-data patches from python"
 readme = "README.md"
 requires-python = ">=3.13"

{py2pd-0.2.0 → py2pd-0.2.1}/src/py2pd/__init__.py

@@ -89,4 +89,4 @@ __all__ = [
     "extract_declare_paths",
 ]
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"

{py2pd-0.2.0 → py2pd-0.2.1}/src/py2pd/api.py

@@ -1,4 +1,5 @@
 from collections import deque
+from pathlib import Path
 import re
 from typing import Any, Callable, Dict, FrozenSet, List, Optional, Sequence, Set, Tuple, Union
 import warnings
@@ -73,8 +74,10 @@ def _fmt_coord(value: float) -> str:
 def escape(text: str) -> str:
     """Escape special characters for PureData format."""
     save = re.sub(r"\\", r"\\\\", text)
-    save = re.sub(r";", r" \; ", save)
-    save = re.sub(r",", r" \, ", save)
+    # Absorb whitespace already flanking the separator: PureData puts one space
+    # between atoms, and "0, 1 10" would otherwise gain a second one.
+    save = re.sub(r"[ \t]*;[ \t]*", r" \; ", save)
+    save = re.sub(r"[ \t]*,[ \t]*", r" \, ", save)
     save = re.sub(r"\$(?=[0-9])", r"\$", save)
     return save
 
@@ -310,7 +313,8 @@ class Msg(Node):
     text : str
         Message content. Will be escaped for the PureData file format.
     num_inlets : int, optional
-        Number of inlets (default: 2 -- hot inlet + cold inlet for setting contents)
+        Number of inlets (default: 1). A message box has one inlet; contents
+        are replaced by sending ``set ...`` to it, not through a second inlet.
     num_outlets : int, optional
         Number of outlets (default: 1)
     escaped : bool, optional
@@ -323,7 +327,7 @@ class Msg(Node):
         x_pos: int,
         y_pos: int,
         text: str,
-        num_inlets: Optional[int] = 2,
+        num_inlets: Optional[int] = 1,
         num_outlets: Optional[int] = 1,
         *,
         escaped: bool = False,
@@ -368,10 +372,12 @@ class Float(Node):
         Y position in patch coordinates
     width : int
         Display width in characters (default: 5)
-    upper_limit : float
-        Maximum value; 0 means no limit (default: 0)
     lower_limit : float
         Minimum value; 0 means no limit (default: 0)
+    upper_limit : float
+        Maximum value; 0 means no limit (default: 0)
+    label_pos : int
+        Label placement: 0=left, 1=right, 2=top, 3=bottom (default: 0)
     label : str
         Label text (default: ``'-'`` for none)
     receive : str
@@ -385,8 +391,9 @@ class Float(Node):
         x_pos: int,
         y_pos: int,
         width: int = 5,
-        upper_limit: float = 0,
         lower_limit: float = 0,
+        upper_limit: float = 0,
+        label_pos: int = 0,
         label: str = "-",
         receive: str = "-",
         send: str = "-",
@@ -397,8 +404,9 @@ class Float(Node):
             "x_pos": x_pos,
             "y_pos": y_pos,
             "width": width,
-            "upper_limit": upper_limit,
             "lower_limit": lower_limit,
+            "upper_limit": upper_limit,
+            "label_pos": label_pos,
             "label": label,
             "receive": receive,
             "send": send,
@@ -410,8 +418,8 @@ class Float(Node):
         p = self.parameters
         return (
             f"#X floatatom {p['x_pos']} {p['y_pos']} {p['width']} "
-            f"{p['upper_limit']} {p['lower_limit']} {p['label']} "
-            f"{p['receive']} {p['send']};\n"
+            f"{p['lower_limit']} {p['upper_limit']} {p['label_pos']} "
+            f"{p['label']} {p['receive']} {p['send']};\n"
         )
 
     @property
@@ -2143,7 +2151,7 @@ class Patcher:
 
     Attributes
     ----------
-    filename : str or None
+    filename : Path or None
         Default filename for save()
     nodes : list of Node
         All nodes in the patch
@@ -2153,7 +2161,7 @@ class Patcher:
         Manages automatic element positioning
     """
 
-    filename: Optional[str]
+    filename: Optional[Path]
     nodes: List[Node]
     connections: List[Connection]
     layout: LayoutManager
@@ -2161,7 +2169,7 @@ class Patcher:
 
     def __init__(
         self,
-        filename: Optional[str] = None,
+        filename: Optional[Union[str, Path]] = None,
         layout: Optional[LayoutManager] = None,
         *,
         validate_links: bool = True,
@@ -2175,8 +2183,9 @@ class Patcher:
 
         Parameters
         ----------
-        filename : str, optional
-            Default filename for save(). Can be overridden in save().
+        filename : str or Path, optional
+            Default filename for save(), stored as a ``Path``. Can be
+            overridden in save().
         layout : LayoutManager, optional
             Custom layout manager. If None, creates a default LayoutManager.
         validate_links : bool, optional
@@ -2193,7 +2202,7 @@ class Patcher:
         font_size : int, optional
             Patch font size written on the ``#N canvas`` line (default: 10).
         """
-        self.filename = filename
+        self.filename = Path(filename) if filename is not None else None
         self.nodes = []
         self.connections = []
         self.layout = layout if layout is not None else LayoutManager()
@@ -2412,8 +2421,9 @@ class Patcher:
         self,
         *,
         width: int = 5,
-        upper_limit: float = 0,
         lower_limit: float = 0,
+        upper_limit: float = 0,
+        label_pos: int = 0,
         label: str = "-",
         receive: str = "-",
         send: str = "-",
@@ -2428,10 +2438,12 @@ class Patcher:
         ----------
         width : int
             Display width in characters (default: 5)
-        upper_limit : int
-            Maximum value (0 = no limit)
         lower_limit : int
             Minimum value (0 = no limit)
+        upper_limit : int
+            Maximum value (0 = no limit)
+        label_pos : int
+            Label placement: 0=left, 1=right, 2=top, 3=bottom
         label : str
             Label text (default: '-' for none)
         receive : str
@@ -2445,7 +2457,17 @@ class Patcher:
             The created number box
         """
         x_pos, y_pos, pos_update = self._resolve_position(x_pos, y_pos, new_row, new_col)
-        node = Float(x_pos, y_pos, width, upper_limit, lower_limit, label, receive, send)
+        node = Float(
+            x_pos,
+            y_pos,
+            width=width,
+            lower_limit=lower_limit,
+            upper_limit=upper_limit,
+            label_pos=label_pos,
+            label=label,
+            receive=receive,
+            send=send,
+        )
         self._register(node, pos_update)
         return node
 
@@ -3408,23 +3430,36 @@ class Patcher:
         connections_str = "".join(str(c) for c in self.connections)
         return f"{nodes_str}{connections_str}"
 
-    def save(self, filename: Optional[str] = None) -> None:
+    def save(
+        self,
+        filename: Optional[Union[str, Path]] = None,
+        *,
+        to_dir: Optional[Union[str, Path]] = None,
+    ) -> None:
         """Save the patch to a file.
 
         Parameters
         ----------
-        filename : str, optional
+        filename : str or Path, optional
             Path to the output .pd file. If not provided, uses the filename
             from the constructor.
+        to_dir : str or Path, optional
+            Directory to write into, created if missing. Only the base name of
+            *filename* is used, so one patch can be written to several
+            directories.
 
         Raises
         ------
         ValueError
             If no filename is provided and none was set in constructor.
         """
-        fn = filename or self.filename
+        fn = Path(filename) if filename is not None else self.filename
         if fn is None:
             raise ValueError("No filename specified. Provide filename or set in constructor.")
+        if to_dir is not None:
+            d = Path(to_dir)
+            d.mkdir(parents=True, exist_ok=True)
+            fn = d / fn.name
         with open(fn, "w", encoding="utf-8", newline="\n") as f:
             f.write(str(self) + "\n")
 

{py2pd-0.2.0 → py2pd-0.2.1}/src/py2pd/ast.py

@@ -1874,12 +1874,13 @@ def to_builder(ast: PdPatch) -> "api.Patcher":
             node = api.Float(
                 elem.position.x,
                 elem.position.y,
-                elem.width,
-                elem.upper_limit,
-                elem.lower_limit,
-                elem.label,
-                elem.receive,
-                elem.send,
+                width=elem.width,
+                lower_limit=elem.lower_limit,
+                upper_limit=elem.upper_limit,
+                label_pos=elem.label_pos,
+                label=elem.label,
+                receive=elem.receive,
+                send=elem.send,
             )
             patch.nodes.append(node)
             node_map.append(node)

{py2pd-0.2.0 → py2pd-0.2.1}/src/py2pd/integrations/hvcc.py

@@ -28,6 +28,7 @@ Usage::
 from dataclasses import dataclass, field
 from enum import Enum
 import os
+from pathlib import Path
 import re
 import shutil
 import subprocess
@@ -425,7 +426,7 @@ class HeavyPatcher(Patcher):
 
     Parameters
     ----------
-    filename : str, optional
+    filename : str or Path, optional
         Default filename for save().
     layout : LayoutManager, optional
         Custom layout manager.
@@ -435,7 +436,7 @@ class HeavyPatcher(Patcher):
 
     def __init__(
         self,
-        filename: Optional[str] = None,
+        filename: Optional[Union[str, Path]] = None,
         layout: Optional[LayoutManager] = None,
         generators: Sequence[HvccGenerator] | None = None,
     ) -> None: