Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf0d2b76

Browse files
author
oleksandr.volha
committed
fixes
1 parent8727c86 commitf0d2b76

File tree

13 files changed

+27
-45
lines changed

13 files changed

+27
-45
lines changed

‎uncoder-core/app/translator/core/custom_types/functions.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class FunctionType(CustomEnum):
2222
upper="upper"
2323

2424
array_length="array_length"
25-
compare="compare"
2625
extract_time="extract_time"
2726
ipv4_is_in_range="ipv4_is_in_range"
2827

‎uncoder-core/app/translator/core/functions.py‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
fromapp.translator.core.exceptions.functionsimportNotSupportedFunctionException
2727
fromapp.translator.core.mappingimportSourceMapping
28-
fromapp.translator.core.models.fieldimportAlias,Field
2928
fromapp.translator.core.models.functions.baseimportFunction,ParsedFunctions,RenderedFunctions
29+
fromapp.translator.core.models.query_tokens.fieldimportAlias,Field
3030
fromapp.translator.tools.utilsimportexecute_module
3131
fromsettingsimportINIT_FUNCTIONS
3232

@@ -83,7 +83,6 @@ def parse(self, func_body: str, raw: str) -> Function:
8383
classFunctionRender(ABC):
8484
function_names_map:ClassVar[dict[str,str]]= {}
8585
order_to_render:int=0
86-
in_query_render:bool=False
8786
render_to_prefix:bool=False
8887
manager:PlatformFunctionsManager=None
8988

@@ -117,7 +116,6 @@ def __init__(self):
117116
self._parsers_map:dict[str,FunctionParser]= {}# {platform_func_name: FunctionParser}
118117

119118
self._renders_map:dict[str,FunctionRender]= {}# {generic_func_name: FunctionRender}
120-
self._in_query_renders_map:dict[str,FunctionRender]= {}# {generic_func_name: FunctionRender}
121119
self._order_to_render:dict[str,int]= {}# {generic_func_name: int}
122120

123121
defregister_render(self,render_class:type[FunctionRender])->type[FunctionRender]:
@@ -126,8 +124,6 @@ def register_render(self, render_class: type[FunctionRender]) -> type[FunctionRe
126124
forgeneric_function_nameinrender.function_names_map:
127125
self._renders_map[generic_function_name]=render
128126
self._order_to_render[generic_function_name]=render.order_to_render
129-
ifrender.in_query_render:
130-
self._in_query_renders_map[generic_function_name]=render
131127

132128
returnrender_class
133129

@@ -149,24 +145,16 @@ def get_hof_parser(self, platform_func_name: str) -> HigherOrderFunctionParser:
149145

150146
raiseNotSupportedFunctionException
151147

152-
defget_parser(self,platform_func_name:str)->FunctionParser:
148+
defget_parser(self,platform_func_name:str)->Optional[FunctionParser]:
153149
ifINIT_FUNCTIONSand (parser:=self._parsers_map.get(platform_func_name)):
154150
returnparser
155151

156-
raiseNotSupportedFunctionException
157-
158152
defget_render(self,generic_func_name:str)->FunctionRender:
159153
ifINIT_FUNCTIONSand (render:=self._renders_map.get(generic_func_name)):
160154
returnrender
161155

162156
raiseNotSupportedFunctionException
163157

164-
defget_in_query_render(self,generic_func_name:str)->FunctionRender:
165-
ifINIT_FUNCTIONSand (render:=self._in_query_renders_map.get(generic_func_name)):
166-
returnrender
167-
168-
raiseNotSupportedFunctionException
169-
170158
@property
171159
deforder_to_render(self)->dict[str,int]:
172160
ifINIT_FUNCTIONS:

‎uncoder-core/app/translator/core/models/functions/base.py‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
from __future__importannotations
22

33
fromdataclassesimportdataclass,field
4-
fromtypingimportOptional,Union
4+
fromtypingimportTYPE_CHECKING,Optional,Union
55

6-
fromapp.translator.core.models.fieldimportAlias,Field,FieldValue,Keyword
7-
fromapp.translator.core.models.identifierimportIdentifier
6+
fromapp.translator.core.models.query_tokens.fieldimportAlias,Field
7+
fromapp.translator.core.models.query_tokens.field_fieldimportFieldField
8+
fromapp.translator.core.models.query_tokens.field_valueimportFieldValue
9+
fromapp.translator.core.models.query_tokens.identifierimportIdentifier
10+
fromapp.translator.core.models.query_tokens.keywordimportKeyword
11+
12+
ifTYPE_CHECKING:
13+
fromapp.translator.core.models.query_tokens.function_valueimportFunctionValue
814

915

1016
@dataclass
1117
classFunction:
1218
name:str=None
13-
args:list[Union[Alias,Field,FieldValue,Keyword,Function,Identifier,str,bool]]=field(default_factory=list)
19+
args:list[
20+
Union[Alias,Field,FieldField,FieldValue,FunctionValue,Keyword,Function,Identifier,int,str,bool]
21+
]=field(default_factory=list)
1422
alias:Optional[Alias]=None
1523
raw:str=""
1624

‎uncoder-core/app/translator/core/models/functions/bin.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,15 @@
22
fromtypingimportOptional
33

44
fromapp.translator.core.custom_types.functionsimportFunctionType
5-
fromapp.translator.core.models.fieldimportField
5+
fromapp.translator.core.custom_types.timeimportTimeFrameType
66
fromapp.translator.core.models.functions.baseimportFunction
7-
fromapp.translator.tools.custom_enumimportCustomEnum
8-
9-
10-
classSpanType(CustomEnum):
11-
days="days"
12-
hours="hours"
13-
minutes="minutes"
7+
fromapp.translator.core.models.query_tokens.fieldimportField
148

159

1610
@dataclass
1711
classSpan:
1812
value:str="1"
19-
type_:str=SpanType.days
13+
type_:str=TimeFrameType.days
2014

2115

2216
@dataclass

‎uncoder-core/app/translator/core/models/functions/eval.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
fromtypingimportUnion
33

44
fromapp.translator.core.custom_types.functionsimportFunctionType
5-
fromapp.translator.core.models.fieldimportAlias,Field
65
fromapp.translator.core.models.functions.baseimportFunction
7-
fromapp.translator.core.models.identifierimportIdentifier
6+
fromapp.translator.core.models.query_tokens.fieldimportAlias,Field
7+
fromapp.translator.core.models.query_tokens.identifierimportIdentifier
88

99

1010
@dataclass

‎uncoder-core/app/translator/core/models/functions/group_by.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
fromtypingimportUnion
33

44
fromapp.translator.core.custom_types.functionsimportFunctionType
5-
fromapp.translator.core.models.fieldimportAlias
65
fromapp.translator.core.models.functions.baseimportFunction
6+
fromapp.translator.core.models.query_tokens.fieldimportAlias
77

88

99
@dataclass

‎uncoder-core/app/translator/core/models/functions/join.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
fromtypingimportUnion
33

44
fromapp.translator.core.custom_types.functionsimportFunctionType
5-
fromapp.translator.core.models.fieldimportAlias,Field
65
fromapp.translator.core.models.functions.baseimportFunction
7-
fromapp.translator.core.models.identifierimportIdentifier
86
fromapp.translator.core.models.query_containerimportTokenizedQueryContainer
7+
fromapp.translator.core.models.query_tokens.fieldimportAlias,Field
8+
fromapp.translator.core.models.query_tokens.identifierimportIdentifier
99
fromapp.translator.tools.custom_enumimportCustomEnum
1010

1111

‎uncoder-core/app/translator/core/models/functions/rename.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
fromdataclassesimportdataclass
22

33
fromapp.translator.core.custom_types.functionsimportFunctionType
4-
fromapp.translator.core.models.fieldimportAlias,Field
54
fromapp.translator.core.models.functions.baseimportFunction
5+
fromapp.translator.core.models.query_tokens.fieldimportAlias,Field
66

77

88
@dataclass

‎uncoder-core/app/translator/core/models/functions/sort.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
fromtypingimportUnion
33

44
fromapp.translator.core.custom_types.functionsimportFunctionType
5-
fromapp.translator.core.models.fieldimportAlias,Field
65
fromapp.translator.core.models.functions.baseimportFunction
6+
fromapp.translator.core.models.query_tokens.fieldimportAlias,Field
77
fromapp.translator.tools.custom_enumimportCustomEnum
88

99

‎uncoder-core/app/translator/core/models/functions/timeframe.py‎renamed to ‎uncoder-core/app/translator/core/models/functions/time.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
fromdataclassesimportdataclass
22

33
fromapp.translator.core.custom_types.functionsimportFunctionType
4+
fromapp.translator.core.custom_types.timeimportTimeFrameType
45
fromapp.translator.core.models.functions.baseimportFunction
5-
fromapp.translator.tools.custom_enumimportCustomEnum
6-
7-
8-
classTimeFrameType(CustomEnum):
9-
days="days"
10-
hours="hours"
11-
minutes="minutes"
126

137

148
@dataclass

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp