Skip to content

Catch EDR AttributeError errors more fine grained #2118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Catch EDR AttributeError errors more fine grained #2118

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94868fa
fix EDR error handling
C-Loftus Sep 25, 2025
b14dfdb
test commit
C-Loftus Sep 29, 2025
479986a
Merge branch 'geopython:master' into fixEDRErrorHandling
C-Loftus Oct 2, 2025
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
18 changes: 14 additions & 4 deletions pygeoapi/provider/base_edr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
# =================================================================

import logging
from typing import Optional

from pygeoapi.provider.base import BaseProvider, ProviderInvalidDataError
from pygeoapi.provider.base import (BaseProvider, ProviderInvalidDataError,
ProviderQueryError)

LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -116,8 +118,16 @@ def query(self, **kwargs):

:returns: coverage data as `dict` of CoverageJSON or native format
"""

query_type: Optional[str] = kwargs.get('query_type')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

        query_type = kwargs.get('query_type')

        if query_type is None:
            raise ProviderQueryError('Missing query_type parameter is required')

if not query_type:
raise ProviderQueryError(
'query_type parameter is required'
)
try:
return getattr(self, kwargs.get('query_type'))(**kwargs)
query_function = getattr(self, query_type)
except AttributeError:
raise NotImplementedError('Query not implemented!')
raise NotImplementedError(
f'Query "{query_type}" not implemented in registered query types: {self.query_types}' # noqa
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A client can always autodiscover the query types from collection links. Suggest, then:

f'Query type not implemented'.

)

return query_function(**kwargs)