geoai-py 0.12.0__py2.py3-none-any.whl → 0.13.1__py2.py3-none-any.whl

geoai/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Qiusheng Wu"""
 __email__ = "giswqs@gmail.com"
-__version__ = "0.12.0"
+__version__ = "0.13.1"
 
 
 import os
@@ -99,5 +99,5 @@ def set_proj_lib_path(verbose=False):
 # if ("google.colab" not in sys.modules) and (sys.platform != "windows"):
 #     set_proj_lib_path()
 
+from .dinov3 import DINOv3GeoProcessor, analyze_image_patches, create_similarity_map
 from .geoai import *
-from .dinov3 import DINOv3GeoProcessor, create_similarity_map, analyze_image_patches

geoai/agents/__init__.py

@@ -1,2 +1,8 @@
-from .geo_agents import GeoAgent
+from .geo_agents import (
+    GeoAgent,
+    create_ollama_model,
+    create_anthropic_model,
+    create_openai_model,
+    create_bedrock_model,
+)
 from .map_tools import MapTools

geoai/agents/geo_agents.py

@@ -1,17 +1,23 @@
 from __future__ import annotations
 
 import asyncio
+import os
 import uuid
 from concurrent.futures import ThreadPoolExecutor
 from types import SimpleNamespace
 from typing import Any, Callable, Optional
 
+import boto3
 import ipywidgets as widgets
 import leafmap.maplibregl as leafmap
+from botocore.config import Config as BotocoreConfig
 from ipyevents import Event
 from IPython.display import display
 from strands import Agent
-from strands.models.ollama import OllamaModel
+from strands.models import BedrockModel
+from strands.models.anthropic import AnthropicModel
+from strands.models.ollama import OllamaModel as _OllamaModel
+from strands.models.openai import OpenAIModel
 
 from .map_tools import MapSession, MapTools
 
@@ -23,6 +29,147 @@ except Exception:
     pass
 
 
+class OllamaModel(_OllamaModel):
+    """Fixed OllamaModel that ensures proper model_id handling."""
+
+    async def stream(self, *args, **kwargs):
+        """Override stream to ensure model_id is passed as string."""
+        # Patch the ollama client to handle model object correctly
+        import ollama
+
+        # Save original method if not already saved
+        if not hasattr(ollama.AsyncClient, "_original_chat"):
+            ollama.AsyncClient._original_chat = ollama.AsyncClient.chat
+
+            async def fixed_chat(self, **chat_kwargs):
+                # If model is an OllamaModel object, extract the model_id
+                if "model" in chat_kwargs and hasattr(chat_kwargs["model"], "config"):
+                    chat_kwargs["model"] = chat_kwargs["model"].config["model_id"]
+                return await ollama.AsyncClient._original_chat(self, **chat_kwargs)
+
+            ollama.AsyncClient.chat = fixed_chat
+
+        # Call the original stream method
+        async for chunk in super().stream(*args, **kwargs):
+            yield chunk
+
+
+def create_ollama_model(
+    host: str = "http://localhost:11434",
+    model_id: str = "llama3.1",
+    client_args: dict = None,
+    **kwargs: Any,
+) -> OllamaModel:
+    """Create an Ollama model.
+
+    Args:
+        host: Ollama host URL.
+        model_id: Ollama model ID.
+        client_args: Client arguments for the Ollama model.
+        **kwargs: Additional keyword arguments for the Ollama model.
+
+    Returns:
+        OllamaModel: An Ollama model.
+    """
+    if client_args is None:
+        client_args = {}
+    return OllamaModel(host=host, model_id=model_id, client_args=client_args, **kwargs)
+
+
+def create_openai_model(
+    model_id: str = "gpt-4o-mini",
+    api_key: str = None,
+    client_args: dict = None,
+    **kwargs: Any,
+) -> OpenAIModel:
+    """Create an OpenAI model.
+
+    Args:
+        model_id: OpenAI model ID.
+        api_key: OpenAI API key.
+        client_args: Client arguments for the OpenAI model.
+        **kwargs: Additional keyword arguments for the OpenAI model.
+
+    Returns:
+        OpenAIModel: An OpenAI model.
+    """
+
+    if api_key is None:
+        try:
+            api_key = os.getenv("OPENAI_API_KEY", None)
+            if api_key is None:
+                raise ValueError("OPENAI_API_KEY is not set")
+        except Exception:
+            raise ValueError("OPENAI_API_KEY is not set")
+
+    if client_args is None:
+        client_args = kwargs.get("client_args", {})
+    if "api_key" not in client_args and api_key is not None:
+        client_args["api_key"] = api_key
+
+    return OpenAIModel(client_args=client_args, model_id=model_id, **kwargs)
+
+
+def create_anthropic_model(
+    model_id: str = "claude-sonnet-4-20250514",
+    api_key: str = None,
+    client_args: dict = None,
+    **kwargs: Any,
+) -> AnthropicModel:
+    """Create an Anthropic model.
+
+    Args:
+        model_id: Anthropic model ID. Defaults to "claude-sonnet-4-20250514".
+            For a complete list of supported models,
+            see https://docs.claude.com/en/docs/about-claude/models/overview.
+        api_key: Anthropic API key.
+        client_args: Client arguments for the Anthropic model.
+        **kwargs: Additional keyword arguments for the Anthropic model.
+    """
+
+    if api_key is None:
+        try:
+            api_key = os.getenv("ANTHROPIC_API_KEY", None)
+            if api_key is None:
+                raise ValueError("ANTHROPIC_API_KEY is not set")
+        except Exception:
+            raise ValueError("ANTHROPIC_API_KEY is not set")
+
+    if client_args is None:
+        client_args = kwargs.get("client_args", {})
+    if "api_key" not in client_args and api_key is not None:
+        client_args["api_key"] = api_key
+
+    return AnthropicModel(client_args=client_args, model_id=model_id, **kwargs)
+
+
+def create_bedrock_model(
+    model_id: str = "anthropic.claude-sonnet-4-20250514-v1:0",
+    region_name: str = None,
+    boto_session: Optional[boto3.Session] = None,
+    boto_client_config: Optional[BotocoreConfig] = None,
+    **kwargs: Any,
+) -> BedrockModel:
+    """Create a Bedrock model.
+
+    Args:
+        model_id: Bedrock model ID. Run the following command to get the model ID:
+            aws bedrock list-foundation-models | jq -r '.modelSummaries[].modelId'
+        region_name: Bedrock region name.
+        boto_session: Bedrock boto session.
+        boto_client_config: Bedrock boto client config.
+        **kwargs: Additional keyword arguments for the Bedrock model.
+    """
+
+    return BedrockModel(
+        model_id=model_id,
+        region_name=region_name,
+        boto_session=boto_session,
+        boto_client_config=boto_client_config,
+        **kwargs,
+    )
+
+
 def _ensure_loop() -> asyncio.AbstractEventLoop:
     try:
         loop = asyncio.get_event_loop()
@@ -39,28 +186,98 @@ class GeoAgent(Agent):
     """Geospatial AI agent with interactive mapping capabilities."""
 
     def __init__(
-        self, *, model_id: str = "llama3.1", map_instance: Optional[leafmap.Map] = None
+        self,
+        *,
+        model: str = "llama3.1",
+        map_instance: Optional[leafmap.Map] = None,
+        system_prompt: str = "default",
+        model_args: dict = None,
+        **kwargs: Any,
     ) -> None:
         """Initialize the GeoAgent.
 
         Args:
