dcicutils 8.7.0.1b28__py3-none-any.whl → 8.7.0.1b29__py3-none-any.whl

dcicutils/structured_data.py

@@ -1,5 +1,6 @@
 import copy
 from functools import lru_cache
+import glob
 import json
 from jsonschema import Draft7Validator as SchemaValidator
 import os
@@ -111,6 +112,14 @@ class StructuredDataSet:
                             result.append({"type": type_name, "file": file_name})
         return result
 
+    def upload_files_located(self,
+                             location: Union[str, Optional[List[str]]] = None, recursive: bool = False) -> List[str]:
+        upload_files = copy.deepcopy(self.upload_files)
+        for upload_file in upload_files:
+            if file_path := _search_for_file(upload_file["file"], location=location, recursive=recursive):
+                upload_file["path"] = file_path
+        return upload_files
+
     def _load_file(self, file: str) -> None:
         # Returns a dictionary where each property is the name (i.e. the type) of the data,
         # and the value is array of dictionaries for the data itself. Handle these kinds of files:
@@ -641,3 +650,23 @@ def _split_dotted_string(value: str):
 
 def _split_array_string(value: str, unique: bool = False):
     return split_string(value, ARRAY_VALUE_DELIMITER_CHAR, ARRAY_VALUE_DELIMITER_ESCAPE_CHAR, unique=unique)
+
+
+def _search_for_file(file: str,
+                     location: Union[str, Optional[List[str]]] = None, recursive: bool = False) -> Optional[str]:
+    if isinstance(file, str) or not file:
+        if not location:
+            location = "."
+        if location:
+            if isinstance(location, str):
+                location = [location]
+            if isinstance(location, list):
+                for directory in location:
+                    if isinstance(directory, str) and os.path.exists(os.path.join(directory, file)):
+                        return os.path.normpath(os.path.join(directory, file))
+        if recursive:
+            if not file.startswith("**/"):
+                file = "**/" + file
+            files = glob.glob(file, recursive=recursive)
+            if files:
+                return files[0]

{dcicutils-8.7.0.1b28.dist-info → dcicutils-8.7.0.1b29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.7.0.1b28
+Version: 8.7.0.1b29
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.7.0.1b28.dist-info → dcicutils-8.7.0.1b29.dist-info}/RECORD

@@ -58,15 +58,15 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=ymP7PXH6-yEiXAt75w0ldQFciGNqWBClNxC5gfX2FnY,22961
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
-dcicutils/structured_data.py,sha256=-QcaVVbta9t5hIXVO0yKMDs8jQyrpvuEET0WFFkNFSM,33582
+dcicutils/structured_data.py,sha256=aeFrqFkz_ij_wXouJBTZ71fnWr4OkymCwPcG8P5RG04,34849
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
 dcicutils/tmpfile_utils.py,sha256=n95XF8dZVbQRSXBZTGToXXfSs3JUVRyN6c3ZZ0nhAWI,1403
 dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
-dcicutils-8.7.0.1b28.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.7.0.1b28.dist-info/METADATA,sha256=pNdoWloEdcv9nbbh3c4pEFjsd0oT6mR1VVp8fr278Ls,3315
-dcicutils-8.7.0.1b28.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.7.0.1b28.dist-info/entry_points.txt,sha256=8wbw5csMIgBXhkwfgsgJeuFcoUc0WsucUxmOyml2aoA,209
-dcicutils-8.7.0.1b28.dist-info/RECORD,,
+dcicutils-8.7.0.1b29.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.7.0.1b29.dist-info/METADATA,sha256=qAWF7z9WUO4FKeKo158CYIUTXBFZgM9gqksX9bF4RWo,3315
+dcicutils-8.7.0.1b29.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.7.0.1b29.dist-info/entry_points.txt,sha256=8wbw5csMIgBXhkwfgsgJeuFcoUc0WsucUxmOyml2aoA,209
+dcicutils-8.7.0.1b29.dist-info/RECORD,,