release 0.5a1

Author: hx2A

py5/__init__.py

@@ -259,14 +259,14 @@ def blend(self, sx: int, sy: int, sw: int, sh: int, dx: int,
         * DARKEST: only the darkest colour succeeds: ``C = min(A*factor, B)``
         * LIGHTEST: only the lightest colour succeeds: ``C = max(A*factor, B)``
         * DIFFERENCE: subtract colors from underlying image.
-        * EXCLUSION: similar to ``DIFFERENCE``, but less extreme.
+        * EXCLUSION: similar to DIFFERENCE, but less extreme.
         * MULTIPLY: Multiply the colors, result will always be darker.
         * SCREEN: Opposite multiply, uses inverse values of the colors.
-        * OVERLAY: A mix of ``MULTIPLY`` and ``SCREEN``. Multiplies dark values, and
-        screens light values.
-        * HARD_LIGHT: ``SCREEN`` when greater than 50% gray, ``MULTIPLY`` when lower.
-        * SOFT_LIGHT: Mix of ``DARKEST`` and ``LIGHTEST``.  Works like ``OVERLAY``, but
-        not as harsh.
+        * OVERLAY: A mix of MULTIPLY and SCREEN. Multiplies dark values, and screens
+        light values.
+        * HARD_LIGHT: SCREEN when greater than 50% gray, MULTIPLY when lower.
+        * SOFT_LIGHT: Mix of DARKEST and LIGHTEST.  Works like OVERLAY, but not as
+        harsh.
         * DODGE: Lightens light tones and increases contrast, ignores darks. Called
         "Color Dodge" in Illustrator and Photoshop.
         * BURN: Darker areas are applied, increasing contrast, ignores lights. Called
@@ -343,14 +343,14 @@ def blend(self, src: Py5Image, sx: int, sy: int, sw: int, sh: int,
         * DARKEST: only the darkest colour succeeds: ``C = min(A*factor, B)``
         * LIGHTEST: only the lightest colour succeeds: ``C = max(A*factor, B)``
         * DIFFERENCE: subtract colors from underlying image.
-        * EXCLUSION: similar to ``DIFFERENCE``, but less extreme.
+        * EXCLUSION: similar to DIFFERENCE, but less extreme.
         * MULTIPLY: Multiply the colors, result will always be darker.
         * SCREEN: Opposite multiply, uses inverse values of the colors.
-        * OVERLAY: A mix of ``MULTIPLY`` and ``SCREEN``. Multiplies dark values, and
-        screens light values.
-        * HARD_LIGHT: ``SCREEN`` when greater than 50% gray, ``MULTIPLY`` when lower.
-        * SOFT_LIGHT: Mix of ``DARKEST`` and ``LIGHTEST``.  Works like ``OVERLAY``, but
-        not as harsh.
+        * OVERLAY: A mix of MULTIPLY and SCREEN. Multiplies dark values, and screens
+        light values.
+        * HARD_LIGHT: SCREEN when greater than 50% gray, MULTIPLY when lower.
+        * SOFT_LIGHT: Mix of DARKEST and LIGHTEST.  Works like OVERLAY, but not as
+        harsh.
         * DODGE: Lightens light tones and increases contrast, ignores darks. Called
         "Color Dodge" in Illustrator and Photoshop.
         * BURN: Darker areas are applied, increasing contrast, ignores lights. Called
@@ -425,14 +425,14 @@ def blend(self, *args):
         * DARKEST: only the darkest colour succeeds: ``C = min(A*factor, B)``
         * LIGHTEST: only the lightest colour succeeds: ``C = max(A*factor, B)``
         * DIFFERENCE: subtract colors from underlying image.
-        * EXCLUSION: similar to ``DIFFERENCE``, but less extreme.
+        * EXCLUSION: similar to DIFFERENCE, but less extreme.
         * MULTIPLY: Multiply the colors, result will always be darker.
         * SCREEN: Opposite multiply, uses inverse values of the colors.
-        * OVERLAY: A mix of ``MULTIPLY`` and ``SCREEN``. Multiplies dark values, and
-        screens light values.
-        * HARD_LIGHT: ``SCREEN`` when greater than 50% gray, ``MULTIPLY`` when lower.
-        * SOFT_LIGHT: Mix of ``DARKEST`` and ``LIGHTEST``.  Works like ``OVERLAY``, but
-        not as harsh.
+        * OVERLAY: A mix of MULTIPLY and SCREEN. Multiplies dark values, and screens
+        light values.
+        * HARD_LIGHT: SCREEN when greater than 50% gray, MULTIPLY when lower.
+        * SOFT_LIGHT: Mix of DARKEST and LIGHTEST.  Works like OVERLAY, but not as
+        harsh.
         * DODGE: Lightens light tones and increases contrast, ignores darks. Called
         "Color Dodge" in Illustrator and Photoshop.
         * BURN: Darker areas are applied, increasing contrast, ignores lights. Called

py5/graphics.py

@@ -909,13 +909,13 @@ def random(self, *args: float) -> float:
             return self._rng.uniform()
         elif len(args) == 1:
             high = args[0]
-            if isinstance(high, (int, float)):
+            if isinstance(high, (int, np.integer, float)):
                 return self._rng.uniform(0, high)
         elif len(args) == 2:
             low, high = args
             if isinstance(
-                    low, (int, float)) and isinstance(
-                    high, (int, float)):
+                    low, (int, np.integer, float)) and isinstance(
+                    high, (int, np.integer, float)):
                 return self._rng.uniform(low, high)
 
         types = ','.join([type(a).__name__ for a in args])
@@ -1127,11 +1127,13 @@ def random_int(self, *args: int) -> int:
             return self._rng.integers(0, 1, endpoint=True)
         elif len(args) == 1:
             high = args[0]
-            if isinstance(high, int):
+            if isinstance(high, (int, np.integer)):
                 return self._rng.integers(0, high, endpoint=True)
         elif len(args) == 2:
             low, high = args
-            if isinstance(low, int) and isinstance(high, int):
+            if isinstance(
+                    low, (int, np.integer)) and isinstance(
+                    high, (int, np.integer)):
                 return self._rng.integers(low, high, endpoint=True)
 
         types = ','.join([type(a).__name__ for a in args])
@@ -1333,13 +1335,13 @@ def random_gaussian(self, *args: float) -> float:
             return self._rng.normal()
         elif len(args) == 1:
             loc = args[0]
-            if isinstance(loc, int):
+            if isinstance(loc, (int, np.integer)):
                 return self._rng.normal(loc)
         elif len(args) == 2:
             loc, scale = args
             if isinstance(
-                    loc, (int, float)) and isinstance(
-                    scale, (int, float)):
+                    loc, (int, np.integer, float)) and isinstance(
+                    scale, (int, np.integer, float)):
                 return self._rng.normal(loc, scale)
 
         types = ','.join([type(a).__name__ for a in args])

