Merge branch 'main' of github.com:geo-engine/geoengine-python into da…

…taset_and_ml_model_name_in_res
geo-engine · Jan 31, 2025 · 1ac7307 · 1ac7307
2 parents d091eae + 12c8f55
commit 1ac7307
Show file tree

Hide file tree

Showing 28 changed files with 4,000 additions and 4,207 deletions.
diff --git a/.github/.backend_git_ref b/.github/.backend_git_ref
@@ -1 +1 @@
-add_ml_permissions
+main
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   check:
-    uses: geo-engine/geoengine-python/.github/workflows/test-python.yml@reusable-workflow
+    uses: geo-engine/geoengine-python/.github/workflows/test-python.yml@main
 
     strategy:
       fail-fast: false
@@ -28,7 +28,7 @@ jobs:
   # Checks the library using minimum version resolution
   # `uv` has this feature built-in, c.f. https://github.com/astral-sh/uv
   check-min-version:
-    uses: geo-engine/geoengine-python/.github/workflows/test-python.yml@reusable-workflow
+    uses: geo-engine/geoengine-python/.github/workflows/test-python.yml@main
 
     with:
       python-version: 3.9

diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,5 @@ env-*
 # Downloaded files
 examples/raster_download.tif
 examples/download
-examples/test
+examples/test
+examples/export_data/test
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Geo Engine Python Package
 
-[![CI](https://github.com/geo-engine/geoengine-python/actions/workflows/ci.yml/badge.svg)](https://github.com/geo-engine/geoengine-python/actions/workflows/ci.yml)
+[![CI](https://github.com/geo-engine/geoengine-python/actions/workflows/ci.yml/badge.svg?event=merge_group)](https://github.com/geo-engine/geoengine-python/actions/workflows/ci.yml?query=event%3Amerge_group)
 [![Coverage Status](https://coveralls.io/repos/github/geo-engine/geoengine-python/badge.svg)](https://coveralls.io/github/geo-engine/geoengine-python)
 [![Documentation](https://img.shields.io/badge/documentation-python.docs.geoengine.io-blue)](https://python.docs.geoengine.io/)
 

diff --git a/examples/add_public_raster_dataset.ipynb b/examples/add_public_raster_dataset.ipynb
diff --git a/examples/add_public_vector_dataset.ipynb b/examples/add_public_vector_dataset.ipynb
@@ -81,7 +81,7 @@
     {
      "data": {
       "text/plain": [
-       "MetaDataDefinition(oneof_schema_1_validator=None, oneof_schema_2_validator=None, oneof_schema_3_validator=None, oneof_schema_4_validator=None, oneof_schema_5_validator=None, oneof_schema_6_validator=None, actual_instance=OgrMetaData(loading_info=OgrSourceDataset(attribute_query=None, cache_ttl=None, columns=OgrSourceColumnSpec(bool=None, datetime=None, var_float=[], format_specifics=None, int=[], rename=None, text=[], x='', y=''), data_type=<VectorDataType.MULTIPOLYGON: 'MultiPolygon'>, default_geometry=None, file_name='vector/data/germany_polygon.gpkg', force_ogr_spatial_filter=None, force_ogr_time_filter=None, layer_name='test_germany', on_error=<OgrSourceErrorSpec.ABORT: 'abort'>, sql_query=None, time=OgrSourceDatasetTimeType(oneof_schema_1_validator=None, oneof_schema_2_validator=None, oneof_schema_3_validator=None, oneof_schema_4_validator=None, actual_instance=OgrSourceDatasetTimeTypeNone(type='none'), one_of_schemas=typing.Literal['OgrSourceDatasetTimeTypeNone', 'OgrSourceDatasetTimeTypeStart', 'OgrSourceDatasetTimeTypeStartDuration', 'OgrSourceDatasetTimeTypeStartEnd'], discriminator_value_class_map={})), result_descriptor=VectorResultDescriptor(bbox=BoundingBox2D(lower_left_coordinate=Coordinate2D(x=5.85249, y=47.271121), upper_right_coordinate=Coordinate2D(x=15.022059, y=55.065334)), columns={}, data_type=<VectorDataType.MULTIPOLYGON: 'MultiPolygon'>, spatial_reference='EPSG:4326', time=None), type='OgrMetaData'), one_of_schemas=typing.Literal['GdalMetaDataList', 'GdalMetaDataRegular', 'GdalMetaDataStatic', 'GdalMetadataNetCdfCf', 'MockMetaData', 'OgrMetaData'], discriminator_value_class_map={})"
+       "MetaDataDefinition(oneof_schema_1_validator=None, oneof_schema_2_validator=None, oneof_schema_3_validator=None, oneof_schema_4_validator=None, oneof_schema_5_validator=None, oneof_schema_6_validator=None, actual_instance=OgrMetaData(loading_info=OgrSourceDataset(attribute_query=None, cache_ttl=None, columns=OgrSourceColumnSpec(bool=None, datetime=None, float=[], format_specifics=None, int=[], rename=None, text=[], x='', y=''), data_type=<VectorDataType.MULTIPOLYGON: 'MultiPolygon'>, default_geometry=None, file_name='vector/data/germany_polygon.gpkg', force_ogr_spatial_filter=None, force_ogr_time_filter=None, layer_name='test_germany', on_error=<OgrSourceErrorSpec.ABORT: 'abort'>, sql_query=None, time=OgrSourceDatasetTimeType(oneof_schema_1_validator=None, oneof_schema_2_validator=None, oneof_schema_3_validator=None, oneof_schema_4_validator=None, actual_instance=OgrSourceDatasetTimeTypeNone(type='none'), one_of_schemas=['OgrSourceDatasetTimeTypeNone', 'OgrSourceDatasetTimeTypeStart', 'OgrSourceDatasetTimeTypeStartDuration', 'OgrSourceDatasetTimeTypeStartEnd'], discriminator_value_class_map={})), result_descriptor=VectorResultDescriptor(bbox=BoundingBox2D(lower_left_coordinate=Coordinate2D(x=5.85249, y=47.271121), upper_right_coordinate=Coordinate2D(x=15.022059, y=55.065334)), columns={}, data_type=<VectorDataType.MULTIPOLYGON: 'MultiPolygon'>, spatial_reference='EPSG:4326', time=None), type='OgrMetaData'), one_of_schemas=['GdalMetaDataList', 'GdalMetaDataRegular', 'GdalMetaDataStatic', 'GdalMetadataNetCdfCf', 'MockMetaData', 'OgrMetaData'], discriminator_value_class_map={})"
       ]
      },
      "execution_count": 4,
@@ -174,26 +174,6 @@
    "execution_count": 6,
    "metadata": {},
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/home/kremerl/geoengine-python/env/lib/python3.10/site-packages/pydantic/main.py:347: UserWarning: Pydantic serializer warnings:\n",
-      "  Expected `list[str]` but got `_LiteralGenericAlias` - serialized value may not be as expected\n",
-      "  Expected `Union[definition-ref, definition-ref, definition-ref, definition-ref, definition-ref, definition-ref]` but got `OgrMetaData` - serialized value may not be as expected\n",
-      "  Expected `list[str]` but got `_LiteralGenericAlias` - serialized value may not be as expected\n",
-      "  Expected `list[str]` but got `_LiteralGenericAlias` - serialized value may not be as expected\n",
-      "  return self.__pydantic_serializer__.to_python(\n",
-      "/home/kremerl/geoengine-python/env/lib/python3.10/site-packages/pydantic/main.py:347: UserWarning: Pydantic serializer warnings:\n",
-      "  Expected `Union[definition-ref, definition-ref, definition-ref, definition-ref, definition-ref, definition-ref]` but got `OgrMetaData` - serialized value may not be as expected\n",
-      "  Expected `list[str]` but got `_LiteralGenericAlias` - serialized value may not be as expected\n",
-      "  Expected `list[str]` but got `_LiteralGenericAlias` - serialized value may not be as expected\n",
-      "  return self.__pydantic_serializer__.to_python(\n",
-      "/home/kremerl/geoengine-python/env/lib/python3.10/site-packages/pydantic/main.py:347: UserWarning: Pydantic serializer warnings:\n",
-      "  Expected `list[str]` but got `_LiteralGenericAlias` - serialized value may not be as expected\n",
-      "  return self.__pydantic_serializer__.to_python(\n"
-     ]
-    },
     {
      "data": {
       "text/plain": [
@@ -348,7 +328,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Operator: Operator: UnknownDatasetName\n"
+      "UnknownDatasetName: Dataset name 'germany_polygon' does not exist\n"
      ]
     }
    ],

diff --git a/examples/band_neighborhood_aggregate.ipynb b/examples/band_neighborhood_aggregate.ipynb
diff --git a/examples/colorizer.ipynb b/examples/colorizer.ipynb
diff --git a/examples/large_raster_download_to_gdal.ipynb → ..._data/large_raster_download_to_gdal.ipynb b/examples/large_raster_download_to_gdal.ipynb → ..._data/large_raster_download_to_gdal.ipynb
diff --git a/examples/expression.ipynb b/examples/expression.ipynb
diff --git a/examples/interpolation.ipynb b/examples/interpolation.ipynb