lfx-nightly 0.2.0.dev41__py3-none-any.whl → 0.3.0.dev3__py3-none-any.whl

lfx/base/models/watsonx_constants.py

@@ -1,29 +1,68 @@
 from .model_metadata import create_model_metadata
 
+WATSONX_DEFAULT_LLM_MODELS = [
+    create_model_metadata(
+        provider="IBM WatsonX",
+        name="ibm/granite-3-2b-instruct",
+        icon="WatsonxAI",
+        model_type="llm",
+        tool_calling=False,
+        default=True,
+    ),
+    create_model_metadata(
+        provider="IBM WatsonX",
+        name="ibm/granite-3-8b-instruct",
+        icon="WatsonxAI",
+        model_type="llm",
+        tool_calling=True,
+        default=True,
+    ),
+    create_model_metadata(
+        provider="IBM WatsonX",
+        name="ibm/granite-13b-instruct-v2",
+        icon="WatsonxAI",
+        model_type="llm",
+        tool_calling=False,
+        default=True,
+    ),
+]
+
 WATSONX_DEFAULT_EMBEDDING_MODELS = [
     create_model_metadata(
-        provider="IBM Watsonx",
+        provider="IBM WatsonX",
         name="sentence-transformers/all-minilm-l12-v2",
         icon="WatsonxAI",
+        model_type="embeddings",
+        default=True,
     ),
     create_model_metadata(
-        provider="IBM Watsonx",
+        provider="IBM WatsonX",
         name="ibm/slate-125m-english-rtrvr-v2",
         icon="WatsonxAI",
+        model_type="embeddings",
+        default=True,
     ),
     create_model_metadata(
-        provider="IBM Watsonx",
+        provider="IBM WatsonX",
         name="ibm/slate-30m-english-rtrvr-v2",
         icon="WatsonxAI",
+        model_type="embeddings",
+        default=True,
     ),
     create_model_metadata(
-        provider="IBM Watsonx",
+        provider="IBM WatsonX",
         name="intfloat/multilingual-e5-large",
         icon="WatsonxAI",
+        model_type="embeddings",
+        default=True,
     ),
 ]
 
 
