pangea-sdk 3.8.0b1__py3-none-any.whl → 5.4.0b1__py3-none-any.whl

pangea/tools.py

@@ -95,7 +95,7 @@ def file_events(root_hashes: Dict[int, str], f: io.TextIOWrapper) -> Iterator[Ev
             else:
                 raise ValueError("invalid data")
         except (json.JSONDecodeError, ValueError, KeyError) as e:
-            exit_with_error(f"failed to parse line {idx}: {str(e)}")
+            exit_with_error(f"failed to parse line {idx}: {e!s}")
 
 
 def init_audit(token: str, domain: str) -> Audit:
@@ -108,15 +108,14 @@ def init_audit(token: str, domain: str) -> Audit:
 def make_aware_datetime(d: datetime) -> datetime:
     if d.tzinfo is None or d.tzinfo.utcoffset(d) is None:
         return d.replace(tzinfo=timezone.utc)
-    else:
-        return d
+    return d
 
 
 def filter_deep_none(data: Dict) -> Dict:
     return {k: v if not isinstance(v, Dict) else filter_deep_none(v) for k, v in data.items() if v is not None}
 
 
-def _load_env_var(env_var_name: str):
+def _load_env_var(env_var_name: str) -> str:
     value = os.getenv(env_var_name)
     if not value:
         raise PangeaException(f"{env_var_name} env var need to be set")
@@ -124,12 +123,12 @@ def _load_env_var(env_var_name: str):
     return value
 
 
-def get_test_domain(environment: TestEnvironment):
+def get_test_domain(environment: TestEnvironment) -> str:
     env_var_name = f"PANGEA_INTEGRATION_DOMAIN_{environment}"
     return _load_env_var(env_var_name)
 
 
-def get_test_token(environment: TestEnvironment):
+def get_test_token(environment: TestEnvironment) -> str:
     env_var_name = f"PANGEA_INTEGRATION_TOKEN_{environment}"
     return _load_env_var(env_var_name)
 
@@ -200,7 +199,7 @@ loggers: Dict[str, bool] = {}
 
 
 def logger_set_pangea_config(logger_name: str, level=logging.DEBUG):
-    if loggers.get(logger_name, None) is not None:
+    if loggers.get(logger_name) is not None:
         return
 
     loggers[logger_name] = True

pangea/utils.py

@@ -1,13 +1,13 @@
+from __future__ import annotations
+
 import base64
 import copy
 import datetime
 import io
 import json
-from collections import OrderedDict
 from hashlib import md5, new, sha1, sha256, sha512
-from typing import Union
 
-from google_crc32c import Checksum as CRC32C  # type: ignore[import]
+from google_crc32c import Checksum as CRC32C
 from pydantic import BaseModel
 
 
@@ -31,24 +31,13 @@ def default_encoder(obj) -> str:
         return str(obj)
 
 
-def str2str_b64(data: str):
-    return base64.b64encode(data.encode("ascii")).decode("ascii")
-
-
-def dict_order_keys(data: dict) -> OrderedDict:
-    if isinstance(data, dict):
-        return OrderedDict(sorted(data.items()))
-    else:
-        return data
-
+def str2str_b64(data: str, encoding: str = "utf-8") -> str:
+    return base64.b64encode(data.encode(encoding)).decode("ascii")
 
-def dict_order_keys_recursive(data: dict) -> OrderedDict:
-    if isinstance(data, dict):
-        for k, v in data.items():
-            if type(v) is dict:
-                data[k] = dict_order_keys_recursive(v)
 
-    return data  # type: ignore[return-value]
+def str_b64_2bytes(data: str) -> bytes:
+    data += "=" * ((4 - len(data) % 4) % 4)  # add padding if needed
+    return base64.urlsafe_b64decode(data)
 
 
 def canonicalize_nested_json(data: dict) -> dict:
@@ -77,7 +66,7 @@ def canonicalize(data: dict) -> str:
         return str(data)
 
 
-def hash_sha256(input: Union[str, io.BufferedReader]) -> str:
+def hash_sha256(input: str | io.BufferedReader) -> str:
     # Return SHA256 hash in hex format
     hash = sha256()
     if isinstance(input, io.BufferedReader):
@@ -90,12 +79,12 @@ def hash_sha256(input: Union[str, io.BufferedReader]) -> str:
 
         input.seek(0)  # restart reading
     else:
-        hash.update(input)  # type: ignore
+        hash.update(input.encode("utf-8"))
 
     return hash.hexdigest()
 
 
-def hash_sha1(input: Union[str, io.BufferedReader]) -> str:
+def hash_sha1(input: str | io.BufferedReader) -> str:
     # Return SHA1 hash in hex format
     hash = sha1()
     if isinstance(input, io.BufferedReader):
@@ -108,12 +97,12 @@ def hash_sha1(input: Union[str, io.BufferedReader]) -> str:
 
         input.seek(0)  # restart reading
     else:
-        hash.update(input)  # type: ignore
+        hash.update(input.encode("utf-8"))
 
     return hash.hexdigest()
 
 
-def hash_sha512(input: Union[str, io.BufferedReader]) -> str:
+def hash_sha512(input: str | io.BufferedReader) -> str:
     # Return SHA512 hash in hex format
     hash = sha512()
     if isinstance(input, io.BufferedReader):
@@ -126,7 +115,7 @@ def hash_sha512(input: Union[str, io.BufferedReader]) -> str:
 
         input.seek(0)  # restart reading
     else:
-        hash.update(input)  # type: ignore
+        hash.update(input.encode("utf-8"))
 
     return hash.hexdigest()
 
@@ -136,7 +125,7 @@ def hash_ntlm(data: str) -> str:
     return new("md4", data.encode("utf-16le")).hexdigest()
 
 
-def hash_md5(input: Union[str, io.BufferedReader]) -> str:
+def hash_md5(input: str | io.BufferedReader) -> str:
     # Return MD5 hash in hex format
     hash = md5()
     if isinstance(input, io.BufferedReader):
@@ -150,7 +139,7 @@ def hash_md5(input: Union[str, io.BufferedReader]) -> str:
 
         input.seek(0)  # restart reading
     else:
-        hash.update(input)  # type: ignore
+        hash.update(input.encode("utf-8"))
 
     return hash.hexdigest()