csvpath 0.0.458__tar.gz → 0.0.460__tar.gz

{csvpath-0.0.458 → csvpath-0.0.460}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: csvpath
-Version: 0.0.458
+Version: 0.0.460
 Summary: A declarative language for data extraction and validation of CSV files
 Author: David Kershaw
 Author-email: dk107dk@hotmail.com

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/functions/boolean/notf.py

@@ -16,3 +16,4 @@ class Not(MatchDecider):
         m = self.children[0].matches(skip=skip)
         m = not m
         self.match = m
+        # print(f"Not._decide_mat: self.match: {self.match} -> {self}")

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/functions/function_factory.py

@@ -72,6 +72,7 @@ from .misc.intf import Int
 from .misc.get import Get
 from .misc.track import Track
 from .misc.importf import Import
+from .misc.debug import Debug, BriefStackTrace, VoteStack
 from .validity.failed import Failed
 from .validity.fail import Fail
 
@@ -323,6 +324,12 @@ class FunctionFactory:
             f = Between(matcher, name, child)
         elif name == "get":
             f = Get(matcher, name, child)
+        elif name == "debug":
+            f = Debug(matcher, name, child)
+        elif name == "brief_stack_trace":
+            f = BriefStackTrace(matcher, name, child)
+        elif name == "vote_stack":
+            f = VoteStack(matcher, name, child)
         elif name == "metaphone":
             f = Metaphone(matcher, name, child)
         else:

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/functions/lines/stop.py

@@ -64,4 +64,4 @@ class Skip(SideEffect):
                     self._set_has_happened()
                 pln = self.matcher.csvpath.line_monitor.physical_line_number
                 self.matcher.csvpath.logger.info(f"skipping line {pln}")
-        self.match = True
+        self.match = self.default_match()

csvpath-0.0.460/csvpath/matching/functions/misc/debug.py

@@ -0,0 +1,73 @@
+# pylint: disable=C0114
+import datetime
+from ..function_focus import SideEffect
+from csvpath.util.log_utility import LogUtility
+from csvpath.matching.util.expression_utility import ExpressionUtility
+
+
+class Debug(SideEffect):
+    """sets the logging level"""
+
+    def check_valid(self) -> None:
+        self.validate_zero_or_one_arg()
+        super().check_valid()
+
+    def _produce_value(self, skip=None) -> None:
+        self.value = self.matches(skip=skip)
+
+    def _decide_match(self, skip=None) -> None:
+        level = None
+        if len(self.children) == 1:
+            level = self.children[0].to_value(skip=skip)
+            level = f"{level}".strip()
+        else:
+            level = "debug"
+        LogUtility.logger(self.matcher.csvpath, level)
+
+
+class BriefStackTrace(SideEffect):
+    def check_valid(self) -> None:
+        self.validate_zero_or_one_arg()
+        super().check_valid()
+
+    def _produce_value(self, skip=None) -> None:
+        self.value = self.matches(skip=skip)
+
+    def _decide_match(self, skip=None) -> None:
+        out = None
+        if len(self.children) == 1:
+            out = self.children[0].to_value(skip=skip)
+            out = f"{out}".strip()
+            if out not in ["log", "print"]:
+                out = "log"
+        else:
+            out = "log"
+        if out == "log":
+            LogUtility.log_brief_trace(self.matcher.csvpath.logger)
+        else:
+            LogUtility.log_brief_trace()
+
+
+class VoteStack(SideEffect):
+    def check_valid(self) -> None:
+        self.validate_zero_args()
+        super().check_valid()
+
+    def _produce_value(self, skip=None) -> None:
+        # do this first so we get an complete vote tally
+        self.matches(skip=skip)
+        votes = []
+        # we're being evaluated so we should assume our expression hasn't
+        # voted yet. while we could be embedded somewhere deep the expectation
+        # is that we're the main element of our match component, so we should
+        # be able to represent a ~faux vote without causing problems.
+        me = ExpressionUtility.get_my_expression(self)
+        for e in self.matcher.expressions:
+            if e[0] == me:
+                votes.append(self.match)
+            else:
+                votes.append(e[1])
+        self.value = votes
+
+    def _decide_match(self, skip=None) -> None:
+        self.match = self.default_match()

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/functions/misc/pushpop.py

@@ -31,7 +31,8 @@ class Push(SideEffect):
         self.value = True
 
     def _decide_match(self, skip=None) -> None:
-        self.match = self.to_value(skip=skip)
+        self.to_value(skip=skip)
+        self.match = self.default_match()
 
 
 class PushDistinct(Push):

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/functions/print/printf.py

@@ -30,13 +30,16 @@ class Print(SideEffect):
         if isinstance(self.children[0], Equality):
             right = self.children[0].right
         if self.do_onchange():
-            v = self.to_value(skip=skip)
-            #
-            # we intentionally add a single char suffix
-            #
-            if v[len(v) - 1] == " ":
-                v = v[0 : len(v) - 1]
-            self.matcher.csvpath.print(f"{v}")
-            if right:
-                right.matches(skip=skip)
+            if self.do_once():
+                v = self.to_value(skip=skip)
+                #
+                # we intentionally add a single char suffix
+                #
+                if v[len(v) - 1] == " ":
+                    v = v[0 : len(v) - 1]
+                self.matcher.csvpath.print(f"{v}")
+                if right:
+                    right.matches(skip=skip)
+                self._set_has_happened()
+
         self.match = True

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/lark_transformer.py

@@ -106,6 +106,7 @@ class LarkTransformer(Transformer):  # pylint: disable=C0115
         for _ in args:
             if isinstance(_, Matchable):
                 e.children.append(_)
