csvpath 0.0.523__tar.gz → 0.0.524__tar.gz

{csvpath-0.0.523 → csvpath-0.0.524}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: csvpath
-Version: 0.0.523
+Version: 0.0.524
 Summary: An edge governance framework for managing and validating CSV, Excel, and other tabular data files
 Author: David Kershaw
 Author-email: dk107dk@hotmail.com
@@ -50,7 +50,7 @@ Description-Content-Type: text/markdown
 
 # <a href='https://www.csvpath.org/'><img src='https://github.com/csvpath/csvpath/blob/main/docs/images/logo-wordmark-4.svg'/></a>
 
-The CsvPath Language defines a declarative syntax for inspecting and validating CSV and Excel files, and other tabular data.
+The CsvPath Framework helps you close the gap between Managed File Transfer and your data lake and/or applications. CsvPath Language is the core of the Framework. It defines a declarative syntax for inspecting and validating CSV and Excel files, and other tabular data.
 
 The CsvPath Framework makes it easy to setup a <a href='https://www.atestaanalytics.com/s/The-Collect-Store-Validate-Pattern-Atesta-Analytics-88gj.pdf'>Collect, Store, Validate Pattern</a> flat-file landing zone that:
 - Registers files for **clear and durable identity**
@@ -128,7 +128,7 @@ This project tackles two needs:
 - A more robust validation language for delimited and tabular data
 - A systems integration framework for flat-file landing and staging
 
-CsvPath Language is first and foremost a validation language. It supports both schema definitions and rules-based validation. CsvPath Language describes data so you can easily tell if a file is valid. CsvPath can also extract and shape data and create reports. Overall the goal is to automate human judgement out of the processing loop and instead move it to the process definition stage.
+CsvPath Language is the core of the CsvPath Framework. It is a simple validation language for delimited data. It supports both schema definitions and rules-based validation. CsvPath Language describes data so you can easily tell if a file is valid. CsvPath can also extract and shape data and create reports. Overall the goal is to automate human judgement out of the processing loop and instead move it to the process definition stage.
 
 The CsvPath Framework implements CsvPath Language, but goes far beyond it to provide a full <a href='https://www.atestaanalytics.com/s/The-Collect-Store-Validate-Pattern-Atesta-Analytics-88gj.pdf'>Collect, Store, Validate Pattern</a> framework for landing flat files, registering them, validating them, shaping them to a consistent and comparable form, and staging them for a data lake. In that way, CsvPath fills the gap commonly found between an organization's MFT (managed file transfer) and a typical data lake architecture.
 

{csvpath-0.0.523 → csvpath-0.0.524}/README.md

@@ -1,7 +1,7 @@
 
 # <a href='https://www.csvpath.org/'><img src='https://github.com/csvpath/csvpath/blob/main/docs/images/logo-wordmark-4.svg'/></a>
 
-The CsvPath Language defines a declarative syntax for inspecting and validating CSV and Excel files, and other tabular data.
+The CsvPath Framework helps you close the gap between Managed File Transfer and your data lake and/or applications. CsvPath Language is the core of the Framework. It defines a declarative syntax for inspecting and validating CSV and Excel files, and other tabular data.
 
 The CsvPath Framework makes it easy to setup a <a href='https://www.atestaanalytics.com/s/The-Collect-Store-Validate-Pattern-Atesta-Analytics-88gj.pdf'>Collect, Store, Validate Pattern</a> flat-file landing zone that:
 - Registers files for **clear and durable identity**
@@ -79,7 +79,7 @@ This project tackles two needs:
 - A more robust validation language for delimited and tabular data
 - A systems integration framework for flat-file landing and staging
 
