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

terrakio_core/sync_client.py

@@ -1,6 +1,345 @@
+# import asyncio
+# import concurrent.futures
+# import threading
+# import functools
+# import inspect
+# from typing import Optional, Dict, Any, Union
+# from geopandas import GeoDataFrame
+# from shapely.geometry.base import BaseGeometry as ShapelyGeometry
+# from .async_client import AsyncClient
+# from typing import TYPE_CHECKING
+
+# # # Add this after your other imports
+# # if TYPE_CHECKING:
+# #     from .endpoints.dataset_management import DatasetManagement
+# #     from .endpoints.user_management import UserManagement
+# #     from .endpoints.mass_stats import MassStats
+# #     from .endpoints.group_management import GroupManagement
+# #     from .endpoints.space_management import SpaceManagement
+# #     from .endpoints.model_management import ModelManagement
+# #     from .endpoints.auth import AuthClient
+
+
+# class SyncWrapper:
+#     """Generic synchronous wrapper with __dir__ support for runtime autocomplete."""
+    
+#     def __init__(self, async_obj, sync_client):
+#         self._async_obj = async_obj
+#         self._sync_client = sync_client
+    
+#     def __dir__(self):
+#         """Return list of attributes for autocomplete in interactive environments."""
+#         async_attrs = [attr for attr in dir(self._async_obj) if not attr.startswith('_')]
+#         wrapper_attrs = [attr for attr in object.__dir__(self) if not attr.startswith('_')]
+#         return list(set(async_attrs + wrapper_attrs))
+    
+#     def __getattr__(self, name):
+#         """Dynamically wrap any method call to convert async to sync."""
+#         attr = getattr(self._async_obj, name)
+        
+#         if callable(attr):
+#             @functools.wraps(attr)
+#             def sync_wrapper(*args, **kwargs):
+#                 result = attr(*args, **kwargs)
+#                 if hasattr(result, '__await__'):
+#                     return self._sync_client._run_async(result)
+#                 return result
+#             return sync_wrapper
+        
+#         return attr
+
+
+# class SyncClient:
+#     """
+#     Thread-safe synchronous wrapper for AsyncClient.
+#     Uses a persistent event loop in a dedicated thread to avoid event loop conflicts.
+#     """
+
+#     # datasets: 'DatasetManagement'
+#     # users: 'UserManagement' 
+#     # mass_stats: 'MassStats'
+#     # groups: 'GroupManagement'
+#     # space: 'SpaceManagement'
+#     # model: 'ModelManagement'
+#     # auth: 'AuthClient'
+    
+#     def __init__(self, url: Optional[str] = None, api_key: Optional[str] = None, verbose: bool = False):
+#         self._async_client = AsyncClient(url=url, api_key=api_key, verbose=verbose)
+#         self._context_entered = False
+#         self._closed = False
+        
+#         # Thread and event loop management
+#         self._loop = None
+#         self._thread = None
+#         self._loop_ready = None
+#         self._loop_exception = None
+        
+#         # Initialize endpoint managers
+#         print("we are here!!!!!!!!!!!!!!!!!")
+#         self.datasets = SyncWrapper(self._async_client.datasets, self)
+#         self.users = SyncWrapper(self._async_client.users, self)
+#         self.mass_stats = SyncWrapper(self._async_client.mass_stats, self)
+#         self.groups = SyncWrapper(self._async_client.groups, self)
+#         self.space = SyncWrapper(self._async_client.space, self)
+#         self.model = SyncWrapper(self._async_client.model, self)
+#         self.auth = SyncWrapper(self._async_client.auth, self)
+        
+#         # Register cleanup
+#         import atexit
+#         atexit.register(self._cleanup)
+    
+#     def _ensure_event_loop(self):
+#         """Ensure we have a persistent event loop in a dedicated thread."""
+#         if self._loop is None or self._loop.is_closed():
+#             self._loop_ready = threading.Event()
+#             self._loop_exception = None
+            
+#             def run_loop():
+#                 """Run the event loop in a dedicated thread."""
+#                 try:
+#                     # Create a new event loop for this thread
+#                     self._loop = asyncio.new_event_loop()
+#                     asyncio.set_event_loop(self._loop)
+                    
+#                     # Signal that the loop is ready
+#                     self._loop_ready.set()
+                    
+#                     # Run the loop forever (until stopped)
+#                     self._loop.run_forever()
+#                 except Exception as e:
+#                     self._loop_exception = e
+#                     self._loop_ready.set()
+#                 finally:
+#                     # Clean up when the loop stops
+#                     if self._loop and not self._loop.is_closed():
+#                         self._loop.close()
+            
+#             # Start the thread
+#             self._thread = threading.Thread(target=run_loop, daemon=True)
+#             self._thread.start()
+            
+#             # Wait for the loop to be ready
+#             self._loop_ready.wait(timeout=10)
+            
+#             if self._loop_exception:
+#                 raise self._loop_exception
+            
+#             if not self._loop_ready.is_set():
+#                 raise RuntimeError("Event loop failed to start within timeout")
+    
+#     def _run_async(self, coro):
+#         """
+#         Run async coroutine using persistent event loop.
+#         This is the core method that makes everything work.
+#         """
+#         # Ensure we have an event loop
+#         self._ensure_event_loop()
+        
+#         if self._loop.is_closed():
+#             raise RuntimeError("Event loop is closed")
+        
+#         # Create a future to get the result back from the event loop thread
+#         future = concurrent.futures.Future()
+        
+#         async def run_with_context():
+#             """Run the coroutine with proper context management."""
+#             try:
+#                 # Ensure the async client is properly initialized
+#                 await self._ensure_context()
+                
+#                 # Run the actual coroutine
+#                 result = await coro
+                
+#                 # Set the result on the future
+#                 future.set_result(result)
+#             except Exception as e:
+#                 # Set the exception on the future
+#                 future.set_exception(e)
+        
+#         # Schedule the coroutine on the persistent event loop
+#         self._loop.call_soon_threadsafe(
+#             lambda: asyncio.create_task(run_with_context())
+#         )
+        
+#         # Wait for the result (with timeout to avoid hanging)
+#         try:
+#             return future.result(timeout=300)  # 5 minute timeout
+#         except concurrent.futures.TimeoutError:
+#             raise RuntimeError("Async operation timed out after 5 minutes")
+    
+#     async def _ensure_context(self):
+#         """Ensure the async client context is entered."""
+#         if not self._context_entered and not self._closed:
+#             await self._async_client.__aenter__()
+#             self._context_entered = True
+    
+#     async def _exit_context(self):
+#         """Exit the async client context."""
+#         if self._context_entered and not self._closed:
+#             await self._async_client.__aexit__(None, None, None)
+#             self._context_entered = False
+    
+#     def close(self):
+#         """Close the underlying async client session and stop the event loop."""
+#         if not self._closed:
+#             if self._loop and not self._loop.is_closed():
+#                 # Schedule cleanup on the event loop
+#                 future = concurrent.futures.Future()
+                
+#                 async def cleanup():
+#                     """Clean up the async client."""
+#                     try:
+#                         await self._exit_context()
+#                         future.set_result(None)
+#                     except Exception as e:
+#                         future.set_exception(e)
+                
+#                 # Run cleanup
+#                 self._loop.call_soon_threadsafe(
+#                     lambda: asyncio.create_task(cleanup())
+#                 )
+                
+#                 # Wait for cleanup to complete
+#                 try:
+#                     future.result(timeout=10)
+#                 except:
+#                     pass  # Ignore cleanup errors
+                
+#                 # Stop the event loop
+#                 self._loop.call_soon_threadsafe(self._loop.stop)
+                
+#                 # Wait for thread to finish
+#                 if self._thread and self._thread.is_alive():
+#                     self._thread.join(timeout=5)
+            
+#             self._closed = True
+    
+#     def _cleanup(self):
+#         """Internal cleanup method called by atexit."""
+#         if not self._closed:
+#             try:
+#                 self.close()
+#             except Exception:
+#                 pass  # Ignore cleanup errors
+    
+#     def __dir__(self):
+#         """Return list of attributes for autocomplete in interactive environments."""
+#         default_attrs = [attr for attr in object.__dir__(self) if not attr.startswith('_')]
+#         async_client_attrs = [attr for attr in dir(self._async_client) if not attr.startswith('_')]
+#         endpoint_attrs = ['datasets', 'users', 'mass_stats', 'groups', 'space', 'model', 'auth']
+#         all_attrs = default_attrs + async_client_attrs + endpoint_attrs
+#         return list(set(all_attrs))
+    
+#     # Your existing methods (geoquery, zonal_stats, etc.)
+#     def geoquery(
+#         self,
+#         expr: str,
+#         feature: Union[Dict[str, Any], ShapelyGeometry],
+#         in_crs: str = "epsg:4326",
+#         out_crs: str = "epsg:4326",
+#         resolution: int = -1,
+#         geom_fix: bool = False,
+#         **kwargs
+#     ):
+#         """Compute WCS query for a single geometry (synchronous version)."""
+#         coro = self._async_client.geoquery(
+#             expr=expr,
+#             feature=feature,
+#             in_crs=in_crs,
+#             out_crs=out_crs,
+#             output="netcdf",
+#             resolution=resolution,
+#             geom_fix=geom_fix,
+#             **kwargs
+#         )
+#         return self._run_async(coro)
+
+#     def zonal_stats(
+#         self,
+#         gdf: GeoDataFrame,
+#         expr: str,
+#         conc: int = 20,
+#         inplace: bool = False,
+#         in_crs: str = "epsg:4326",
+#         out_crs: str = "epsg:4326",
+#         resolution: int = -1,
+#         geom_fix: bool = False,
+#         drop_nan: bool = False,
+#         spatial_reduction: str = None,
+#         temporal_reduction: str = None,
+#         max_memory_mb: int = 500,
+#         stream_to_disk: bool = False,
+#     ):
+#         """Compute zonal statistics for all geometries in a GeoDataFrame (synchronous version)."""
+#         coro = self._async_client.zonal_stats(
+#             gdf=gdf,
+#             expr=expr,
+#             conc=conc,
+#             inplace=inplace,
+#             in_crs=in_crs,
+#             out_crs=out_crs,
+#             resolution=resolution,
+#             geom_fix=geom_fix,
+#             drop_nan=drop_nan,
+#             spatial_reduction=spatial_reduction,
+#             temporal_reduction=temporal_reduction,
+#             max_memory_mb=max_memory_mb,
+#             stream_to_disk=stream_to_disk
+#         )
+#         return self._run_async(coro)
+    
+#     def create_dataset_file(
+#         self,
+#         aoi: str,
+#         expression: str,
+#         output: str,
+#         in_crs: str = "epsg:4326",
+#         res: float = 0.0001,
+#         region: str = "aus",
+#         to_crs: str = "epsg:4326",
+#         overwrite: bool = True,
+#         skip_existing: bool = False,
+#         non_interactive: bool = True,
+#         poll_interval: int = 30,
+#         download_path: str = "/home/user/Downloads",
+#     ) -> dict:
+#         """Create a dataset file using mass stats operations (synchronous version)."""
+#         coro = self._async_client.create_dataset_file(
+#             aoi=aoi,
+#             expression=expression,
+#             output=output,
+#             in_crs=in_crs,
+#             res=res,
+#             region=region,
+#             to_crs=to_crs,
+#             overwrite=overwrite,
+#             skip_existing=skip_existing,
+#             non_interactive=non_interactive,
+#             poll_interval=poll_interval,
+#             download_path=download_path,
+#         )
+#         return self._run_async(coro)
+    
+#     # Context manager support
+#     def __enter__(self):
+#         """Context manager entry."""
+#         return self
+    
+#     def __exit__(self, exc_type, exc_val, exc_tb):
+#         """Context manager exit."""
+#         self.close()
+    
+#     def __del__(self):
+#         """Destructor to ensure session is closed."""
+#         if not self._closed:
+#             try:
+#                 self._cleanup()
+#             except Exception:
+#                 pass
+
+
 import asyncio
 import functools
-import inspect
 from typing import Optional, Dict, Any, Union
 from geopandas import GeoDataFrame
 from shapely.geometry.base import BaseGeometry as ShapelyGeometry
@@ -21,13 +360,10 @@ class SyncWrapper:
         Return list of attributes for autocomplete in interactive environments.
         This enables autocomplete in Jupyter/iPython after instantiation.
         """
-        # Get all public attributes from the wrapped async object
         async_attrs = [attr for attr in dir(self._async_obj) if not attr.startswith('_')]
         
-        # Get all attributes from this wrapper instance
         wrapper_attrs = [attr for attr in object.__dir__(self) if not attr.startswith('_')]
         
-        # Combine and return unique attributes
         return list(set(async_attrs + wrapper_attrs))
     
     def __getattr__(self, name):
@@ -59,7 +395,6 @@ class SyncClient:
         self._context_entered = False
         self._closed = False
         
-        # Initialize endpoint managers
         self.datasets = SyncWrapper(self._async_client.datasets, self)
         self.users = SyncWrapper(self._async_client.users, self)
         self.mass_stats = SyncWrapper(self._async_client.mass_stats, self)
@@ -68,7 +403,6 @@ class SyncClient:
         self.model = SyncWrapper(self._async_client.model, self)
         self.auth = SyncWrapper(self._async_client.auth, self)
         
-        # Register cleanup
         import atexit
         atexit.register(self._cleanup)
     
@@ -77,16 +411,12 @@ class SyncClient:
         Return list of attributes for autocomplete in interactive environments.
         This includes all methods from the async client plus the endpoint managers.
         """
