terrakio-core 0.4.98.1b12__tar.gz → 0.4.98.1b14__tar.gz

{terrakio_core-0.4.98.1b12 → terrakio_core-0.4.98.1b14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.4.98.1b12
+Version: 0.4.98.1b14
 Summary: Core package for the terrakio-python-api
 Requires-Python: >=3.11
 Requires-Dist: aiofiles>=24.1.0

{terrakio_core-0.4.98.1b12 → terrakio_core-0.4.98.1b14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "terrakio-core"
-version = "0.4.98.1b12"
+version = "0.4.98.1b14"
 description = "Core package for the terrakio-python-api"
 readme = "README.md"
 requires-python = ">=3.11"

{terrakio_core-0.4.98.1b12 → terrakio_core-0.4.98.1b14}/terrakio_core/__init__.py

@@ -5,16 +5,15 @@ Terrakio Core
 Core components for Terrakio API clients.
 """
 
-__version__ = "0.4.98"
+# Suppress ONNX Runtime GPU device discovery warnings - MUST BE FIRST!
+import os
+os.environ['ORT_LOGGING_LEVEL'] = '3'
+__version__ = "0.4.98.1"
 
 from .async_client import AsyncClient
 from .sync_client import SyncClient as Client
 from . import accessors
 
-# Suppress ONNX Runtime GPU device discovery warnings
-import os
-os.environ['ORT_LOGGING_LEVEL'] = '3'
-
 __all__ = [
     "AsyncClient", 
     "Client"

{terrakio_core-0.4.98.1b12 → terrakio_core-0.4.98.1b14}/terrakio_core/endpoints/mass_stats.py

@@ -669,9 +669,8 @@ class MassStats:
             CollectionNotFoundError: If the collection is not found
             GetTaskError: If the API request fails due to unknown reasons
         """
-        await self.create_collection(
-            collection = collection
-        )
+        
+        await self.get_collection(collection = collection)
 
         upload_urls = await self._upload_requests(
             collection = collection
@@ -719,9 +718,8 @@ class MassStats:
             CollectionNotFoundError: If the collection is not found
             GetTaskError: If the API request fails due to unknown reasons
         """
-        await self.create_collection(
-            collection = collection
-        )
+
+        await self.get_collection(collection = collection)
 
         with open(consumer, 'rb') as f:
             form = aiohttp.FormData()
@@ -749,7 +747,7 @@ class MassStats:
     @require_api_key
     async def training_samples(
         self,
-        name: str,
+        collection: str,
         aoi: str,
         expression_x: str,
         filter_x: str = "skip",
@@ -765,7 +763,6 @@ class MassStats:
         skip_test: bool = False,
         start_year: int = None,
         end_year: int = None,
-        bucket: str = None,
         server: str = None,
         extra_filters: list[str] = None,
         extra_filters_rate: list[float] = None,
@@ -775,7 +772,7 @@ class MassStats:
         Generate an AI dataset using specified parameters.
 
         Args:
-            name: Name of the collection to create
+            collection: The collection name where we save the results
             aoi: Path to GeoJSON file containing area of interest
             expression_x: Expression for X data (features)
             filter_x: Filter expression for X data (default: "skip")
@@ -791,7 +788,6 @@ class MassStats:
             skip_test: Skip expression validation test (default: False)
             start_year: Start year for temporal filtering
             end_year: End year for temporal filtering
-            bucket: Storage bucket name
             server: Server to use for processing
             extra_filters: Additional filter expressions
             extra_filters_rate: Rates for additional filters
@@ -846,11 +842,9 @@ class MassStats:
         
         with open(aoi, 'r') as f:
             aoi_data = json.load(f)
-        
-        await self.create_collection(
-            collection = name,
-            bucket = bucket,
-            collection_type = "basic"
+
+        await self.get_collection(
+            collection = collection,
         )
 
         payload = {
@@ -866,18 +860,18 @@ class MassStats:
             "server": server
         }
         
-        task_id_dict, status = await self._client._terrakio_request("POST", f"collections/{name}/training_samples", json=payload)
+        task_id_dict, status = await self._client._terrakio_request("POST", f"collections/{collection}/training_samples", json=payload)
 
         if status != 200:
             if status == 404:
-                raise CollectionNotFoundError(f"Collection {name} not found", status_code=status)
+                raise CollectionNotFoundError(f"Collection {collection} not found", status_code=status)
             raise GetTaskError(f"Training sample failed with status {status}", status_code=status)
         
         task_id = task_id_dict["task_id"]
         
         await self._client.mass_stats.track_progress(task_id)
         
-        return {"task_id": task_id, "collection": name}
+        return {"task_id": task_id, "collection": collection}
 
     @require_api_key
     async def download_files(
@@ -1075,6 +1069,7 @@ class MassStats:
     @require_api_key
     async def create_pyramids(
         self,
+        collection: str,
         name: str,
         levels: int,
         config: Dict[str, Any]
@@ -1083,6 +1078,7 @@ class MassStats:
         Create pyramid tiles for a dataset.
 
         Args:
+            collection: Name of collection
             name: Dataset name
             levels: Maximum zoom level for pyramid (e.g., 8)
             config: Full pyramid configuration dictionary containing:
@@ -1104,9 +1100,10 @@ class MassStats:
         Raises:
             GetTaskError: If the API request fails
         """
-        await self.create_collection(collection = name)
-        
+        await self.get_collection(collection = collection)
+
         pyramid_request = {
+            'collection_name': collection,
             'name': name,
             'max_zoom': levels,
             **config

{terrakio_core-0.4.98.1b12 → terrakio_core-0.4.98.1b14}/terrakio_core/endpoints/model_management.py

@@ -919,13 +919,13 @@ class ModelManagement:
             if not SKL2ONNX_AVAILABLE:
                 raise ImportError("skl2onnx is not installed. Please install it with: pip install skl2onnx")
             return self._convert_sklearn_to_onnx(model, input_shape), "random_forest"
-        elif isinstance(model, ort.InferenceSession):
-            if model_type is None:
-                raise ValueError(
-                    "For ONNX InferenceSession models, you must specify the 'model_type' parameter. Currently 'nerual network' and 'random forest' are supported."
-                    "Example: model_type='random forest' or model_type='neural network'"
-                )
-            return model.SerializeToString(), model_type
+        # elif isinstance(model, ort.InferenceSession):
+        #     if model_type is None:
+        #         raise ValueError(
+        #             "For ONNX InferenceSession models, you must specify the 'model_type' parameter. Currently 'nerual network' and 'random forest' are supported."
+        #             "Example: model_type='random forest' or model_type='neural network'"
+        #         )
+        #     return model.SerializeToString(), model_type
         else:
             model_type = type(model).__name__
             raise ValueError(f"Unsupported model type: {model_type}. Supported types: PyTorch nn.Module, sklearn BaseEstimator")