From 61de88680ef85aedfa16f62b537fc662972f4374 Mon Sep 17 00:00:00 2001 From: Luan Citta Date: Wed, 5 Jun 2024 13:59:15 +0100 Subject: [PATCH] Refactor --- nodes/agent_node.py | 11 ++++++----- nodes/crew_node.py | 4 ++-- nodes/list_agent_node.py | 6 ++++-- nodes/list_task_node.py | 6 ++++-- nodes/llm_chatGpt_node.py | 11 +++++------ nodes/llm_huggingface_node.py | 10 +++++----- nodes/llm_openai_node.py | 10 +++++----- nodes/task_node.py | 9 +++++---- 8 files changed, 36 insertions(+), 31 deletions(-) diff --git a/nodes/agent_node.py b/nodes/agent_node.py index 2e22069..7dc1899 100644 --- a/nodes/agent_node.py +++ b/nodes/agent_node.py @@ -10,24 +10,25 @@ class AgentNode: return { "required": { "role": ("STRING", { - "forceInput": True, "multiline": True, "default": "" + "multiline": True, "default": "" }), "goal": ("STRING", { - "forceInput": True, "multiline": True, "default": "" + "multiline": True, "default": "" }), "backstory": ("STRING", { - "forceInput": True, "multiline": True, "default": "" + "multiline": True, "default": "" }), }, "optional": { - "LLM": ("CAI_LLM",), + "LLM": ("CREWAI_LLM",), "verbose": ("BOOL", {"default": False}), "allow_delegation": ("BOOL", {"default": True}), }, } OUTPUT_NODE = True - RETURN_TYPES = ("CAI_AGENT",) + RETURN_TYPES = ("CREWAI_AGENT",) + RETURN_NAMES = ("agent",) FUNCTION = "create_agent" CATEGORY = "📎CrewAi" diff --git a/nodes/crew_node.py b/nodes/crew_node.py index 6dd93af..8e74686 100644 --- a/nodes/crew_node.py +++ b/nodes/crew_node.py @@ -10,10 +10,10 @@ class CrewNode(BaseNode): def INPUT_TYPES(cls): return { "required": { - "tasks": ("CAI_TASK", {"default": []}), + "tasks": ("CREWAI_TASK", {"default": []}), }, "optional": { - "agents": ("CAI_AGENT", {"forceInput": False, "default": []}), + "agents": ("CREWAI_AGENT", {"forceInput": False, "default": []}), "topic": ("STRING", { "forceInput": False, "multiline": True, "default": "" }), diff --git a/nodes/list_agent_node.py b/nodes/list_agent_node.py index 6a7ff24..10598f8 100644 --- a/nodes/list_agent_node.py +++ b/nodes/list_agent_node.py @@ -4,8 +4,10 @@ from .base_node import BaseNode class AgentList(BaseNode): @classmethod def INPUT_TYPES(cls): - return {"required": {"agent-1": ("CAI_AGENT",)}} + return {"required": {"agent-1": ("CREWAI_AGENT",)}} OUTPUT_IS_LIST = (True,) - RETURN_TYPES = ("CAI_AGENT",) + RETURN_TYPES = ("CREWAI_AGENT",) + RETURN_NAMES = ("agent",) + FUNCTION = "create_list" diff --git a/nodes/list_task_node.py b/nodes/list_task_node.py index e604952..75ab95d 100644 --- a/nodes/list_task_node.py +++ b/nodes/list_task_node.py @@ -4,8 +4,10 @@ from .base_node import BaseNode class TaskList(BaseNode): @classmethod def INPUT_TYPES(s): - return {"required": {"task-1": ("CAI_TASK",)}} + return {"required": {"task-1": ("CREWAI_TASK",)}} OUTPUT_IS_LIST = (True,) - RETURN_TYPES = ("CAI_TASK",) + RETURN_TYPES = ("CREWAI_TASK",) + RETURN_NAMES = ("task",) + FUNCTION = "create_list" diff --git a/nodes/llm_chatGpt_node.py b/nodes/llm_chatGpt_node.py index 704c2ca..5cf4205 100644 --- a/nodes/llm_chatGpt_node.py +++ b/nodes/llm_chatGpt_node.py @@ -12,19 +12,18 @@ class LlmChatGpt(BaseNode): def INPUT_TYPES(cls): return { "required": { - "api_key": ("STRING", { - "forceInput": True, - "default": "http://localhost:11434/v1" - }), + "api_key": ("STRING", {"default": ""}), }, "optional": { "model": ("STRING", { - "forceInput": True, "default": "gpt-4o" + "default": "gpt-4o" }), } } - RETURN_TYPES = ("CAI_LLM",) + RETURN_TYPES = ("CREWAI_LLM",) + RETURN_NAMES = ("llm",) + FUNCTION = "create_task" def create_task(self, model, api_key): diff --git a/nodes/llm_huggingface_node.py b/nodes/llm_huggingface_node.py index aa6fc00..1df8598 100644 --- a/nodes/llm_huggingface_node.py +++ b/nodes/llm_huggingface_node.py @@ -13,22 +13,22 @@ class LlmHuggingFace(BaseNode): return { "required": { "model": ("STRING", { - "forceInput": True, "default": "crewai-llama3" + "default": "crewai-llama3" }), "base_url": ("STRING", { - "forceInput": True, "default": "http://localhost:11434/v1" }), }, "optional": { "api_key": ("STRING", { - "forceInput": True, - "default": "http://localhost:11434/v1" + "default": "..." }), } } - RETURN_TYPES = ("CAI_LLM",) + RETURN_TYPES = ("CREWAI_LLM",) + RETURN_NAMES = ("llm",) + FUNCTION = "create_task" def create_task(self, base_url, api_key, task, max_new_tokens): diff --git a/nodes/llm_openai_node.py b/nodes/llm_openai_node.py index 31dacbd..ef7d5c9 100644 --- a/nodes/llm_openai_node.py +++ b/nodes/llm_openai_node.py @@ -13,22 +13,22 @@ class LlmOpenai(BaseNode): return { "required": { "model": ("STRING", { - "forceInput": True, "default": "crewai-llama3" + "default": "crewai-llama3" }), "base_url": ("STRING", { - "forceInput": True, "default": "http://localhost:11434/v1" }), }, "optional": { "api_key": ("STRING", { - "forceInput": True, - "default": "http://localhost:11434/v1" + "default": "" }), } } - RETURN_TYPES = ("CAI_LLM",) + RETURN_TYPES = ("CREWAI_LLM",) + RETURN_NAMES = ("llm",) + FUNCTION = "create_task" def create_task(self, model, base_url, api_key): diff --git a/nodes/task_node.py b/nodes/task_node.py index cc1e182..d504243 100644 --- a/nodes/task_node.py +++ b/nodes/task_node.py @@ -11,18 +11,19 @@ class TaskNode(BaseNode): return { "required": { "description": ("STRING", { - "forceInput": True, "multiline": True, "default": "" + "multiline": True, "default": "" }), }, "optional": { "expected_output": ("STRING", { - "forceInput": False, "multiline": True, "default": "" + "multiline": True, "default": "" }), - "agent": ("CAI_AGENT",), + "agent": ("CREWAI_AGENT",), } } - RETURN_TYPES = ("CAI_TASK",) + RETURN_TYPES = ("CREWAI_TASK",) + RETURN_NAMES = ("task",) FUNCTION = "create_task" def create_task(self, description, expected_output, agent):