Profile mk3 - errors handling.

Author: portnov

nodes/script/profile_mk3.py

@@ -667,7 +667,8 @@ def process(self):
             curves_form = Interpreter.NURBS if self.nurbs_out else None
             interpreter = Interpreter(self, input_names,
                             curves_form=curves_form,
-                            z_axis=self.selected_axis)
+                            z_axis=self.selected_axis,
+                            logger = self.sv_logger)
             interpreter.interpret(profile, variables)
             verts = self.extend_out_verts(interpreter.vertices)
             result_vertices.append(verts)

utils/modules/profile_mk3/interpreter.py

@@ -23,14 +23,17 @@
 from mathutils.geometry import interpolate_bezier
 from mathutils import Vector, Matrix
 
-from sverchok.utils.sv_logging import sv_logger
 from sverchok.utils.geom import interpolate_quadratic_bezier
 from sverchok.utils.sv_curve_utils import Arc
 from sverchok.utils.nurbs_common import SvNurbsMaths
 from sverchok.utils.curve import SvCircle, SvLine, SvBezierCurve, SvCubicBezierCurve
 import sverchok.utils.curve.knotvector as sv_knotvector
 from sverchok.utils.curve.nurbs_solver import SvNurbsCurveControlPoints
 from sverchok.utils.curve.nurbs_solver_applications import prepare_solver_for_interpolation
+from sverchok.utils.sv_logging import get_logger, sv_logger
+
+class SvProfileException(Exception):
+    __description__ = "Error in profile definition"
 
 def make_functions_dict(*functions):
     return dict([(function.__name__, function) for function in functions])
@@ -73,14 +76,15 @@ def __eq__(self, other):
         return isinstance(other, Expression) and self.string == other.string
 
     @classmethod
-    def from_string(cls, string):
+    def from_string(cls, string, logger=None):
         try:
             string = string[1:][:-1]
             expr = ast.parse(string, mode='eval')
             return Expression(expr, string)
         except Exception as e:
-            print(e)
-            print(string)
+            if logger is None:
+                logger = get_logger()
+            logger.warning(f"Cannot parse expression «{string}»: {e}")
             return None
 
     def eval_(self, variables):
@@ -338,7 +342,7 @@ def interpret(self, interpreter, variables):
             v1 = (x, y0)
             interpreter.position = v1
             verts = self._interpolate(v0, v1, num_segments)
-            # sv_logger.debug("V0 %s, v1 %s, N %s => %s", v0, v1, num_segments, verts)
+            #interpreter.logger.debug("V0 %s, v1 %s, N %s => %s", v0, v1, num_segments, verts)
             for vertex in verts[1:]:
                 v_index = interpreter.new_vertex(*vertex)
                 interpreter.new_edge(prev_index, v_index)
@@ -1029,7 +1033,7 @@ def get_variables(self):
     def interpret(self, interpreter, variables):
         interpreter.assert_not_closed()
         if not interpreter.has_last_vertex:
-            sv_logger.info("X statement: no current point, do nothing")
+            interpreter.logger.warning("X statement: no current point, do nothing")
             return
 
         v0 = interpreter.vertices[0]
@@ -1063,7 +1067,11 @@ def get_variables(self):
     def interpret(self, interpreter, variables):
         interpreter.assert_not_closed()
         if not interpreter.has_last_vertex:
-            sv_logger.info("X statement: no current point, do nothing")
+            interpreter.logger.warning("X statement: no current point, do nothing")
+            return
+
+        if interpreter.close_first_index >= len(interpreter.vertices):
+            interpreter.logger.warning("X statement: curve was not started")
             return
 
         v0 = interpreter.vertices[interpreter.close_first_index]
@@ -1100,7 +1108,7 @@ def get_optional_inputs(self):
 
     def interpret(self, interpreter, variables):
         if self.name in interpreter.defaults:
