Merge remote-tracking branch 'origin/dev' into zustand/io/migration

pyproject.toml

@@ -7,7 +7,6 @@ maintainers = [
     "Carlos Coelho <carlos@logspace.ai>",
     "Cristhian Zanforlin <cristhian.lousa@gmail.com>",
     "Gabriel Almeida <gabriel@logspace.ai>",
-    "Gustavo Schaedler <gustavopoa@gmail.com>",
     "Igor Carvalho <igorr.ackerman@gmail.com>",
     "Lucas Eduoli <lucaseduoli@gmail.com>",
     "Otávio Anovazzi <otavio2204@gmail.com>",

src/backend/base/langflow/alembic/versions/006b3990db50_add_unique_constraints.py

@@ -26,13 +26,13 @@ def upgrade() -> None:
     flow_constraints = inspector.get_unique_constraints("flow")
     user_constraints = inspector.get_unique_constraints("user")
     try:
-        if not any(constraint["name"] == "uq_apikey_id" for constraint in api_key_constraints):
+        if not any(constraint["column_names"] == ["id"] for constraint in api_key_constraints):
             with op.batch_alter_table("apikey", schema=None) as batch_op:
                 batch_op.create_unique_constraint("uq_apikey_id", ["id"])
-        if not any(constraint["name"] == "uq_flow_id" for constraint in flow_constraints):
+        if not any(constraint["column_names"] == ["id"] for constraint in flow_constraints):
             with op.batch_alter_table("flow", schema=None) as batch_op:
                 batch_op.create_unique_constraint("uq_flow_id", ["id"])
-        if not any(constraint["name"] == "uq_user_id" for constraint in user_constraints):
+        if not any(constraint["column_names"] == ["id"] for constraint in user_constraints):
             with op.batch_alter_table("user", schema=None) as batch_op:
                 batch_op.create_unique_constraint("uq_user_id", ["id"])
     except Exception as e:

src/backend/base/langflow/components/embeddings/CohereEmbeddings.py

@@ -2,7 +2,7 @@ from typing import Optional
 
 from langchain_community.embeddings.cohere import CohereEmbeddings
 
-from langflow.interface.custom.custom_component import CustomComponent
+from langflow.custom import CustomComponent
 
 
 class CohereEmbeddingsComponent(CustomComponent):

src/backend/base/langflow/components/model_specs/ChatAnthropicSpecs.py

@@ -3,8 +3,8 @@ from typing import Callable, Optional, Union
 from langchain_community.chat_models.anthropic import ChatAnthropic
 from pydantic.v1.types import SecretStr
 
+from langflow.custom import CustomComponent
 from langflow.field_typing import BaseLanguageModel
-from langflow.interface.custom.custom_component import CustomComponent
 
 
 class ChatAnthropicComponent(CustomComponent):
@@ -20,31 +20,48 @@ class ChatAnthropicComponent(CustomComponent):
                 "field_type": "str",
                 "password": True,
             },
-            "anthropic_api_url": {
-                "display_name": "Anthropic API URL",
-                "field_type": "str",
-            },
             "model_kwargs": {
                 "display_name": "Model Kwargs",
                 "field_type": "dict",
                 "advanced": True,
             },
+            "model_name": {
+                "display_name": "Model Name",
+                "field_type": "str",
+                "advanced": False,
+                "required": False,
+                "options": ["claude-3-opus-20240229", "claude-3-sonnet-20240229", "claude-3-haiku-20240307"],
+            },
             "temperature": {
                 "display_name": "Temperature",
                 "field_type": "float",
             },
+            "max_tokens": {
+                "display_name": "Max Tokens",
+                "field_type": "int",
+                "advanced": False,
+                "required": False,
+            },
+            "top_k": {"display_name": "Top K", "field_type": "int", "advanced": True},
+            "top_p": {"display_name": "Top P", "field_type": "float", "advanced": True},
         }
 
     def build(
         self,
         anthropic_api_key: str,
-        anthropic_api_url: Optional[str] = None,
         model_kwargs: dict = {},
+        model_name: str = "claude-3-opus-20240229",
         temperature: Optional[float] = None,
+        max_tokens: Optional[int] = 1024,
+        top_k: Optional[int] = None,
+        top_p: Optional[float] = None,
     ) -> Union[BaseLanguageModel, Callable]:
         return ChatAnthropic(
             anthropic_api_key=SecretStr(anthropic_api_key),
-            anthropic_api_url=anthropic_api_url,
             model_kwargs=model_kwargs,
+            model_name=model_name,
             temperature=temperature,
+            max_tokens=max_tokens,  # type: ignore
+            top_k=top_k,
+            top_p=top_p,
         )

src/backend/base/langflow/interface/custom/code_parser/code_parser.py

@@ -237,10 +237,28 @@ class CodeParser:
 
     def parse_return_statement(self, node: ast.FunctionDef) -> bool:
         """
-        Parses the return statement of a function or method node.
+        Parses the return statement of a function or method node, including nested returns.
         """
 
-        return any(isinstance(n, ast.Return) for n in node.body)
+        def has_return(node):
+            if isinstance(node, ast.Return):
+                return True
+            elif isinstance(node, ast.If):
+                return any(has_return(child) for child in node.body) or any(has_return(child) for child in node.orelse)
+            elif isinstance(node, ast.Try):
+                return (
+                    any(has_return(child) for child in node.body)
+                    or any(has_return(child) for child in node.handlers)
+                    or any(has_return(child) for child in node.finalbody)
+                )
+            elif isinstance(node, (ast.For, ast.While)):
+                return any(has_return(child) for child in node.body) or any(has_return(child) for child in node.orelse)
+            elif isinstance(node, ast.With):
+                return any(has_return(child) for child in node.body)
+            else:
+                return False
+
+        return any(has_return(child) for child in node.body)
 
     def parse_assign(self, stmt):
         """

src/backend/base/langflow/interface/initialize/utils.py

@@ -32,6 +32,8 @@ def check_tools_in_params(params: Dict):
 
 def instantiate_from_template(class_object, params: Dict):
     from_template_params = {"template": params.pop("prompt", params.pop("template", ""))}
+
+    from_template_params.update(params)
     if not from_template_params.get("template"):
         raise ValueError("Prompt template is required")
     return class_object.from_template(**from_template_params)

src/frontend/src/modals/formModal/chatInput/index.tsx

@@ -33,7 +33,7 @@ export default function ChatInput({
     <div className="relative">
       <Textarea
         onKeyDown={(event) => {
-          if (event.key === "Enter" && !lockChat && !event.shiftKey) {
+          if (event.key === "Enter" && !event.nativeEvent.isComposing && !lockChat && !event.shiftKey) {
             sendMessage();
           }
         }}