Merge branch 'form_io' of github.com:logspace-ai/langflow into form_io

src/backend/langflow/config.yaml

@@ -73,6 +73,11 @@ prompts:
   - PromptTemplate
   - FewShotPromptTemplate
   - ZeroShotPrompt
+  - ChatPromptTemplate
+  - SystemMessagePromptTemplate
+  - AIMessagePromptTemplate
+  - HumanMessagePromptTemplate
+  - ChatMessagePromptTemplate
 textsplitters:
   - CharacterTextSplitter
   - RecursiveCharacterTextSplitter

src/backend/langflow/graph/vertex/types.py

@@ -180,11 +180,17 @@ class PromptVertex(Vertex):
                 ]
             else:
                 prompt_params = ["template"]
-            for param in prompt_params:
+
-                prompt_text = self.params[param]
+            if "prompt" not in self.params and "messages" not in self.params:
-                variables = extract_input_variables_from_prompt(prompt_text)
+                for param in prompt_params:
-                self.params["input_variables"].extend(variables)
+                    prompt_text = self.params[param]
-            self.params["input_variables"] = list(set(self.params["input_variables"]))
+                    variables = extract_input_variables_from_prompt(prompt_text)
+                    self.params["input_variables"].extend(variables)
+                self.params["input_variables"] = list(
+                    set(self.params["input_variables"])
+                )
+            else:
+                self.params.pop("input_variables", None)
 
             self._build()
         return self._built_object

src/backend/langflow/interface/agents/custom.py

@@ -6,6 +6,7 @@ from langchain.agents import (
     Tool,
     ZeroShotAgent,
     initialize_agent,
+    AgentType,
 )
 from langchain.agents.agent_toolkits import (
     SQLDatabaseToolkit,
@@ -297,6 +298,9 @@ class InitializeAgent(CustomAgentExecutor):
         agent: str,
         memory: Optional[BaseChatMemory] = None,
     ):
+        # Find which value in the AgentType enum corresponds to the string
+        # passed in as agent
+        agent = AgentType(agent)
         return initialize_agent(
             tools=tools,
             llm=llm,

src/backend/langflow/interface/initialize/loading.py

@@ -97,6 +97,19 @@ def instantiate_prompt(node_type, class_object, params):
         if "tools" not in params:
             params["tools"] = []
         return ZeroShotAgent.create_prompt(**params)
+    if "MessagePromptTemplate" in node_type:
+        # Then we only need the template
+        from_template_params = {
+            "template": params.pop("prompt", params.pop("template", ""))
+        }
+
+        if not from_template_params.get("template"):
+            raise ValueError("Prompt template is required")
+        return class_object.from_template(**from_template_params)
+
+    if node_type == "ChatPromptTemplate":
+        return class_object.from_messages(**params)
+
     return class_object(**params)