-            model_id: Ollama model identifier (default: "llama3.1").
+            model: Model identifier (default: "llama3.1").
             map_instance: Optional existing map instance.
+            model_args: Additional keyword arguments for the model.
+            **kwargs: Additional keyword arguments for the model.
         """
         self.session: MapSession = MapSession(map_instance)
         self.tools: MapTools = MapTools(self.session)
 
+        if model_args is None:
+            model_args = {}
+
         # --- save a model factory we can call each turn ---
-        self._model_factory: Callable[[], OllamaModel] = lambda: OllamaModel(
-            host="http://localhost:11434", model_id=model_id
-        )
+        if model == "llama3.1":
+            self._model_factory: Callable[[], OllamaModel] = (
+                lambda: create_ollama_model(
+                    host="http://localhost:11434", model_id=model, **model_args
+                )
+            )
+        elif isinstance(model, str):
+            self._model_factory: Callable[[], BedrockModel] = (
+                lambda: create_bedrock_model(model_id=model, **model_args)
+            )
+        elif isinstance(model, OllamaModel):
+            # Extract configuration from existing OllamaModel and create new instances
+            model_id = model.config["model_id"]
+            host = model.host
+            client_args = model.client_args
+            self._model_factory: Callable[[], OllamaModel] = (
+                lambda: create_ollama_model(
+                    host=host, model_id=model_id, client_args=client_args, **model_args
+                )
+            )
+        elif isinstance(model, OpenAIModel):
+            # Extract configuration from existing OpenAIModel and create new instances
+            model_id = model.config["model_id"]
+            client_args = model.client_args.copy()
+            self._model_factory: Callable[[], OpenAIModel] = (
+                lambda mid=model_id, client_args=client_args: create_openai_model(
+                    model_id=mid, client_args=client_args, **model_args
+                )
+            )
+        elif isinstance(model, AnthropicModel):
+            # Extract configuration from existing AnthropicModel and create new instances
+            model_id = model.config["model_id"]
+            client_args = model.client_args.copy()
+            self._model_factory: Callable[[], AnthropicModel] = (
+                lambda mid=model_id, client_args=client_args: create_anthropic_model(
+                    model_id=mid, client_args=client_args, **model_args
+                )
+            )
+        else:
+            raise ValueError(f"Invalid model: {model}")
 
         # build initial model (first turn)
-        ollama_model: OllamaModel = self._model_factory()
+        model = self._model_factory()
+
+        if system_prompt == "default":
+            system_prompt = """
+            You are a map control agent. Call tools with MINIMAL parameters only.
+
+            CRITICAL: Treat all kwargs parameters as optional parameters.
+            CRITICAL: NEVER include optional parameters unless user explicitly asks for them.
+
+            TOOL CALL RULES:
+            - zoom_to(zoom=N) - ONLY zoom parameter, OMIT options completely
+            - add_cog_layer(url='X') - NEVER include bands, nodata, opacity, etc.
+            - fly_to(longitude=N, latitude=N) - NEVER include zoom parameter
+            - add_basemap(name='X') - NEVER include any other parameters
+            - add_marker(lng_lat=[lon,lat]) - NEVER include popup or options
+
+            - remove_layer(name='X') - call get_layer_names() to get the layer name closest to
+            the name of the layer you want to remove before calling this tool
+
+            - add_overture_3d_buildings(kwargs={}) - kwargs parameter required by tool validation
+            FORBIDDEN: Optional parameters, string representations like '{}' or '[1,2,3]'
+            REQUIRED: Minimal tool calls with only what's absolutely necessary
+            """
 
         super().__init__(
             name="Leafmap Visualization Agent",
-            model=ollama_model,
+            model=model,
             tools=[
                 # Core navigation tools
                 self.tools.fly_to,
@@ -87,36 +304,37 @@ class GeoAgent(Agent):
                 self.tools.add_marker,
                 self.tools.set_pitch,
             ],
-            system_prompt="You are a map control agent. Call tools with MINIMAL parameters only.\n\n"
-            + "CRITICAL: Treat all kwargs parameters as optional parameters.\n"
-            + "CRITICAL: NEVER include optional parameters unless user explicitly asks for them.\n\n"
-            + "TOOL CALL RULES:\n"
-            + "- zoom_to(zoom=N) - ONLY zoom parameter, OMIT options completely\n"
-            + "- add_cog_layer(url='X') - NEVER include bands, nodata, opacity, etc.\n"
-            + "- fly_to(longitude=N, latitude=N) - NEVER include zoom parameter\n"
-            + "- add_basemap(name='X') - NEVER include any other parameters\n"
-            + "- add_marker(lng_lat=[lon,lat]) - NEVER include popup or options\n\n"
-            + "- remove_layer(name='X') - call get_layer_names() to get the layer name closest to"
-            + "the name of the layer you want to remove before calling this tool\n\n"
-            + "- add_overture_3d_buildings(kwargs={}) - kwargs parameter required by tool validation\n"
-            + "FORBIDDEN: Optional parameters, string representations like '{}' or '[1,2,3]'\n"
-            + "REQUIRED: Minimal tool calls with only what's absolutely necessary",
+            system_prompt=system_prompt,
             callback_handler=None,
         )
 
     def ask(self, prompt: str) -> str:
         """Send a single-turn prompt to the agent.
 
