diff --git a/core/__init__.py b/core/__init__.py index 073ab2e..c080e05 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -1,17 +1,17 @@ -from .vork_node import VorkNode -from .vork_node_registry import VorkNodeRegistry -from .vork_node_link import VorkNodeLink -from .vork_node_start import VorkNodeStart +from .vork_node import WorkNode +from .work_node_registry import WorkNodeRegistry +from .work_node_link import WorkNodeLink +from .vork_node_start import WorkNodeStart from .link_name_generator import edge_title_generator, edge_title_to_number __version__ = "0.1.0" __author__ = "Your Name" __all__ = [ - "VorkNode", - "VorkNodeRegistry", - "VorkNodeLink", - "VorkNodeStart", + "WorkNode", + "WorkNodeRegistry", + "WorkNodeLink", + "WorkNodeStart", "edge_title_generator", "edge_title_to_number", ] diff --git a/core/vork_node.py b/core/vork_node.py index c00e202..4af005b 100644 --- a/core/vork_node.py +++ b/core/vork_node.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod from typing import Any, Dict -class VorkNode(ABC): +class WorkNode(ABC): def __init__(self, data: Dict[str, Any], links: Dict[str, Any]): self.data: Dict[str, Any] = data diff --git a/core/vork_node_start.py b/core/vork_node_start.py index ad7a05b..d965dd7 100644 --- a/core/vork_node_start.py +++ b/core/vork_node_start.py @@ -9,7 +9,7 @@ from model_nodes.node_start_models import ( ) -class VorkNodeStart(VorkNode): +class WorkNodeStart(VorkNode): def __init__(self, data: Dict[str, Any], links: Dict[str, Any] = None): """ diff --git a/core/vork_node_link.py b/core/work_node_link.py similarity index 91% rename from core/vork_node_link.py rename to core/work_node_link.py index c023cfa..3ab2748 100644 --- a/core/vork_node_link.py +++ b/core/work_node_link.py @@ -1,12 +1,12 @@ from typing import Dict, Any -from model_nodes import VorkNodeLinkData, VorkNodeLinkSchema +from model_nodes import NodeLinkData, NodeLinkSchema from .link_name_generator import edge_title_generator, edge_title_to_number -class VorkNodeLink: +class WorkNodeLink: def __init__(self, data: Dict[str, Any]): """ @@ -30,7 +30,7 @@ class VorkNodeLink: # """ # return VorkNodeLinkSchema() - def validate(self) -> VorkNodeLinkSchema: + def validate(self) -> NodeLinkSchema: """ Валидирует данные связи с помощью Pydantic моделей @@ -62,7 +62,7 @@ class VorkNodeLink: pass # Создаем схему с валидированными данными - return VorkNodeLinkSchema( + return NodeLinkSchema( link_name=validated_data.last_link_name, parent_port_number=validated_data.parent_port_number, to_id=validated_data.to_id, @@ -73,11 +73,11 @@ class VorkNodeLink: print(f"Link validation error: {e}") raise - def validate_data(self) -> VorkNodeLinkData: + def validate_data(self) -> NodeLinkData: """ Валидирует данные связи Returns: VorkNodeLinkData: Валидированные данные """ - return VorkNodeLinkData(**self.data) + return NodeLinkData(**self.data) diff --git a/core/vork_node_registry.py b/core/work_node_registry.py similarity index 99% rename from core/vork_node_registry.py rename to core/work_node_registry.py index 43a27d6..f1d82fd 100644 --- a/core/vork_node_registry.py +++ b/core/work_node_registry.py @@ -5,7 +5,7 @@ from typing import Dict, Type, Optional, List from .vork_node import VorkNode -class VorkNodeRegistry: +class WorkNodeRegistry: def __init__(self): self.registry: Dict[str, Type[VorkNode]] = {} diff --git a/model_nodes/__init__.py b/model_nodes/__init__.py index 92f4ea6..f551a17 100644 --- a/model_nodes/__init__.py +++ b/model_nodes/__init__.py @@ -26,8 +26,8 @@ from .node_start_models import ( # Экспорты для моделей связей между узлами from .node_link_models import ( - VorkNodeLinkData, - VorkNodeLinkSchema + NodeLinkData, + NodeLinkSchema ) __all__ = [ @@ -52,6 +52,6 @@ __all__ = [ "StartNodeDescriptor", # Node link models - "VorkNodeLinkData", - "VorkNodeLinkSchema" + "NodeLinkData", + "NodeLinkSchema" ] diff --git a/model_nodes/node_link_models.py b/model_nodes/node_link_models.py index 8e498e6..8d2f921 100644 --- a/model_nodes/node_link_models.py +++ b/model_nodes/node_link_models.py @@ -2,7 +2,7 @@ from typing import Optional, Dict, Any from pydantic import BaseModel, Field -class VorkNodeLinkData(BaseModel): +class NodeLinkData(BaseModel): """ Pydantic модель для валидации данных VorkNodeLink """ @@ -12,7 +12,7 @@ class VorkNodeLinkData(BaseModel): last_link_name: Optional[str] = Field(default=None, description="Название последней связи") -class VorkNodeLinkSchema(BaseModel): +class NodeLinkSchema(BaseModel): """ Pydantic модель для схемы VorkNodeLink """ diff --git a/nodes/__init__.py b/nodes/__init__.py index 14c5ed4..e119c4a 100644 --- a/nodes/__init__.py +++ b/nodes/__init__.py @@ -1,26 +1,26 @@ -from .vork_node_if import VorkNodeIf -from .vork_node_switch import VorkNodeSwitch -from .vork_node_set import VorkNodeSet -from .vork_node_wait import VorkNodeWait -from .vork_node_while import VorkNodeWhile -from .vork_node_each import VorkNodeEach -from .vork_node_listen import VorkNodeListen -from .vork_node_trigger import VorkNodeTrigger -from .vork_node_callback import VorkNodeCallback -from .vork_node_run import VorkNodeRun +from .node_if import WorkNodeIf +from .node_switch import WorkNodeSwitch +from .node_set import WorkNodeSet +from .node_wait import WorkNodeWait +from .node_while import WorkNodeWhile +from .node_each import WorkNodeEach +from .node_listen import WorkNodeListen +from .node_trigger import WorkNodeTrigger +from .node_callback import WorkNodeCallback +from .node_run import WorkNodeRun __version__ = "0.1.0" __author__ = "Your Name" __all__ = [ - "VorkNodeIf", - "VorkNodeSwitch", - "VorkNodeSet", - "VorkNodeWait", - "VorkNodeWhile", - "VorkNodeEach", - "VorkNodeListen", - "VorkNodeTrigger", - "VorkNodeCallback", - "VorkNodeRun", + "WorkNodeIf", + "WorkNodeSwitch", + "WorkNodeSet", + "WorkNodeWait", + "WorkNodeWhile", + "WorkNodeEach", + "WorkNodeListen", + "WorkNodeTrigger", + "WorkNodeCallback", + "WorkNodeRun", ] diff --git a/nodes/node_callback.py b/nodes/node_callback.py new file mode 100644 index 0000000..1fae00d --- /dev/null +++ b/nodes/node_callback.py @@ -0,0 +1,18 @@ +from core import VorkNode + + +class WorkNodeCallback(VorkNode): + + @property + def id(self) -> str: + return "node_callback" + + @classmethod + def form(cls): + pass + + def validate(self) -> bool: + return True + + def process(self, context): + pass diff --git a/nodes/vork_node_set.py b/nodes/node_each.py similarity index 78% rename from nodes/vork_node_set.py rename to nodes/node_each.py index 93b9635..316726d 100644 --- a/nodes/vork_node_set.py +++ b/nodes/node_each.py @@ -1,11 +1,11 @@ from core import VorkNode -class VorkNodeSet(VorkNode): +class WorkNodeEach(VorkNode): @property def id(self) -> str: - return "vork_node_set" + return "node_each" @classmethod def form(cls): diff --git a/nodes/vork_node_if.py b/nodes/node_if.py similarity index 96% rename from nodes/vork_node_if.py rename to nodes/node_if.py index f106dcb..0c8a5fb 100644 --- a/nodes/vork_node_if.py +++ b/nodes/node_if.py @@ -9,11 +9,11 @@ from model_nodes.node_if_models import ( ) -class VorkNodeIf(VorkNode): +class WorkNodeIf(VorkNode): @property def id(self) -> str: - return "vork_node_if" + return "node_if" @classmethod def form(cls) -> IfNodeDescriptor: diff --git a/nodes/vork_node_listen.py b/nodes/node_listen.py similarity index 86% rename from nodes/vork_node_listen.py rename to nodes/node_listen.py index 4052c7c..bd78aeb 100644 --- a/nodes/vork_node_listen.py +++ b/nodes/node_listen.py @@ -8,11 +8,11 @@ from core import VorkNode # ) -class VorkNodeListen(VorkNode): +class WorkNodeListen(VorkNode): @property def id(self) -> str: - return "vork_node_listen" + return "node_listen" @classmethod def form(cls) -> Dict[str, Any]: diff --git a/nodes/vork_node_run.py b/nodes/node_run.py similarity index 78% rename from nodes/vork_node_run.py rename to nodes/node_run.py index 79ff542..dab3da8 100644 --- a/nodes/vork_node_run.py +++ b/nodes/node_run.py @@ -1,11 +1,11 @@ from core import VorkNode -class VorkNodeRun(VorkNode): +class WorkNodeRun(VorkNode): @property def id(self) -> str: - return "vork_node_run" + return "node_run" @classmethod def form(cls): diff --git a/nodes/vork_node_wait.py b/nodes/node_set.py similarity index 77% rename from nodes/vork_node_wait.py rename to nodes/node_set.py index e448aa4..ae477bb 100644 --- a/nodes/vork_node_wait.py +++ b/nodes/node_set.py @@ -1,11 +1,11 @@ from core import VorkNode -class VorkNodeWait(VorkNode): +class WorkNodeSet(VorkNode): @property def id(self) -> str: - return "vork_node_wait" + return "node_set" @classmethod def form(cls): diff --git a/nodes/vork_node_each.py b/nodes/node_switch.py similarity index 77% rename from nodes/vork_node_each.py rename to nodes/node_switch.py index 388be09..bb2273f 100644 --- a/nodes/vork_node_each.py +++ b/nodes/node_switch.py @@ -1,11 +1,11 @@ from core import VorkNode -class VorkNodeEach(VorkNode): +class WorkNodeSwitch(VorkNode): @property def id(self) -> str: - return "vork_node_each" + return "node_switch" @classmethod def form(cls): diff --git a/nodes/node_trigger.py b/nodes/node_trigger.py new file mode 100644 index 0000000..ae12f7b --- /dev/null +++ b/nodes/node_trigger.py @@ -0,0 +1,18 @@ +from core import VorkNode + + +class WorkNodeTrigger(VorkNode): + + @property + def id(self) -> str: + return "node_trigger" + + @classmethod + def form(cls): + pass + + def validate(self) -> bool: + return True + + def process(self, context): + pass diff --git a/nodes/node_wait.py b/nodes/node_wait.py new file mode 100644 index 0000000..7dd82b3 --- /dev/null +++ b/nodes/node_wait.py @@ -0,0 +1,18 @@ +from core import VorkNode + + +class WorkNodeWait(VorkNode): + + @property + def id(self) -> str: + return "node_wait" + + @classmethod + def form(cls): + pass + + def validate(self) -> bool: + return True + + def process(self, context): + pass diff --git a/nodes/node_while.py b/nodes/node_while.py new file mode 100644 index 0000000..d92d1fb --- /dev/null +++ b/nodes/node_while.py @@ -0,0 +1,18 @@ +from core import VorkNode + + +class WorkNodeWhile(VorkNode): + + @property + def id(self) -> str: + return "node_while" + + @classmethod + def form(cls): + pass + + def validate(self) -> bool: + return True + + def process(self, context): + pass diff --git a/nodes/vork_node_callback.py b/nodes/vork_node_callback.py deleted file mode 100644 index ab10d33..0000000 --- a/nodes/vork_node_callback.py +++ /dev/null @@ -1,18 +0,0 @@ -from core import VorkNode - - -class VorkNodeCallback(VorkNode): - - @property - def id(self) -> str: - return "vork_node_callback" - - @classmethod - def form(cls): - pass - - def validate(self) -> bool: - return True - - def process(self, context): - pass diff --git a/nodes/vork_node_switch.py b/nodes/vork_node_switch.py deleted file mode 100644 index e9e1b4f..0000000 --- a/nodes/vork_node_switch.py +++ /dev/null @@ -1,18 +0,0 @@ -from core import VorkNode - - -class VorkNodeSwitch(VorkNode): - - @property - def id(self) -> str: - return "vork_node_switch" - - @classmethod - def form(cls): - pass - - def validate(self) -> bool: - return True - - def process(self, context): - pass diff --git a/nodes/vork_node_trigger.py b/nodes/vork_node_trigger.py deleted file mode 100644 index 53417c1..0000000 --- a/nodes/vork_node_trigger.py +++ /dev/null @@ -1,18 +0,0 @@ -from core import VorkNode - - -class VorkNodeTrigger(VorkNode): - - @property - def id(self) -> str: - return "vork_node_trigger" - - @classmethod - def form(cls): - pass - - def validate(self) -> bool: - return True - - def process(self, context): - pass diff --git a/nodes/vork_node_while.py b/nodes/vork_node_while.py deleted file mode 100644 index e230056..0000000 --- a/nodes/vork_node_while.py +++ /dev/null @@ -1,18 +0,0 @@ -from core import VorkNode - - -class VorkNodeWhile(VorkNode): - - @property - def id(self) -> str: - return "vork_node_while" - - @classmethod - def form(cls): - pass - - def validate(self) -> bool: - return True - - def process(self, context): - pass