csvpath 0.0.487__tar.gz → 0.0.488__tar.gz

{csvpath-0.0.487 → csvpath-0.0.488}/PKG-INFO

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

csvpath-0.0.488/config/config.ini

@@ -0,0 +1,29 @@
+[csvpath_files]
+extensions = txt, csvpath, csvpaths
+
+[csv_files]
+extensions = txt, csv, tsv, dat, tab, psv, ssv
+
+[errors]
+csvpath = raise, collect, stop, fail, print
+csvpaths = raise, collect
+
+[logging]
+csvpath = info
+csvpaths = info
+log_file = logs/csvpath.log
+log_files_to_keep = 100
+log_file_size = 52428800
+
+[config]
+path = config/config.ini
+
+[cache]
+path = cache
+
+[functions]
+imports = config/functions.imports
+
+[results]
+archive = archive
+

{csvpath-0.0.487 → csvpath-0.0.488}/csvpath/managers/result_serializer.py

@@ -23,7 +23,7 @@ class ResultSerializer:
         runtime_data["run_index"] = result.run_index
         self._save(
             metadata=result.csvpath.metadata,
-            errors=result.errors,
+            errors=[e.to_json() for e in result.errors],
             variables=result.variables,
             lines=result.lines,
             printouts=result.get_printouts(),
@@ -62,7 +62,6 @@ class ResultSerializer:
             "metadata": metadata,
             "runtime_data": runtime_data,
         }
-        print(f"\nresult_serializer: meta: {meta}")
         run_dir = self.get_instance_dir(run_dir=run_dir, identity=identity)
         # Save the JSON files
         with open(os.path.join(run_dir, "meta.json"), "w") as f:

{csvpath-0.0.487 → csvpath-0.0.488}/csvpath/util/config.py

@@ -120,6 +120,12 @@ class Config:
                 f"WARNING: Check config at {self.config_path} for [{section}][{name}]"
             )
 
+    def add_to_config(self, section, key, value) -> None:
+        if not self._config.has_section(section):
+            self._config.add_section(section)
+        self._config.set(section, key, value)
+        self.save_config()
+
     def save_config(self) -> None:
         with open(self.configpath, "w") as f:
             self._config.write(f)
@@ -352,6 +358,9 @@ archive = archive
     def archive_path(self) -> str:
         if self._archive_path is None:
             self._archive_path = self._get("results", "archive")
+            if self._archive_path is None:
+                self._archive_path = "archive"
+                self.add_to_config("results", "archive", "archive")
         return self._archive_path
 
     @archive_path.setter

{csvpath-0.0.487 → csvpath-0.0.488}/csvpath/util/error.py

@@ -79,7 +79,23 @@ class Error:
         self.json: str = None
         self.datum: Any = None
         self.filename: str = None
-        self.at: datetime = datetime.now()
+        self.at: datetime.now()
+
+    def to_json(self) -> dict:
+        ret = {
+            "line_count":self.line_count,
+            "match_count":self.match_count,
+            "scan_count":self.scan_count,
+            "error":f"{self.error}",
+            "source":f"{self.source}",
+            "message":self.message,
+            "trace":self.trace,
+            "json":self.json,
+            "datum":self.datum,
+            "filename":self.filename,
+            "at":f"{self.at}"
+        }
+        return ret
 
     def __str__(self) -> str:
         string = f"""Error

{csvpath-0.0.487 → csvpath-0.0.488}/pyproject.toml

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