dcicutils 8.8.4.1b12__tar.gz → 8.8.4.1b15__tar.gz

{dcicutils-8.8.4.1b12 → dcicutils-8.8.4.1b15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.4.1b12
+Version: 8.8.4.1b15
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT
@@ -26,8 +26,8 @@ Requires-Dist: PyJWT (>=2.6.0,<3.0.0)
 Requires-Dist: PyYAML (>=6.0.1,<7.0.0)
 Requires-Dist: appdirs (>=1.4.4,<2.0.0)
 Requires-Dist: aws-requests-auth (>=0.4.2,<1)
-Requires-Dist: boto3 (>=1.34.90,<2.0.0)
-Requires-Dist: botocore (>=1.34.90,<2.0.0)
+Requires-Dist: boto3 (>=1.34.93,<2.0.0)
+Requires-Dist: botocore (>=1.34.93,<2.0.0)
 Requires-Dist: chardet (>=5.2.0,<6.0.0)
 Requires-Dist: docker (>=4.4.4,<5.0.0)
 Requires-Dist: elasticsearch (==7.13.4)
@@ -43,6 +43,7 @@ Requires-Dist: pytz (>=2020.4)
 Requires-Dist: redis (>=4.5.1,<5.0.0)
 Requires-Dist: requests (>=2.21.0,<3.0.0)
 Requires-Dist: rfc3986 (>=1.4.0,<2.0.0)
+Requires-Dist: shortuuid (>=1.0.13,<2.0.0)
 Requires-Dist: structlog (>=19.2.0,<20.0.0)
 Requires-Dist: toml (>=0.10.1,<1)
 Requires-Dist: tqdm (>=4.66.2,<5.0.0)

{dcicutils-8.8.4.1b12 → dcicutils-8.8.4.1b15}/dcicutils/file_utils.py

@@ -103,9 +103,15 @@ def are_files_equal(filea: str, fileb: str) -> bool:
         return False
 
 
-def create_random_file(file: Optional[str] = None,
-                       prefix: Optional[str] = None, suffix: Optional[str] = None,
+def create_random_file(file: Optional[str] = None, prefix: Optional[str] = None, suffix: Optional[str] = None,
                        nbytes: int = 1024, binary: bool = False, line_length: Optional[int] = None) -> str:
+    """
+    Write to the given file (name/path) some random content. If the given file is None then writes
+    to a temporary file. In either case, returns the file written to. The of bytes written is 1024
+    by default be can be specified with the nbytes argument; default to writing ASCII text but if
+    the binary argument is True then writes binary data as well; if not binary the content is in
+    lines of 80 characters each; use the line_length argumetn in this case to change the line length.
+    """
     if not isinstance(nbytes, int) or nbytes < 0:
         nbytes = 0
     if not isinstance(file, str) or not file:

{dcicutils-8.8.4.1b12 → dcicutils-8.8.4.1b15}/dcicutils/misc_utils.py

@@ -19,6 +19,7 @@ import pytz
 import re
 import rfc3986.validators
 import rfc3986.exceptions
+import shortuuid
 import time
 import uuid
 import warnings
@@ -2698,3 +2699,9 @@ def get_cpu_architecture_name() -> str:
         if os_architecture_name == "x86_64": return "amd64"  # noqa
         return os_architecture_name
     return ""
+
+
+def short_uuid(length: Optional[int] = None):
+    if (length is None) or (not isinstance(length, int)) or (length < 1):
+        length = 16
+    return shortuuid.ShortUUID().random(length=length)

{dcicutils-8.8.4.1b12 → dcicutils-8.8.4.1b15}/dcicutils/tmpfile_utils.py

@@ -18,30 +18,31 @@ def temporary_directory() -> str:
 
 
 @contextmanager
-def temporary_file(name: Optional[str] = None, suffix: Optional[str] = None,
+def temporary_file(name: Optional[str] = None, prefix: Optional[str] = None, suffix: Optional[str] = None,
                    content: Optional[Union[str, bytes, List[str]]] = None) -> str:
     with temporary_directory() as tmp_directory_name:
-        tmp_file_name = os.path.join(tmp_directory_name, name or tempfile.mktemp(dir="")) + (suffix or "")
-        with open(tmp_file_name, "wb" if isinstance(content, bytes) else "w") as tmp_file:
+        tmp_file_name = f"{prefix or ''}{name or tempfile.mktemp(dir='')}{suffix or ''}"
+        tmp_file_path = os.path.join(tmp_directory_name, tmp_file_name)
+        with open(tmp_file_path, "wb" if isinstance(content, bytes) else "w") as tmp_file:
             if content is not None:
                 tmp_file.write("\n".join(content) if isinstance(content, list) else content)
-        yield tmp_file_name
+        yield tmp_file_path
 
 
 def create_temporary_file_name(prefix: Optional[str] = None, suffix: Optional[str] = None) -> str:
     """
     Generates and returns the full path to file within the system temporary directory.
     """
-    tmp_file_name = f"{datetime.utcnow().strftime('%Y%m%d%H%M%S')}{str(uuid()).replace('-', '')}"
+    random_string = f"{datetime.utcnow().strftime('%Y%m%d%H%M%S')}{str(uuid()).replace('-', '')}"
+    tmp_file_name = f"{prefix or ''}{random_string}{suffix or ''}"
     return os.path.join(tempfile.gettempdir(), tmp_file_name)
 
 
 @contextmanager
 def temporary_random_file(prefix: Optional[str] = None, suffix: Optional[str] = None,
                           nbytes: int = 1024, binary: bool = False, line_length: Optional[int] = None) -> str:
-    with temporary_file() as tmp_file_path:
-        create_random_file(tmp_file_path, prefix=prefix, suffix=suffix,
-                           nbytes=nbytes, binary=binary, line_length=line_length)
+    with temporary_file(prefix=prefix, suffix=suffix) as tmp_file_path:
+        create_random_file(tmp_file_path, nbytes=nbytes, binary=binary, line_length=line_length)
         yield tmp_file_path
 
 

{dcicutils-8.8.4.1b12 → dcicutils-8.8.4.1b15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.8.4.1b12"  # TODO: To become 8.8.5
+version = "8.8.4.1b15"  # TODO: To become 8.8.5
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"
@@ -38,8 +38,8 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = ">=3.8,<3.13"
-boto3 = "^1.34.90"
-botocore = "^1.34.90"
+boto3 = "^1.34.93"
+botocore = "^1.34.93"
 # The DCIC portals (cgap-portal and fourfront) are very particular about which ElasticSearch version.
 # This value is intentionally pinned and must not be changed casually.
 elasticsearch = "7.13.4"
@@ -61,6 +61,7 @@ pyperclip = "^1.8.2"
 PyYAML = "^6.0.1"
 requests = "^2.21.0"
 rfc3986 = "^1.4.0"
+shortuuid = "^1.0.13"
 structlog = "^19.2.0"
 toml = ">=0.10.1,<1"
 tqdm = "^4.66.2"
@@ -70,8 +71,8 @@ webtest = "^2.0.34"
 
 
 [tool.poetry.dev-dependencies]
-boto3-stubs = "^1.34.90"
-botocore-stubs = "^1.34.90"
+boto3-stubs = "^1.34.93"
+botocore-stubs = "^1.34.93"
 coverage = ">=7.2.3"
 # Loaded manually in GA workflow for coverage because a dependency on 2to3
 # in its docopts dependency makes a problem for laoding it here in poetry. -kmp 7-Apr-2023