+        Runs entirely on the same thread/event loop as the Agent
+        to avoid cross-loop asyncio object issues.
+
         Args:
             prompt: The text prompt to send to the agent.
 
         Returns:
             The agent's response as a string.
         """
-        _ensure_loop()
+        # Ensure there's an event loop bound to this thread (Jupyter-safe)
+        loop = _ensure_loop()
+
+        # Preserve existing conversation messages
+        existing_messages = self.messages.copy()
+
+        # Create a fresh model but keep conversation history
         self.model = self._model_factory()
 
-        result = self(prompt)
+        # Restore the conversation messages
+        self.messages = existing_messages
+
+        # Execute the prompt using the Agent's async API on this loop
+        # Avoid Agent.__call__ since it spins a new thread+loop
+        result = loop.run_until_complete(self.invoke_async(prompt))
         return getattr(result, "final_text", str(result))
 
     def show_ui(self, *, height: int = 700) -> None:
@@ -186,7 +404,7 @@ class GeoAgent(Agent):
                 ),
                 (
                     "Add GeoJSON",
-                    "Add vector layer: https://github.com/opengeos/datasets/releases/download/us/us_states.geojson",
+                    "Add GeoJSON layer: https://github.com/opengeos/datasets/releases/download/us/us_states.geojson",
                 ),
                 ("Remove layer", "Remove layer OpenTopoMap"),
                 ("Save map", "Save the map as demo.html and return the path"),

geoai/agents/map_tools.py

@@ -115,7 +115,7 @@ class MapTools:
         visible: bool = True,
         bands: Optional[List[int]] = None,
         nodata: Optional[Union[int, float]] = 0,
-        titiler_endpoint: str = "https://giswqs-titiler-endpoint.hf.space",
+        titiler_endpoint: str = None,
     ) -> str:
         """Add a Cloud Optimized GeoTIFF (COG) layer to the map.
 
@@ -224,7 +224,6 @@ class MapTools:
 
         Args:
             pitch (float): The pitch value to set.
-            **kwargs (Any): Additional keyword arguments to control the pitch.
 
         Returns:
             None
@@ -496,7 +495,7 @@ class MapTools:
         array_args=None,
         client_args={"cors_all": True},
         overwrite: bool = True,
-        **kwargs,
+        **kwargs: Any,
     ):
         """Add a local raster dataset to the map.
             If you are using this function in JupyterHub on a remote server
@@ -523,12 +522,6 @@ class MapTools:
                 the palette when plotting a single band. Defaults to None.
             nodata (float, optional): The value from the band to use to interpret
                 as not valid data. Defaults to None.
-            attribution (str, optional): Attribution for the source raster. This
-                defaults to a message about it being a local file.. Defaults to None.
-            layer_name (str, optional): The layer name to use. Defaults to 'Raster'.
-            layer_index (int, optional): The index of the layer. Defaults to None.
-            zoom_to_layer (bool, optional): Whether to zoom to the extent of the
-                layer. Defaults to True.
             visible (bool, optional): Whether the layer is visible. Defaults to True.
             opacity (float, optional): The opacity of the layer. Defaults to 1.0.
             array_args (dict, optional): Additional arguments to pass to
@@ -570,8 +563,8 @@ class MapTools:
         remove_port: bool = True,
         preview: bool = False,
         overwrite: bool = False,
-        **kwargs,
-    ):
+        **kwargs: Any,
+    ) -> str:
         """Render the map to an HTML page.
 
         Args:
@@ -756,7 +749,6 @@ class MapTools:
         Adds a marker to the map.
 
         Args:
-            marker (Marker, optional): A Marker object. Defaults to None.
             lng_lat (List[Union[float, float]]): A list of two floats
                 representing the longitude and latitude of the marker.
             popup (Optional[str], optional): The text to display in a popup when
@@ -891,7 +883,6 @@ class MapTools:
         Args:
             zoom (float): The zoom level to zoom to.
             options (Dict[str, Any], optional): Additional options to control the zoom. Defaults to {}.
-            **kwargs (Any): Additional keyword arguments to control the zoom.
 
         Returns:
             None
@@ -1059,7 +1050,7 @@ class MapTools:
         dpi: Optional[Union[str, float]] = "figure",
         transparent: Optional[bool] = False,
         position: str = "bottom-right",
-        **kwargs,
+        **kwargs: Any,
     ) -> str:
         """
         Add a colorbar to the map.
@@ -1186,7 +1177,9 @@ class MapTools:
         return f"Video added: {layer_id}"
 
     @tool
-    def add_nlcd(self, years: list = [2023], add_legend: bool = True, **kwargs) -> None:
+    def add_nlcd(
+        self, years: list = [2023], add_legend: bool = True, **kwargs: Any
+    ) -> None:
         """
         Adds National Land Cover Database (NLCD) data to the map.
 

geoai/dinov3.py

@@ -8,22 +8,21 @@ import json
 import math
 import os
 import sys