+WATSONX_EMBEDDING_MODELS_DETAILED = WATSONX_DEFAULT_EMBEDDING_MODELS
+# Combined list for all watsonx models
+WATSONX_MODELS_DETAILED = WATSONX_DEFAULT_LLM_MODELS + WATSONX_DEFAULT_EMBEDDING_MODELS
+
 WATSONX_EMBEDDING_MODEL_NAMES = [metadata["name"] for metadata in WATSONX_DEFAULT_EMBEDDING_MODELS]
 
 IBM_WATSONX_URLS = [

lfx/base/prompts/api_utils.py

@@ -3,6 +3,7 @@ from typing import Any
 
 from fastapi import HTTPException
 from langchain_core.prompts import PromptTemplate
+from langchain_core.prompts.string import mustache_template_vars
 
 from lfx.inputs.inputs import DefaultPromptField
 from lfx.interface.utils import extract_input_variables_from_prompt
@@ -90,7 +91,7 @@ def _check_variable(var, invalid_chars, wrong_variables, empty_variables):
 def _check_for_errors(input_variables, fixed_variables, wrong_variables, empty_variables) -> None:
     if any(var for var in input_variables if var not in fixed_variables):
         error_message = (
-            f"Error: Input variables contain invalid characters or formats. \n"
+            f"Input variables contain invalid characters or formats. \n"
             f"Invalid variables: {', '.join(wrong_variables)}.\n"
             f"Empty variables: {', '.join(empty_variables)}. \n"
             f"Fixed variables: {', '.join(fixed_variables)}."
@@ -122,8 +123,37 @@ def _check_input_variables(input_variables):
     return fixed_variables
 
 
-def validate_prompt(prompt_template: str, *, silent_errors: bool = False) -> list[str]:
-    input_variables = extract_input_variables_from_prompt(prompt_template)
+def validate_prompt(prompt_template: str, *, silent_errors: bool = False, is_mustache: bool = False) -> list[str]:
+    if is_mustache:
+        # Extract only mustache variables
+        try:
+            input_variables = mustache_template_vars(prompt_template)
+        except Exception as exc:
+            # Mustache parser errors are often cryptic (e.g., "unclosed tag at line 1")
+            # Provide a more helpful error message
+            error_str = str(exc).lower()
+            if "unclosed" in error_str or "tag" in error_str:
+                msg = "Invalid template syntax. Check that all {{variables}} have matching opening and closing braces."
+            else:
+                msg = f"Invalid mustache template: {exc}"
+            raise ValueError(msg) from exc
+
+        # Also get f-string variables to filter them out
+        fstring_vars = extract_input_variables_from_prompt(prompt_template)
+
+        # Only keep variables that are actually in mustache syntax (not in f-string syntax)
+        # This handles cases where template has both {var} and {{var}}
+        input_variables = [v for v in input_variables if v not in fstring_vars or f"{{{{{v}}}}}" in prompt_template]
+    else:
+        # Extract f-string variables
+        input_variables = extract_input_variables_from_prompt(prompt_template)
+
+        # Also get mustache variables to filter them out
+        mustache_vars = mustache_template_vars(prompt_template)
+
+        # Only keep variables that are NOT in mustache syntax
+        # This handles cases where template has both {var} and {{var}}
+        input_variables = [v for v in input_variables if v not in mustache_vars]
 
     # Check if there are invalid characters in the input_variables
     input_variables = _check_input_variables(input_variables)
@@ -199,11 +229,16 @@ def update_input_variables_field(input_variables, template) -> None:
 
 
 def process_prompt_template(
-    template: str, name: str, custom_fields: dict[str, list[str]] | None, frontend_node_template: dict[str, Any]
+    template: str,
+    name: str,
+    custom_fields: dict[str, list[str]] | None,
+    frontend_node_template: dict[str, Any],
+    *,
+    is_mustache: bool = False,
 ):
     """Process and validate prompt template, update template and custom fields."""
     # Validate the prompt template and extract input variables
-    input_variables = validate_prompt(template)
+    input_variables = validate_prompt(template, is_mustache=is_mustache)
 
     # Initialize custom_fields if None
     if custom_fields is None:

lfx/base/tools/component_tool.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import re
-from typing import TYPE_CHECKING, Literal
+from typing import TYPE_CHECKING
 
 import pandas as pd
 from langchain_core.tools import BaseTool, ToolException
@@ -22,7 +22,6 @@ if TYPE_CHECKING:
     from lfx.events.event_manager import EventManager
     from lfx.inputs.inputs import InputTypes
     from lfx.io import Output
-    from lfx.schema.content_block import ContentBlock
     from lfx.schema.dotdict import dotdict
 
 TOOL_TYPES_SET = {"Tool", "BaseTool", "StructuredTool"}
@@ -42,15 +41,9 @@ def build_description(component: Component) -> str:
 
 async def send_message_noop(
     message: Message,
-    text: str | None = None,  # noqa: ARG001
-    background_color: str | None = None,  # noqa: ARG001
-    text_color: str | None = None,  # noqa: ARG001
-    icon: str | None = None,  # noqa: ARG001
-    content_blocks: list[ContentBlock] | None = None,  # noqa: ARG001
-    format_type: Literal["default", "error", "warning", "info"] = "default",  # noqa: ARG001
     id_: str | None = None,  # noqa: ARG001
     *,
-    allow_markdown: bool = True,  # noqa: ARG001
+    skip_db_update: bool = False,  # noqa: ARG001
 ) -> Message:
     """No-op implementation of send_message."""
     return message

lfx/cli/__init__.py

@@ -1,5 +1,13 @@
 """LFX CLI module for serving flows."""
 
-from lfx.cli.commands import serve_command
-
 __all__ = ["serve_command"]
+
+
+def __getattr__(name: str):
+    """Lazy import for serve_command."""
+    if name == "serve_command":
+        from lfx.cli.commands import serve_command
+
+        return serve_command
+    msg = f"module {__name__!r} has no attribute {name!r}"
+    raise AttributeError(msg)

lfx/cli/commands.py

@@ -303,6 +303,9 @@ async def serve_command(
         console.print()
 
         # Start the server
+        # Use uvicorn.Server to properly handle async context
+        # uvicorn.run() uses asyncio.run() internally which fails when
+        # an event loop is already running (due to syncify decorator)
         try:
             config = uvicorn.Config(
                 serve_app,