geoai-py 0.18.2__tar.gz → 0.20.0__tar.gz

{geoai_py-0.18.2 → geoai_py-0.20.0}/.gitignore

@@ -11,6 +11,7 @@ AGENTS.md
 docs/examples/timm_output/
 docs/examples/timm_seg_output/
 docs/examples/timm_buildings/
+docs/workshops/**/*.txt
 
 # C extensions
 *.so

{geoai_py-0.18.2 → geoai_py-0.20.0}/.pre-commit-config.yaml

@@ -12,7 +12,7 @@ repos:
             args: ["--maxkb=500"]
 
     - repo: https://github.com/psf/black-pre-commit-mirror
-      rev: 25.11.0
+      rev: 25.12.0
       hooks:
           - id: black-jupyter
 
@@ -27,6 +27,6 @@ repos:
                 ]
 
     - repo: https://github.com/kynan/nbstripout
-      rev: 0.8.1
+      rev: 0.8.2
       hooks:
           - id: nbstripout

{geoai_py-0.18.2 → geoai_py-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geoai-py
-Version: 0.18.2
+Version: 0.20.0
 Summary: A Python package for using Artificial Intelligence (AI) with geospatial data
 Author-email: Qiusheng Wu <giswqs@gmail.com>
 License: MIT License
@@ -57,6 +57,8 @@ Requires-Dist: strands-agents-tools; extra == "agents"
 Requires-Dist: strands-agents[ollama]; extra == "agents"
 Requires-Dist: strands-agents[anthropic]; extra == "agents"
 Requires-Dist: strands-agents[openai]; extra == "agents"
+Provides-Extra: sr
+Requires-Dist: opensr-model; extra == "sr"
 Dynamic: license-file
 
 # GeoAI: Artificial Intelligence for Geospatial Data

{geoai_py-0.18.2 → geoai_py-0.20.0}/geoai/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Qiusheng Wu"""
 __email__ = "giswqs@gmail.com"
-__version__ = "0.18.2"
+__version__ = "0.20.0"
 
 
 import os
@@ -136,3 +136,25 @@ try:
 except ImportError:
     # MultiClean not available (missing dependency)
     pass
+
+# Removed redundant cloud mask imports; these are already available via the tools subpackage.
+
+try:
+    from .tools import super_resolution
+except ImportError:
+    # super_resolution not available (missing dependency)
+    pass
+
+# Moondream Vision Language Model
+try:
+    from .moondream import (
+        MoondreamGeo,
+        moondream_caption,
+        moondream_query,
+        moondream_detect,
+        moondream_point,
+    )
+    from .map_widgets import moondream_gui
+except ImportError:
+    # Moondream not available (missing dependency)
+    pass

{geoai_py-0.18.2 → geoai_py-0.20.0}/geoai/agents/__init__.py

@@ -6,6 +6,7 @@ from .geo_agents import (
     create_ollama_model,
     create_anthropic_model,
     create_openai_model,
+    create_gemini_model,
     create_bedrock_model,
 )
 from .map_tools import MapTools

{geoai_py-0.18.2 → geoai_py-0.20.0}/geoai/agents/geo_agents.py

@@ -17,6 +17,7 @@ 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 strands.models.gemini import GeminiModel
 
 from .catalog_tools import CatalogTools
 from .map_tools import MapSession, MapTools
@@ -202,6 +203,40 @@ def create_bedrock_model(
     )
 
 
+def create_gemini_model(
+    model_id: str = "gemini-2.5-flash",
+    api_key: str = None,
+    client_args: dict = None,
+    **kwargs: Any,
+) -> GeminiModel:
+    """Create a Gemini model.
+
+    Args:
+        model_id: Gemini model ID.
+        api_key: Gemini API key.
+        client_args: Client arguments for the Gemini model.
+        **kwargs: Additional keyword arguments for the Gemini model.
+
+    Returns:
+        GeminiModel: A Gemini model.
+    """
+
+    if api_key is None and (client_args is None or "api_key" not in client_args):
+        try:
+            api_key = os.getenv("GOOGLE_API_KEY", None)
+            if api_key is None:
+                raise ValueError("GOOGLE_API_KEY is not set")
+        except Exception:
+            raise ValueError("GOOGLE_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 GeminiModel(client_args=client_args, model_id=model_id, **kwargs)
+
+
 class GeoAgent(Agent):
     """Geospatial AI agent with interactive mapping capabilities."""
 
@@ -229,15 +264,10 @@ class GeoAgent(Agent):
             model_args = {}
 
         # --- save a model factory we can call each turn ---
-        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)
+        if isinstance(model, str) and (":" in model or model.startswith("llama")):
+            # treat ANY "llama..." model id as Ollama
+            self._model_factory = lambda m=model: create_ollama_model(
+                host="http://localhost:11434", model_id=m, **model_args
             )
         elif isinstance(model, OllamaModel):
             # Extract configuration from existing OllamaModel and create new instances
@@ -267,6 +297,20 @@ class GeoAgent(Agent):
                     model_id=mid, client_args=client_args, **model_args
                 )
             )
+        elif isinstance(model, GeminiModel):
+            # Extract configuration from existing GeminiModel and create new instances
+            model_id = model.config["model_id"]
+            client_args = model.client_args.copy()
+            self._model_factory: Callable[[], GeminiModel] = (
+                lambda mid=model_id, client_args=client_args: create_gemini_model(
+                    model_id=mid, client_args=client_args, **model_args
+                )
+            )
+        elif isinstance(model, str):
+            # Only Bedrock IDs here, not LLaMA
+            self._model_factory = lambda m=model: create_bedrock_model(
+                model_id=m, **model_args
+            )
         else:
             raise ValueError(f"Invalid model: {model}")
 
@@ -473,7 +517,7 @@ class GeoAgent(Agent):
                         f"<div style='margin:6px 0;padding:6px 8px;border-radius:8px;background:#f7f7f7;'><b>Agent</b>: {_esc(mm)}</div>"
                     )
             self._ui.log.value = (
-                "<div>"
+                "<div style='height:100%; overflow-y:auto;'>"
                 + (
                     "".join(parts)
                     if parts
@@ -643,16 +687,12 @@ class STACAgent(Agent):
             model_args = {}
 
         # --- save a model factory we can call each turn ---
-        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)
+        if isinstance(model, str) and (":" in model or model.startswith("llama")):
+            # treat ANY "llama..." model id as Ollama
+            self._model_factory = lambda m=model: create_ollama_model(
+                host="http://localhost:11434", model_id=m, **model_args
             )
+
         elif isinstance(model, OllamaModel):
             # Extract configuration from existing OllamaModel and create new instances
             model_id = model.config["model_id"]
@@ -681,6 +721,11 @@ class STACAgent(Agent):
                     model_id=mid, client_args=client_args, **model_args
                 )
             )
+        elif isinstance(model, str):
+            # Only Bedrock IDs here, not LLaMA
+            self._model_factory = lambda m=model: create_bedrock_model(
+                model_id=m, **model_args
+            )
         else:
             raise ValueError(f"Invalid model: {model}")
 
@@ -1092,7 +1137,7 @@ CRITICAL: Return ONLY JSON. NO explanatory text, NO made-up data."""
                         f"<div style='margin:6px 0;padding:6px 8px;border-radius:8px;background:#f7f7f7;'><b>Agent</b>: {_esc(mm)}</div>"
                     )
             self._ui.log.value = (
-                "<div>"
+                "<div style='height:100%; overflow-y:auto;'>"
                 + (
                     "".join(parts)
                     if parts
@@ -1284,15 +1329,10 @@ class CatalogAgent(Agent):
             model_args = {}
 
         # --- save a model factory we can call each turn ---
-        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)
+        if isinstance(model, str) and (":" in model or model.startswith("llama")):
+            # treat ANY "llama..." model id as Ollama
+            self._model_factory = lambda m=model: create_ollama_model(
+                host="http://localhost:11434", model_id=m, **model_args
             )
         elif isinstance(model, OllamaModel):
             # Extract configuration from existing OllamaModel and create new instances
@@ -1322,6 +1362,11 @@ class CatalogAgent(Agent):
                     model_id=mid, client_args=client_args, **model_args
                 )
             )
+        elif isinstance(model, str):
+            # Only Bedrock IDs here, not LLaMA
+            self._model_factory = lambda m=model: create_bedrock_model(
+                model_id=m, **model_args
+            )
         else:
             raise ValueError(f"Invalid model: {model}")
 

{geoai_py-0.18.2 → geoai_py-0.20.0}/geoai/geoai.py

@@ -44,6 +44,8 @@ from .train import (
     train_segmentation_model,
 )
 from .utils import *
+from .landcover_utils import *
+from .landcover_train import *
 
 
 class LeafMap(leafmap.Map):