csvpath 0.0.586__tar.gz → 0.0.587__tar.gz

{csvpath-0.0.586 → csvpath-0.0.587}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: csvpath
-Version: 0.0.586
+Version: 0.0.587
 Summary: A data preboarding framework for ingesting, managing, and validating CSV, Excel, and other tabular data files using a Collect, Store, Validate, Publish architecture to create a trusted publisher for downstream data consumers.
 Author: David Kershaw
 Author-email: info@csvpath.org

{csvpath-0.0.586 → csvpath-0.0.587}/csvpath/matching/functions/function_factory.py

@@ -139,6 +139,7 @@ class FunctionFactory:
     @classmethod
     def add_function(cls, name: str, function: Function) -> None:
         """use to add a new, external function at runtime"""
+
         if name is None:
             name = function.name
         if name is None:
@@ -150,18 +151,27 @@ class FunctionFactory:
             raise InvalidNameException("Name must not be an empty string")
         if not cls.valid_function_name(name):  # name.isalpha():
             raise InvalidNameException(f"Name {name} is not valid")
+        cls._debug(function.matcher, "Looking for an existing function named %s", name)
         if cls.get_function(None, name=name, find_external_functions=False) is not None:
             function.matcher.csvpath.logger.warning(
                 "Internal function is overriden by external function: %s", name
             )
-            # raise InvalidNameException("Built-in functions cannot be overriden")
         if not isinstance(function, Function):
             # pass as an instance, not a class, for specificity. good to do?
             raise InvalidChildException(
                 "Function being registered must be passed as an instance"
             )
+        cls._debug(function.matcher, "Adding %s as key to %s", name, function.__class__)
         cls.NOT_MY_FUNCTION[name] = function.__class__
 
+    @classmethod
+    def _debug(cls, matcher, txt: str, obj=None, obj2=None) -> None:
+        if matcher is None:
+            return
+        if matcher.csvpath is None:
+            return
+        matcher.csvpath.logger.debug(txt, obj, obj2)
+
     #
     # valid function names start with a letter and contain only letters,
     # numbers, periods, and/or underscores. the grammar allows '.' and '_' at the
@@ -287,9 +297,15 @@ class FunctionFactory:
             # if proj not set we check for name
             #
             qname = cls.qname(matcher=matcher, name=name)
+            cls._debug(matcher, "Qualified name of %s is %s", name, qname)
             if qname in FunctionFactory.NOT_MY_FUNCTION:
                 f = cls.NOT_MY_FUNCTION[qname]
                 f = f(matcher, name, child)
+            cls._debug(matcher, "Found %s as %s", qname, f)
+            if f is None:
+                cls._debug(
+                    matcher, "%s not in: %s", qname, FunctionFactory.NOT_MY_FUNCTION
+                )
         return f
 
     @classmethod
@@ -308,10 +324,10 @@ class FunctionFactory:
         return qname
 
     @classmethod
-    def improve_name(cls, name:str) -> str:
+    def improve_name(cls, name: str) -> str:
         ffrom = " `~!@#$%^&*()_+-=[]\\{}|;':\",./<>?"
-        to    = "1234567890abcdefghijklmnopqrstuvw"
-        table = str.maketrans(ffrom,to)
+        to = "1234567890abcdefghijklmnopqrstuvw"
+        table = str.maketrans(ffrom, to)
         name = name.translate(table)
         return name
 

{csvpath-0.0.586 → csvpath-0.0.587}/csvpath/matching/functions/function_finder.py

@@ -24,6 +24,7 @@ class FunctionFinder:  # pylint: disable=R0903
             if path is None or path.strip() == "":
                 matcher.csvpath.logger.error("No [functions][imports] in config.ini")
                 return
+            cls._debug(matcher, "Functions import file is at %s", path)
             if not os.path.exists(path):
                 matcher.csvpath.logger.error(
                     f"[functions][imports] path {path} in {config.configpath} does not exist"
@@ -35,8 +36,10 @@ class FunctionFinder:  # pylint: disable=R0903
                 i = 0
                 for line in file:
                     i += 1
-                    if str(line).strip() == "":
+                    line = str(line).strip()
+                    if line == "" or line.startswith("#"):
                         continue
+                    cls._debug(matcher, "Adding function %s", line)
                     cls._add_function(matcher, func_fact, line)
                 matcher.csvpath.logger.info("Added %s external functions", i)
         # add a sentinel to keep us from attempting reload.
@@ -44,6 +47,15 @@ class FunctionFinder:  # pylint: disable=R0903
         # never be empty
         e = cls.externals_sentinel(matcher)
         func_fact.add_function(e, Yes(None, e))
+        cls._debug(matcher, "Added sentinel function %s", e)
+
+    @classmethod
+    def _debug(cls, matcher, txt: str, obj=None, obj2=None) -> None:
+        if matcher is None:
+            return
+        if matcher.csvpath is None:
+            return
+        matcher.csvpath.logger.debug(txt, obj, obj2)
 
     @classmethod
     def externals_sentinel(cls, matcher) -> str:
@@ -79,10 +91,14 @@ class FunctionFinder:  # pylint: disable=R0903
         # lines in config are like:
         #   from module import class as function-name
         #
+        matcher.csvpath.logger.debug("Import line is %s", cs)
         if len(cs) == 6 and cs[0] == "from" and cs[2] == "import" and cs[4] == "as":
             config = matcher.csvpath.config
             instance = ClassLoader.load_private_function(config, s, matcher, cs[5])
             qname = func_fact.qname(matcher=matcher, name=cs[5])
+            matcher.csvpath.logger.debug(
+                "Adding custom function %s: %s", qname, instance
+            )
             func_fact.add_function(qname, instance)
         else:
             raise ConfigurationException("Unclear external function imports: {s}")

{csvpath-0.0.586 → csvpath-0.0.587}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "csvpath"
-version = "0.0.586"
+version = "0.0.587"
 description = "A data preboarding framework for ingesting, managing, and validating CSV, Excel, and other tabular data files using a Collect, Store, Validate, Publish architecture to create a trusted publisher for downstream data consumers."
 authors = ["David Kershaw <info@csvpath.org>"]
 readme = "README.md"