-        # Get default attributes from this class
         default_attrs = [attr for attr in object.__dir__(self) if not attr.startswith('_')]
         
-        # Get all public methods from the async client
         async_client_attrs = [attr for attr in dir(self._async_client) if not attr.startswith('_')]
         
-        # Add endpoint managers
         endpoint_attrs = ['datasets', 'users', 'mass_stats', 'groups', 'space', 'model', 'auth']
         
-        # Combine all attributes
         all_attrs = default_attrs + async_client_attrs + endpoint_attrs
         
         return list(set(all_attrs))
@@ -119,16 +449,10 @@ class SyncClient:
             gdf: GeoDataFrame,
             expr: str,
             conc: int = 20,
-            inplace: bool = False,
             in_crs: str = "epsg:4326",
             out_crs: str = "epsg:4326",
             resolution: int = -1,
             geom_fix: bool = False,
-            drop_nan: bool = False,
-            spatial_reduction: str = None,
-            temporal_reduction: str = None,
-            max_memory_mb: int = 500,
-            stream_to_disk: bool = False,
     ):
         """
         Compute zonal statistics for all geometries in a GeoDataFrame (synchronous version).
@@ -137,22 +461,13 @@ class SyncClient:
             gdf (GeoDataFrame): GeoDataFrame containing geometries
             expr (str): Terrakio expression to evaluate, can include spatial aggregations
             conc (int): Number of concurrent requests to make
-            inplace (bool): Whether to modify the input GeoDataFrame in place
             in_crs (str): Input coordinate reference system
             out_crs (str): Output coordinate reference system
             resolution (int): Resolution parameter
             geom_fix (bool): Whether to fix the geometry (default False)
-            drop_nan (bool): Whether to drop NaN values from the results (default False)
-            spatial_reduction (str): Reduction operation for spatial dimensions (x, y). 
-                                Options: 'mean', 'median', 'min', 'max', 'std', 'var', 'sum', 'count'
-            temporal_reduction (str): Reduction operation for temporal dimension (time).
-                                    Options: 'mean', 'median', 'min', 'max', 'std', 'var', 'sum', 'count'
-            max_memory_mb (int): Maximum memory threshold in MB (default 500MB)
-            stream_to_disk (bool): Whether to stream datasets to disk as NetCDF files (default False)
 
         Returns:
-            geopandas.GeoDataFrame: GeoDataFrame with added columns for results, or None if inplace=True
-                                If stream_to_disk=True, large datasets are saved as NetCDF files with file paths stored.
+            geopandas.GeoDataFrame: GeoDataFrame with added columns for results
 
         Raises:
             ValueError: If concurrency is too high or if data exceeds memory limit without streaming
@@ -162,16 +477,10 @@ class SyncClient:
             gdf=gdf,
             expr=expr,
             conc=conc,
-            inplace=inplace,
             in_crs=in_crs,
             out_crs=out_crs,
             resolution=resolution,
             geom_fix=geom_fix,
-            drop_nan=drop_nan,
-            spatial_reduction=spatial_reduction,
-            temporal_reduction=temporal_reduction,
-            max_memory_mb=max_memory_mb,
-            stream_to_disk=stream_to_disk
         )
         return self._run_async(coro)
     
@@ -207,7 +516,6 @@ class SyncClient:
         )
         return self._run_async(coro)
 
-    # Rest of the methods remain the same...
     async def _ensure_context(self):
         """Ensure the async client context is entered."""
         if not self._context_entered and not self._closed:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.4.3
+Version: 0.4.4
 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
@@ -24,6 +24,7 @@ Requires-Dist: geopandas>=0.13.0
 Requires-Dist: google-cloud-storage>=2.0.0
 Requires-Dist: scipy>=1.7.0
 Requires-Dist: nest_asyncio
+Requires-Dist: onnxruntime>=1.10.0
 Provides-Extra: ml
 Requires-Dist: torch>=2.7.1; extra == "ml"
 Requires-Dist: scikit-learn>=1.7.0; extra == "ml"

terrakio_core-0.4.4.dist-info/RECORD

@@ -0,0 +1,22 @@
+terrakio_core/__init__.py,sha256=tHjogyeQC-EKWpfPNnQqieQWGYRagVnj_LBiPP8vZrw,273
+terrakio_core/accessors.py,sha256=qWLljU83YO7EUOefo_f6_P6ba6uiYMXwou0ihAHKBHQ,23706
+terrakio_core/async_client.py,sha256=FYUuN1IboFkygylo0jFjEmhBGoHhzhAwG_KznkQR2y4,12449
+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/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
+terrakio_core/endpoints/group_management.py,sha256=VFl3jakjQa9OPi351D3DZvLU9M7fHdfjCzGhmyJsx3U,6309
+terrakio_core/endpoints/mass_stats.py,sha256=6PSWWCpKLKMcFOoXfOAuROX8iSuG_dLyTYcw7gzhhZ4,23464
+terrakio_core/endpoints/model_management.py,sha256=LH_gHPrqYA-_45KWpDBRcFbwHgm-Kg0zk1ealy7P_C0,52379
+terrakio_core/endpoints/space_management.py,sha256=YWb55nkJnFJGlALJ520DvurxDqVqwYtsvqQPWzxzhDs,2266
+terrakio_core/endpoints/user_management.py,sha256=WlFr3EfK8iI6DfkpMuYLHZUPk2n7_DHHO6z1hndmZB4,3816
+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.3.dist-info/RECORD

@@ -1,21 +0,0 @@
-terrakio_core/__init__.py,sha256=GDUYT7cudfxltFZZ-2_5xM4Pd7o-pkQx1O8K9HrE5f0,248
-terrakio_core/async_client.py,sha256=ffLKMbzclHfyBZBJn4uR8nlMW5E-96PX-4O5EghaSPE,13805
-terrakio_core/client.py,sha256=-tGffOKGMyuowsvBwaV7Wtc_EZSWuSwv26_I5FkUank,5446
-terrakio_core/config.py,sha256=r8NARVYOca4AuM88VP_j-8wQxOk1s7VcRdyEdseBlLE,4193
-terrakio_core/exceptions.py,sha256=4qnpOM1gOxsNIXDXY4qwY1d3I4Myhp7HBh7b2D0SVrU,529
-terrakio_core/sync_client.py,sha256=UpPn9rHp6x6otxj3QJ1Scnac4stgIpTtb__gmXszYCA,10787
-terrakio_core/convenience_functions/convenience_functions.py,sha256=sBY2g7Vv3jakkuXnuFomXBWP0y6Q7q1K4ay3g4TxIoQ,21068
-terrakio_core/endpoints/auth.py,sha256=e_hdNE6JOGhRVlQMFdEoOmoMHp5EzK6CclOEnc_AmZw,5863
-terrakio_core/endpoints/dataset_management.py,sha256=BUm8IIlW_Q45vDiQp16CiJGeSLheI8uWRVRQtMdhaNk,13161
-terrakio_core/endpoints/group_management.py,sha256=VFl3jakjQa9OPi351D3DZvLU9M7fHdfjCzGhmyJsx3U,6309
-terrakio_core/endpoints/mass_stats.py,sha256=IZEozQ9GyOmUhd7V8M66Bz2OWsyq-VKzOw_sj_i-dng,23154
-terrakio_core/endpoints/model_management.py,sha256=PF-2f6mW_RtkPWSL-N56kbgLeB6Z4EhU2N2qFqPan7o,70365
-terrakio_core/endpoints/space_management.py,sha256=YWb55nkJnFJGlALJ520DvurxDqVqwYtsvqQPWzxzhDs,2266
-terrakio_core/endpoints/user_management.py,sha256=WlFr3EfK8iI6DfkpMuYLHZUPk2n7_DHHO6z1hndmZB4,3816
-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.3.dist-info/METADATA,sha256=201kTjM26SSTmtRPBohs9GlBsP_3U3tUw6ja2X0D6uM,1756
-terrakio_core-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-terrakio_core-0.4.3.dist-info/top_level.txt,sha256=5cBj6O7rNWyn97ND4YuvvXm0Crv4RxttT4JZvNdOG6Q,14
-terrakio_core-0.4.3.dist-info/RECORD,,