kiln-ai 0.21.0__py3-none-any.whl → 0.22.1__py3-none-any.whl

kiln_ai/datamodel/external_tool_server.py

@@ -1,7 +1,10 @@
+import re
 from enum import Enum
-from typing import Any, Dict
+from typing import Any
+from urllib.parse import urlparse
 
 from pydantic import Field, PrivateAttr, model_validator
+from typing_extensions import NotRequired, TypedDict
 
 from kiln_ai.datamodel.basemodel import (
     FilenameString,
@@ -9,6 +12,7 @@ from kiln_ai.datamodel.basemodel import (
 )
 from kiln_ai.utils.config import MCP_SECRETS_KEY, Config
 from kiln_ai.utils.exhaustive_error import raise_exhaustive_enum_error
+from kiln_ai.utils.validation import tool_name_validator, validate_return_dict_prop
 
 
 class ToolServerType(str, Enum):
@@ -18,6 +22,28 @@ class ToolServerType(str, Enum):
 
     remote_mcp = "remote_mcp"
     local_mcp = "local_mcp"
+    kiln_task = "kiln_task"
+
+
+class LocalServerProperties(TypedDict, total=True):
+    command: str
+    args: NotRequired[list[str]]
+    env_vars: NotRequired[dict[str, str]]
+    secret_env_var_keys: NotRequired[list[str]]
+
+
+class RemoteServerProperties(TypedDict, total=True):
+    server_url: str
+    headers: NotRequired[dict[str, str]]
+    secret_header_keys: NotRequired[list[str]]
+
+
+class KilnTaskServerProperties(TypedDict, total=True):
+    task_id: str
+    run_config_id: str
+    name: str
+    description: str
+    is_archived: bool
 
 
 class ExternalToolServer(KilnParentedModel):
@@ -36,8 +62,10 @@ class ExternalToolServer(KilnParentedModel):
         default=None,
         description="A description of the external tool for you and your team. Will not be used in prompts/training/validation.",
     )
