ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-02-12 15:50:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix mongoengine cannot handle field name with leading or trailing "_" when used in fields query within get_all endpoints

Browse Source
This commit is contained in:
allegroai 2021-07-25 14:34:04 +03:00
parent 465e270342
commit ec2e071ab7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apiserver/database/model/base.py
View File

@ -117,7 +117,7 @@ class GetMixin(PropsMixin):
def __init__(self, legacy=False): def __init__(self, legacy=False):
self._legacy = legacy self._legacy = legacy
def key(self, v): def key(self, v) -> Optional[str]:
if v is None: if v is None:
self._next = self._default self._next = self._default
return self._default return self._default
@ -133,6 +133,7 @@ class GetMixin(PropsMixin):
next_ = self._next next_ = self._next
if not self._sticky: if not self._sticky:
self._next = self._default self._next = self._default
return next_ return next_
def value_transform(self, v): def value_transform(self, v):
@ -273,10 +274,13 @@ class GetMixin(PropsMixin):
).items(): ).items():
query &= cls.get_range_field_query(field, data) query &= cls.get_range_field_query(field, data)
for field in opts.fields or []: for field, data in cls._pop_matching_params(
data = parameters.pop(field, None) patterns=opts.fields or [], parameters=parameters
if data is not None: ).items():
dict_query[field] = data if "._" in field or "_." in field:
query &= Q(__raw__={field: data})
else:
dict_query[field.replace(".", "__")] = data
for field in opts.datetime_fields or []: for field in opts.datetime_fields or []:
data = parameters.pop(field, None) data = parameters.pop(field, None)