terrakio-core 0.2.7__tar.gz → 0.3.0__tar.gz

{terrakio_core-0.2.7 → terrakio_core-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.2.7
+Version: 0.3.0
 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
@@ -21,6 +21,7 @@ Requires-Dist: pyyaml>=5.1
 Requires-Dist: xarray>=2023.1.0
 Requires-Dist: shapely>=2.0.0
 Requires-Dist: geopandas>=0.13.0
+Requires-Dist: google-cloud-storage>=2.0.0
 
 # Terrakio Core
 

{terrakio_core-0.2.7 → terrakio_core-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "terrakio-core"
-version = "0.2.7"
+version = "0.3.0"
 authors = [
     {name = "Yupeng Chao", email = "yupeng@haizea.com.au"},
 ]
@@ -28,6 +28,7 @@ dependencies = [
     "xarray>=2023.1.0",
     "shapely>=2.0.0",
     "geopandas>=0.13.0",
+    "google-cloud-storage>=2.0.0",
 ]
 
 [project.urls]

{terrakio_core-0.2.7 → terrakio_core-0.3.0}/terrakio_core/__init__.py

@@ -4,4 +4,4 @@ Terrakio Core
 Core components for Terrakio API clients.
 """
 
-__version__ = "0.2.7"
+__version__ = "0.3.0"

{terrakio_core-0.2.7 → terrakio_core-0.3.0}/terrakio_core/client.py

@@ -91,7 +91,7 @@ class BaseClient:
 
     async def wcs_async(self, expr: str, feature: Union[Dict[str, Any], ShapelyGeometry],
                         in_crs: str = "epsg:4326", out_crs: str = "epsg:4326",
-                        output: str = "csv", resolution: int = -1, buffer: bool = True, 
+                        output: str = "csv", resolution: int = -1, buffer: bool = False, 
                         retry: int = 3, **kwargs):
         """
         Asynchronous version of the wcs() method using aiohttp.
@@ -129,16 +129,13 @@ class BaseClient:
             "resolution": resolution,
             **kwargs
         }
-        
         request_url = f"{self.url}/geoquery"
-        
         for attempt in range(retry + 1):
             try:
                 session = await self.aiohttp_session
                 async with session.post(request_url, json=payload, ssl=self.verify) as response:
                     if not response.ok:
                         should_retry = False
-                        
                         if response.status in [408, 502, 503, 504]:
                             should_retry = True
                         elif response.status == 500:
@@ -684,7 +681,7 @@ class BaseClient:
         return self.mass_stats.random_sample(name, **kwargs)
 
     async def zonal_stats_async(self, gdb, expr, conc=20, inplace=False, output="csv", 
-                               in_crs="epsg:4326", out_crs="epsg:4326", resolution=0.005, buffer=True):
+                               in_crs="epsg:4326", out_crs="epsg:4326", resolution=-1, buffer=False):
         """
         Compute zonal statistics for all geometries in a GeoDataFrame using asyncio for concurrency.
         
@@ -709,6 +706,13 @@ class BaseClient:
         all_results = []
         row_indices = []
         
+        # Calculate total batches for progress reporting
+        total_geometries = len(gdb)
+        total_batches = (total_geometries + conc - 1) // conc  # Ceiling division
+        completed_batches = 0
+        
+        print(f"Processing {total_geometries} geometries with concurrency {conc}")
+        
         async def process_geometry(geom, index):
             """Process a single geometry"""
             try:
@@ -760,11 +764,19 @@ class BaseClient:
                 batch_results = await process_batch(batch_indices)
                 all_results.extend(batch_results)
                 row_indices.extend(batch_indices)
+                
+                # Update progress
+                completed_batches += 1
+                processed_geometries = min(i + conc, total_geometries)
+                print(f"Progress: {completed_batches}/{total_batches} completed ({processed_geometries}/{total_geometries} geometries processed)")
+                
             except Exception as e:
                 if hasattr(e, 'response'):
                     raise APIError(f"API request failed: {e.response.text}")
                 raise
         
+        print("All batches completed! Processing results...")
+        
         if not all_results:
             raise ValueError("No valid results were returned for any geometry")
             
@@ -857,7 +869,7 @@ class BaseClient:
                 return result_gdf
 
     def zonal_stats(self, gdb, expr, conc=20, inplace=False, output="csv", 
-                   in_crs="epsg:4326", out_crs="epsg:4326", resolution=0.005, buffer=True):
+                   in_crs="epsg:4326", out_crs="epsg:4326", resolution=-1, buffer=False):
         """
         Compute zonal statistics for all geometries in a GeoDataFrame.
         
@@ -879,6 +891,8 @@ class BaseClient:
             raise ValueError("Concurrency (conc) is too high. Please set conc to 100 or less.")
         import asyncio
         
+        print(f"Starting zonal statistics computation for expression: {expr}")
+        
         # Check if we're in a Jupyter environment or already have an event loop
         try:
             loop = asyncio.get_running_loop()
@@ -912,6 +926,7 @@ class BaseClient:
             # Event loop may already be closed, ignore
             pass
         
+        print("Zonal statistics computation completed!")
         return result
 
     # Group access management protected methods

{terrakio_core-0.2.7 → terrakio_core-0.3.0}/terrakio_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.2.7
+Version: 0.3.0
 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
@@ -21,6 +21,7 @@ Requires-Dist: pyyaml>=5.1
 Requires-Dist: xarray>=2023.1.0
 Requires-Dist: shapely>=2.0.0
 Requires-Dist: geopandas>=0.13.0
+Requires-Dist: google-cloud-storage>=2.0.0
 
 # Terrakio Core
 

{terrakio_core-0.2.7 → terrakio_core-0.3.0}/terrakio_core.egg-info/requires.txt

@@ -4,3 +4,4 @@ pyyaml>=5.1
 xarray>=2023.1.0
 shapely>=2.0.0
 geopandas>=0.13.0
+google-cloud-storage>=2.0.0