release 0.9.1a1

Author: hx2A

py5/__init__.py

@@ -89,13 +89,15 @@
     pass
 
 
-__version__ = '0.9.0a0'
+__version__ = '0.9.1a1'
 
 _PY5_USE_IMPORTED_MODE = py5_tools.get_imported_mode()
 py5_tools._lock_imported_mode()
 
 object_conversion.init_jpype_converters()
 
+warnings.filterwarnings("once", category=DeprecationWarning, module="py5")
+
 
 _py5sketch = Sketch()
 
@@ -2786,8 +2788,6 @@ def bezier_vertex(*args):
 def bezier_vertices(coordinates: npt.NDArray[np.floating], /) -> None:
     """Create a collection of bezier vertices.
 
-    Underlying Processing method: PApplet.bezierVertices
-
     Parameters
     ----------
 
@@ -6395,8 +6395,6 @@ def curve_vertex(*args):
 def curve_vertices(coordinates: npt.NDArray[np.floating], /) -> None:
     """Create a collection of curve vertices.
 
-    Underlying Processing method: PApplet.curveVertices
-
     Parameters
     ----------
 
@@ -9269,8 +9267,6 @@ def line(*args):
 def lines(coordinates: npt.NDArray[np.floating], /) -> None:
     """Draw a collection of lines to the screen.
 
-    Underlying Processing method: PApplet.lines
-
     Parameters
     ----------
 
@@ -10705,8 +10701,6 @@ def points(coordinates: npt.NDArray[np.floating], /) -> None:
     """Draw a collection of points, each a coordinate in space at the dimension of one
     pixel.
 
-    Underlying Processing method: PApplet.points
-
     Parameters
     ----------
 
@@ -11114,8 +11108,6 @@ def quadratic_vertex(*args):
 def quadratic_vertices(coordinates: npt.NDArray[np.floating], /) -> None:
     """Create a collection of quadratic vertices.
 
-    Underlying Processing method: PApplet.quadraticVertices
-
     Parameters
     ----------
 
@@ -17331,8 +17323,6 @@ def vertex(*args):
 def vertices(coordinates: npt.NDArray[np.floating], /) -> None:
     """Create a collection of vertices.
 
-    Underlying Processing method: PApplet.vertices
-
     Parameters
     ----------
 
@@ -21047,8 +21037,8 @@ class mode. Don't forget you can always replace the `draw()` function in a
     Mode. This value must be the canonical name of your Processing Sketch class
     (i.e. `"org.test.MySketch"`). The class must inherit from `py5.core.SketchBase`.
     Read py5's online documentation to learn more about Processing Mode."""
-    caller_globals = inspect.stack()[1].frame.f_globals
     caller_locals = inspect.stack()[1].frame.f_locals
+    caller_globals = inspect.stack()[1].frame.f_globals
     functions, function_param_counts = bridge._extract_py5_user_function_data(
         sketch_functions if sketch_functions else caller_locals)
     functions = _split_setup.transform(
@@ -21078,13 +21068,12 @@ class mode. Don't forget you can always replace the `draw()` function in a
 
     _prepare_dynamic_variables(caller_locals, caller_globals)
 
-    _py5sketch._run_sketch(
-        functions,
-        function_param_counts,
-        block,
-        py5_options,
-        sketch_args,
-        _osx_alt_run_method)
+    _py5sketch._run_sketch(functions, function_param_counts, block,
+                           py5_options=py5_options,
+                           sketch_args=sketch_args,
+                           _caller_locals=caller_locals,
+                           _caller_globals=caller_globals,
+                           _osx_alt_run_method=_osx_alt_run_method)
 
 
 def get_current_sketch() -> Sketch:

py5/bridge.py

@@ -163,6 +163,8 @@ class Py5Bridge:
 
     def __init__(self, sketch):
         self._sketch = sketch
+        self._caller_locals = dict()
+        self._caller_globals = dict()
         self._functions = dict()
         self._function_param_counts = dict()
         self._pre_hooks = defaultdict(dict)
@@ -175,6 +177,10 @@ def __init__(self, sketch):
         self._convert_to_python_types = convert_to_python_types
         self._convert_to_java_type = convert_to_java_type
 
+    def set_caller_locals_globals(self, locals, globals):
+        self._caller_locals = locals
+        self._caller_globals = globals
+
     def set_functions(self, functions, function_param_counts):
         self._function_param_counts = dict()
         self._functions = dict()
@@ -283,9 +289,20 @@ def _get_current_running_method(self):
 
     @JOverride
     def call_function(self, key, params):
-        d = py5_tools.config._PY5_PROCESSING_MODE_KEYS
         try:
-            *str_hierarchy, c = str(key).split('.')
+            key = str(key)
+            *str_hierarchy, c = key.split('.')
+            key_start = key.split('.')[0]
+
+            if key_start in py5_tools.config._PY5_PROCESSING_MODE_KEYS:
+                d = py5_tools.config._PY5_PROCESSING_MODE_KEYS
+            elif key_start in self._caller_locals:
+                d = self._caller_locals
+            elif key_start in self._caller_globals:
+                d = self._caller_globals
+            else:
+                return _JAVA_RUNTIMEEXCEPTION(
+                    f'callable {c} not found with key {key}')
 
             for s in str_hierarchy:
                 if s in d:

py5/custom_exceptions.py

@@ -56,10 +56,20 @@ def handle_nameerror(exc_type_name, exc_msg, py5info):
         if m:
             fname = m.group(1)
             exc_msg = 'The name "' + fname + '" is not defined.'
-            suggestion_list = spelling.suggestions(
-                fname, py5_tools.reference.PY5_DIR_STR)
-            if suggestion_list:
-                exc_msg += ' Did you mean ' + suggestion_list + '?'
+            if fname == 'py5':
+                return exc_msg + (' Your Sketch is also running in Imported Mode. ' +
+                                  'Remember that in imported mode you do not access py5\'s methods ' +
+                                  'with the `py5.` module prefix.')
+            elif fname in py5_tools.reference.PY5_DIR_STR:
+                return exc_msg + (' Your Sketch is also running in Imported Mode. ' +
+                                  'If the code throwing this exception was imported into your ' +
+                                  'main py5 Sketch code, please ensure the py5 Imported Mode marker ' +
+                                  '"# PY5 IMPORTED MODE CODE" has been properly added to the module.')
+            else:
+                suggestion_list = spelling.suggestions(
+                    fname, py5_tools.reference.PY5_DIR_STR)
+                if suggestion_list:
+                    exc_msg += ' Did you mean ' + suggestion_list + '?'
 
     return exc_msg