samgis_core 3.0.14__py3-none-any.whl → 3.0.15__py3-none-any.whl

samgis_core/utilities/frontend_builder.py

@@ -1,6 +1,7 @@
 import os
 import subprocess
 from pathlib import Path
+from typing import Mapping
 
 from dotenv import load_dotenv
 
@@ -51,7 +52,7 @@ def read_std_out_err(std_out_err: str, output_type: str, command: ListStr) -> No
     app_logger.info("########")
 
 
-def run_command(commands_list: ListStr, capture_output: bool = True, text: bool = True, check: bool = True) -> None:
+def run_command(commands_list: ListStr, capture_output: bool = True, text: bool = True, check: bool = True, env: Mapping[str, str] | None = None) -> None:
     """
     Run a system command and capture its output.
     See https://docs.python.org/3.11/library/subprocess.html#subprocess.run for more details
@@ -63,6 +64,7 @@ def run_command(commands_list: ListStr, capture_output: bool = True, text: bool
         check: If check is true, and the process exits with a non-zero exit code, a CalledProcessError exception will
                be raised. Attributes of that exception hold the arguments, the exit code, and stdout and stderr if they
                were captured.
+        env: environment variables
 
     Returns:
 
@@ -72,7 +74,8 @@ def run_command(commands_list: ListStr, capture_output: bool = True, text: bool
             commands_list,
             capture_output=capture_output,
             text=text,
-            check=check
+            check=check,
+            env=env
         )
         read_std_out_err(output_content_home.stdout, "stdout", commands_list)
         read_std_out_err(output_content_home.stderr, "stderr", commands_list)
@@ -143,6 +146,50 @@ def build_frontend(
     return True
 
 
+def get_installed_node():
+    """
+    Get the installed node bin folder given the environment variables:
+    - NODE_DIR (current node installed), without the bin subfolder
+    - NODE_DIR_PARENT (parent folder of the node installed versions, e.g. `~/.nvm/versions/node/` )
+
+    Returns:
+        node bin path
+
+    """
+    node_dir = os.getenv("NODE_DIR")
+    if not (node_dir and Path(node_dir).exists() and Path(node_dir).is_dir()):
+        app_logger.error(f"node_dir:{node_dir} not found.")
+        node_dir_env = os.getenv("NODE_DIR_PARENT")
+        assert node_dir_env is not None and node_dir_env != "", "NODE_DIR_PARENT/NODE_DIR env variable not found."
+        node_dir_parent = Path(os.getenv("NODE_DIR_PARENT"))
+        app_logger.error(f"try with '{node_dir_parent}' ...")
+        assert node_dir_parent.exists() and node_dir_parent.is_dir(), "node_dir_parent not found"
+        list_node_folders = [f.path for f in os.scandir(node_dir_parent) if f.is_dir()]
+        list_node_folders.sort()
+        assert isinstance(list_node_folders, list) and len(list_node_folders) > 0, "no node folders found."
+        node_dir = list_node_folders.pop()
+    node_dir_bin = Path(node_dir) / "bin"
+    assert node_dir_bin.exists() and node_dir_bin.is_dir(), f"node's bin not found or not a directory: {node_dir}."
+    return node_dir_bin
+
+
+def get_path_with_node_dir():
+    """
+    Get the PATH environment variable with the node bin folder.
+
+    Returns:
+        PATH environment variable with the node bin folder
+
+    """
+    node_dir = get_installed_node()
+    path = os.getenv("PATH")
+    if path is None or path == "":
+        return f"{node_dir}:"
+    if "node" not in path:
+        return f"{node_dir}:{path}"
+    return path
+
+
 if __name__ == '__main__':
     build_frontend(
         project_root_folder=Path(env_project_root_folder),

samgis_core/utilities/utilities.py

@@ -63,12 +63,14 @@ def base64_encode(sb: str | bytes) -> bytes:
     return base64.b64encode(sb_bytes)
 
 
-def hash_calculate(arr) -> str | bytes:
+def hash_calculate(arr_or_path, is_file: bool, read_mode: str = "rb") -> str | bytes:
     """
     Return computed hash from input variable (typically a numpy array).
 
     Args:
-        arr: input variable
+        arr_or_path: input variable
+        is_file: whether input is a file or not
+        read_mode: mode for reading file
 
     Returns:
         computed hash from input variable
@@ -77,24 +79,41 @@ def hash_calculate(arr) -> str | bytes:
     from base64 import b64encode
     from numpy import ndarray as np_ndarray
 
-    if isinstance(arr, np_ndarray):
-        hash_fn = sha256(arr.data)
-    elif isinstance(arr, dict):
+    if is_file:
+        with open(arr_or_path, read_mode) as file_to_check:
+            # read contents of the file
+            arr_or_path = file_to_check.read()
+            # # pipe contents of the file through
+            # try:
+            #     return hashlib.sha256(data).hexdigest()
+            # except TypeError:
+            #     app_logger.warning(
+            #         f"TypeError, re-try encoding arg:{arr_or_path},type:{type(arr_or_path)}."
+            #     )
+            #     return hashlib.sha256(data.encode("utf-8")).hexdigest()
+
+    if isinstance(arr_or_path, np_ndarray):
+        hash_fn = sha256(arr_or_path.data)
+    elif isinstance(arr_or_path, dict):
         import json
 
