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