-            raise Exception("Value for the `{}' variable has been already assigned!".format(self.name))
+            raise SvProfileException(f"Value for the `{self.name}' variable has been already assigned!")
         if self.name not in interpreter.input_names:
             value = interpreter.eval_(self.value, variables)
             interpreter.defaults[self.name] = value
@@ -1133,7 +1141,7 @@ class Interpreter(object):
     NURBS = 'NURBS'
     BEZIER = 'BEZIER'
 
-    def __init__(self, node, input_names, curves_form = None, force_curves_form = False, z_axis='Z'):
+    def __init__(self, node, input_names, curves_form = None, force_curves_form = False, z_axis='Z', logger=None):
         self.position = (0, 0)
         self.next_vertex_index = 0
         self.segment_start_index = 0
@@ -1156,6 +1164,10 @@ def __init__(self, node, input_names, curves_form = None, force_curves_form = Fa
         self.curves_form = curves_form
         self.force_curves_form = force_curves_form
         self.z_axis = z_axis
+        if logger is None:
+            self.logger = get_logger()
+        else:
+            self.logger = logger
 
     def to3d(self, vertex):
         if self.z_axis == 'X':
@@ -1175,7 +1187,7 @@ def to3d_np(self, vertex):
 
     def assert_not_closed(self):
         if self.closed:
-            raise Exception("Path was already closed, will not process any further directives!")
+            raise SvProfileException("Path was already closed, will not process any further directives!")
 
     def relative(self, x, y):
         x0, y0 = self.position
@@ -1210,14 +1222,14 @@ def new_curve(self, curve, statement):
                 curve = curve.to_nurbs()
             else:
                 if self.force_curves_form:
-                    raise Exception(f"Cannot convert curve to NURBS: {statement}")
+                    raise SvProfileException(f"Cannot convert curve to NURBS: {statement}")
         elif self.curves_form == Interpreter.BEZIER:
             if not isinstance(curve, (SvBezierCurve, SvCubicBezierCurve)):
                 if hasattr(curve, 'to_bezier'):
                     curve = curve.to_bezier()
                 else:
                     if self.force_curves_form:
-                        raise Exception("Cannot convert curve to Bezier: {statement}")
+                        raise SvProfileException(f"Cannot convert curve to Bezier: {statement}")
         self.curves.append(curve)
 
     def new_line_segment(self, v1, v2):
@@ -1262,6 +1274,6 @@ def interpret(self, profile, variables):
         if not profile:
             return
         for statement in profile:
-            sv_logger.debug("Interpret: %s", statement)
+            self.logger.debug("Interpret: %s", statement)
             statement.interpret(self, variables)
 

utils/modules/profile_mk3/parser.py

@@ -19,9 +19,11 @@
 import re
 
 from sverchok.utils.parsec import *
-from sverchok.utils.sv_logging import sv_logger
+from sverchok.utils.sv_logging import get_logger
 from sverchok.utils.modules.profile_mk3.interpreter import *
 
+logger = get_logger()
+
 #########################################
 # DSL parsing
 #########################################
@@ -32,7 +34,7 @@
 
 def parse_expr(src):
     for string, rest in parse_regexp(expr_regex)(src):
-        expr = Expression.from_string(string)
+        expr = Expression.from_string(string, logger=logger)
         if expr is not None:
             yield expr, rest
 
@@ -261,6 +263,6 @@ def parse_profile(src):
         cleaned = cleaned + " " + line
 
     profile = parse(parse_definition, cleaned)
-    sv_logger.debug(profile)
+    logger.debug(profile)
     return profile
 

utils/parsec.py

@@ -218,9 +218,9 @@ def parse(func, s):
     s = s.strip()
     match = list(func(s))
     if len(match) != 1:
-        raise ValueError("invalid syntax: " + str(match))
+        raise SyntaxError("invalid syntax: " + str(match))
     result, rest = match[0]
     if rest.strip():
-        raise ValueError("parsed: {}\nleftover: {}".format(result, rest))
+        raise SyntaxError("parsed: {}\nunparsed part: {}".format(result, rest))
     return result