csvpath 0.0.619__tar.gz → 0.0.620__tar.gz

{csvpath-0.0.619 → csvpath-0.0.620}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csvpath
-Version: 0.0.619
+Version: 0.0.620
 Summary: CsvPath Framework is a data preboarding automation library for receiving, validating, and tracking CSV, Excel, JSONL and other tabular data files before they can corrupt downstream data consumers.
 License-File: LICENSE
 Author: David Kershaw
@@ -113,8 +113,7 @@ If you need help getting started, there are lots of ways to reach us.
 - Email support@csvpath.org
 - Or reach out to one of our [sponsors, below](#sponsors).
 
-![PyPI - Python Version](https://img.shields.io/pypi/pyversions/csvpath?logoColor=green&color=green) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/dk107dk/csvpath) ![PyPI - Version](https://img.shields.io/pypi/v/csvpath)
-
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/csvpath?logoColor=yellow&color=yellow) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/dk107dk/csvpath) ![PyPI - Version](https://img.shields.io/pypi/v/csvpath) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/csvpath?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/csvpath)
 
 # Contents
 

{csvpath-0.0.619 → csvpath-0.0.620}/README.md

@@ -48,8 +48,7 @@ If you need help getting started, there are lots of ways to reach us.
 - Email support@csvpath.org
 - Or reach out to one of our [sponsors, below](#sponsors).
 
-![PyPI - Python Version](https://img.shields.io/pypi/pyversions/csvpath?logoColor=green&color=green) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/dk107dk/csvpath) ![PyPI - Version](https://img.shields.io/pypi/v/csvpath)
-
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/csvpath?logoColor=yellow&color=yellow) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/dk107dk/csvpath) ![PyPI - Version](https://img.shields.io/pypi/v/csvpath) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/csvpath?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/csvpath)
 
 # Contents
 

{csvpath-0.0.619 → csvpath-0.0.620}/csvpath/managers/files/file_describer.py

@@ -1,4 +1,5 @@
 import json
+import traceback
 from typing import NewType
 
 from csvpath.util.nos import Nos
@@ -57,16 +58,21 @@ class NamedFileDescriber:
         home = self.file_manager.named_file_home(name)
         path = Nos(home).join(self.JSON_FILE)
         nos = Nos(path)
-        if nos.exists() is False:
-            #
-            # cannot return None (today) and we definitely should not
-            # create+save a new json file. returning None may be better
-            # for today this works.
-            #
-            return {}
-            # self.store_json(name, {})
-        with DataFileReader(path) as file:
-            return json.load(file.source)
+        if nos.exists() is True:
+            with DataFileReader(path) as file:
+                try:
+                    return json.load(file.source)
+                except Exception:
+                    msg = "Error getting named-file discriptor JSON for {name}: {ex}"
+                    self.file_manager.csvpaths.logger.error(msg)
+                    msg = traceback.format_exc()
+                    self.file_manager.csvpaths.logger.debug(msg)
+        #
+        # cannot return None (today; << explain?) and we definitely should not
+        # create+save a new json file. (<< reasoning?) returning None may be
+        # better (<< why?) but for today this works.
+        #
+        return {}
 
     # ========== Templates ============
 

{csvpath-0.0.619 → csvpath-0.0.620}/csvpath/managers/files/file_manager.py

@@ -57,7 +57,6 @@ class FileManager:
 
     @property
     def csvpaths(self):
-        """@private"""
         return self._csvpaths
 
     #
@@ -65,7 +64,6 @@ class FileManager:
     #
     @property
     def named_files_dir(self) -> str:
-        """@private"""
         return self._csvpaths.config.inputs_files_path
 
     #
@@ -75,7 +73,6 @@ class FileManager:
     #
     @property
     def files_root_manifest(self) -> dict:
-        """@private"""
         p = self.files_root_manifest_path
         nos = Nos(p)
         if nos.exists():
@@ -85,7 +82,6 @@ class FileManager:
 
     @property
     def files_root_manifest_path(self) -> dict:
-        """@private"""
         return Nos(self.named_files_dir).join("manifest.json")
 
     def _named_file_ref_to_uuid(self, ref: ReferenceParser) -> str:
@@ -944,7 +940,7 @@ class FileManager:
         mdata.template = data.get("template") or ""
         mdata.uuid_string = data.get("registration_uuid")
         mdata.status = "Registration failed"
-        self.csvpaths.logger.warn(
+        self.csvpaths.logger.warning(
             "[%s] Registration failed for %s", mdata.named_file_name, data
         )
         lst.metadata_update(mdata)

{csvpath-0.0.619 → csvpath-0.0.620}/csvpath/managers/integrations/webhook/webhook_listener.py

@@ -128,7 +128,7 @@ class WebhookListener(Listener, threading.Thread):
                 url=url, payload=payload, headers=headers, timeout=self.timeout
             )
             # x = requests.post(url, json=payload, headers=headers, timeout=self.timeout)
-            if x and x.status_code != 200:
+            if x and x.status_code >= 200 and x.status_code < 300:
                 if self.csvpaths is not None:
                     self.csvpaths.logger.warning(
                         "WebhookListener received status code %s from %s",

{csvpath-0.0.619 → csvpath-0.0.620}/csvpath/matching/functions/strings/format.py

@@ -1,7 +1,6 @@
 from typing import Any
 from csvpath.matching.productions import Term, Variable, Header, Reference
 from csvpath.matching.functions.function import Function
-from csvpath.matching.util.exceptions import ChildrenException, MatchException
 from ..args import Args
 from ..function_focus import ValueProducer
 
@@ -21,7 +20,8 @@ class Format(ValueProducer):
         if self.name == "interpolate":
             s = self.wrap(
                 """Interpolates a complete Pythonic formatting string with one replacement value.
-                Use {{ and }} to demarcate your replacement pattern."""
+                Use {{ and }} to demarcate your replacement pattern. For example, to set a variable
+                to a value as a string, use: @a = interpolate(uuid(), "{}")"""
             )
             self.description.append(s)
 

{csvpath-0.0.619 → csvpath-0.0.620}/csvpath/util/var_utility.py

@@ -52,7 +52,7 @@ class VarUtility:
         elif section or name:
             # if config is None:
             #    config = Config()
-            config.logger.warn(
+            config.logger.warning(
                 "Get var with section or name but not both will not work: %s, %s",
                 section,
                 name,

{csvpath-0.0.619 → csvpath-0.0.620}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "csvpath"
-version = "0.0.619"
+version = "0.0.620"
 description = "CsvPath Framework is a data preboarding automation library for receiving, validating, and tracking CSV, Excel, JSONL and other tabular data files before they can corrupt downstream data consumers."
 authors = ["David Kershaw <info@csvpath.org>"]
 readme = "README.md"