Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ jobs:
- name: Create .env file
run: |
echo "DATABASE_URL=sqlite:///:memory:" >> .env

echo "KEYCLOAK_HOST=http://localhost" >> .env
echo "KEYCLOAK_REALM=apex" >> .env
echo "KEYCLOAK_CLIENT_ID=apex-dispatcher-api-local" >> .env
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
13 changes: 8 additions & 5 deletions app/platforms/implementations/openeo.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,9 @@ async def _transform_parameters(
for param in service_params:
if param.type == ParamTypeEnum.BOUNDING_BOX and param.name in parameters:
# Transform GeoJSON to bounding box
geojson = parameters[param.name]
if geojson.get("type") == "Polygon":
coordinates = geojson.get("coordinates", [])
value = parameters[param.name]
if value.get("type") == "Polygon":
coordinates = value.get("coordinates", [])
if coordinates and isinstance(coordinates, list):
# Assuming the first set of coordinates defines the polygon
polygon_coords = coordinates[0]
Expand All @@ -489,12 +489,15 @@ async def _transform_parameters(
}
else:
raise ValueError(
f"Invalid GeoJSON geometry for parameter {param.name}: {geojson}"
f"Invalid GeoJSON geometry for parameter {param.name}: {value}"
)
elif ["east", "north", "south", "west"] == sorted(value.keys()):
# Already in bounding box format, no transformation needed
transformed_parameters[param.name] = value
else:
raise ValueError(
f"Unsupported GeoJSON type for parameter {param.name}: "
f"{geojson.get('type')}"
f"{value.get('type')}"
)
logger.debug(f"Transformed parameters for openEO: {transformed_parameters}")
return transformed_parameters
117 changes: 117 additions & 0 deletions tests/platforms/test_openeo_platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,37 @@ async def test_transform_parameters_passthrough_when_not_applicable(
assert result == parameters


@pytest.mark.asyncio
@patch.object(OpenEOPlatform, "get_service_parameters", new_callable=AsyncMock)
async def test_transform_parameters_bbox_passthrough_when_already_bbox(
mock_get_service_parameters, platform, service_details
):
mock_get_service_parameters.return_value = [
Parameter(
name="area",
description="Area of interest",
type=ParamTypeEnum.BOUNDING_BOX,
optional=False,
)
]

parameters = {
"area": {
"north": 52.0,
"west": 3.0,
"east": 5.0,
"south": 50.0,
},
"other": "untouched",
}

result = await platform._transform_parameters(
user_token="fake-token", details=service_details, parameters=parameters
)

assert result == parameters


@pytest.mark.asyncio
@patch.object(OpenEOPlatform, "get_service_parameters", new_callable=AsyncMock)
async def test_transform_parameters_raises_for_unsupported_geojson_type(
Expand Down Expand Up @@ -1105,3 +1136,89 @@ async def test_transform_parameters_raises_for_invalid_polygon_coordinates(
await platform._transform_parameters(
user_token="fake-token", details=service_details, parameters=parameters
)


@pytest.mark.asyncio
@patch.object(OpenEOPlatform, "get_service_parameters", new_callable=AsyncMock)
async def test_transform_parameters_raises_for_non_list_polygon_coordinates(
mock_get_service_parameters, platform, service_details
):
mock_get_service_parameters.return_value = [
Parameter(
name="area",
description="Area of interest",
type=ParamTypeEnum.BOUNDING_BOX,
optional=False,
)
]

parameters = {
"area": {
"type": "Polygon",
"coordinates": "not-a-list",
}
}

with pytest.raises(ValueError, match="Invalid GeoJSON geometry"):
await platform._transform_parameters(
user_token="fake-token", details=service_details, parameters=parameters
)


@pytest.mark.asyncio
@patch.object(OpenEOPlatform, "get_service_parameters", new_callable=AsyncMock)
async def test_transform_parameters_mixed_bbox_inputs(
mock_get_service_parameters, platform, service_details
):
mock_get_service_parameters.return_value = [
Parameter(
name="area_polygon",
description="Polygon area",
type=ParamTypeEnum.BOUNDING_BOX,
optional=False,
),
Parameter(
name="area_bbox",
description="Bounding box area",
type=ParamTypeEnum.BOUNDING_BOX,
optional=False,
),
Parameter(
name="date",
description="Date interval",
type=ParamTypeEnum.DATE_INTERVAL,
optional=True,
),
]

parameters = {
"area_polygon": {
"type": "Polygon",
"coordinates": [
[
[3.0, 50.0],
[5.0, 50.0],
[5.0, 52.0],
[3.0, 52.0],
[3.0, 50.0],
]
],
},
"area_bbox": {
"south": 49.0,
"east": 6.0,
"north": 53.0,
"west": 2.0,
},
"date": ["2024-01-01", "2024-12-31"],
}

result = await platform._transform_parameters(
user_token="fake-token", details=service_details, parameters=parameters
)

assert result == {
"area_polygon": {"west": 3.0, "south": 50.0, "east": 5.0, "north": 52.0},
"area_bbox": {"south": 49.0, "east": 6.0, "north": 53.0, "west": 2.0},
"date": ["2024-01-01", "2024-12-31"],
}
Loading