py5/image.py

@@ -209,6 +209,22 @@
     (('Sketch', 'vertex'), ['(x: float, y: float, /) -> None', '(x: float, y: float, z: float, /) -> None', '(x: float, y: float, u: float, v: float, /) -> None', '(x: float, y: float, z: float, u: float, v: float, /) -> None', '(v: NDArray[(Any,), Float], /) -> None']),
     (('Sketch', 'vertices'), ['(coordinates: NDArray[(Any, Any), Float], /) -> None']),
     (('Sketch', 'year'), ['() -> int']),
+    (('Sketch', 'load_json'), ['(json_path: Union[str, Path], **kwargs: Dict[str, Any]) -> Any']),
+    (('Sketch', 'save_json'), ['(json_data: Any, filename: Union[str, Path], **kwargs: Dict[str, Any]) -> None']),
+    (('Sketch', 'parse_json'), ['(serialized_json: Any, **kwargs: Dict[str, Any]) -> Any']),
+    (('Sketch', 'set_println_stream'), ['(println_stream: Any) -> None']),
+    (('Sketch', 'println'), ["(*args, sep: str = ' ', end: str = '\\n', stderr: bool = False) -> None"]),
+    (('Sketch', 'load_np_pixels'), ['() -> None']),
+    (('Sketch', 'update_np_pixels'), ['() -> None']),
+    (('Sketch', 'set_np_pixels'), ["(array: np.ndarray, bands: str = 'ARGB') -> None"]),
+    (('Sketch', 'save'), ['(filename: Union[str, Path], *, format: str = None, drop_alpha: bool = True, use_thread: bool = False, **params) -> None']),
+    (('Sketch', 'launch_thread'), ['(f: Callable, name: str = None, *, daemon: bool = True, args: Tuple = None, kwargs: Dict = None) -> str']),
+    (('Sketch', 'launch_promise_thread'), ['(f: Callable, name: str = None, *, daemon: bool = True, args: Tuple = None, kwargs: Dict = None) -> Py5Promise']),
+    (('Sketch', 'launch_repeating_thread'), ['(f: Callable, name: str = None, *, time_delay: float = 0, daemon: bool = True, args: Tuple = None, kwargs: Dict = None) -> str']),
+    (('Sketch', 'has_thread'), ['(name: str) -> None']),
+    (('Sketch', 'stop_thread'), ['(name: str, wait: bool = False) -> None']),
+    (('Sketch', 'stop_all_threads'), ['(wait: bool = False) -> None']),
+    (('Sketch', 'list_threads'), ['() -> None']),
     (('Sketch', 'sin'), ['(angle: float) -> float']),
     (('Sketch', 'cos'), ['(angle: float) -> float']),
     (('Sketch', 'tan'), ['(angle: float) -> float']),