-from typing import Tuple, Optional, Dict, List, Union
+from typing import Dict, List, Optional, Tuple, Union
 
+import matplotlib.patches as patches
+import matplotlib.pyplot as plt
 import numpy as np
-from PIL import Image
+import rasterio
 import torch
 import torch.nn.functional as F
 import torchvision.transforms as transforms
-import rasterio
-from rasterio.windows import Window
-from rasterio.io import DatasetReader
-import matplotlib.pyplot as plt
-import matplotlib.patches as patches
-
 from huggingface_hub import hf_hub_download
+from PIL import Image
+from rasterio.io import DatasetReader
+from rasterio.windows import Window
 
-from .utils import get_device, coords_to_xy, dict_to_image, dict_to_rioxarray
+from .utils import coords_to_xy, dict_to_image, dict_to_rioxarray, get_device
 
 
 class DINOv3GeoProcessor:
@@ -47,7 +46,6 @@ class DINOv3GeoProcessor:
                  See https://github.com/facebookresearch/dinov3 for more details.
             weights_path: Path to model weights (optional)
             device: Torch device to use
-            dinov3_location: Path to DINOv3 repository
         """
 
         dinov3_github_location = "facebookresearch/dinov3"

geoai/geoai.py

@@ -8,7 +8,6 @@ logging.getLogger("maplibre").setLevel(logging.ERROR)
 import leafmap
 import leafmap.maplibregl as maplibregl
 
-from .change_detection import ChangeDetection
 from .classify import classify_image, classify_images, train_classifier
 from .download import (
     download_naip,
@@ -26,6 +25,7 @@ from .download import (
 )
 from .extract import *
 from .hf import *
+from .map_widgets import DINOv3GUI
 from .segment import *
 from .train import (
     get_instance_segmentation_model,
@@ -41,7 +41,6 @@ from .train import (
     train_segmentation_model,
 )
 from .utils import *
-from .map_widgets import DINOv3GUI
 
 
 class LeafMap(leafmap.Map):

geoai/map_widgets.py

@@ -1,6 +1,7 @@
 """Interactive widget for GeoAI."""
 
 import ipywidgets as widgets
+
 from .utils import dict_to_image, dict_to_rioxarray
 
 
@@ -28,14 +29,13 @@ class DINOv3GUI(widgets.VBox):
             colormap_options (list): The colormap options.
             raster_args (dict): The raster arguments.
 
-        Returns:
-            None
-
         Example:
             >>> processor = DINOv3GeoProcessor()
             >>> features, h_patches, w_patches = processor.extract_features(raster)
             >>> gui = DINOv3GUI(raster, processor, features, host_map=m)
         """
+        super().__init__()
+
         if raster_args is None:
             raster_args = {}
 

geoai/utils.py

