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

Gis 8064 FunctionValue class, query tokens refactoring#170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
alexvolha merged 7 commits intomainfromgis-8064
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletionsuncoder-core/app/translator/core/const.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
from typing import Union

from app.translator.core.models.field import Alias, Field, FieldValue, Keyword
from app.translator.core.models.identifier import Identifier
from app.translator.core.models.query_tokens.field import Alias, Field
from app.translator.core.models.query_tokens.field_field import FieldField
from app.translator.core.models.query_tokens.field_value import FieldValue
from app.translator.core.models.query_tokens.function_value import FunctionValue
from app.translator.core.models.query_tokens.identifier import Identifier
from app.translator.core.models.query_tokens.keyword import Keyword

TOKEN_TYPE = Union[FieldValue, Keyword, Identifier, Field, Alias]
QUERY_TOKEN_TYPE = Union[FieldField,FieldValue, FunctionValue, Keyword, Identifier, Field, Alias]
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ class FunctionType(CustomEnum):
upper = "upper"

array_length = "array_length"
compare = "compare"
extract_time = "extract_time"
ipv4_is_in_range = "ipv4_is_in_range"

Expand Down
16 changes: 2 additions & 14 deletionsuncoder-core/app/translator/core/functions.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@

from app.translator.core.exceptions.functions import NotSupportedFunctionException
from app.translator.core.mapping import SourceMapping
from app.translator.core.models.field import Alias, Field
from app.translator.core.models.functions.base import Function, ParsedFunctions, RenderedFunctions
from app.translator.core.models.query_tokens.field import Alias, Field
from app.translator.tools.utils import execute_module
from settings import INIT_FUNCTIONS

Expand DownExpand Up@@ -83,7 +83,6 @@ def parse(self, func_body: str, raw: str) -> Function:
class FunctionRender(ABC):
function_names_map: ClassVar[dict[str, str]] = {}
order_to_render: int = 0
in_query_render: bool = False
render_to_prefix: bool = False
manager: PlatformFunctionsManager = None

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

self._renders_map: dict[str, FunctionRender] = {} # {generic_func_name: FunctionRender}
self._in_query_renders_map: dict[str, FunctionRender] = {} # {generic_func_name: FunctionRender}
self._order_to_render: dict[str, int] = {} # {generic_func_name: int}

def register_render(self, render_class: type[FunctionRender]) -> type[FunctionRender]:
Expand All@@ -126,8 +124,6 @@ def register_render(self, render_class: type[FunctionRender]) -> type[FunctionRe
for generic_function_name in render.function_names_map:
self._renders_map[generic_function_name] = render
self._order_to_render[generic_function_name] = render.order_to_render
if render.in_query_render:
self._in_query_renders_map[generic_function_name] = render

return render_class

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

raise NotSupportedFunctionException

def get_parser(self, platform_func_name: str) -> FunctionParser:
def get_parser(self, platform_func_name: str) ->Optional[FunctionParser]:
if INIT_FUNCTIONS and (parser := self._parsers_map.get(platform_func_name)):
return parser

raise NotSupportedFunctionException

def get_render(self, generic_func_name: str) -> FunctionRender:
if INIT_FUNCTIONS and (render := self._renders_map.get(generic_func_name)):
return render

raise NotSupportedFunctionException

def get_in_query_render(self, generic_func_name: str) -> FunctionRender:
if INIT_FUNCTIONS and (render := self._in_query_renders_map.get(generic_func_name)):
return render

raise NotSupportedFunctionException

@property
def order_to_render(self) -> dict[str, int]:
if INIT_FUNCTIONS:
Expand Down
18 changes: 9 additions & 9 deletionsuncoder-core/app/translator/core/mixins/logic.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
from typing import Union

from app.translator.core.const import QUERY_TOKEN_TYPE
from app.translator.core.custom_types.tokens import GroupType, LogicalOperatorType
from app.translator.core.models.field import FieldValue, Keyword
from app.translator.core.models.identifier import Identifier
from app.translator.core.models.query_tokens.field_field import FieldField
from app.translator.core.models.query_tokens.field_value import FieldValue
from app.translator.core.models.query_tokens.function_value import FunctionValue
from app.translator.core.models.query_tokens.identifier import Identifier
from app.translator.core.models.query_tokens.keyword import Keyword


class ANDLogicOperatorMixin:
@staticmethod
def get_missed_and_token_indices(tokens: list[Union[FieldValue, Keyword, Identifier]]) -> list[int]:
def get_missed_and_token_indices(tokens: list[QUERY_TOKEN_TYPE]) -> list[int]:
missed_and_indices = []
for index in range(len(tokens) - 1):
token = tokens[index]
next_token = tokens[index + 1]
if (
isinstance(token, (FieldValue, Keyword))
isinstance(token, (FieldField,FieldValue, FunctionValue, Keyword))
or isinstance(token, Identifier)
and token.token_type == GroupType.R_PAREN
) and not (
Expand All@@ -23,9 +25,7 @@ def get_missed_and_token_indices(tokens: list[Union[FieldValue, Keyword, Identif
missed_and_indices.append(index + 1)
return list(reversed(missed_and_indices))

def add_and_token_if_missed(
self, tokens: list[Union[FieldValue, Keyword, Identifier]]
) -> list[Union[FieldValue, Keyword, Identifier]]:
def add_and_token_if_missed(self, tokens: list[QUERY_TOKEN_TYPE]) -> list[QUERY_TOKEN_TYPE]:
indices = self.get_missed_and_token_indices(tokens=tokens)
for index in indices:
tokens.insert(index, Identifier(token_type=LogicalOperatorType.AND))
Expand Down
2 changes: 1 addition & 1 deletionuncoder-core/app/translator/core/mixins/operator.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,7 @@
from typing import Optional, Union

from app.translator.core.custom_types.tokens import OperatorType
from app.translator.core.models.identifier import Identifier
from app.translator.core.models.query_tokens.identifier import Identifier


class WildCardMixin:
Expand Down
136 changes: 0 additions & 136 deletionsuncoder-core/app/translator/core/models/field.py
View file
Open in desktop

This file was deleted.

16 changes: 12 additions & 4 deletionsuncoder-core/app/translator/core/models/functions/base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
from __future__ import annotations

from dataclasses import dataclass, field
from typing import Optional, Union
from typing importTYPE_CHECKING,Optional, Union

from app.translator.core.models.field import Alias, Field, FieldValue, Keyword
from app.translator.core.models.identifier import Identifier
from app.translator.core.models.query_tokens.field import Alias, Field
from app.translator.core.models.query_tokens.field_field import FieldField
from app.translator.core.models.query_tokens.field_value import FieldValue
from app.translator.core.models.query_tokens.identifier import Identifier
from app.translator.core.models.query_tokens.keyword import Keyword

if TYPE_CHECKING:
from app.translator.core.models.query_tokens.function_value import FunctionValue


@dataclass
class Function:
name: str = None
args: list[Union[Alias, Field, FieldValue, Keyword, Function, Identifier, str, bool]] = field(default_factory=list)
args: list[
Union[Alias, Field, FieldField, FieldValue, FunctionValue, Keyword, Function, Identifier, int, str, bool]
] = field(default_factory=list)
alias: Optional[Alias] = None
raw: str = ""

Expand Down
12 changes: 3 additions & 9 deletionsuncoder-core/app/translator/core/models/functions/bin.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,21 +2,15 @@
from typing import Optional

from app.translator.core.custom_types.functions import FunctionType
from app.translator.core.models.field importField
from app.translator.core.custom_types.time importTimeFrameType
from app.translator.core.models.functions.base import Function
from app.translator.tools.custom_enum import CustomEnum


class SpanType(CustomEnum):
days = "days"
hours = "hours"
minutes = "minutes"
from app.translator.core.models.query_tokens.field import Field


@dataclass
class Span:
value: str = "1"
type_: str =SpanType.days
type_: str =TimeFrameType.days


@dataclass
Expand Down
4 changes: 2 additions & 2 deletionsuncoder-core/app/translator/core/models/functions/eval.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,9 +2,9 @@
from typing import Union

from app.translator.core.custom_types.functions import FunctionType
from app.translator.core.models.field import Alias, Field
from app.translator.core.models.functions.base import Function
from app.translator.core.models.identifier import Identifier
from app.translator.core.models.query_tokens.field import Alias, Field
from app.translator.core.models.query_tokens.identifier import Identifier


@dataclass
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
from typing import Union

from app.translator.core.custom_types.functions import FunctionType
from app.translator.core.models.field import Alias
from app.translator.core.models.functions.base import Function
from app.translator.core.models.query_tokens.field import Alias


@dataclass
Expand Down
4 changes: 2 additions & 2 deletionsuncoder-core/app/translator/core/models/functions/join.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,10 @@
from typing import Union

from app.translator.core.custom_types.functions import FunctionType
from app.translator.core.models.field import Alias, Field
from app.translator.core.models.functions.base import Function
from app.translator.core.models.identifier import Identifier
from app.translator.core.models.query_container import TokenizedQueryContainer
from app.translator.core.models.query_tokens.field import Alias, Field
from app.translator.core.models.query_tokens.identifier import Identifier
from app.translator.tools.custom_enum import CustomEnum


Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
from dataclasses import dataclass

from app.translator.core.custom_types.functions import FunctionType
from app.translator.core.models.field import Alias, Field
from app.translator.core.models.functions.base import Function
from app.translator.core.models.query_tokens.field import Alias, Field


@dataclass
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@
from typing import Union

from app.translator.core.custom_types.functions import FunctionType
from app.translator.core.models.field import Alias, Field
from app.translator.core.models.functions.base import Function
from app.translator.core.models.query_tokens.field import Alias, Field
from app.translator.tools.custom_enum import CustomEnum


Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
from dataclasses import dataclass

from app.translator.core.custom_types.functions import FunctionType
from app.translator.core.custom_types.time import TimeFrameType
from app.translator.core.models.functions.base import Function
from app.translator.tools.custom_enum import CustomEnum


class TimeFrameType(CustomEnum):
days = "days"
hours = "hours"
minutes = "minutes"


@dataclass
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp