terrakio-core 0.4.0__tar.gz → 0.4.2__tar.gz

{terrakio_core-0.4.0 → terrakio_core-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.4.0
+Version: 0.4.2
 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.0 → terrakio_core-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "terrakio-core"
-version = "0.4.0"
+version = "0.4.2"
 authors = [
     {name = "Yupeng Chao", email = "yupeng@haizea.com.au"},
 ]

{terrakio_core-0.4.0 → terrakio_core-0.4.2}/terrakio_core/__init__.py

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

{terrakio_core-0.4.0 → terrakio_core-0.4.2}/terrakio_core/endpoints/model_management.py

@@ -903,19 +903,39 @@ class ModelManagement:
             "    output = model.run(None, {\"float_input\": input_data})[0]",
             "    logging.info(f\"Model output shape: {output.shape}\")",
             "    ",
-            "    # Process output back to xarray format",
-            "    # Assuming output is (1, height, width) or (1, 1, height, width)",
-            "    if output.ndim == 4 and output.shape[1] == 1:",
-            "        # Remove channel dimension if it's 1",
-            "        output_2d = output[0, 0]",
+            "    # UPDATED: Handle multi-class CNN output properly",
+            "    if output.ndim == 4:",
+            "        if output.shape[1] == 1:",
+            "            # Single class output (regression or binary classification)",
+            "            output_2d = output[0, 0]",
+            "            logging.info(\"Single channel output detected\")",
+            "        else:",
+            "            # Multi-class output - convert logits/probabilities to class predictions",
+            "            output_classes = np.argmax(output, axis=1)  # Shape: (1, height, width)",
+            "            output_2d = output_classes[0]  # Shape: (height, width)",
+            "            ",
+            "            # Apply class merging: merge class 6 into class 3",
+            "            output_2d = np.where(output_2d == 6, 3, output_2d)",
+            "            ",
+            "            logging.info(f\"Multi-class output processed. Original classes: {output.shape[1]}\")",
+            "            logging.info(f\"Unique classes in output: {np.unique(output_2d)}\")",
+            "            logging.info(f\"Class distribution: {np.bincount(output_2d.flatten())}\")",
             "    elif output.ndim == 3:",
             "        # Remove batch dimension",
             "        output_2d = output[0]",
+            "        logging.info(\"3D output detected, removed batch dimension\")",
             "    else:",
             "        # Handle other cases",
             "        output_2d = np.squeeze(output)",
             "        if output_2d.ndim != 2:",
+            "            logging.error(f\"Cannot process output shape: {output.shape}\")",
+            "            logging.error(f\"After squeeze: {output_2d.shape}\")",
             "            raise ValueError(f\"Unexpected output shape after processing: {output_2d.shape}\")",
+            "        logging.info(\"Applied squeeze to output\")",
+            "    ",
+            "    # Ensure output is 2D",
+            "    if output_2d.ndim != 2:",
+            "        raise ValueError(f\"Final output must be 2D, got shape: {output_2d.shape}\")",
             "    ",
             "    # Determine output timestamp (use the latest timestamp)",
             "    output_timestamp = time_coords[-1]",
@@ -923,18 +943,34 @@ class ModelManagement:
             "    # Get spatial coordinates from reference array",
             "    spatial_coords = {dim: reference_array.coords[dim] for dim in spatial_dims}",
             "    ",
-            "    # Create output DataArray",
+            "    # Create output DataArray with appropriate data type",
+            "    # Use int32 for classification, float32 for regression",
+            "    is_multiclass = output.ndim == 4 and output.shape[1] > 1",
+            "    if is_multiclass:",
+            "        # Multi-class classification - use integer type",
+            "        output_dtype = np.int32",
+            "        output_type = 'classification'",
+            "    else:",
+            "        # Single output - use float type",
+            "        output_dtype = np.float32",
+            "        output_type = 'regression'",
+            "    ",
             "    result = xr.DataArray(",
-            "        data=np.expand_dims(output_2d.astype(np.float32), axis=0),",
+            "        data=np.expand_dims(output_2d.astype(output_dtype), axis=0),",
             "        dims=['time'] + spatial_dims,",
             "        coords={",
             "            'time': [output_timestamp.values],",
             "            spatial_dims[0]: spatial_coords[spatial_dims[0]].values,",
             "            spatial_dims[1]: spatial_coords[spatial_dims[1]].values",
+            "        },",
+            "        attrs={",
+            "            'description': 'CNN model prediction',",
             "        }",
             "    )",
             "    ",
             "    logging.info(f\"Final result shape: {result.shape}\")",
+            "    logging.info(f\"Final result data type: {result.dtype}\")",
+            "    logging.info(f\"Final result value range: {result.values.min()} to {result.values.max()}\")",
         ])
         
         # Add postprocessing call if postprocessing exists

{terrakio_core-0.4.0 → terrakio_core-0.4.2}/terrakio_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terrakio-core
-Version: 0.4.0
+Version: 0.4.2
 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