🐛 fix(endpoints.py): fix import order and remove unused imports to improve code readability and maintainability
✨ feat(endpoints.py): add support for creating and updating custom components in the API 🐛 fix(types.py): add helper function to create and validate custom components before using them
This commit is contained in:
parent
4959d8ecf4
commit
172e8d3853
2 changed files with 22 additions and 36 deletions
|
|
@ -1,33 +1,24 @@
|
||||||
from http import HTTPStatus
|
from http import HTTPStatus
|
||||||
from typing import Annotated, Optional, Union
|
from typing import Annotated, Optional, Union
|
||||||
from langflow.services.auth.utils import api_key_security, get_current_active_user
|
|
||||||
|
|
||||||
|
|
||||||
from langflow.services.cache.utils import save_uploaded_file
|
|
||||||
from langflow.services.database.models.flow import Flow
|
|
||||||
from langflow.processing.process import process_graph_cached, process_tweaks
|
|
||||||
from langflow.services.database.models.user.user import User
|
|
||||||
from langflow.services.deps import (
|
|
||||||
get_session_service,
|
|
||||||
get_settings_service,
|
|
||||||
get_task_service,
|
|
||||||
)
|
|
||||||
from loguru import logger
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException, UploadFile, Body, status
|
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
from langflow.interface.custom.custom_component import CustomComponent
|
from fastapi import APIRouter, Body, Depends, HTTPException, UploadFile, status
|
||||||
|
from loguru import logger
|
||||||
|
|
||||||
from langflow.api.v1.schemas import (
|
from langflow.api.v1.schemas import (
|
||||||
|
CustomComponentCode,
|
||||||
ProcessResponse,
|
ProcessResponse,
|
||||||
TaskResponse,
|
TaskResponse,
|
||||||
TaskStatusResponse,
|
TaskStatusResponse,
|
||||||
UploadFileResponse,
|
UploadFileResponse,
|
||||||
CustomComponentCode,
|
|
||||||
)
|
)
|
||||||
|
from langflow.interface.types import build_langchain_template_custom_component, create_and_validate_component
|
||||||
|
from langflow.processing.process import process_graph_cached, process_tweaks
|
||||||
from langflow.services.deps import get_session
|
from langflow.services.auth.utils import api_key_security, get_current_active_user
|
||||||
|
from langflow.services.cache.utils import save_uploaded_file
|
||||||
|
from langflow.services.database.models.flow import Flow
|
||||||
|
from langflow.services.database.models.user.user import User
|
||||||
|
from langflow.services.deps import get_session, get_session_service, get_settings_service, get_task_service
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from langflow.worker import process_graph_cached_task
|
from langflow.worker import process_graph_cached_task
|
||||||
|
|
@ -39,7 +30,6 @@ except ImportError:
|
||||||
|
|
||||||
from sqlmodel import Session
|
from sqlmodel import Session
|
||||||
|
|
||||||
|
|
||||||
from langflow.services.task.service import TaskService
|
from langflow.services.task.service import TaskService
|
||||||
|
|
||||||
# build router
|
# build router
|
||||||
|
|
@ -212,28 +202,18 @@ async def custom_component(
|
||||||
raw_code: CustomComponentCode,
|
raw_code: CustomComponentCode,
|
||||||
user: User = Depends(get_current_active_user),
|
user: User = Depends(get_current_active_user),
|
||||||
):
|
):
|
||||||
from langflow.interface.types import (
|
component = create_and_validate_component(raw_code.code)
|
||||||
build_langchain_template_custom_component,
|
|
||||||
)
|
|
||||||
|
|
||||||
extractor = CustomComponent(code=raw_code.code)
|
return build_langchain_template_custom_component(component, user_id=user.id)
|
||||||
extractor.is_check_valid()
|
|
||||||
|
|
||||||
return build_langchain_template_custom_component(extractor, user_id=user.id)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post("/custom_component/update", status_code=HTTPStatus.OK)
|
@router.post("/custom_component/update", status_code=HTTPStatus.OK)
|
||||||
async def custom_component_update(
|
async def custom_component_update(
|
||||||
raw_code: CustomComponentCode,
|
raw_code: CustomComponentCode,
|
||||||
field: str,
|
|
||||||
user: User = Depends(get_current_active_user),
|
user: User = Depends(get_current_active_user),
|
||||||
):
|
):
|
||||||
from langflow.interface.types import (
|
component = create_and_validate_component(raw_code.code)
|
||||||
build_langchain_template_custom_component,
|
|
||||||
)
|
|
||||||
|
|
||||||
extractor = CustomComponent(code=raw_code.code)
|
component_node = build_langchain_template_custom_component(component, user_id=user.id, update_field=raw_code.field)
|
||||||
extractor.is_check_valid()
|
|
||||||
|
|
||||||
component_node = build_langchain_template_custom_component(extractor, user_id=user.id)
|
|
||||||
# Update the field
|
# Update the field
|
||||||
|
return component_node
|
||||||
|
|
|
||||||
|
|
@ -343,7 +343,7 @@ def build_langchain_template_custom_component(
|
||||||
|
|
||||||
update_attributes(frontend_node, template_config)
|
update_attributes(frontend_node, template_config)
|
||||||
logger.debug("Updated attributes")
|
logger.debug("Updated attributes")
|
||||||
field_config = build_field_config(custom_component, user_id=user_id)
|
field_config = build_field_config(custom_component, user_id=user_id, update_field=update_field)
|
||||||
logger.debug("Built field config")
|
logger.debug("Built field config")
|
||||||
entrypoint_args = custom_component.get_function_entrypoint_args
|
entrypoint_args = custom_component.get_function_entrypoint_args
|
||||||
|
|
||||||
|
|
@ -527,3 +527,9 @@ def merge_nested_dicts(dict1, dict2):
|
||||||
else:
|
else:
|
||||||
dict1[key] = value
|
dict1[key] = value
|
||||||
return dict1
|
return dict1
|
||||||
|
|
||||||
|
|
||||||
|
def create_and_validate_component(code: str) -> CustomComponent:
|
||||||
|
component = CustomComponent(code=code)
|
||||||
|
component.is_check_valid()
|
||||||
|
return component
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue