terrakio-core 0.4.4__py3-none-any.whl → 0.4.5__py3-none-any.whl

terrakio_core/__init__.py

@@ -5,7 +5,7 @@ Terrakio Core
 Core components for Terrakio API clients.
 """
 
-__version__ = "0.4.4"
+__version__ = "0.4.5"
 
 from .async_client import AsyncClient
 from .sync_client import SyncClient as Client

terrakio_core/async_client.py

@@ -17,7 +17,7 @@ from .endpoints.group_management import GroupManagement
 from .endpoints.space_management import SpaceManagement
 from .endpoints.model_management import ModelManagement
 from .endpoints.auth import AuthClient
-from .convenience_functions.convenience_functions import zonal_stats as _zonal_stats, create_dataset_file as _create_dataset_file
+from .convenience_functions.convenience_functions import zonal_stats as _zonal_stats, create_dataset_file as _create_dataset_file, request_geoquery_list as _request_geoquery_list
 
 class AsyncClient(BaseClient):
     def __init__(self, url: Optional[str] = None, api_key: Optional[str] = None, verbose: bool = False, session: Optional[aiohttp.ClientSession] = None):
@@ -282,6 +282,49 @@ class AsyncClient(BaseClient):
             download_path=download_path,
         )
 
+    async def geo_queries(
+        self,
+        queries: list[dict],
+        conc: int = 20,
+    ):
+        """
+        Execute multiple geo queries concurrently.
+
+        Args:
+            queries (list[dict]): List of dictionaries containing query parameters.
+                                  Each query must have 'expr', 'feature', and 'in_crs' keys.
+            conc (int): Number of concurrent requests to make (default 20, max 100)
+
+        Returns:
+            Union[float, geopandas.GeoDataFrame]: 
+                - float: Average of all results if results are integers
+                - GeoDataFrame: GeoDataFrame with geometry and dataset columns if results are xarray datasets
+
+        Raises:
+            ValueError: If queries list is empty, concurrency is too high, or queries are malformed
+            APIError: If the API request fails
+
+        Example:
+            queries = [
+                {
+                    'expr': 'WCF.wcf',
+                    'feature': {'type': 'Feature', 'geometry': {...}, 'properties': {}},
+                    'in_crs': 'epsg:4326'
+                },
+                {
+                    'expr': 'NDVI.ndvi',
+                    'feature': {'type': 'Feature', 'geometry': {...}, 'properties': {}},
+                    'in_crs': 'epsg:4326'
+                }
+            ]
+            result = await client.geo_queries(queries)
+        """
+        return await _request_geoquery_list(
+            client=self,
+            quries=queries,  # Note: keeping original parameter name for compatibility
+            conc=conc,
+        )
+
     async def __aenter__(self):
         if self._session is None:
             headers = {

terrakio_core/sync_client.py

@@ -340,6 +340,7 @@
 
 import asyncio
 import functools
+import concurrent.futures
 from typing import Optional, Dict, Any, Union
 from geopandas import GeoDataFrame
 from shapely.geometry.base import BaseGeometry as ShapelyGeometry
@@ -516,6 +517,49 @@ class SyncClient:
         )
         return self._run_async(coro)
 
+    def geo_queries(
+        self,
+        queries: list[dict],
+        conc: int = 20,
+    ):
+        """
+        Execute multiple geo queries concurrently (synchronous version).
+
+        Args:
+            queries (list[dict]): List of dictionaries containing query parameters.
+                                  Each query must have 'expr', 'feature', and 'in_crs' keys.
+            conc (int): Number of concurrent requests to make (default 20, max 100)
+
+        Returns:
+            Union[float, geopandas.GeoDataFrame]: 
+                - float: Average of all results if results are integers
+                - GeoDataFrame: GeoDataFrame with geometry and dataset columns if results are xarray datasets
+
+        Raises:
+            ValueError: If queries list is empty, concurrency is too high, or queries are malformed
+            APIError: If the API request fails
+
+        Example:
+            queries = [
+                {
+                    'expr': 'WCF.wcf',
+                    'feature': {'type': 'Feature', 'geometry': {...}, 'properties': {}},
+                    'in_crs': 'epsg:4326'
+                },
+                {
+                    'expr': 'NDVI.ndvi',
+                    'feature': {'type': 'Feature', 'geometry': {...}, 'properties': {}},
+                    'in_crs': 'epsg:4326'
+                }
+            ]
+            result = client.geo_queries(queries)
+        """
+        coro = self._async_client.geo_queries(
+            queries=queries,
+            conc=conc,
+        )
+        return self._run_async(coro)
+
     async def _ensure_context(self):
         """Ensure the async client context is entered."""
         if not self._context_entered and not self._closed:
@@ -529,18 +573,36 @@ class SyncClient:
             self._context_entered = False
     
     def _run_async(self, coro):
-        """Run an async coroutine and return the result synchronously."""
+        """
+        Run an async coroutine and return the result synchronously.
+        This version handles both Jupyter notebook environments and regular Python environments.
+        """
         async def run_with_context():
             await self._ensure_context()
             return await coro
         
         try:
+            # Check if we're in a running event loop (like Jupyter)
             loop = asyncio.get_running_loop()
-            import concurrent.futures
+            
+            # Method 1: Try using nest_asyncio if available
+            try:
+                import nest_asyncio
+                nest_asyncio.apply()
+                return asyncio.run(run_with_context())
+            except ImportError:
+                pass
+            
+            # Method 2: Use ThreadPoolExecutor to run in a separate thread
+            def run_in_thread():
+                return asyncio.run(run_with_context())
+            
             with concurrent.futures.ThreadPoolExecutor() as executor:
-                future = executor.submit(asyncio.run, run_with_context())
+                future = executor.submit(run_in_thread)
                 return future.result()
+                
         except RuntimeError:
+            # No running loop, safe to use asyncio.run()
             return asyncio.run(run_with_context())
     
     def close(self):
@@ -551,10 +613,21 @@ class SyncClient:
             
             try:
                 loop = asyncio.get_running_loop()
-                import concurrent.futures
-                with concurrent.futures.ThreadPoolExecutor() as executor:
-                    future = executor.submit(asyncio.run, close_async())
-                    future.result()
+                
+                # Try nest_asyncio first
+                try:
+                    import nest_asyncio
+                    nest_asyncio.apply()
+                    asyncio.run(close_async())
+                except ImportError:
+                    # Fall back to ThreadPoolExecutor
+                    def run_in_thread():
+                        return asyncio.run(close_async())
+                    
+                    with concurrent.futures.ThreadPoolExecutor() as executor:
+                        future = executor.submit(run_in_thread)
+                        future.result()
+                        
             except RuntimeError:
                 asyncio.run(close_async())
             
@@ -575,10 +648,21 @@ class SyncClient:
         
         try:
             loop = asyncio.get_running_loop()
-            import concurrent.futures
-            with concurrent.futures.ThreadPoolExecutor() as executor:
-                future = executor.submit(asyncio.run, enter_async())
-                future.result()
+            
+            # Try nest_asyncio first
+            try:
+                import nest_asyncio
+                nest_asyncio.apply()
+                asyncio.run(enter_async())
+            except ImportError:
+                # Fall back to ThreadPoolExecutor
+                def run_in_thread():
+                    return asyncio.run(enter_async())
+                
+                with concurrent.futures.ThreadPoolExecutor() as executor:
+                    future = executor.submit(run_in_thread)
+                    future.result()
+                    
         except RuntimeError:
             asyncio.run(enter_async())
         

{terrakio_core-0.4.4.dist-info → terrakio_core-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.4.4
+Version: 0.4.5
 Summary: Core components for Terrakio API clients
 Author-email: Yupeng Chao <yupeng@haizea.com.au>
 Project-URL: Homepage, https://github.com/HaizeaAnalytics/terrakio-python-api

{terrakio_core-0.4.4.dist-info → terrakio_core-0.4.5.dist-info}/RECORD

@@ -1,10 +1,10 @@
-terrakio_core/__init__.py,sha256=tHjogyeQC-EKWpfPNnQqieQWGYRagVnj_LBiPP8vZrw,273
+terrakio_core/__init__.py,sha256=snOTpM6-GxHvvDJ6hjlsWywgIago1JbE8QDfsWMRlPI,273
 terrakio_core/accessors.py,sha256=qWLljU83YO7EUOefo_f6_P6ba6uiYMXwou0ihAHKBHQ,23706
-terrakio_core/async_client.py,sha256=FYUuN1IboFkygylo0jFjEmhBGoHhzhAwG_KznkQR2y4,12449
+terrakio_core/async_client.py,sha256=M7C6by-GCW9AvDRhIwpBG12fO5--NG5qrHdSC6Fjkrc,14082
 terrakio_core/client.py,sha256=VXP7BtJWIfpPPZR7_yNdSTcGwNgTwhb7KorusqkQrzk,5603
 terrakio_core/config.py,sha256=r8NARVYOca4AuM88VP_j-8wQxOk1s7VcRdyEdseBlLE,4193
 terrakio_core/exceptions.py,sha256=4qnpOM1gOxsNIXDXY4qwY1d3I4Myhp7HBh7b2D0SVrU,529
-terrakio_core/sync_client.py,sha256=HkLavfbT1sXGE1kTkiCDgNJxL9bErgOD6WihFrM-2xI,21873
+terrakio_core/sync_client.py,sha256=wsVKjaIDZW4AC2-81RXseE9mFbXu90T5Bbwrgw37x6k,24864
 terrakio_core/convenience_functions/convenience_functions.py,sha256=B7qbObjP4OuAUtrVf4Gi58c0q2EkTwOCOE568P0Q-EE,18607
 terrakio_core/endpoints/auth.py,sha256=FdLsPScPIBo-Gxl6ZnE-46cp2molggAJtL72LssN3fg,6049
 terrakio_core/endpoints/dataset_management.py,sha256=BUm8IIlW_Q45vDiQp16CiJGeSLheI8uWRVRQtMdhaNk,13161
@@ -16,7 +16,7 @@ terrakio_core/endpoints/user_management.py,sha256=WlFr3EfK8iI6DfkpMuYLHZUPk2n7_D
 terrakio_core/helper/bounded_taskgroup.py,sha256=wiTH10jhKZgrsgrFUNG6gig8bFkUEPHkGRT2XY7Rgmo,677
 terrakio_core/helper/decorators.py,sha256=L6om7wmWNgCei3Wy5U0aZ-70OzsCwclkjIf7SfQuhCg,2289
 terrakio_core/helper/tiles.py,sha256=xNtp3oDD912PN_FQV5fb6uQYhwfHANuXyIcxoVCCfZU,2632
-terrakio_core-0.4.4.dist-info/METADATA,sha256=y2xrfAhs9JnlPKMyqj34QXXxS_AvY2tUyTrSM9SDFCY,1791
-terrakio_core-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-terrakio_core-0.4.4.dist-info/top_level.txt,sha256=5cBj6O7rNWyn97ND4YuvvXm0Crv4RxttT4JZvNdOG6Q,14
-terrakio_core-0.4.4.dist-info/RECORD,,
+terrakio_core-0.4.5.dist-info/METADATA,sha256=5_6bPROpM38AJ7NJDqFzORJFG2HJR-j_X0Rg4KwriUY,1791
+terrakio_core-0.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+terrakio_core-0.4.5.dist-info/top_level.txt,sha256=5cBj6O7rNWyn97ND4YuvvXm0Crv4RxttT4JZvNdOG6Q,14
+terrakio_core-0.4.5.dist-info/RECORD,,