samgis_core 1.1.1__tar.gz → 1.2.0__tar.gz

{samgis_core-1.1.1 → samgis_core-1.2.0}/PKG-INFO

@@ -1,17 +1,19 @@
 Metadata-Version: 2.1
 Name: samgis_core
-Version: 1.1.1
+Version: 1.2.0
 Summary: SamGIS CORE
 License: MIT
 Author: alessandro trinca tornidor
 Author-email: alessandro@trinca.tornidor.com
-Requires-Python: >=3.10,<3.11
+Requires-Python: >=3.10,<3.12
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: bson (>=0.5.10,<0.6.0)
 Requires-Dist: loguru (>=0.7.2,<0.8.0)
-Requires-Dist: numpy (==1.25.2)
+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: onnxruntime (==1.16.3)
 Requires-Dist: opencv-python-headless (==4.8.1.78)
 Requires-Dist: pillow (>=10.2.0,<11.0.0)

{samgis_core-1.1.1 → samgis_core-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "samgis_core"
-version = "1.1.1"
+version = "1.2.0"
 description = "SamGIS CORE"
 authors = ["alessandro trinca tornidor <alessandro@trinca.tornidor.com>"]
 license = "MIT license"
@@ -8,12 +8,18 @@ readme = "README.md"
 
 [metadata]
 name = "samgis_core"
-version = "1.1.1"
+version = "1.2.0"
+
+[project.urls]
+Source = "https://gitlab.com/aletrn/samgis_core"
 
 [tool.poetry.dependencies]
-numpy = "1.25.2"
+numpy = [
+    {version = "1.25.2", python = "~3.10"},
+    {version = "^1.26", python = "~3.11"}
+]
 pillow = "^10.2.0"
-python = "~3.10"
+python = ">=3.10, <3.12"
 onnxruntime = "1.16.3"
 opencv-python-headless = "4.8.1.78"
 loguru = "^0.7.2"

{samgis_core-1.1.1 → samgis_core-1.2.0}/samgis_core/prediction_api/sam_onnx.py

@@ -32,7 +32,7 @@ from onnxruntime import get_available_providers, InferenceSession
 
 from samgis_core import app_logger, MODEL_FOLDER
 from samgis_core.utilities.constants import DEFAULT_INPUT_SHAPE, MODEL_ENCODER_NAME, MODEL_DECODER_NAME
-from samgis_core.utilities.type_hints import PIL_Image, list_dict, tuple_ndarr_int, EmbeddingDict, EmbeddingImage
+from samgis_core.utilities.type_hints import PIL_Image, ListDict, TupleNdarrayInt, EmbeddingDict, EmbeddingImage
 
 
 class SegmentAnythingONNX:
@@ -257,8 +257,8 @@ class SegmentAnythingONNX:
 
 
 def get_raster_inference(
-        img: PIL_Image or ndarray, prompt: list_dict, models_instance: SegmentAnythingONNX, model_name: str
-) -> tuple_ndarr_int:
+        img: PIL_Image or ndarray, prompt: ListDict, models_instance: SegmentAnythingONNX, model_name: str
+) -> TupleNdarrayInt:
     """
     Get inference output for a given image using a SegmentAnythingONNX model
 
@@ -318,7 +318,7 @@ def get_inference_embedding(
 
 
 def get_raster_inference_using_existing_embedding(
-        embedding: dict, prompt: list_dict, models_instance: SegmentAnythingONNX) -> tuple_ndarr_int:
+        embedding: dict, prompt: ListDict, models_instance: SegmentAnythingONNX) -> TupleNdarrayInt:
     """
     Get inference output for a given image using a SegmentAnythingONNX model, using an existing embedding instead of a
     new ndarray or PIL image
@@ -345,8 +345,8 @@ def get_raster_inference_using_existing_embedding(
 
 
 def get_raster_inference_with_embedding_from_dict(
-        img: PIL_Image or ndarray, prompt: list_dict, models_instance: SegmentAnythingONNX, model_name: str,
-        embedding_key: str, embedding_dict: dict) -> tuple_ndarr_int:
+        img: PIL_Image or ndarray, prompt: ListDict, models_instance: SegmentAnythingONNX, model_name: str,
+        embedding_key: str, embedding_dict: dict) -> 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

{samgis_core-1.1.1 → samgis_core-1.2.0}/samgis_core/utilities/serialize.py

@@ -2,7 +2,6 @@
 from typing import Mapping
 
 from samgis_core import app_logger
-from samgis_core.utilities.type_hints import dict_str, dict_str_any
 
 
 def serialize(obj: any, include_none: bool = False):
@@ -74,11 +73,11 @@ def _serialize_list(ls: list, include_none: bool) -> list:
     return [_serialize(elem, include_none) for elem in ls]
 
 
-def _serialize_bytes(b: bytes) -> dict_str:
+def _serialize_bytes(b: bytes) -> dict[str, str]:
     import base64
     encoded = base64.b64encode(b)
     return {"value": encoded.decode('ascii'), "type": "bytes"}
 
 
-def _serialize_exception(e: Exception) -> dict_str_any:
+def _serialize_exception(e: Exception) -> dict[str, str]:
     return {"msg": str(e), "type": str(type(e)), **e.__dict__}

samgis_core-1.2.0/samgis_core/utilities/type_hints.py

@@ -0,0 +1,58 @@
+"""custom type hints"""
+from enum import Enum
+from typing import TypedDict, NewType
+
+from PIL.Image import Image
+from numpy import ndarray
+
+
+class DictStrInt(dict[str, int]): pass
+
+
+class DictStr(dict[str]): pass
+
+
+class DictStrAny(dict[str, any]): pass
+
+
+class ListDict(list[dict]): pass
+
+
+class ListFloat(list[float]): pass
+
+
+class ListInt(list[int]): pass
+
+
+class TupleInt(tuple[int]): pass
+
+
+class TupleNdarrayInt(tuple[ndarray, int]): pass
+
+
+class TupleNdarrayFloat(tuple[ndarray, float]): pass
+
+
+class LlistFloat(ListFloat): pass
+
+
+class TupleFloat(tuple[float]): pass
+
+
+class TupleFloatAny(tuple[float, any]): pass
+
+
+PIL_Image = Image
+
+
+class StrEnum(str, Enum):
+    pass
+
+
+class EmbeddingImage(TypedDict):
+    image_embedding: ndarray
+    original_size: TupleInt
+    transform_matrix: ndarray
+
+
+EmbeddingDict = dict[str, EmbeddingImage]

samgis_core-1.1.1/samgis_core/utilities/type_hints.py

@@ -1,33 +0,0 @@
-"""custom type hints"""
-from enum import Enum
-from typing import TypedDict
-
-from PIL.Image import Image
-from numpy import ndarray
-
-
-dict_str_int = dict[str, int]
-dict_str = dict[str]
-dict_str_any = dict[str, any]
-list_dict = list[dict]
-list_float = list[float]
-list_int = list[int]
-tuple_int = tuple[int]
-tuple_ndarr_int = tuple[ndarray, int]
-llist_float = list[list_float]
-tuple_float = tuple[float]
-tuple_float_any = tuple[float, any]
-PIL_Image = Image
-
-
-class StrEnum(str, Enum):
-    pass
-
-
-class EmbeddingImage(TypedDict):
-    image_embedding: ndarray
-    original_size: tuple_int
-    transform_matrix: ndarray
-
-
-EmbeddingDict = dict[str, EmbeddingImage]