Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
GraceDB Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IGWN Computing and Software
GraceDB
GraceDB Server
Commits
d600a3d2
Commit
d600a3d2
authored
6 years ago
by
Tanner Prestegard
Committed by
GraceDB
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
adding search filter and ordering filter to superevents api
parent
a1ad2f68
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!8
Superevents
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gracedb/superevents/api/filters.py
+79
-0
79 additions, 0 deletions
gracedb/superevents/api/filters.py
gracedb/superevents/api/views.py
+5
-1
5 additions, 1 deletion
gracedb/superevents/api/views.py
with
84 additions
and
1 deletion
gracedb/superevents/api/filters.py
0 → 100644
+
79
−
0
View file @
d600a3d2
from
rest_framework
import
filters
,
exceptions
from
django.http
import
HttpResponseBadRequest
from
..query
import
parseSupereventQuery
from
pyparsing
import
ParseException
import
logging
logger
=
logging
.
getLogger
(
__name__
)
class
SupereventSearchFilter
(
filters
.
SearchFilter
):
search_param
=
'
query
'
def
get_search_terms
(
self
,
request
):
# Custom because we don't want default behavior of splitting on spaces
return
request
.
query_params
.
get
(
self
.
search_param
,
''
)
def
filter_queryset
(
self
,
request
,
queryset
,
view
):
query
=
self
.
get_search_terms
(
request
)
if
not
query
:
return
queryset
# Do filtering
try
:
filter_params
=
parseSupereventQuery
(
query
)
except
ParseException
as
e
:
raise
exceptions
.
ParseError
(
'
Invalid query
'
)
return
queryset
.
filter
(
filter_params
)
class
SupereventOrderingFilter
(
filters
.
OrderingFilter
):
ordering_param
=
'
sort
'
field_map
=
{
'
created
'
:
u
'
date_created
'
,
'
preferred_event
'
:
u
'
preferred_event__id
'
,
'
id
'
:
[
u
'
t_0_date
'
,
u
'
is_gw
'
,
u
'
gw_date_number
'
,
'
base_date_number
'
],
'
superevent_id
'
:
[
u
'
t_0_date
'
,
u
'
is_gw
'
,
u
'
gw_date_number
'
,
'
base_date_number
'
],
}
def
custom_field_mapping
(
self
,
fields
):
out_fields
=
[]
for
f
in
fields
:
prefix
=
'
-
'
if
f
.
startswith
(
'
-
'
)
else
''
f_s
=
f
.
lstrip
(
'
-
'
)
if
f_s
in
self
.
field_map
.
keys
():
mapped_fields
=
self
.
field_map
[
f_s
]
if
not
isinstance
(
mapped_fields
,
list
):
mapped_fields
=
[
mapped_fields
]
if
prefix
:
mapped_fields
=
[
prefix
+
f
for
f
in
mapped_fields
]
out_fields
.
extend
(
mapped_fields
)
else
:
out_fields
.
append
(
f
)
return
out_fields
def
get_ordering
(
self
,
request
,
queryset
,
view
):
"""
Same as base class get_ordering method except we add in custom
mappings between ordering keywords and fields.
"""
# Get ordering fields from request query params
params
=
request
.
query_params
.
get
(
self
.
ordering_param
)
if
params
:
fields
=
[
param
.
strip
()
for
param
in
params
.
split
(
'
,
'
)]
# Get custom field mappings
fields
=
self
.
custom_field_mapping
(
fields
)
# Remove invalid fields
ordering
=
self
.
remove_invalid_fields
(
queryset
,
fields
,
view
,
request
)
if
ordering
:
return
ordering
# No ordering was included, or all the ordering fields were invalid
return
self
.
get_default_ordering
(
view
)
This diff is collapsed.
Click to expand it.
gracedb/superevents/api/views.py
+
5
−
1
View file @
d600a3d2
...
@@ -22,6 +22,7 @@ from events.view_utils import reverse as gracedb_reverse
...
@@ -22,6 +22,7 @@ from events.view_utils import reverse as gracedb_reverse
#from events.api.views import IsAuthorizedForPipeline, LigoLwRenderer
#from events.api.views import IsAuthorizedForPipeline, LigoLwRenderer
from
events.api.backends
import
LigoAuthentication
from
events.api.backends
import
LigoAuthentication
from
.filters
import
SupereventSearchFilter
,
SupereventOrderingFilter
from
.mixins
import
GetParentSupereventMixin
,
BaseGetObjectMixin
from
.mixins
import
GetParentSupereventMixin
,
BaseGetObjectMixin
from
.paginators
import
BasePaginationFactory
,
CustomLabelPagination
,
\
from
.paginators
import
BasePaginationFactory
,
CustomLabelPagination
,
\
CustomLogTagPagination
,
CustomSupereventPagination
CustomLogTagPagination
,
CustomSupereventPagination
...
@@ -29,7 +30,6 @@ from .serializers import SupereventSerializer, SupereventUpdateSerializer, \
...
@@ -29,7 +30,6 @@ from .serializers import SupereventSerializer, SupereventUpdateSerializer, \
SupereventEventSerializer
,
SupereventLabelSerializer
,
\
SupereventEventSerializer
,
SupereventLabelSerializer
,
\
SupereventLogSerializer
,
SupereventLogTagSerializer
,
\
SupereventLogSerializer
,
SupereventLogTagSerializer
,
\
SupereventVOEventSerializer
,
SupereventEMObservationSerializer
SupereventVOEventSerializer
,
SupereventEMObservationSerializer
from
.settings
import
SUPEREVENT_LOOKUP_FIELD
,
SUPEREVENT_LOOKUP_REGEX
from
.settings
import
SUPEREVENT_LOOKUP_FIELD
,
SUPEREVENT_LOOKUP_REGEX
import
os
import
os
...
@@ -47,6 +47,10 @@ class SupereventViewSet(viewsets.ModelViewSet):
...
@@ -47,6 +47,10 @@ class SupereventViewSet(viewsets.ModelViewSet):
pagination_class
=
CustomSupereventPagination
pagination_class
=
CustomSupereventPagination
lookup_field
=
SUPEREVENT_LOOKUP_FIELD
lookup_field
=
SUPEREVENT_LOOKUP_FIELD
lookup_value_regex
=
SUPEREVENT_LOOKUP_REGEX
lookup_value_regex
=
SUPEREVENT_LOOKUP_REGEX
filter_backends
=
(
SupereventSearchFilter
,
SupereventOrderingFilter
,)
ordering_fields
=
(
'
date_created
'
,
'
t_0
'
,
'
t_start
'
,
'
t_end
'
,
'
preferred_event__id
'
,
'
t_0_date
'
,
'
is_gw
'
,
'
base_date_number
'
,
'
gw_date_number
'
)
def
get_serializer_class
(
self
):
def
get_serializer_class
(
self
):
"""
Select a different serializer for updates
"""
"""
Select a different serializer for updates
"""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment