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

Commit73dee61

Browse files
committed
gis-8825 cleaning
1 parent2123434 commit73dee61

File tree

5 files changed

+10
-22
lines changed

5 files changed

+10
-22
lines changed

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
fromapp.translator.core.exceptions.parserimportTokenizerGeneralException
2525
fromapp.translator.core.functionsimportPlatformFunctions
2626
fromapp.translator.core.mappingimportBasePlatformMappings,SourceMapping
27-
fromapp.translator.core.models.functions.baseimportFunction,ParsedFunctions
27+
fromapp.translator.core.models.functions.baseimportFunction
2828
fromapp.translator.core.models.platform_detailsimportPlatformDetails
2929
fromapp.translator.core.models.query_containerimportRawQueryContainer,TokenizedQueryContainer
3030
fromapp.translator.core.models.query_tokens.fieldimportField
@@ -51,9 +51,6 @@ def parse_raw_query(self, text: str, language: str) -> RawQueryContainer:
5151
defparse(self,raw_query_container:RawQueryContainer)->TokenizedQueryContainer:
5252
raiseNotImplementedError("Abstract method")
5353

54-
def_parse_query(self,query:str)->tuple[str,dict[str,Union[list[str],list[int]]],Optional[ParsedFunctions]]:
55-
raiseNotImplementedError("Abstract method")
56-
5754

5855
classPlatformQueryParser(QueryParser,ABC):
5956
mappings:BasePlatformMappings=None
@@ -91,8 +88,3 @@ def get_source_mappings(
9188
)
9289
self.tokenizer.set_field_tokens_generic_names_map(field_tokens,source_mappings,self.mappings.default_mapping)
9390
returnsource_mappings
94-
95-
defget_source_mapping_ids_by_logsources(self,query:str)->Optional[list[str]]:
96-
_,parsed_logsources,_=self._parse_query(query=query)
97-
ifparsed_logsources:
98-
returnself.mappings.get_source_mappings_by_log_sources(parsed_logsources)

‎uncoder-core/app/translator/platforms/base/aql/parsers/aql.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"""
1818

1919
importre
20-
fromtypingimportOptional,Union
20+
fromtypingimportUnion
2121

2222
fromapp.translator.core.exceptions.parserimportTokenizerGeneralException
2323
fromapp.translator.core.models.functions.baseimportParsedFunctions
@@ -105,7 +105,7 @@ def __parse_log_sources(self, query: str) -> tuple[dict[str, Union[list[str], li
105105

106106
returnlog_sources,query
107107

108-
def_parse_query(self,query:str)->tuple[str,dict[str,Union[list[str],list[int]]],Optional[ParsedFunctions]]:
108+
def_parse_query(self,text:str)->tuple[str,dict[str,Union[list[str],list[int]]],ParsedFunctions]:
109109
query=self.__clean_query(query)
110110
self.__check_table(query)
111111
query,functions=self.platform_functions.parse(query)

‎uncoder-core/app/translator/platforms/base/lucene/parsers/lucene.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
"""
1818

1919
importre
20-
fromtypingimportOptional,Union
2120

22-
fromapp.translator.core.models.functions.baseimportParsedFunctions
2321
fromapp.translator.core.models.query_containerimportRawQueryContainer,TokenizedQueryContainer
2422
fromapp.translator.core.parserimportPlatformQueryParser
2523
fromapp.translator.platforms.base.lucene.tokenizerimportLuceneTokenizer
@@ -33,7 +31,7 @@ class LuceneQueryParser(PlatformQueryParser):
3331

3432
wrapped_with_comment_pattern=r"^\s*//.*(?:\n|$)"
3533

36-
def_parse_query(self,query:str)->tuple[str,dict[str,Union[list[str],list[int]]],Optional[ParsedFunctions]]:
34+
def_parse_query(self,query:str)->tuple[str,dict[str,list[str]]]:
3735
log_sources= {}
3836
forsource_typeinself.log_source_key_types:
3937
pattern=self.log_source_pattern.replace("___source_type___",source_type)
@@ -45,10 +43,10 @@ def _parse_query(self, query: str) -> tuple[str, dict[str, Union[list[str], list
4543
pos_end=search.end()
4644
query=query[:pos_start]+query[pos_end:]
4745

48-
returnquery,log_sources,None
46+
returnquery,log_sources
4947

5048
defparse(self,raw_query_container:RawQueryContainer)->TokenizedQueryContainer:
51-
query,log_sources,_=self._parse_query(raw_query_container.query)
49+
query,log_sources=self._parse_query(raw_query_container.query)
5250
query_tokens=self.get_query_tokens(query)
5351
query_field_tokens,_,_=self.get_field_tokens(query_tokens)
5452
source_mappings=self.get_source_mappings(query_field_tokens,log_sources)

‎uncoder-core/app/translator/platforms/base/sql/parsers/sql.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"""
1818

1919
importre
20-
fromtypingimportOptional,Union
2120

2221
fromapp.translator.core.models.functions.baseimportParsedFunctions
2322
fromapp.translator.core.models.query_containerimportRawQueryContainer,TokenizedQueryContainer
@@ -32,18 +31,18 @@ class SqlQueryParser(PlatformQueryParser):
3231

3332
wrapped_with_comment_pattern=r"^\s*--.*(?:\n|$)"
3433

35-
def_parse_query(self,query:str)->tuple[str,dict[str,Union[list[str],list[int]]],Optional[ParsedFunctions]]:
34+
def_parse_query(self,query:str)->tuple[str,dict[str,list[str]]]:
3635
log_source= {"table": []}
3736
ifre.search(self.query_delimiter_pattern,query,flags=re.IGNORECASE):
3837
table_search=re.search(self.table_pattern,query)
3938
table=table_search.group("table")
4039
log_source["table"]= [table]
4140
returnre.split(self.query_delimiter_pattern,query,flags=re.IGNORECASE)[1],log_source,None
4241

43-
returnquery,log_source,None
42+
returnquery,log_source
4443

4544
defparse(self,raw_query_container:RawQueryContainer)->TokenizedQueryContainer:
46-
query,log_sources,_=self._parse_query(raw_query_container.query)
45+
query,log_sources=self._parse_query(raw_query_container.query)
4746
query_tokens=self.get_query_tokens(query)
4847
query_field_tokens,_,_=self.get_field_tokens(query_tokens)
4948
source_mappings=self.get_source_mappings(query_field_tokens,log_sources)

‎uncoder-core/app/translator/platforms/microsoft/parsers/microsoft_sentinel.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
-----------------------------------------------------------------
1717
"""
1818

19-
fromtypingimportOptional,Union
2019

2120
fromapp.translator.core.models.functions.baseimportParsedFunctions
2221
fromapp.translator.core.models.platform_detailsimportPlatformDetails
@@ -38,7 +37,7 @@ class MicrosoftSentinelQueryParser(PlatformQueryParser):
3837

3938
wrapped_with_comment_pattern=r"^\s*//.*(?:\n|$)"
4039

41-
def_parse_query(self,query:str)->tuple[str,dict[str,Union[list[str],list[int]]],Optional[ParsedFunctions]]:
40+
def_parse_query(self,query:str)->tuple[str,dict[str,list[str]],ParsedFunctions]:
4241
table,query,functions=self.platform_functions.parse(query)
4342
log_sources= {"table": [table]}
4443
returnquery,log_sources,functions

0 commit comments

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