ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-02-11 23:34:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix NewListBucketsHelper backwards compatibility

Browse Source
This commit is contained in:
allegroai 2023-07-26 18:27:51 +03:00
parent 011164ce9b
commit 8061dfedbb
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,8 +137,8 @@ class GetMixin(PropsMixin):
op_prefix = "__$" op_prefix = "__$"
_unary_operators = { _unary_operators = {
"__$not": False, "__$not": False,
"__$nop": True,
} }
_reset_operator = "__$nop"
_operators = { _operators = {
"__$all": Q.AND, "__$all": Q.AND,
"__$and": Q.AND, "__$and": Q.AND,
@ -154,20 +154,22 @@ class GetMixin(PropsMixin):
@attr.s(auto_attribs=True) @attr.s(auto_attribs=True)
class Term: class Term:
operator: str = None operator: str = None
reset: bool = False
include: bool = True include: bool = True
value: str = None value: str = None
def __init__(self, field: str, data: Sequence[str], legacy=False): def __init__(self, field: str, data: Sequence[str], legacy=False):
self._field = field self._field = field
self._support_legacy = legacy
self.allow_empty = False self.allow_empty = False
self.global_operator = None self.global_operator = None
self.actions = defaultdict(list) self.actions = defaultdict(list)
self._support_legacy = legacy
current_context = self.default_operator current_context = self.default_operator
for d in self._get_next_term(data): for d in self._get_next_term(data):
if d.operator is not None: if d.operator is not None:
current_context = d.operator current_context = d.operator
self._support_legacy = False
if self.global_operator is None: if self.global_operator is None:
self.global_operator = d.operator self.global_operator = d.operator
continue continue
@ -175,6 +177,11 @@ class GetMixin(PropsMixin):
if self.global_operator is None: if self.global_operator is None:
self.global_operator = self.default_operator self.global_operator = self.default_operator
if d.reset:
current_context = self.default_operator
self._support_legacy = legacy
continue
if d.value is None: if d.value is None:
self.allow_empty = True self.allow_empty = True
continue continue
@ -186,7 +193,9 @@ class GetMixin(PropsMixin):
if self.global_operator is None: if self.global_operator is None:
self.global_operator = self.default_operator self.global_operator = self.default_operator
def _get_next_term(self, data: Sequence[str]) -> Generator[Term, None, None]: def _get_next_term(
self, data: Sequence[str]
) -> Generator[Term, None, None]:
unary_operator = None unary_operator = None
for value in data: for value in data:
if value is None: if value is None:
@ -201,6 +210,11 @@ class GetMixin(PropsMixin):
value=str(value), value=str(value),
) )
if value == self._reset_operator:
unary_operator = None
yield self.Term(reset=True)
continue
if value.startswith(self.op_prefix): if value.startswith(self.op_prefix):
if unary_operator: if unary_operator:
raise FieldsValueError( raise FieldsValueError(
@ -215,14 +229,12 @@ class GetMixin(PropsMixin):
operator = self._operators.get(value) operator = self._operators.get(value)
if operator is None: if operator is None:
raise FieldsValueError( raise FieldsValueError(
"Unsupported operator", "Unsupported operator", field=self._field, operator=value,
field=self._field,
operator=value,
) )
yield self.Term(operator=operator) yield self.Term(operator=operator)
continue continue
if self._support_legacy and value.startswith("-"): if not unary_operator and self._support_legacy and value.startswith("-"):
value = value[1:] value = value[1:]
if not value: if not value:
raise FieldsValueError( raise FieldsValueError(
@ -230,7 +242,6 @@ class GetMixin(PropsMixin):
field=self._field, field=self._field,
value=value, value=value,
) )
unary_operator = None
yield self.Term(value=value, include=False) yield self.Term(value=value, include=False)
continue continue