csvpath 0.0.614__tar.gz → 0.0.615__tar.gz

{csvpath-0.0.614 → csvpath-0.0.615}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csvpath
-Version: 0.0.614
+Version: 0.0.615
 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

{csvpath-0.0.614 → csvpath-0.0.615}/assets/config/jenkins-local-sftp.ini

@@ -25,7 +25,7 @@ path = cache
 use_cache = no
 
 [functions]
-imports =
+imports = 
 
 [results]
 archive = tmp/sftp/archive
@@ -95,7 +95,7 @@ port = SFTPPLUS_PORT
 admin_username = SFTPPLUS_ADMIN_USERNAME
 admin_password = SFTPPLUS_ADMIN_PASSWORD
 api_url = https://. . . :10020/json
-scripts_dir =
+scripts_dir = 
 execute_timeout = 300
 
 [ckan]
@@ -110,5 +110,5 @@ timeout = 5
 verify = False
 
 [slack]
-webhook_url =
+webhook_url = 
 

{csvpath-0.0.614 → csvpath-0.0.615}/config/config.ini

@@ -35,7 +35,7 @@ path = cache
 use_cache = yes
 
 [functions]
-imports =
+imports = 
 
 [results]
 archive = tmp/local/archive
@@ -106,7 +106,7 @@ port = SFTPPLUS_PORT
 admin_username = SFTPPLUS_ADMIN_USERNAME
 admin_password = SFTPPLUS_ADMIN_PASSWORD
 api_url = https://. . . :10020/json
-scripts_dir =
+scripts_dir = 
 execute_timeout = 300
 
 [ckan]
@@ -121,7 +121,7 @@ timeout = 5
 verify = False
 
 [slack]
-webhook_url =
+webhook_url = 
 
 [scripts]
 run_scripts = yes

{csvpath-0.0.614 → csvpath-0.0.615}/csvpath/managers/files/file_manager.py

@@ -86,7 +86,22 @@ class FileManager:
     def files_root_manifest_path(self) -> dict:
         """@private"""
         return Nos(self.named_files_dir).join("manifest.json")
-        # return os.path.join(self.named_files_dir, "manifest.json")
+
+    def _named_file_ref_to_uuid(self, ref: ReferenceParser) -> str:
+        if ref is None:
+            raise ValueError("Reference cannot be None")
+        finder = FilesReferenceFinder(self._csvpaths, ref=ref)
+        lst = finder.resolve()
+        if lst is None:
+            raise ValueError("ReferenceFinder cannot return None")
+        if len(lst) == 0:
+            return None
+        path = lst[0]
+        mani = self.get_manifest(ref.root_major)
+        for r in mani:
+            if r.get("file") == path:
+                return r.get("uuid")
+        return None
 
     #
     # namedfile: a NamedFileName (name or reference)
@@ -119,6 +134,11 @@ class FileManager:
             else None
         )
         if ref is not None and file is None:
+            #
+            # we need to support files as well as results
+            #
+            if ref.datatype == ref.FILES:
+                return self._named_file_ref_to_uuid(ref)
             if ref.datatype != ref.RESULTS:
                 raise ValueError("Reference must be results, not {ref.datatype}")
             #
@@ -175,7 +195,7 @@ class FileManager:
                         return _["uuid"]
         raise ValueError(f"No matching UUID found for file {file} in {name}")
 
-    def get_reference_for_uuid(self, name:NamedFileName, uuid:str) -> str|None:
+    def get_reference_for_uuid(self, name: NamedFileName, uuid: str) -> str | None:
         mani = self.get_manifest(name)
         for _ in mani:
             if uuid == _["uuid"]:
@@ -598,7 +618,7 @@ class FileManager:
         path: str,
         template: str = None,
         config: Config = None,
-        registration_uuid:str = None
+        registration_uuid: str = None,
     ) -> str | None:
         #
         # note that we can pass in a Config with a template that is different
@@ -614,7 +634,11 @@ class FileManager:
             # issue driven by the 3rd party or business rules.
             #
             UUID(registration_uuid)
-            self.csvpaths.logger.info("Registration of %s will be associated with UUID %s", path, registration_uuid)
+            self.csvpaths.logger.info(
+                "Registration of %s will be associated with UUID %s",
+                path,
+                registration_uuid,
+            )
         if not self.can_load(path):
             #
             # if False, can_load() will have already raised an error and/or, minimally,

csvpath-0.0.615/csvpath/managers/files/files_activation_listener.py

@@ -0,0 +1,46 @@
+import threading
+
+from csvpath import CsvPaths
+from csvpath.managers.metadata import Metadata
+from csvpath.managers.listener import Listener
+
+
+class FileActivationListener(Listener, threading.Thread):
+    def __init__(self, *, config=None):
+        Listener.__init__(self, config=config)
+        threading.Thread.__init__(self)
+        # self.csvpaths = None
+        #
+        # we hold csvpaths on the main thread, but we may not want
+        # the csvpaths that triggered this listener activity and
+        # shouldn't need it. we'll create our own and not having a
+        # csvpaths property means we won't receive a ref to the
+        # overall csvpaths context.
+        #
+        self.my_csvpaths = None
+        self.result = None
+        self.metadata = None
+
+    def run(self):
+        self._metadata_update(self.metadata)
+        self.my_csvpaths.wrap_up()
+
+    def metadata_update(self, mdata: Metadata) -> None:
+        self.metadata = mdata
+        self.my_csvpaths = CsvPaths()
+        self.start()
+
+    def _metadata_update(self, mdata: Metadata) -> None:
+        #
+        # cannot set a new CsvPaths here. crosses qt thread lines and
+        # causes a segfault. move ahead of start and/or use listener's
+        # own csvpaths. better the former because it is more like what
+        # we have today.
+        #
+        activator = self.my_csvpaths.file_manager.activator
+        ref = mdata.named_file_ref
+        self.my_csvpaths.logger.info(
+            f"Activating for {ref} if any activation is configured"
+        )
+        activator.activate_if(ref)
+        self.my_csvpaths.logger.info(f"Activation for {ref} if any completed")

{csvpath-0.0.614 → csvpath-0.0.615}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "csvpath"
-version = "0.0.614"
+version = "0.0.615"
 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"

csvpath-0.0.614/csvpath/managers/files/files_activation_listener.py

@@ -1,31 +0,0 @@
-import threading
-
-
-from csvpath import CsvPaths
-from csvpath.managers.metadata import Metadata
-from csvpath.managers.listener import Listener
-
-
-class FileActivationListener(Listener, threading.Thread):
-    def __init__(self, *, config=None):
-        Listener.__init__(self, config=config)
-        threading.Thread.__init__(self)
-        self.csvpaths = None
-        self.result = None
-        self.metadata = None
-
-    def run(self):
-        self._metadata_update(self.metadata)
-        self.csvpaths.wrap_up()
-
-    def metadata_update(self, mdata: Metadata) -> None:
-        self.metadata = mdata
-        self.start()
-
-    def _metadata_update(self, mdata: Metadata) -> None:
-        csvpaths = CsvPaths()
-        activator = csvpaths.file_manager.activator
-        ref = mdata.named_file_ref
-        csvpaths.logger.info(f"Activating for {ref} if any activation is configured")
-        activator.activate_if(ref)
-        csvpaths.logger.info(f"Activation for {ref} if any completed")