+                _.parent = e
         if len(e.children) == 1:
             return e.children[0]
         if len(e.children) > 1:

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/matcher.py

@@ -195,6 +195,13 @@ class Matcher:  # pylint: disable=R0902
             # now ret holds this expression's vote
             #
             pln = self.csvpath.line_monitor.physical_line_number
+            self.csvpath.logger.debug(
+                "Matcher.matches: ready to adjudicate %s component %s match: ret: %s, failed: %s",
+                "AND" if self._AND else "OR",
+                str(et[0]),
+                ret,
+                failed,
+            )
             if self._AND:
                 if ret is False:
                     failed = True
@@ -208,7 +215,12 @@ class Matcher:  # pylint: disable=R0902
         # were found, we would respond True; else, False.
         #
         pln = self.csvpath.line_monitor.physical_line_number
-        self.csvpath.logger.debug("Match result for line %s: %s", pln, failed)
+        self.csvpath.logger.debug(
+            "Matcher.matches: result (AND:%s) for line %s: %s",
+            self._AND,
+            pln,
+            not failed,
+        )
         return not failed
 
     def check_valid(self) -> None:  # pylint: disable=C0116

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/productions/equality.py

@@ -253,6 +253,7 @@ class Equality(Matchable):
                 )
         else:
             ret = not ret
+
         #
         # asbool
         #
@@ -356,7 +357,6 @@ class Equality(Matchable):
             lm = self.left.matches(skip=skip)
             if lm is True:
                 b = True
-                # print(f"EQuality.do_when: matcher._AND: {self.matcher._AND}, b: {b}")
                 if self.matcher._AND is False:
                     b = not b
                 #

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/productions/header.py

@@ -50,6 +50,7 @@ class Header(Matchable):
                 self.value = ExpressionUtility.asbool(ret)
             else:
                 self.value = ret
+        # print(f"header.to_value: self.value: {self.value}<<<")
         return self.value
 
     def matches(self, *, skip=None) -> bool:
@@ -61,5 +62,6 @@ class Header(Matchable):
                 v = self.to_value(skip=skip)
                 self.match = ExpressionUtility.asbool(v)
             else:
-                self.match = v is not None
+                self.match = not ExpressionUtility.is_none(v)  # v is not None
+                # print(f"Header.matches: match? {self.match}")
         return self.match

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/productions/matchable.py

@@ -123,4 +123,4 @@ class Matchable(Qualified):
         return None
 
     def default_match(self) -> bool:
-        return True
+        return self.matcher._AND

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/productions/qualified.py

@@ -260,6 +260,7 @@ class Qualified:
         by adding self to the skip list."""
         es = self.matcher.expressions  # pylint: disable=E1101
         for e in es:
+
             m = e[1] is self.default_match() or e[0].matches(
                 skip=[self]
             )  # pylint: disable=E1101
@@ -284,13 +285,17 @@ class Qualified:
         qualified doesn't have the qualification."""
         if not self.onchange:
             return True
-        _id = self.get_id()  # pylint: disable=E1101
+        _id = f"{self.get_id()}_onchange"  # pylint: disable=E1101
         v = self.matcher.get_variable(_id)  # pylint: disable=E1101
         me = hashlib.sha256(
             f"{self.to_value()}".encode("utf-8")  # pylint: disable=E1101
         ).hexdigest()
         self.matcher.set_variable(_id, value=me)  # pylint: disable=E1101
-        return me != v
+        # I think this would be better as an is True/is False test
+        # but this works fine
+        ret = me != v
+        # print(f"qualified.do_onchange: v: {v}, me: {me} == {ret}")
+        return ret
 
     @property
     def onchange(self) -> bool:  # pylint: disable=C0116
@@ -327,7 +332,7 @@ class Qualified:
         #
         # supports ONCE
         #
-        _id = self.get_id()  # pylint: disable=E1101
+        _id = f"{self.get_id()}_once"  # pylint: disable=E1101
         v = self.matcher.get_variable(_id, set_if_none=True)  # pylint: disable=E1101
         return v
 
@@ -335,6 +340,6 @@ class Qualified:
         #
         # supports ONCE
         #
-        _id = self.get_id()  # pylint: disable=E1101
+        _id = f"{self.get_id()}_once"  # pylint: disable=E1101
         self.matcher.set_variable(_id, value=False)  # pylint: disable=E1101
         # re: E1101: inheritance structure. good point, but not the time to fix it.

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/matching/util/print_parser.py

@@ -144,6 +144,7 @@ class PrintParser:
         if name not in data:
             self.csvpath.logger.warning(f"No key '{name}' in data of ref {ref}")
             return name
+
         datum = data[name]
         iota = None
         if tracking is not None:

{csvpath-0.0.458 → csvpath-0.0.460}/csvpath/util/printer.py

@@ -54,3 +54,22 @@ class StdOutPrinter(Printer):
         else:
             print(string)
         self._last_line = string
+
+
+class TestPrinter(Printer):
+    def __init__(self):
+        self.lines = []
+
+    @property
+    def lines_printed(self) -> int:
+        return len(self.lines)
+
+    @property
+    def last_line(self) -> str:
+        return self.lines[len(self.lines) - 1] if len(self.lines) > 0 else ""
+
+    def print(self, string: str) -> None:
+        self.print_to(None, string)
+
+    def print_to(self, name: str, string: str) -> None:
+        self.lines.append(string)

{csvpath-0.0.458 → csvpath-0.0.460}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "csvpath"
-version = "0.0.458"
+version = "0.0.460"
 description = "A declarative language for data extraction and validation of CSV files"
 authors = ["David Kershaw <dk107dk@hotmail.com>"]
 readme = "README.md"