@@ -182,7 +182,6 @@ def view_image(
         image (Union[np.ndarray, torch.Tensor]): The image to visualize.
         transpose (bool, optional): Whether to transpose the image. Defaults to False.
         bdx (Optional[int], optional): The band index to visualize. Defaults to None.
-        scale_factor (float, optional): The scale factor to apply to the image. Defaults to 1.0.
         figsize (Tuple[int, int], optional): The size of the figure. Defaults to (10, 5).
         axis_off (bool, optional): Whether to turn off the axis. Defaults to True.
         title (Optional[str], optional): The title of the plot. Defaults to None.
@@ -396,9 +395,10 @@ def dict_to_rioxarray(data_dict: Dict) -> xr.DataArray:
         xr.DataArray: The xarray DataArray.
     """
 
-    from affine import Affine
     from collections import namedtuple
 
+    from affine import Affine
+
     BoundingBox = namedtuple("BoundingBox", ["minx", "maxx", "miny", "maxy"])
 
     # Extract components from the dictionary
@@ -710,7 +710,7 @@ def view_vector_interactive(
         tiles_args (dict, optional): Additional arguments for the localtileserver client.
             get_folium_tile_layer function. Defaults to None.
         **kwargs: Additional keyword arguments to pass to GeoDataFrame.explore() function.
-        See https://geopandas.org/en/stable/docs/reference/api/geopandas.GeoDataFrame.explore.html
+            See https://geopandas.org/en/stable/docs/reference/api/geopandas.GeoDataFrame.explore.html
 
     Returns:
         folium.Map: The map object with the vector data added.
@@ -2508,7 +2508,7 @@ def batch_vector_to_raster(
     fill_value=0,
     dtype=np.uint8,
     nodata=None,
-):
+) -> List[str]:
     """
     Batch convert vector data to multiple rasters based on different extents or reference rasters.
 
@@ -2527,7 +2527,7 @@ def batch_vector_to_raster(
         nodata (int): No data value for the output raster.
 
     Returns:
-        list: List of paths to the created raster files.
+        List[str]: List of paths to the created raster files.
     """
     # Create output directory if it doesn't exist
     os.makedirs(output_dir, exist_ok=True)
@@ -3128,7 +3128,7 @@ def export_geotiff_tiles_batch(
     skip_empty_tiles=False,
     image_extensions=None,
     mask_extensions=None,
-):
+) -> Dict[str, Any]:
     """
     Export georeferenced GeoTIFF tiles from folders of images and masks.
 
@@ -3156,7 +3156,7 @@ def export_geotiff_tiles_batch(
         mask_extensions (list): List of mask file extensions to process (default: common raster/vector formats)
 
     Returns:
-        dict: Dictionary containing batch processing statistics
+        Dict[str, Any]: Dictionary containing batch processing statistics
 
     Raises:
         ValueError: If no images or masks found, or if counts don't match
@@ -3631,7 +3631,7 @@ def _process_image_mask_pair(
 
 def create_overview_image(
     src, tile_coordinates, output_path, tile_size, stride, geojson_path=None
-):
+) -> str:
     """Create an overview image showing all tiles and their status, with optional GeoJSON export.
 
     Args:
@@ -3782,7 +3782,7 @@ def create_overview_image(
 
 def export_tiles_to_geojson(
     tile_coordinates, src, output_path, tile_size=None, stride=None
-):
+) -> str:
     """
     Export tile rectangles directly to GeoJSON without creating an overview image.
 
@@ -4630,14 +4630,14 @@ def export_training_data(
 
 
 def masks_to_vector(
-    mask_path,
-    output_path=None,
-    simplify_tolerance=1.0,
-    mask_threshold=0.5,
-    min_object_area=100,
-    max_object_area=None,
-    nms_iou_threshold=0.5,
-):
+    mask_path: str,
+    output_path: Optional[str] = None,
+    simplify_tolerance: float = 1.0,
+    mask_threshold: float = 0.5,
+    min_object_area: int = 100,
+    max_object_area: Optional[int] = None,
+    nms_iou_threshold: float = 0.5,
+) -> Any:
     """
     Convert a building mask GeoTIFF to vector polygons and save as a vector dataset.
 
@@ -4651,7 +4651,7 @@ def masks_to_vector(
         nms_iou_threshold: IoU threshold for non-maximum suppression (default: self.nms_iou_threshold)
 
     Returns:
-        GeoDataFrame with building footprints
+        Any: GeoDataFrame with building footprints
     """
     # Set default output path if not provided
     # if output_path is None:
@@ -5654,7 +5654,7 @@ def orthogonalize(
     min_segments=4,
     area_tolerance=0.7,
     detect_triangles=True,
-):
+) -> Any:
     """
     Orthogonalizes object masks in a GeoTIFF file.
 
@@ -5678,7 +5678,7 @@ def orthogonalize(
         detect_triangles (bool, optional): If True, performs additional check to avoid creating triangular shapes.
 
     Returns:
-        geopandas.GeoDataFrame: A GeoDataFrame containing the orthogonalized features.
+        Any: A GeoDataFrame containing the orthogonalized features.
     """
 
     from functools import partial
@@ -7085,8 +7085,8 @@ def regularize(
     num_cores: int = 1,
     include_metadata: bool = False,
     output_path: Optional[str] = None,
-    **kwargs,
-) -> gpd.GeoDataFrame:
+    **kwargs: Any,
+) -> Any:
     """Regularizes polygon geometries in a GeoDataFrame by aligning edges.
 
     Aligns edges to be parallel or perpendicular (optionally also 45 degrees)
@@ -7522,7 +7522,11 @@ def write_colormap(
 
 
 def plot_performance_metrics(
-    history_path: str, figsize: Tuple[int, int] = (15, 5), verbose: bool = True
+    history_path: str,
+    figsize: Tuple[int, int] = (15, 5),
+    verbose: bool = True,
+    save_path: Optional[str] = None,
+    kwargs: Optional[Dict] = None,
 ) -> None:
     """Plot performance metrics from a history object.
 
@@ -7531,6 +7535,8 @@ def plot_performance_metrics(
         figsize: The figure size.
         verbose: Whether to print the best and final metrics.
     """
+    if kwargs is None:
+        kwargs = {}
     history = torch.load(history_path)
 
     # Handle different key naming conventions
@@ -7579,6 +7585,14 @@ def plot_performance_metrics(
         plt.grid(True)
 
     plt.tight_layout()
+
+    if save_path:
+        if "dpi" not in kwargs:
+            kwargs["dpi"] = 150
+        if "bbox_inches" not in kwargs:
+            kwargs["bbox_inches"] = "tight"
+        plt.savefig(save_path, **kwargs)
+
     plt.show()
 
     if verbose:

{geoai_py-0.12.0.dist-info → geoai_py-0.13.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geoai-py
-Version: 0.12.0
+Version: 0.13.1
 Summary: A Python package for using Artificial Intelligence (AI) with geospatial data
 Author-email: Qiusheng Wu <giswqs@gmail.com>
 License: MIT License
@@ -39,13 +39,13 @@ Requires-Dist: rioxarray
 Requires-Dist: scikit-image
 Requires-Dist: scikit-learn
 Requires-Dist: torch
-Requires-Dist: torchange
 Requires-Dist: torchgeo
 Requires-Dist: torchinfo
 Requires-Dist: tqdm
 Requires-Dist: transformers
 Provides-Extra: extra
 Requires-Dist: overturemaps; extra == "extra"
+Requires-Dist: torchange; extra == "extra"
 Provides-Extra: agents
 Requires-Dist: strands-agents; extra == "agents"
 Requires-Dist: strands-agents-tools; extra == "agents"

geoai_py-0.13.1.dist-info/RECORD

@@ -0,0 +1,24 @@
+geoai/__init__.py,sha256=HOXMIhkhHbKfAjjyW5KoS3iHaqq9-SUA6Vstr22G5f4,3851
+geoai/change_detection.py,sha256=XkJjMEU1nD8uX3-nQy7NEmz8cukVeSaRxKJHlrv8xPM,59636
+geoai/classify.py,sha256=0DcComVR6vKU4qWtH2oHVeXc7ZTcV0mFvdXRtlNmolo,35637
+geoai/detectron2.py,sha256=dOOFM9M9-6PV8q2A4-mnIPrz7yTo-MpEvDiAW34nl0w,14610
+geoai/dinov3.py,sha256=u4Lulihhvs4wTgi84RjRw8jWQpB8omQSl-dVVryNVus,40377
+geoai/download.py,sha256=B0EwpQFndJknOKmwRfEEnnCJhplOAwcLyNzFuA6FjZs,47633
+geoai/extract.py,sha256=595MBcSaFx-gQLIEv5g3oEM90QA5In4L59GPVgBOlQc,122092
+geoai/geoai.py,sha256=ZnGhcTvXbhqpO98Bmt2c4q09VXEgawn0yF8dqxGrlRg,10066
+geoai/hf.py,sha256=HbfJfpO6XnANKhmFOBvpwULiC65TeMlnLNtyQHHmlKA,17248
+geoai/map_widgets.py,sha256=QLmkILsztNaRXRULHKOd7Glb7S0pEWXSK9-P8S5AuzQ,5856
+geoai/sam.py,sha256=O6S-kGiFn7YEcFbfWFItZZQOhnsm6-GlunxQLY0daEs,34345
+geoai/segment.py,sha256=yBGTxA-ti8lBpk7WVaBOp6yP23HkaulKJQk88acrmZ0,43788
+geoai/segmentation.py,sha256=7yEzBSKCyHW1dNssoK0rdvhxi2IXsIQIFSga817KdI4,11535
+geoai/train.py,sha256=r9eioaBpc2eg6hckkGVI3aGhQZffKas_UVRj-AWruu8,136049
+geoai/utils.py,sha256=lpyhytBeDLiqWz31syeRvpbT5AUn3cOblKU57uDD9sU,301265
+geoai/agents/__init__.py,sha256=NndUtQ5-i8Zuim8CJftCZYKbCvrkDXj9iLVtiBtc_qE,178
+geoai/agents/geo_agents.py,sha256=4tLntKBL_FgTQsUVzReP9acbYotnfjMRc5BYwW9WEyE,21431
+geoai/agents/map_tools.py,sha256=OK5uB0VUHjjUnc-DYRy2CQ__kyUIARSCPBucGabO0Xw,60669
+geoai_py-0.13.1.dist-info/licenses/LICENSE,sha256=vN2L5U7cZ6ZkOHFmc8WiGlsogWsZc5dllMeNxnKVOZg,1070
+geoai_py-0.13.1.dist-info/METADATA,sha256=sNcJv-QuPoSMPAahudoWE3Z0BnV2hxwYO5bRKNKoPaA,10345
+geoai_py-0.13.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+geoai_py-0.13.1.dist-info/entry_points.txt,sha256=uGp3Az3HURIsRHP9v-ys0hIbUuBBNUfXv6VbYHIXeg4,41
+geoai_py-0.13.1.dist-info/top_level.txt,sha256=1YkCUWu-ii-0qIex7kbwAvfei-gos9ycyDyUCJPNWHY,6
+geoai_py-0.13.1.dist-info/RECORD,,

geoai_py-0.12.0.dist-info/RECORD

@@ -1,24 +0,0 @@
-geoai/__init__.py,sha256=DKFI6qeNtIjJ48oO7YWDxyaZmzSlsQ7YeXPypF9mhKI,3851
-geoai/change_detection.py,sha256=XkJjMEU1nD8uX3-nQy7NEmz8cukVeSaRxKJHlrv8xPM,59636
-geoai/classify.py,sha256=0DcComVR6vKU4qWtH2oHVeXc7ZTcV0mFvdXRtlNmolo,35637
-geoai/detectron2.py,sha256=dOOFM9M9-6PV8q2A4-mnIPrz7yTo-MpEvDiAW34nl0w,14610
-geoai/dinov3.py,sha256=c1rNvCdGSRvI8Twj-4Eanunxjh411ctIXRo_GpVRahQ,40433
-geoai/download.py,sha256=B0EwpQFndJknOKmwRfEEnnCJhplOAwcLyNzFuA6FjZs,47633
-geoai/extract.py,sha256=595MBcSaFx-gQLIEv5g3oEM90QA5In4L59GPVgBOlQc,122092
-geoai/geoai.py,sha256=6WwUnYQtQmPAiE9AJtdb4Elztc8vcH39nFFgwJQBPVQ,10112
-geoai/hf.py,sha256=HbfJfpO6XnANKhmFOBvpwULiC65TeMlnLNtyQHHmlKA,17248
-geoai/map_widgets.py,sha256=8S0WCAeH8f1jswtBJHzV_lGaO92er8P58GxxotbKUng,5862
-geoai/sam.py,sha256=O6S-kGiFn7YEcFbfWFItZZQOhnsm6-GlunxQLY0daEs,34345
-geoai/segment.py,sha256=yBGTxA-ti8lBpk7WVaBOp6yP23HkaulKJQk88acrmZ0,43788
-geoai/segmentation.py,sha256=7yEzBSKCyHW1dNssoK0rdvhxi2IXsIQIFSga817KdI4,11535
-geoai/train.py,sha256=r9eioaBpc2eg6hckkGVI3aGhQZffKas_UVRj-AWruu8,136049
-geoai/utils.py,sha256=Vg8vNuIZ2PvmwPGAIZHN_1dHw4jC9ddjM_GmdkFN1KA,300899
-geoai/agents/__init__.py,sha256=MdJH4hA6dMV4mbXpq0wwhO7gMJdb5oDj8RJDJIRSr7A,65
-geoai/agents/geo_agents.py,sha256=Yv9WYqjfV5mv8PN1n2ZP6aPhuy0MWDtgJgaVxLzc24A,13771
-geoai/agents/map_tools.py,sha256=HrreesNpsj8jytwO3ZA1e2REYQ4nyas_5v23-xb5sdY,61354
-geoai_py-0.12.0.dist-info/licenses/LICENSE,sha256=vN2L5U7cZ6ZkOHFmc8WiGlsogWsZc5dllMeNxnKVOZg,1070
-geoai_py-0.12.0.dist-info/METADATA,sha256=NJ7ybA_ondbMpU3Jw58hDLOKD5maa_HMT04xnNY_cHI,10327
-geoai_py-0.12.0.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-geoai_py-0.12.0.dist-info/entry_points.txt,sha256=uGp3Az3HURIsRHP9v-ys0hIbUuBBNUfXv6VbYHIXeg4,41
-geoai_py-0.12.0.dist-info/top_level.txt,sha256=1YkCUWu-ii-0qIex7kbwAvfei-gos9ycyDyUCJPNWHY,6
-geoai_py-0.12.0.dist-info/RECORD,,