-        serialized = serialize(arr)
-        variable_to_hash = json.dumps(serialized, sort_keys=True).encode('utf-8')
+        serialized = serialize(arr_or_path)
+        variable_to_hash = json.dumps(serialized, sort_keys=True).encode("utf-8")
         hash_fn = sha256(variable_to_hash)
-    elif isinstance(arr, str):
+    elif isinstance(arr_or_path, str):
         try:
-            hash_fn = sha256(arr)
+            hash_fn = sha256(arr_or_path)
         except TypeError:
-            app_logger.warning(f"TypeError, re-try encoding arg:{arr},type:{type(arr)}.")
-            hash_fn = sha256(arr.encode('utf-8'))
-    elif isinstance(arr, bytes):
-        hash_fn = sha256(arr)
+            app_logger.warning(
+                f"TypeError, re-try encoding arg:{arr_or_path},type:{type(arr_or_path)}."
+            )
+            hash_fn = sha256(arr_or_path.encode("utf-8"))
+    elif isinstance(arr_or_path, bytes):
+        hash_fn = sha256(arr_or_path)
     else:
-        raise ValueError(f"variable 'arr':{arr} of type '{type(arr)}' not yet handled.")
+        raise ValueError(
+            f"variable 'arr':{arr_or_path} of type '{type(arr_or_path)}' not yet handled."
+        )
     return b64encode(hash_fn.digest())
 
 

{samgis_core-3.0.14.dist-info → samgis_core-3.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: samgis_core
-Version: 3.0.14
+Version: 3.0.15
 Summary: SamGIS CORE
 License: MIT
 Author: alessandro trinca tornidor
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: bson (>=0.5.10,<0.6.0)
 Requires-Dist: numpy (==1.25.2) ; python_version >= "3.10" and python_version < "3.11"
 Requires-Dist: numpy (>=1.26,<2.0) ; python_version >= "3.11" and python_version < "3.12"
-Requires-Dist: pillow (>=10.4.0,<11.0.0)
+Requires-Dist: pillow (>=11.0.0,<12.0.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: structlog (>=24.4.0,<25.0.0)
 Project-URL: Source, https://gitlab.com/aletrn/samgis_core

{samgis_core-3.0.14.dist-info → samgis_core-3.0.15.dist-info}/RECORD

@@ -6,14 +6,14 @@ samgis_core/prediction_api/sam_onnx_inference.py,sha256=WFRc8TNMOix4g0IAteNbDAs0
 samgis_core/utilities/__init__.py,sha256=nL9pzdB4SdEF8m5gCbtlVCtdGLg9JjPm-FNxKBsIBZA,32
 samgis_core/utilities/constants.py,sha256=0xBdfGYwCg4O0OXFtTcMVNj-kryjbajcxOZhMVkVP7U,227
 samgis_core/utilities/create_folders_if_not_exists.py,sha256=Ee_4l83suZvY5r24D26SNKGJVH3KAHregsiWs-0W-gQ,3202
-samgis_core/utilities/frontend_builder.py,sha256=IK0D1koYwT1ZKHqVl6wllFxMu8NBhNoI2-tC1ju0QeQ,5415
+samgis_core/utilities/frontend_builder.py,sha256=XyNe8d4hbnz_yIFZF1dVlA-sgoJliridBINSLTMDBfU,7268
 samgis_core/utilities/plot_images.py,sha256=1pwTJC2_ju-QhJXDonvEw6FMK_9i1kQhLnC4tjn2EH0,3469
 samgis_core/utilities/serialize.py,sha256=aIjhEoibBpV_gpgOg6LiVxZCWjOkYxlzcboDZLQctJE,2689
 samgis_core/utilities/session_logger.py,sha256=mlzLaeSC2b_MF3wLywyXYQsSPIvEd3OnhlD7_4VhMzo,5704
 samgis_core/utilities/type_hints.py,sha256=anbm8pHFWr_C1upCmncYOK-q9Iq82fO9_yftTqXeizc,1649
 samgis_core/utilities/update_requirements_txt.py,sha256=w0KQSyiM6b70_Yinf06g0ujqS41bnlR0-dKwD4enYE0,4356
-samgis_core/utilities/utilities.py,sha256=Yi-nBdgz75BOfPbBPs3pFE6ag6KyZ-wK_FAgHkGtNQs,4298
-samgis_core-3.0.14.dist-info/LICENSE,sha256=cmg7mi2IynvK5xYN_TJBikA008n6IJNjQIig1c3ge9Q,1083
-samgis_core-3.0.14.dist-info/METADATA,sha256=M7AN14-TQgO5MS4m6JCVtr0ma3Yx6Ic-ez3EyfjkUpQ,1110
-samgis_core-3.0.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-samgis_core-3.0.14.dist-info/RECORD,,
+samgis_core/utilities/utilities.py,sha256=R1BPhJIf81Bz0JH4WdwHJjrO14Fq0OPyvE28BSi_zDc,5148
+samgis_core-3.0.15.dist-info/LICENSE,sha256=cmg7mi2IynvK5xYN_TJBikA008n6IJNjQIig1c3ge9Q,1083
+samgis_core-3.0.15.dist-info/METADATA,sha256=2fo0EkubgmzMIPorV-zPJZK0HUvDXVrgLZYee5MFTkE,1110
+samgis_core-3.0.15.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+samgis_core-3.0.15.dist-info/RECORD,,

{samgis_core-3.0.14.dist-info → samgis_core-3.0.15.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any