-    properties: Dict[str, Any] = Field(
-        default={},
+
+    properties: (
+        LocalServerProperties | RemoteServerProperties | KilnTaskServerProperties
+    ) = Field(
         description="Configuration properties specific to the tool type.",
     )
 
@@ -80,6 +108,9 @@ class ExternalToolServer(KilnParentedModel):
                         # Remove from env_vars immediately so they are not saved to file
                         del env_vars[key_name]
 
+            case ToolServerType.kiln_task:
+                pass
+
             case _:
                 raise_exhaustive_enum_error(self.type)
 
@@ -93,76 +124,195 @@ class ExternalToolServer(KilnParentedModel):
         if name == "properties":
             self._process_secrets_from_properties()
 
-    @model_validator(mode="after")
-    def validate_required_fields(self) -> "ExternalToolServer":
+    # Validation Helpers
+
+    @classmethod
+    def check_server_url(cls, server_url: str) -> None:
+        """Validate Server URL"""
+        if not isinstance(server_url, str):
+            raise ValueError("Server URL must be a string")
+
+        # Check for leading whitespace in URL
+        if server_url != server_url.lstrip():
+            raise ValueError("Server URL must not have leading whitespace")
+
+        parsed_url = urlparse(server_url)
+        if not parsed_url.netloc:
+            raise ValueError("Server URL is not a valid URL")
+        if parsed_url.scheme not in ["http", "https"]:
+            raise ValueError("Server URL must start with http:// or https://")
+
+    @classmethod
+    def check_headers(cls, headers: dict) -> None:
+        """Validate Headers"""
+        if not isinstance(headers, dict):
+            raise ValueError("headers must be a dictionary")
+
+        for key, value in headers.items():
+            if not key:
+                raise ValueError("Header name is required")
+            if not value:
+                raise ValueError("Header value is required")
+
+            # Reject invalid header names and CR/LF in names/values
+            token_re = re.compile(r"^[!#$%&'*+.^_`|~0-9A-Za-z-]+$")
+            if not token_re.match(key):
+                raise ValueError(f'Invalid header name: "{key}"')
+            if re.search(r"\r|\n", key) or re.search(r"\r|\n", value):
+                raise ValueError(
+                    "Header names/values must not contain invalid characters"
+                )
+
+    @classmethod
+    def check_secret_keys(
+        cls, secret_keys: list, key_type: str, tool_type: str
+    ) -> None:
+        """Validate Secret Keys (generic method for both header and env var keys)"""
+        if not isinstance(secret_keys, list):
+            raise ValueError(
+                f"{key_type} must be a list for external tools of type '{tool_type}'"
+            )
+        if not all(isinstance(k, str) for k in secret_keys):
+            raise ValueError(f"{key_type} must contain only strings")
+        if not all(key for key in secret_keys):
+            raise ValueError("Secret key is required")
+
+    @classmethod
+    def check_env_vars(cls, env_vars: dict) -> None:
+        """Validate Environment Variables"""
+        if not isinstance(env_vars, dict):
+            raise ValueError("environment variables must be a dictionary")
+
+        # Validate env_vars keys are in the correct format for Environment Variables
+        # According to POSIX specification, environment variable names must:
+        # - Start with a letter (a-z, A-Z) or underscore (_)
+        # - Contain only ASCII letters, digits, and underscores
+        for key, _ in env_vars.items():
+            if not key or not (
+                key[0].isascii() and (key[0].isalpha() or key[0] == "_")
+            ):
+                raise ValueError(
+                    f"Invalid environment variable key: {key}. Must start with a letter or underscore."
+                )
+
+            if not all(c.isascii() and (c.isalnum() or c == "_") for c in key):
+                raise ValueError(
+                    f"Invalid environment variable key: {key}. Can only contain letters, digits, and underscores."
+                )
+
+    @classmethod
+    def type_from_data(cls, data: dict) -> ToolServerType:
+        """Get the tool server type from the data for the the validators"""
+        raw_type = data.get("type")
+        if raw_type is None:
+            raise ValueError("type is required")
+        try:
+            return ToolServerType(raw_type)
+        except ValueError:
+            valid_types = ", ".join(type.value for type in ToolServerType)
+            raise ValueError(f"type must be one of: {valid_types}")
+
+    @model_validator(mode="before")
+    def validate_required_fields(cls, data: dict) -> dict:
         """Validate that each tool type has the required configuration."""
-        match self.type:
+        server_type = ExternalToolServer.type_from_data(data)
+        properties = data.get("properties", {})
+
+        match server_type:
             case ToolServerType.remote_mcp:
-                server_url = self.properties.get("server_url", None)
-                if not isinstance(server_url, str):
-                    raise ValueError(
-                        "server_url must be a string for external tools of type 'remote_mcp'"
-                    )
-                if not server_url:
+                server_url = properties.get("server_url", None)
+                if server_url is None:
                     raise ValueError(
-                        "server_url is required to connect to a remote MCP server"
+                        "Server URL is required to connect to a remote MCP server"
                     )
+                ExternalToolServer.check_server_url(server_url)
 
-                headers = self.properties.get("headers", None)
-                if headers is None:
-                    raise ValueError("headers must be set when type is 'remote_mcp'")
-                if not isinstance(headers, dict):
+            case ToolServerType.local_mcp:
+                command = properties.get("command", None)
+                if command is None:
+                    raise ValueError("command is required to start a local MCP server")
+                if not isinstance(command, str):
                     raise ValueError(
-                        "headers must be a dictionary for external tools of type 'remote_mcp'"
+                        "command must be a string to start a local MCP server"
                     )
+                # Reject empty/whitespace-only command strings
+                if command.strip() == "":
+                    raise ValueError("command must be a non-empty string")
 
-                secret_header_keys = self.properties.get("secret_header_keys", None)
-                # Secret header keys are optional, but if they are set, they must be a list of strings
-                if secret_header_keys is not None:
-                    if not isinstance(secret_header_keys, list):
+                args = properties.get("args", None)
+                if args is not None:
+                    if not isinstance(args, list):
                         raise ValueError(
-                            "secret_header_keys must be a list for external tools of type 'remote_mcp'"
+                            "arguments must be a list to start a local MCP server"
                         )
-                    if not all(isinstance(k, str) for k in secret_header_keys):
-                        raise ValueError("secret_header_keys must contain only strings")
 
-            case ToolServerType.local_mcp:
-                command = self.properties.get("command", None)
-                if not isinstance(command, str):
-                    raise ValueError(
-                        "command must be a string to start a local MCP server"
-                    )
-                if not command.strip():
-                    raise ValueError("command is required to start a local MCP server")
+            case ToolServerType.kiln_task:
+                tool_name_validator(properties.get("name", ""))
+                err_msg_prefix = "Kiln task server properties:"
+                validate_return_dict_prop(
+                    properties, "description", str, err_msg_prefix
+                )
+                description = properties.get("description", "")
+                if len(description) > 128:
+                    raise ValueError("description must be 128 characters or less")
+                validate_return_dict_prop(
+                    properties, "is_archived", bool, err_msg_prefix
+                )
+                validate_return_dict_prop(properties, "task_id", str, err_msg_prefix)
+                validate_return_dict_prop(
+                    properties, "run_config_id", str, err_msg_prefix
+                )
 
-                args = self.properties.get("args", None)
-                if not isinstance(args, list):
-                    raise ValueError(
-                        "arguments must be a list to start a local MCP server"
-                    )
+            case _:
+                # Type checking will catch missing cases
+                raise_exhaustive_enum_error(server_type)
+        return data
 
-                env_vars = self.properties.get("env_vars", {})
-                if not isinstance(env_vars, dict):
-                    raise ValueError(
-                        "environment variables must be a dictionary for external tools of type 'local_mcp'"
+    @model_validator(mode="before")
+    def validate_headers_and_env_vars(cls, data: dict) -> dict:
+        """
+        Validate secrets, these needs to be validated before model initlization because secrets will be processed and stripped
+        """
+        type = ExternalToolServer.type_from_data(data)
+
+        properties = data.get("properties", {})
+        if properties is None:
+            raise ValueError("properties is required")
+
+        match type:
+            case ToolServerType.remote_mcp:
+                # Validate headers
+                headers = properties.get("headers", None)
+                if headers is not None:
+                    ExternalToolServer.check_headers(headers)
+
+                # Secret header keys are optional, validate if they are set
+                secret_header_keys = properties.get("secret_header_keys", None)
+                if secret_header_keys is not None:
+                    ExternalToolServer.check_secret_keys(
+                        secret_header_keys, "secret_header_keys", "remote_mcp"
                     )
 
-                secret_env_var_keys = self.properties.get("secret_env_var_keys", None)
+            case ToolServerType.local_mcp:
+                # Validate secret environment variable keys
+                env_vars = properties.get("env_vars", {})
+                if env_vars is not None:
+                    ExternalToolServer.check_env_vars(env_vars)
+
                 # Secret env var keys are optional, but if they are set, they must be a list of strings
+                secret_env_var_keys = properties.get("secret_env_var_keys", None)
                 if secret_env_var_keys is not None:
-                    if not isinstance(secret_env_var_keys, list):
-                        raise ValueError(
-                            "secret_env_var_keys must be a list for external tools of type 'local_mcp'"
-                        )
-                    if not all(isinstance(k, str) for k in secret_env_var_keys):
-                        raise ValueError(
-                            "secret_env_var_keys must contain only strings"
-                        )
+                    ExternalToolServer.check_secret_keys(
+                        secret_env_var_keys, "secret_env_var_keys", "local_mcp"
+                    )
+
+            case ToolServerType.kiln_task:
+                pass
 
             case _:
-                # Type checking will catch missing cases
-                raise_exhaustive_enum_error(self.type)
-        return self
+                raise_exhaustive_enum_error(type)
+
+        return data
 
     def get_secret_keys(self) -> list[str]:
         """
@@ -176,6 +326,8 @@ class ExternalToolServer(KilnParentedModel):
                 return self.properties.get("secret_header_keys", [])
             case ToolServerType.local_mcp:
                 return self.properties.get("secret_env_var_keys", [])
+            case ToolServerType.kiln_task:
+                return []
             case _:
                 raise_exhaustive_enum_error(self.type)
 

kiln_ai/datamodel/extraction.py

@@ -8,6 +8,7 @@ from pydantic import (
     Field,
     SerializationInfo,
     ValidationInfo,
+    computed_field,
     field_serializer,
     field_validator,
     model_validator,
@@ -259,10 +260,17 @@ class FileInfo(BaseModel):
 class Document(
     KilnParentedModel, KilnParentModel, parent_of={"extractions": Extraction}
 ):
+    # this field should not be changed after creation
     name: FilenameString = Field(
         description="A name to identify the document.",
     )
 
+    # this field can be changed after creation
+    name_override: str | None = Field(
+        description="A friendly name to identify the document. This is used for display purposes and can be different from the name.",
+        default=None,
+    )
+
     description: str = Field(description="A description for the file")
 
     original_file: FileInfo = Field(description="The original file")
@@ -295,6 +303,12 @@ class Document(
     def extractions(self, readonly: bool = False) -> list[Extraction]:
         return super().extractions(readonly=readonly)  # type: ignore
 
+    @computed_field
+    @property
+    def friendly_name(self) -> str:
+        # backward compatibility: old documents did not have name_override
+        return self.name_override or self.name
+
 
 def get_kind_from_mime_type(mime_type: str) -> Kind | None:
     for kind, mime_types in SUPPORTED_MIME_TYPES.items():

kiln_ai/datamodel/task.py

@@ -131,6 +131,11 @@ class Task(
         description="Instructions for the model 'thinking' about the requirement prior to answering. Used for chain of thought style prompting.",
     )
 
+    default_run_config_id: ID_TYPE | None = Field(
+        default=None,
+        description="ID of the run config to use for this task by default. Must exist in saved run configs for this task.",
+    )
+
     def output_schema(self) -> Dict | None:
         if self.output_json_schema is None:
             return None

kiln_ai/datamodel/task_output.py

@@ -171,6 +171,7 @@ class DataSourceType(str, Enum):
     human = "human"
     synthetic = "synthetic"
     file_import = "file_import"
+    tool_call = "tool_call"
 
 
 class DataSourceProperty(BaseModel):
@@ -189,16 +190,17 @@ class DataSourceProperty(BaseModel):
 
 class DataSource(BaseModel):
     """
-    Represents the origin of data, either human or synthetic, with associated properties.
+    Represents the origin of data, either human, synthetic, file import, or tool call, with associated properties.
 
-    Properties vary based on the source type - for synthetic sources this includes
-    model information, for human sources this includes creator information.
+    Properties vary based on the source type - for synthetic/tool_call sources this includes
+    model information, for human sources this includes creator information, for file imports
+    this includes file information.
     """
 
     type: DataSourceType
     properties: Dict[str, str | int | float] = Field(
         default={},
-        description="Properties describing the data source. For synthetic things like model. For human, the human's name.",
+        description="Properties describing the data source. For synthetic things like model. For human: the human's name. For file_import: file information.",
     )
     run_config: Optional[RunConfigProperties] = Field(
         default=None,
@@ -210,43 +212,71 @@ class DataSource(BaseModel):
             name="created_by",
             type=str,
             required_for=[DataSourceType.human],
-            not_allowed_for=[DataSourceType.synthetic, DataSourceType.file_import],
+            not_allowed_for=[
+                DataSourceType.synthetic,
+                DataSourceType.file_import,
+                DataSourceType.tool_call,
+            ],
         ),
         DataSourceProperty(
             name="model_name",
             type=str,
             required_for=[DataSourceType.synthetic],
-            not_allowed_for=[DataSourceType.human, DataSourceType.file_import],
+            not_allowed_for=[
+                DataSourceType.human,
+                DataSourceType.file_import,
+                DataSourceType.tool_call,
+            ],
         ),
         DataSourceProperty(
             name="model_provider",
             type=str,
             required_for=[DataSourceType.synthetic],
-            not_allowed_for=[DataSourceType.human, DataSourceType.file_import],
+            not_allowed_for=[
+                DataSourceType.human,
+                DataSourceType.file_import,
+                DataSourceType.tool_call,
+            ],
         ),
         DataSourceProperty(
             name="adapter_name",
             type=str,
             required_for=[DataSourceType.synthetic],
-            not_allowed_for=[DataSourceType.human, DataSourceType.file_import],
+            not_allowed_for=[
+                DataSourceType.human,
+                DataSourceType.file_import,
+                DataSourceType.tool_call,
+            ],
         ),
         DataSourceProperty(
             # Legacy field -- allow loading from old runs, but we shouldn't be setting it.
             name="prompt_builder_name",
             type=str,
-            not_allowed_for=[DataSourceType.human, DataSourceType.file_import],
+            not_allowed_for=[
+                DataSourceType.human,
+                DataSourceType.file_import,
+                DataSourceType.tool_call,
+            ],
         ),
         DataSourceProperty(
             # The PromptId of the prompt. Can be a saved prompt, fine-tune, generator name, etc. See PromptId type for more details.
             name="prompt_id",
             type=str,
-            not_allowed_for=[DataSourceType.human, DataSourceType.file_import],
+            not_allowed_for=[
+                DataSourceType.human,
+                DataSourceType.file_import,
+                DataSourceType.tool_call,
+            ],
         ),
         DataSourceProperty(
             name="file_name",
             type=str,
             required_for=[DataSourceType.file_import],
-            not_allowed_for=[DataSourceType.human, DataSourceType.synthetic],
+            not_allowed_for=[
+                DataSourceType.human,
+                DataSourceType.synthetic,
+                DataSourceType.tool_call,
+            ],
         ),
     ]
 

kiln_ai/datamodel/test_attachment.py

@@ -14,7 +14,7 @@ from kiln_ai.datamodel.basemodel import KilnAttachmentModel, KilnBaseModel
 
 
 class ModelWithAttachment(KilnBaseModel):
-    attachment: KilnAttachmentModel = Field(default=None)
+    attachment: KilnAttachmentModel | None = Field(default=None)
     attachment_list: Optional[List[KilnAttachmentModel]] = Field(default=None)
     attachment_dict: Optional[Dict[str, KilnAttachmentModel]] = Field(default=None)
 
@@ -516,7 +516,7 @@ class ModelWithAttachmentNameOverrideList(KilnBaseModel):
     @field_serializer("attachment_list")
     def serialize_attachment_list(
         self, attachment_list: List[KilnAttachmentModel], info: SerializationInfo
-    ) -> dict:
+    ) -> List[dict]:
         context = info.context or {}
         context["filename_prefix"] = "attachment_override"
         return [
@@ -555,7 +555,7 @@ def test_attachment_filename_override_list(test_base_kiln_file, mock_file_factor
 
 
 class ModelWithAttachmentNoNameOverride(KilnBaseModel):
-    attachment: KilnAttachmentModel = Field(default=None)
+    attachment: KilnAttachmentModel | None = Field(default=None)
 
 
 def test_attachment_filename_no_override(test_base_kiln_file, mock_file_factory):