-CsvPath Language is first and foremost a validation language. It supports both schema definitions and rules-based validation. CsvPath Language describes data so you can easily tell if a file is valid. CsvPath can also extract and shape data and create reports. Overall the goal is to automate human judgement out of the processing loop and instead move it to the process definition stage.
+CsvPath Language is the core of the CsvPath Framework. It is a simple validation language for delimited data. It supports both schema definitions and rules-based validation. CsvPath Language describes data so you can easily tell if a file is valid. CsvPath can also extract and shape data and create reports. Overall the goal is to automate human judgement out of the processing loop and instead move it to the process definition stage.
 
 The CsvPath Framework implements CsvPath Language, but goes far beyond it to provide a full <a href='https://www.atestaanalytics.com/s/The-Collect-Store-Validate-Pattern-Atesta-Analytics-88gj.pdf'>Collect, Store, Validate Pattern</a> framework for landing flat files, registering them, validating them, shaping them to a consistent and comparable form, and staging them for a data lake. In that way, CsvPath fills the gap commonly found between an organization's MFT (managed file transfer) and a typical data lake architecture.
 

{csvpath-0.0.523 → csvpath-0.0.524}/csvpath/cli/cli.py

@@ -8,13 +8,16 @@ from .selecter import Selecter
 from .debug_config import DebugConfig
 from csvpath.util.nos import Nos
 from .asker import Asker
+from .function_lister import FunctionLister
+from .const import Const
 
 
 class Cli:
     def __init__(self):
         self.csvpaths = CsvPaths()
         self.clear()
-        splash = """
+        """
+        splash = ""
           *** *            ******        **  **
         ***  **   *        **  **      **** **
        **        ** **  * ** *** ***** **  *****
