samgis_core 3.0.5__py3-none-any.whl → 3.0.6__py3-none-any.whl

samgis_core/prediction_api/sam_onnx_inference.py

@@ -70,7 +70,8 @@ def get_inference_embedding(
 
 
 def get_raster_inference_using_existing_embedding(
-        embedding: dict, prompt: ListDict, models_instance: SegmentAnythingONNX2) -> TupleNdarrayInt:
+        embedding: dict, prompt: ListDict, models_instance: SegmentAnythingONNX2, folder_write_tmp_on_disk: str = None,
+        key: str = None) -> TupleNdarrayInt:
     """
     Get inference output for a given image using a SegmentAnythingONNX model, using an existing embedding instead of a
     new ndarray or PIL image
@@ -79,6 +80,8 @@ def get_raster_inference_using_existing_embedding(
         embedding: dict
         prompt: list of prompt dict
         models_instance: SegmentAnythingONNX instance model
+        folder_write_tmp_on_disk: output folder where to write debug images
+        key: embedding key
 
     Returns:
         raster prediction mask, prediction number
@@ -90,16 +93,27 @@ def get_raster_inference_using_existing_embedding(
     app_logger.info(f"Created {len_inference_out} prediction_masks,"
                     f"shape:{inference_out.shape}, dtype:{inference_out.dtype}.")
     mask = zeros((inference_out.shape[2], inference_out.shape[3]), dtype=uint8)
+    write_tmp_img = bool(folder_write_tmp_on_disk)
     for n, m in enumerate(inference_out[0, :, :, :]):
         app_logger.debug(f"{n}th of prediction_masks shape {inference_out.shape}"
                          f" => mask shape:{mask.shape}, {mask.dtype}.")
         mask[m > 0.0] = 255
+        if write_tmp_img:
+            from pathlib import Path
+            from datetime import datetime
+            from samgis_core.utilities.utilities import convert_ndarray_to_pil, normalize_array
+            m_normalized = normalize_array(m, type_normalization="float")
+            m_out = convert_ndarray_to_pil(m_normalized)
+            now = datetime.now().isoformat()
+            if len(m.shape) == 2:
+                m_out = m_out.convert("L")
+            m_out.save(Path(folder_write_tmp_on_disk) / f"mask_{key}_{now}_n{n}.png")
     return mask, len_inference_out
 
 
 def get_raster_inference_with_embedding_from_dict(
         img: PIL_Image | ndarray, prompt: ListDict, models_instance: SegmentAnythingONNX2, model_name: str,
-        embedding_key: str, embedding_dict: dict) -> TupleNdarrayInt:
+        embedding_key: str, embedding_dict: dict, folder_write_tmp_on_disk: str = None) -> TupleNdarrayInt:
     """
     Get inference output using a SegmentAnythingONNX model, but get the image embedding from the given embedding dict
      instead of creating a new embedding. This function needs the img argument to update the embedding dict if necessary