@@ -239,22 +255,6 @@
     (('Sketch', 'noise_mode'), ['(mode: int) -> None']),
     (('Sketch', 'noise_detail'), ['(octaves: float = None, persistence: float = None, lacunarity: float = None) -> None']),
     (('Sketch', 'noise_seed'), ['(seed: int) -> None']),
-    (('Sketch', 'load_json'), ['(json_path: Union[str, Path], **kwargs: Dict[str, Any]) -> Any']),
-    (('Sketch', 'save_json'), ['(json_data: Any, filename: Union[str, Path], **kwargs: Dict[str, Any]) -> None']),
-    (('Sketch', 'parse_json'), ['(serialized_json: Any, **kwargs: Dict[str, Any]) -> Any']),
-    (('Sketch', 'set_println_stream'), ['(println_stream: Any) -> None']),
-    (('Sketch', 'println'), ["(*args, sep: str = ' ', end: str = '\\n', stderr: bool = False) -> None"]),
-    (('Sketch', 'load_np_pixels'), ['() -> None']),
-    (('Sketch', 'update_np_pixels'), ['() -> None']),
-    (('Sketch', 'set_np_pixels'), ["(array: np.ndarray, bands: str = 'ARGB') -> None"]),
-    (('Sketch', 'save'), ['(filename: Union[str, Path], *, format: str = None, drop_alpha: bool = True, use_thread: bool = False, **params) -> None']),
-    (('Sketch', 'launch_thread'), ['(f: Callable, name: str = None, *, daemon: bool = True, args: Tuple = None, kwargs: Dict = None) -> str']),
-    (('Sketch', 'launch_promise_thread'), ['(f: Callable, name: str = None, *, daemon: bool = True, args: Tuple = None, kwargs: Dict = None) -> Py5Promise']),
-    (('Sketch', 'launch_repeating_thread'), ['(f: Callable, name: str = None, *, time_delay: float = 0, daemon: bool = True, args: Tuple = None, kwargs: Dict = None) -> str']),
-    (('Sketch', 'has_thread'), ['(name: str) -> None']),
-    (('Sketch', 'stop_thread'), ['(name: str, wait: bool = False) -> None']),
-    (('Sketch', 'stop_all_threads'), ['(wait: bool = False) -> None']),
-    (('Sketch', 'list_threads'), ['() -> None']),
     (('Sketch', 'sketch_path'), ['() -> Path', '(where: str, /) -> Path']),
     (('Sketch', 'hot_reload_draw'), ['(draw: Callable) -> None']),
     (('Sketch', 'profile_functions'), ['(function_names: List[str]) -> None']),
@@ -542,9 +542,10 @@
     (('Py5Tools', 'get_classpath'), ['() -> str']),
     (('Py5Tools', 'add_classpath'), ['(classpath: Union[Path, str]) -> None']),
     (('Py5Tools', 'add_jars'), ['(path: Union[Path, str]) -> None']),
+    (('Py5Tools', 'get_jvm_debug_info'), ['() -> Dict[str, Any]']),
     (('Py5Tools', 'screenshot'), ['(*, sketch: Sketch = None, hook_post_draw: bool = False) -> PIL.Image']),
     (('Py5Tools', 'save_frames'), ["(dirname: str, *, filename: str = 'frame_####.png', period: float = 0.0, start: int = None, limit: int = 0, sketch: Sketch = None, hook_post_draw: bool = False) -> List[str]"]),
     (('Py5Tools', 'animated_gif'), ['(filename: str, count: int, period: float, duration: float, *, loop: int = 0, optimize: bool = True, sketch: Sketch = None, hook_post_draw: bool = False) -> str']),
     (('Py5Tools', 'capture_frames'), ['(count: float, *, period: float = 0.0, sketch: Sketch = None, hook_post_draw: bool = False) -> List[PIL.Image]']),
-    (('Py5Tools', 'sketch_portal'), ['(*, time_limit: float = 0.0, throttle_frame_rate: float = None, scale: float = 1.0, quality: int = 75, portal_widget: Py5SketchPortal = None, sketch: Sketch = None, hook_post_draw: bool = False) -> None']),
+    (('Py5Tools', 'sketch_portal'), ['(*, time_limit: float = 0.0, throttle_frame_rate: float = 30, scale: float = 1.0, quality: int = 75, portal_widget: Py5SketchPortal = None, sketch: Sketch = None, hook_post_draw: bool = False) -> None']),
 ])