@@ -26,7 +29,7 @@ CsvPath Command Line Interface
 Try tab completion and menu-by-key.
 For help see https://www.csvpath.org
 """
-        print(splash)
+        print(Const.SPLASH)
         self._return_to_cont()
         self.clear()
 
@@ -40,33 +43,33 @@ For help see https://www.csvpath.org
         time.sleep(0.5)
 
     ITALIC = "\033[3m"
-    SIDEBAR_COLOR = "\033[36m"
-    REVERT = "\033[0m"
-    STOP_HERE = f"{SIDEBAR_COLOR}{ITALIC}... done picking dir{REVERT}"
-    STOP_HERE2 = "👍 pick this dir"
-    CANCEL = f"{SIDEBAR_COLOR}{ITALIC}... cancel{REVERT}"
-    CANCEL2 = "← cancel"
-    QUIT = "← quit"
-    NAMED_FILES = "register data"
-    NAMED_PATHS = "load csvpaths"
-    ARCHIVE = "access the archive"
+    # SIDEBAR_COLOR = "\033[36m"
+    # REVERT = "\033[0m"
+    # STOP_HERE = f"{Const.SIDEBAR_COLOR}{ITALIC}... done picking dir{Const.REVERT}"
+    # STOP_HERE2 = "👍 pick this dir"
+    # CANCEL = f"{Const.SIDEBAR_COLOR}{ITALIC}... cancel{Const.REVERT}"
+    # CANCEL2 = "← cancel"
+    # QUIT = "← quit"
+    # NAMED_FILES = "register data"
+    # NAMED_PATHS = "load csvpaths"
+    # ARCHIVE = "access the archive"
 
     def _return_to_cont(self):
         print(
-            f"\n{Cli.SIDEBAR_COLOR}{Cli.ITALIC}... Hit return to continue{Cli.REVERT}\n"
+            f"\n{Const.SIDEBAR_COLOR}{Cli.ITALIC}... Hit return to continue{Const.REVERT}\n"
         )
         self._input("")
 
     def _response(self, text: str) -> None:
-        sys.stdout.write(f"\u001b[30;1m{text}{Cli.REVERT}\n")
+        sys.stdout.write(f"\u001b[30;1m{text}{Const.REVERT}\n")
 
     def action(self, text: str) -> None:
-        sys.stdout.write(f"\033[36m{text}{Cli.REVERT}\n")
+        sys.stdout.write(f"\033[36m{text}{Const.REVERT}\n")
 
     def _input(self, prompt: str) -> str:
         try:
             response = input(f"{prompt}\033[93m")
-            sys.stdout.write(Cli.REVERT)
+            sys.stdout.write(Const.REVERT)
             return response.strip()
         except KeyboardInterrupt:
             return "cancel"
@@ -80,12 +83,12 @@ For help see https://www.csvpath.org
             return
         if q is not None:
             print(q)
-        if choices[len(choices) - 1] == Cli.CANCEL:
-            choices[len(choices) - 1] = Cli.CANCEL2
-        if choices[len(choices) - 2] == Cli.STOP_HERE:
-            choices[len(choices) - 2] = Cli.STOP_HERE2
+        if choices[len(choices) - 1] == Const.CANCEL:
+            choices[len(choices) - 1] = Const.CANCEL2
+        if choices[len(choices) - 2] == Const.STOP_HERE:
+            choices[len(choices) - 2] = Const.STOP_HERE2
         cs = [(s, s) for s in choices]
-        t = Selecter().ask(title="", values=cs, cancel_value="CANCEL")
+        t = Selecter().ask(title="", values=cs, cancel_value=Const.CANCEL)
         self.clear()
         return t
 
@@ -94,47 +97,53 @@ For help see https://www.csvpath.org
             t = None
             try:
                 choices = [
-                    Cli.NAMED_FILES,
-                    Cli.NAMED_PATHS,
-                    Cli.ARCHIVE,
+                    Const.NAMED_FILES,
+                    Const.NAMED_PATHS,
+                    Const.ARCHIVE,
                     "run",
                     "config",
-                    self.QUIT,
+                    "functions",
+                    Const.QUIT,
                 ]
                 t = self.ask(choices)
             except KeyboardInterrupt:
                 self.end()
                 return
             t = self._do(t)
-            if t == Cli.QUIT:
+            if t == Const.QUIT:
                 self.end()
                 return
 
     def _do(self, t: str) -> str | None:
-        if t == Cli.QUIT:
+        if t == Const.QUIT:
             return t
         try:
             if t == "run":
                 self.run()
-            if t == Cli.NAMED_FILES:
+            if t == Const.NAMED_FILES:
                 self._files()
-            if t == Cli.NAMED_PATHS:
+            if t == Const.NAMED_PATHS:
                 self._paths()
-            if t == Cli.ARCHIVE:
+            if t == Const.ARCHIVE:
                 self._results()
             if t == "config":
                 self._config()
+            if t == "functions":
+                self._functions()
         except KeyboardInterrupt:
-            return Cli.QUIT
+            return Const.QUIT
         except Exception:
             print(traceback.format_exc())
             self._return_to_cont()
 
+    def _functions(self) -> None:
+        FunctionLister(self).list_functions()
+
     def _config(self) -> None:
         DebugConfig(self).show()
 
     def _files(self) -> None:
-        choices = ["add named-file", "list named-files", self.CANCEL2]
+        choices = ["add named-file", "list named-files", Const.CANCEL2]
         t = self.ask(choices)
         if t == "add named-file":
             DrillDown(self).name_file()
@@ -142,7 +151,7 @@ For help see https://www.csvpath.org
             self.list_named_files()
 
     def _paths(self) -> None:
-        choices = ["add named-paths", "list named-paths", self.CANCEL2]
+        choices = ["add named-paths", "list named-paths", Const.CANCEL2]
         t = self.ask(choices)
         if t == "add named-paths":
             DrillDown(self).name_paths()
@@ -150,7 +159,7 @@ For help see https://www.csvpath.org
             self.list_named_paths()
 
     def _results(self) -> None:
-        choices = ["open named-result", "list named-results", self.CANCEL2]
+        choices = ["open named-result", "list named-results", Const.CANCEL2]
         t = self.ask(choices)
         if t == "open named-result":
             self.open_named_result()
@@ -173,9 +182,9 @@ For help see https://www.csvpath.org
             names = self.csvpaths.results_manager.list_named_results()
             names = [n for n in names if n.find(".") == -1]
             print(f"{len(names)} named-results names:")
-            names.append(self.CANCEL)
+            names.append(Const.CANCEL)
             t = self.ask(names)
-            if t == self.CANCEL:
+            if t == Const.CANCEL:
                 return
             t = f"{self.csvpaths.config.archive_path}{os.sep}{t}"
             self.action(f"Opening results at {t}...")
@@ -245,10 +254,10 @@ For help see https://www.csvpath.org
             paths = self.complete_paths_reference(paths)
 
         self.clear()
-        choices = ["collect", "fast-forward", Cli.CANCEL2]
+        choices = ["collect", "fast-forward", Const.CANCEL2]
         method = self.ask(choices, q="What method? ")
         self.clear()
-        if method == Cli.CANCEL2:
+        if method == Const.CANCEL2:
             return
         self.action(f"Running {paths} against {file} using {method}\n")
         self.pause()

csvpath-0.0.524/csvpath/cli/const.py

@@ -0,0 +1,26 @@
+class Const:
+
+    SPLASH = """
+          *** *            ******        **  **
+        ***  **   *        **  **      **** **
+       **        ** **  * ** *** ***** **  *****
+       **    * **** **** ***** *** ** **  ** **
+       **   **** ****** **     ** ** *** ** ** **
+         ***   **** *  **      *** ** ****   **
+***************************
+CsvPath Command Line Interface
+Try tab completion and menu-by-key.
+For help see https://www.csvpath.org
+"""
+
+    ITALIC = "\033[3m"
+    SIDEBAR_COLOR = "\033[36m"
+    REVERT = "\033[0m"
+    STOP_HERE = f"{SIDEBAR_COLOR}{ITALIC}... done picking dir{REVERT}"
+    STOP_HERE2 = "👍 pick this dir"
+    CANCEL = f"{SIDEBAR_COLOR}{ITALIC}... cancel{REVERT}"
+    CANCEL2 = "← cancel"
+    QUIT = "← quit"
+    NAMED_FILES = "register data"
+    NAMED_PATHS = "load csvpaths"
+    ARCHIVE = "access the archive"

{csvpath-0.0.523 → csvpath-0.0.524}/csvpath/cli/drill_down.py

@@ -2,6 +2,7 @@ import os
 import traceback
 from .debug_config import DebugConfig
 from .asker import Asker
+from .const import Const
 
 
 class DrillDown:
@@ -16,14 +17,16 @@ class DrillDown:
         #
         # get name
         #
+        t = self._get_add_type()
+        if t == Const.CANCEL2:
+            return
         self._cli.clear()
-        name = Asker(self._cli, name_type="files").ask()
+        name = None
+        if t == "file":
+            name = Asker(self._cli, name_type="files").ask()
         #
         # get path
         #
-        t = self._get_add_type()
-        if t == self._cli.CANCEL2:
-            return
         p = self._get_path(t, self._cli.csvpaths.config.csv_file_extensions)
         if p is False:
             return
@@ -63,17 +66,19 @@ class DrillDown:
     # ============================
 
     def name_paths(self):
+        t = self._get_add_type()
+        if t == Const.CANCEL2:
+            return
         #
         # get name
         #
         self._cli.clear()
-        name = Asker(self._cli, name_type="paths").ask()
+        name = None
+        if t == "file":
+            name = Asker(self._cli, name_type="paths").ask()
         #
         # get path
         #
-        t = self._get_add_type()
-        if t == self._cli.CANCEL2:
-            return
         exts = self._cli.csvpaths.config.csvpath_file_extensions
         p = self._get_path(t, exts)
         if p is False:
@@ -145,7 +150,7 @@ class DrillDown:
 
     def _get_add_type(self) -> str:
         self._cli.clear()
-        choices = ["dir", "file", "json", self._cli.CANCEL2]
+        choices = ["dir", "file", "json", Const.CANCEL2]
         t = None
         t = self._cli.ask(choices)
         return t
@@ -160,9 +165,9 @@ class DrillDown:
         names.sort()
         names = self._decorate(path, names, select_dir=dir_only)
         t = self._cli.ask(names)
-        if t in [self._cli.STOP_HERE, self._cli.STOP_HERE2]:
+        if t in [Const.STOP_HERE, Const.STOP_HERE2]:
             return (path, True)
-        if t in [self._cli.CANCEL, self._cli.CANCEL2]:
+        if t in [Const.CANCEL, Const.CANCEL2]:
             return (path, False)
         if t.startswith("📂 ") or t.startswith("📄 "):
             t = t[2:]
@@ -171,7 +176,7 @@ class DrillDown:
     def _decorate(self, path, names, select_dir=False) -> list[str]:
         ns = []
         for n in names:
-            if n in [self._cli.STOP_HERE, self._cli.STOP_HERE2]:
+            if n in [Const.STOP_HERE, Const.STOP_HERE2]:
                 pass
             elif os.path.isfile(os.path.join(path, n)):
                 n = f"📄 {n}"
@@ -179,8 +184,8 @@ class DrillDown:
                 n = f"📂 {n}"
             ns.append(n)
         if select_dir is True:
-            ns.append(self._cli.STOP_HERE)
-        ns.append(self._cli.CANCEL)
+            ns.append(Const.STOP_HERE)
+        ns.append(Const.CANCEL)
         return ns
 
     def _filter_hidden(self, names) -> list[str]:

csvpath-0.0.524/csvpath/cli/function_describer.py

@@ -0,0 +1,190 @@
+# pylint: disable=C0114
+import textwrap
+from tabulate import tabulate
+from csvpath.matching.functions.function import Function
+from csvpath.matching.functions.types.type import Type
+from csvpath.matching.functions.function_focus import ValueProducer, MatchDecider
+from .const import Const
+
+
+class FunctionDescriber:
+    @classmethod
+    def describe(cls, function: Function) -> None:
+        if not function.args:
+            #
+            # today this will most of the time blow up because we're
+            # doing a structural validation of a function that is not
+            # part of a structure. this should be refactored at some
+            # point, but it's not hurting anything.
+            #
+            try:
+                function.check_valid()
+            except Exception:
+                ...
+        if function.description and len(function.description) > 0:
+            for i, _ in enumerate(function.description):
+                print(_)
+                print()
+        cls.print_tables(function)
+
+    @classmethod
+    def sigs(cls, function):
+        sigs = []
+        args = function.args
+        argsets = args.argsets
+        for ai, a in enumerate(argsets):
+            pa = ""
+            for i, _ in enumerate(a.args):
+                t = ""
+                if _.name is not None:
+                    t += f"{_.name}: "
+                for j, act in enumerate(_.actuals):
+                    an = cls._actual_name(act)
+                    if an == "":
+                        an = "''"
+                    t += f"{Const.SIDEBAR_COLOR}{Const.ITALIC}{an}{Const.REVERT}"
+                    if j < len(_.actuals) - 1:
+                        t += "|"
+                if _.is_noneable:
+                    pa += f"[{t}]"
+                else:
+                    pa += t
+                if i < len(a.args) - 1:
+                    pa += ", "
+            if a.max_length == -1:
+                pa += ", ..."
+            pa = pa.strip()
+            if pa != "":
+                pa = f" {pa} "
+            sigs.append(f"{function.name}({pa})")
+        return sigs
+
+    @classmethod
+    def funcs(cls, function):
+        sigs = []
+        args = function.args
+        argsets = args.argsets
+        for ai, a in enumerate(argsets):
+            pa = ""
+            for i, _ in enumerate(a.args):
+                t = ""
+                if _.name is not None:
+                    t += f"{_.name}: "
+                for j, act in enumerate(_.types):
+                    an = cls._actual_name(act)
+                    if an == "":
+                        an = "''"
+                    t += f"{Const.SIDEBAR_COLOR}{Const.ITALIC}{an}{Const.REVERT}"
+                    if j < len(_.types) - 1:
+                        t += "|"
+                if _.is_noneable:
+                    pa += f"[{t}]"
+                else:
+                    pa += t
+                if i < len(a.args) - 1:
+                    pa += ", "
+            if a.max_length == -1:
+                pa += ", ..."
+            pa = pa.strip()
+            if pa != "":
+                pa = f" {pa} "
+            sigs.append(f"{function.name}({pa})")
+        return sigs
+
+    @classmethod
+    def focus_stmt(cls, function):
+        stmts = []
+        vp = isinstance(function, ValueProducer)
+        md = isinstance(function, MatchDecider)
+        if vp and md:
+            stmts.append(
+                f"{function.name}() produces a calculated value and decides matches"
+            )
+        elif vp:
+            stmts.append(f"{function.name}() produces a calculated value")
+        elif md:
+            stmts.append(f"{function.name}() determines if lines match")
+        else:
+            stmts.append(f"{function.name}() is a side-effect")
+        return stmts
+
+    @classmethod
+    def type_stmt(cls, function):
+        stmts = []
+        if isinstance(function, Type):
+            t = f"{function.name[0].upper()}{function.name[1:]}"
+            stmts.append(f"{t} is a line() schema type")
+        return stmts
+
+    @classmethod
+    def print_tables(cls, function):
+        #
+        # data sigs
+        #
+        headers = ["Data signatures"]
+        rows = []
+        sigs = cls.sigs(function)
+        for v in sigs:
+            v = str(v)
+            rows.append([v])
+        if len(rows) > 0:
+            print(tabulate(rows, headers=headers, tablefmt="simple_grid"))
+        #
+        # call sigs
+        #
+        headers = ["Call signatures"]
+        rows = []
+        sigs = cls.funcs(function)
+        for v in sigs:
+            v = str(v)
+            rows.append([v])
+        if len(rows) > 0:
+            print(tabulate(rows, headers=headers, tablefmt="simple_grid"))
+        #
+        # type and focus
+        #
+        rows = []
+        headers = []
+        stmts = cls.focus_stmt(function)
+        for v in stmts:
+            v = str(v)
+            rows.append(["Focus", v])
+        stmts = cls.type_stmt(function)
+        for v in stmts:
+            v = str(v)
+            rows.append(["Type", v])
+        if len(rows) > 0:
+            print(tabulate(rows, headers=headers, tablefmt="simple_grid"))
+        #
+        # qualifiers
+        #
+        rows = []
+        headers = []
+        stmts = function.match_qualifiers
+        stmts = [f"{Const.SIDEBAR_COLOR}{Const.ITALIC}{s}{Const.REVERT}" for s in stmts]
+        if len(stmts) > 0:
+            rows.append(["Match qualifiers", ", ".join(stmts)])
+        stmts = function.value_qualifiers
+        stmts = [f"{Const.SIDEBAR_COLOR}{Const.ITALIC}{s}{Const.REVERT}" for s in stmts]
+        if len(stmts) > 0:
+            rows.append(["Value qualifiers", ", ".join(stmts)])
+        if function.name_qualifier:
+            rows.append(
+                [
+                    "Name qualifier",
+                    f"{Const.SIDEBAR_COLOR}{Const.ITALIC}optionally expected{Const.REVERT}",
+                ]
+            )
+        if len(rows) > 0:
+            print(tabulate(rows, headers=headers, tablefmt="simple_grid"))
+
+    @classmethod
+    def _actual_name(cls, a) -> str:
+        an = f"{a}"
+        if an.rfind("'>") > -1:
+            an = an[0 : an.rfind("'>")]
+        if an.rfind(".") > -1:
+            an = an[an.rfind(".") + 1 :]
+        if an.rfind("'") > -1:
+            an = an[an.rfind("'") + 1 :]
+        return an

csvpath-0.0.524/csvpath/cli/function_lister.py

@@ -0,0 +1,30 @@
+import os
+import traceback
+from csvpath.matching.functions.function_factory import FunctionFactory
+from .function_describer import FunctionDescriber
+from .selecter import Selecter
+from .const import Const
+
+
+class FunctionLister:
+    def __init__(self, cli):
+        self._cli = cli
+
+    def list_functions(self) -> None:
+        FunctionFactory.load()
+        names = list(FunctionFactory.MY_FUNCTIONS.keys())
+        names.sort()
+        if None in names:
+            raise ValueError("None cannot be a key in functions")
+
+        cs = [(n, n) for n in names]
+
+        t = Selecter().ask(title="", values=cs, cancel_value="CANCEL")
+        self._cli.clear()
+        if t in [Const.CANCEL, Const.CANCEL2]:
+            return
+        f = FunctionFactory.get_function(
+            None, name=t, child=None, find_external_functions=False
+        )
+        FunctionDescriber.describe(f)
+        self._cli._return_to_cont()

{csvpath-0.0.523 → csvpath-0.0.524}/csvpath/cli/selecter.py

@@ -11,6 +11,7 @@ from prompt_toolkit.formatted_text import AnyFormattedText
 from prompt_toolkit.styles import BaseStyle
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 from prompt_toolkit.formatted_text.base import StyleAndTextTuples, to_formatted_text
+from .const import Const
 
 T = TypeVar("T")
 

{csvpath-0.0.523 → csvpath-0.0.524}/csvpath/csvpath.py

@@ -1252,7 +1252,7 @@ class CsvPath(ErrorCollector, Printer):  # pylint: disable=R0902, R0904
         for k in self.limit_collection_to:
             if k is None or k >= len(line):
                 raise InputException(
-                    f"[{self.identity}] Line {self.line_monitor.physical_line_number}: unknown header name: {k}"
+                    f"[{self.identity}] Line {self.line_monitor.physical_line_number}: unknown header name: {k} of {self.limit_collection_to} in headers {self.headers}"
                 )
             ls.append(line[k])
         return ls

{csvpath-0.0.523 → csvpath-0.0.524}/csvpath/csvpaths.py

@@ -290,9 +290,12 @@ class CsvPaths(CsvPathsCoordinator, ErrorCollector):
         """@private
         at this time we do not recommend reusing CsvPaths, but it is doable
         you should clean before reuse unless you want to accumulate results."""
-        self.results_manager.clean_named_results(paths)
+        self._set_managers()
         self.clear_run_coordination()
-        # self.error_manager.reset()
+        self._errors = []
+        self.named_paths_name = None
+        self.named_file_name = None
+        self.current_matcher = None
         self._errors = []
         self.named_paths_name = None
         self.named_file_name = None

{csvpath-0.0.523 → csvpath-0.0.524}/csvpath/matching/functions/args.py

@@ -38,6 +38,10 @@ class Arg:
     def is_noneable(self, n: bool) -> None:
         self._noneable = n
 
+    @property
+    def name(self) -> str:
+        return self._name
+
     @property
     def types(self) -> list[Type]:
         return self._types
@@ -410,7 +414,7 @@ class Args:
         if not good:
             msg = None
             if self.matchable:
-                msg = f"Problem in {self.matchable.my_chain}: {_m}"
+                msg = f"Csvpath language problem in {self.matchable.my_chain}: {_m}"
             else:
                 msg = "CsvPath Language syntax problem"
             self._matchable.matcher.csvpath.error_manager.handle_error(

{csvpath-0.0.523 → csvpath-0.0.524}/csvpath/matching/functions/args_helper.py

@@ -12,8 +12,15 @@ class ArgumentValidationHelper:
         valid_argsets = self._find_valid_argsets(args_definition, actual_values)
         if len(valid_argsets) == 0:
             if len(args_definition.argsets) == 1:
+                i = 0
+                for a in args_definition.argsets[0].args:
+                    if not a.is_noneable:
+                        i += 1
                 expected = len(args_definition.argsets[0].args)
-                return f"{function_name} requires {expected} argument{'s' if expected != 1 else ''}"
+                if i < expected:
+                    return f"{function_name}() requires {i} to {expected} argument{'s' if expected != 1 else ''}"
+                else:
+                    return f"{function_name}() requires {expected} argument{'s' if expected != 1 else ''}"
             return self._get_argument_count_error(function_name, args_definition)
         #
         # Validate each argument against the argset.