diff --git a/src/backend/langflow/api/v1/users.py b/src/backend/langflow/api/v1/users.py index 4b1b936d4..e68512e43 100644 --- a/src/backend/langflow/api/v1/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -88,7 +88,7 @@ def read_all_users( def patch_user( user_id: UUID, user_update: UserUpdate, - user: Session = Depends(get_current_active_user), + user: User = Depends(get_current_active_user), session: Session = Depends(get_session), ) -> User: """ @@ -113,7 +113,7 @@ def patch_user( def reset_password( user_id: UUID, user_update: UserUpdate, - user: Session = Depends(get_current_active_user), + user: User = Depends(get_current_active_user), session: Session = Depends(get_session), ) -> User: """ diff --git a/src/backend/langflow/components/textsplitters/LanguageRecursiveTextSplitter.py b/src/backend/langflow/components/textsplitters/LanguageRecursiveTextSplitter.py index da7c0dd73..636eb427e 100644 --- a/src/backend/langflow/components/textsplitters/LanguageRecursiveTextSplitter.py +++ b/src/backend/langflow/components/textsplitters/LanguageRecursiveTextSplitter.py @@ -2,7 +2,6 @@ from typing import Optional from langflow import CustomComponent from langchain.text_splitter import Language from langchain.schema import Document -from langflow.utils.util import build_loader_repr_from_documents class LanguageRecursiveTextSplitterComponent(CustomComponent): @@ -78,5 +77,4 @@ class LanguageRecursiveTextSplitterComponent(CustomComponent): ) docs = splitter.split_documents(documents) - self.repr_value = build_loader_repr_from_documents(docs) return docs diff --git a/src/backend/langflow/components/textsplitters/RecursiveCharacterTextSplitter.py b/src/backend/langflow/components/textsplitters/RecursiveCharacterTextSplitter.py index 58b061f2f..fd04b0642 100644 --- a/src/backend/langflow/components/textsplitters/RecursiveCharacterTextSplitter.py +++ b/src/backend/langflow/components/textsplitters/RecursiveCharacterTextSplitter.py @@ -74,6 +74,5 @@ class RecursiveCharacterTextSplitterComponent(CustomComponent): ) docs = splitter.split_documents(documents) - # self.repr_value = build_loader_repr_from_documents(docs) self.repr_value = separators return docs diff --git a/src/backend/langflow/services/database/models/user/crud.py b/src/backend/langflow/services/database/models/user/crud.py index abc79f49f..f7f5958fe 100644 --- a/src/backend/langflow/services/database/models/user/crud.py +++ b/src/backend/langflow/services/database/models/user/crud.py @@ -6,6 +6,7 @@ from langflow.services.database.models.user.user import User, UserUpdate from langflow.services.utils import get_session from sqlalchemy.exc import IntegrityError from sqlmodel import Session +from typing import Optional from sqlalchemy.orm.attributes import flag_modified @@ -19,7 +20,7 @@ def get_user_by_id(db: Session, id: UUID) -> Union[User, None]: def update_user( - user_db: User, user: UserUpdate, db: Session = Depends(get_session) + user_db: Optional[User], user: UserUpdate, db: Session = Depends(get_session) ) -> User: if not user_db: raise HTTPException(status_code=404, detail="User not found") diff --git a/src/backend/langflow/services/plugins/langfuse.py b/src/backend/langflow/services/plugins/langfuse.py index 98375a549..7460f20ad 100644 --- a/src/backend/langflow/services/plugins/langfuse.py +++ b/src/backend/langflow/services/plugins/langfuse.py @@ -1,3 +1,4 @@ +from langflow.services.utils import get_settings_manager from langflow.utils.logger import logger ### Temporary implementation @@ -17,14 +18,18 @@ class LangfuseInstance: @classmethod def create(cls): logger.debug("Creating Langfuse instance") - from langflow.settings import settings from langfuse import Langfuse # type: ignore - if settings.LANGFUSE_PUBLIC_KEY and settings.LANGFUSE_SECRET_KEY: + settings_manager = get_settings_manager() + + if ( + settings_manager.settings.LANGFUSE_PUBLIC_KEY + and settings_manager.settings.LANGFUSE_SECRET_KEY + ): logger.debug("Langfuse credentials found") cls._instance = Langfuse( - public_key=settings.LANGFUSE_PUBLIC_KEY, - secret_key=settings.LANGFUSE_SECRET_KEY, + public_key=settings_manager.settings.LANGFUSE_PUBLIC_KEY, + secret_key=settings_manager.settings.LANGFUSE_SECRET_KEY, ) else: logger.debug("No Langfuse credentials found") diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index 3374ec8b0..d71a18ebb 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -120,17 +120,18 @@ export default function ParameterComponent({ return ( <> {index === 0 && ( - - {left ? "Avaliable input components:" : "Avaliable output components:"} - - ) - } + + {left + ? "Avaliable input components:" + : "Avaliable output components:"} + + )} 0 ? "mt-2 flex items-center" : "mt-3 flex items-center" )} - > + >
- {nodeNames[item.family] ?? "Other"} - {" "} + {nodeNames[item.family] ?? "Other"}{" "} {" "} {item.type === "" ? "" : " - "} diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index 388020f22..c762b3a67 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -158,9 +158,16 @@ export default function GenericNode({ -
+
{data.node?.description !== "" && ( -
{data.node?.description}
+
+ {data.node?.description} +
)} <>