@@ -111,6 +125,7 @@ def get_raster_inference_with_embedding_from_dict(
         model_name: model name string
         embedding_key: embedding id
         embedding_dict: embedding images dict
+        folder_write_tmp_on_disk: output folder where to write debug images
 
     Returns:
         raster prediction mask, prediction number
@@ -122,4 +137,5 @@ def get_raster_inference_with_embedding_from_dict(
     embedding = embedding_dict[embedding_key]
     n_keys = len(embedding_dict)
     app_logger.info(f"embedding created ({n_keys} keys in embedding dict), running predict_masks with prompt {prompt}.")
-    return get_raster_inference_using_existing_embedding(embedding, prompt, models_instance)
+    return get_raster_inference_using_existing_embedding(
+        embedding, prompt, models_instance, folder_write_tmp_on_disk=folder_write_tmp_on_disk, key=embedding_key)

samgis_core/utilities/plot_images.py

@@ -1,12 +1,15 @@
+import structlog.stdlib
 from numpy import ndarray
 from matplotlib import pyplot as plt
 
-from samgis_core.utilities.type_hints import ListStr, TupleInt
-
+from samgis_core.utilities.type_hints import ListStr, MatplotlibBackend
 
 FigAxes = tuple[plt.Figure, plt.Axes]
 
 
+logger = structlog.stdlib.get_logger(__file__)
+
+
 def helper_imshow_output_expected(
         img_list: list[ndarray], titles_list: ListStr, cmap: str = "gist_rainbow", plot_size: int = 5,
         show=False, debug: bool = False, close_after: float = 0.0) -> FigAxes:
@@ -47,10 +50,9 @@ def helper_imshow_output_expected(
     return fig, ax
 
 
-
 def imshow_raster(
         raster, title, cmap: str = "gist_rainbow", interpolation: str = None, alpha=None, transform=None, plot_size=5,
-        show=False, debug: bool = False, close_after: float = 0.0) -> FigAxes:
+        show=False, debug: bool = False, close_after: float = 0.0, backend: MatplotlibBackend = None) -> FigAxes:
     """
     Displays raster images lists/arrays with titles, legend, alpha transparency, figure sizes
     and geographic transformations, if not none (leveraging rasterio.plot)
@@ -66,6 +68,7 @@ def imshow_raster(
         show: fire plt.show() action if needed
         debug: workaround useful in an interactive context, like Pycharm debugger
         close_after: close after give seconds (useful in tests, contrasted to 'debug' option)
+        backend: matplotlib backend string
 
     Returns:
         tuple of matplotlib Figure, Axes
@@ -73,6 +76,11 @@ def imshow_raster(
     """
     from rasterio import plot
 
+    if not backend:
+        backend = plt.get_backend()
+        plt.rcParams["backend"] = backend
+    logger.info(f"use {backend} as matplotlib backend...")
+
     fig, ax = plt.subplots(figsize=(plot_size, plot_size))
     raster_ax = raster[0] if transform is not None else raster
     image_hidden = ax.imshow(raster_ax, cmap=cmap, interpolation=interpolation, alpha=alpha)

samgis_core/utilities/type_hints.py

@@ -67,5 +67,32 @@ class EmbeddingPILImage(TypedDict):
     resized_size: TupleInt2
 
 
+class MatplotlibBackend(StrEnum):
+    gtk3agg = "gtk3agg"
+    gtk3cairo = "gtk3cairo"
+    gtk4agg = "gtk4agg"
+    gtk4cairo = "gtk4cairo"
+    macosx = "macosx"
+    nbagg = "nbagg"
+    notebook = "notebook"
+    qtagg = "qtagg"
+    qtcairo = "qtcairo"
+    qt5agg = "qt5agg"
+    qt5cairo = "qt5cairo"
+    tkagg = "tkagg"
+    tkcairo = "tkcairo"
+    webagg = "webagg"
+    wx = "wx"
+    wxagg = "wxagg"
+    wxcairo = "wxcairo"
+    agg = "agg"
+    cairo = "cairo"
+    pdf = "pdf"
+    pgf = "pgf"
+    ps = "ps"
+    svg = "svg"
+    template = "template"
+
+
 EmbeddingDict = dict[str, EmbeddingImage]
 EmbeddingPILDict = dict[str, EmbeddingPILImage]

samgis_core/utilities/utilities.py

@@ -1,6 +1,7 @@
 """Various utilities (logger, time benchmark, args dump, numerical and stats info)"""
 from copy import deepcopy
 
+import numpy as np
 from numpy import ndarray, float32
 
 from samgis_core import app_logger
@@ -136,3 +137,12 @@ def apply_coords(coords: ndarray, embedding: EmbeddingPILImage):
     coords[..., 1] = coords[..., 1] * (resized_height / orig_height)
 
     return coords.astype(float32)
+
+
+def normalize_array(arr: ndarray, new_h: int | float = 255., type_normalization: str = "int") -> ndarray:
+    arr = arr.astype(float)
+    arr_max = np.nanmax(arr)
+    arr_min = np.nanmin(arr)
+    scaled_arr = (arr - arr_min) / (arr_max - arr_min)
+    multiplied_arr = scaled_arr * new_h
+    return multiplied_arr.astype(int) if type_normalization == "int" else multiplied_arr

{samgis_core-3.0.5.dist-info → samgis_core-3.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: samgis_core
-Version: 3.0.5
+Version: 3.0.6
 Summary: SamGIS CORE
 License: MIT
 Author: alessandro trinca tornidor

{samgis_core-3.0.5.dist-info → samgis_core-3.0.6.dist-info}/RECORD

@@ -2,16 +2,16 @@ samgis_core/__init__.py,sha256=4e1lkiD-cLi_YLjJ4DUpu8LrUgjCHfhO_wnOGyEv_m0,673
 samgis_core/__version__.py,sha256=x-8LeQkljky-ao1MyT98tSQE1xNvJp3LelqsAdCb9Og,94
 samgis_core/prediction_api/__init__.py,sha256=_jUZhspS26ygiSzBJywfZ4fQf9X7oC8w6oxvhd9S2hQ,57
 samgis_core/prediction_api/sam_onnx2.py,sha256=8mORGMl_pE6YjOKGz6L7Lsav_xGteOUma3GzQXIbTFU,8260
-samgis_core/prediction_api/sam_onnx_inference.py,sha256=EkdPr1oBm93Ny4skJUj9cKJGjvoKUCrKVDMc6Wu3S_I,5543
+samgis_core/prediction_api/sam_onnx_inference.py,sha256=WFRc8TNMOix4g0IAteNbDAs040lWXC3YEZYHcnCHRcE,6493
 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/plot_images.py,sha256=O2QhPSWrWBgli-u1rKx_pJxH--V35bhT6M7z7qrihA8,3153
+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=YhTSsD7ICVZtLRoq-P6O5AP9BEGg5hSHJaboS1qbpuw,1101
-samgis_core/utilities/utilities.py,sha256=RXobQKpzqi8uGzbCSIi7jDlYLnmAoHBNnrlQSGDRGV8,3617
-samgis_core-3.0.5.dist-info/LICENSE,sha256=cmg7mi2IynvK5xYN_TJBikA008n6IJNjQIig1c3ge9Q,1083
-samgis_core-3.0.5.dist-info/METADATA,sha256=b2ySELtINqH5EdulwKdAk0JInz56ahI_7g-bS2dTZm8,1109
-samgis_core-3.0.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-samgis_core-3.0.5.dist-info/RECORD,,
+samgis_core/utilities/type_hints.py,sha256=anbm8pHFWr_C1upCmncYOK-q9Iq82fO9_yftTqXeizc,1649
+samgis_core/utilities/utilities.py,sha256=4EBnsTBontnmaZRVtI4VAbvISdmYyg2yEnn8Sb28dUc,4014
+samgis_core-3.0.6.dist-info/LICENSE,sha256=cmg7mi2IynvK5xYN_TJBikA008n6IJNjQIig1c3ge9Q,1083
+samgis_core-3.0.6.dist-info/METADATA,sha256=cF143cyh8z5hhFc3_ZXad95rLjfin9prTKMBBteZLfo,1109
+samgis_core-3.0.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+samgis_core-3.0.6.dist-info/RECORD,,