terrakio-core 0.2.4__py3-none-any.whl → 0.2.6__py3-none-any.whl

terrakio_core/client.py

@@ -8,6 +8,7 @@ import aiohttp
 import pandas as pd
 import geopandas as gpd
 import xarray as xr
+import nest_asyncio
 from shapely.geometry import shape, mapping
 from shapely.geometry.base import BaseGeometry as ShapelyGeometry
 
@@ -18,6 +19,7 @@ class BaseClient:
                 auth_url: Optional[str] = "https://dev-au.terrak.io",
                 quiet: bool = False, config_file: Optional[str] = None,
                 verify: bool = True, timeout: int = 60):
+        nest_asyncio.apply()
         self.quiet = quiet
         self.verify = verify
         self.timeout = timeout
@@ -519,7 +521,24 @@ class BaseClient:
             self.auth_client.session.close()
         # Close aiohttp session if it exists
         if self._aiohttp_session and not self._aiohttp_session.closed:
-            asyncio.run(self.close_async())
+            try:
+                nest_asyncio.apply()
+                asyncio.run(self.close_async())
+            except ImportError:
+                try:
+                    asyncio.run(self.close_async())
+                except RuntimeError as e:
+                    if "cannot be called from a running event loop" in str(e):
+                        # In Jupyter, we can't properly close the async session
+                        # Log a warning or handle gracefully
+                        import warnings
+                        warnings.warn("Cannot properly close aiohttp session in Jupyter environment. "
+                                    "Consider using 'await client.close_async()' instead.")
+                    else:
+                        raise
+            except RuntimeError:
+                # Event loop may already be closed, ignore
+                pass
 
     def __enter__(self):
         return self
@@ -841,7 +860,28 @@ class BaseClient:
             geopandas.GeoDataFrame: GeoDataFrame with added columns for results, or None if inplace=True
         """
         import asyncio
-        result = asyncio.run(self.zonal_stats_async(gdb, expr, conc, inplace, output))
+        
+        # Check if we're in a Jupyter environment or already have an event loop
+        try:
+            loop = asyncio.get_running_loop()
+            # We're in an async context (like Jupyter), use create_task
+            nest_asyncio.apply()
+            result = asyncio.run(self.zonal_stats_async(gdb, expr, conc, inplace, output))
+        except RuntimeError:
+            # No running event loop, safe to use asyncio.run()
+            result = asyncio.run(self.zonal_stats_async(gdb, expr, conc, inplace, output))
+        except ImportError:
+            # nest_asyncio not available, try alternative approach
+            try:
+                loop = asyncio.get_running_loop()
+                # Create task in existing loop
+                task = loop.create_task(self.zonal_stats_async(gdb, expr, conc, inplace, output))
+                # This won't work directly - we need a different approach
+                raise RuntimeError("Cannot run async code in Jupyter without nest_asyncio. Please install: pip install nest-asyncio")
+            except RuntimeError:
+                # No event loop, use asyncio.run
+                result = asyncio.run(self.zonal_stats_async(gdb, expr, conc, inplace, output))
+        
         # Ensure aiohttp session is closed after running async code
         try:
             if self._aiohttp_session and not self._aiohttp_session.closed:
@@ -849,6 +889,7 @@ class BaseClient:
         except RuntimeError:
             # Event loop may already be closed, ignore
             pass
+        
         return result
 
     # Group access management protected methods

{terrakio_core-0.2.4.dist-info → terrakio_core-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.2.4
+Version: 0.2.6
 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.2.4.dist-info → terrakio_core-0.2.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 terrakio_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 terrakio_core/auth.py,sha256=Nuj0_X3Hiy17svYgGxrSAR-LXpTlP0J0dSrfMnkPUbI,7717
-terrakio_core/client.py,sha256=ChKbsGsCbkngRZ8mWgAijhKzElL0ZSdRHU2_XF9C7Ss,44850
+terrakio_core/client.py,sha256=ykbgD_81HAtZXY9wDpPKR9audo5Xkh1Mh0HQcLPgyKs,46878
 terrakio_core/config.py,sha256=AwJ1VgR5K7N32XCU5k7_Dp1nIv_FYt8MBonq9yKlGzA,2658
 terrakio_core/dataset_management.py,sha256=hhO35fwStS6HYFQdKP9wkr3DxHgjvpctmIU8UWH6w6U,8742
 terrakio_core/exceptions.py,sha256=9S-I20-QiDRj1qgjFyYUwYM7BLic_bxurcDOIm2Fu_0,410
@@ -8,7 +8,7 @@ terrakio_core/group_access_management.py,sha256=NJ7SX4keUzZAUENmJ5L6ynKf4eRlqtyi
 terrakio_core/mass_stats.py,sha256=AqYJsd6nqo2BDh4vEPUDgsv4T0UR1_TPDoXa3WO3gTU,9284
 terrakio_core/space_management.py,sha256=wlUUQrlj_4U_Lpjn9lbF5oj0Rv3NPvvnrd5mWej5kmA,4211
 terrakio_core/user_management.py,sha256=MMNWkz0V_9X7ZYjjteuRU4H4W3F16iuQw1dpA2wVTGg,7400
-terrakio_core-0.2.4.dist-info/METADATA,sha256=dMdHIPIFLVF1UMfTSa7D3GMLOw6nVJwl4hMeMcs0FdQ,1405
-terrakio_core-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-terrakio_core-0.2.4.dist-info/top_level.txt,sha256=5cBj6O7rNWyn97ND4YuvvXm0Crv4RxttT4JZvNdOG6Q,14
-terrakio_core-0.2.4.dist-info/RECORD,,
+terrakio_core-0.2.6.dist-info/METADATA,sha256=K-2CqTD95e3a7TgXSEk2JTadmVLQFbDdppRXBrMYyao,1405
+terrakio_core-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+terrakio_core-0.2.6.dist-info/top_level.txt,sha256=5cBj6O7rNWyn97ND4YuvvXm0Crv4RxttT4JZvNdOG6Q,14
+terrakio_core-0.2.6.dist-info/RECORD,,