fastmcp 2.12.5__py3-none-any.whl → 2.14.0__py3-none-any.whl

fastmcp/utilities/cli.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import json
 import os
-from importlib.metadata import version
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal
 
@@ -138,7 +137,7 @@ def load_and_merge_config(
     return new_config, resolved_spec
 
 
-LOGO_ASCII = r"""
+LOGO_ASCII_1 = r"""
     _ __ ___  _____           __  __  _____________    ____    ____ 
    _ __ ___ .'____/___ ______/ /_/  |/  / ____/ __ \  |___ \  / __ \
   _ __ ___ / /_  / __ `/ ___/ __/ /|_/ / /   / /_/ /  ___/ / / / / /
@@ -147,6 +146,56 @@ _ __ ___ /_/    \____/____/\__/_/  /_/\____/_/      /_____(*)____/
 
 """.lstrip("\n")
 
+# This prints the below in a blue gradient
+#  █▀▀ ▄▀█ █▀▀ ▀█▀ █▀▄▀█ █▀▀ █▀█
+#  █▀  █▀█ ▄▄█  █  █ ▀ █ █▄▄ █▀▀
+LOGO_ASCII_2 = (
+    "\x1b[38;2;0;198;255m \x1b[38;2;0;195;255m█\x1b[38;2;0;192;255m▀\x1b[38;2;0;189;255m▀\x1b[38;2;0;186;255m "
+    "\x1b[38;2;0;184;255m▄\x1b[38;2;0;181;255m▀\x1b[38;2;0;178;255m█\x1b[38;2;0;175;255m "
+    "\x1b[38;2;0;172;255m█\x1b[38;2;0;169;255m▀\x1b[38;2;0;166;255m▀\x1b[38;2;0;163;255m "
+    "\x1b[38;2;0;160;255m▀\x1b[38;2;0;157;255m█\x1b[38;2;0;155;255m▀\x1b[38;2;0;152;255m "
+    "\x1b[38;2;0;149;255m█\x1b[38;2;0;146;255m▀\x1b[38;2;0;143;255m▄\x1b[38;2;0;140;255m▀\x1b[38;2;0;137;255m█\x1b[38;2;0;134;255m "
+    "\x1b[38;2;0;131;255m█\x1b[38;2;0;128;255m▀\x1b[38;2;0;126;255m▀\x1b[38;2;0;123;255m "
+    "\x1b[38;2;0;120;255m█\x1b[38;2;0;117;255m▀\x1b[38;2;0;114;255m█\x1b[39m\n"
+    "\x1b[38;2;0;198;255m \x1b[38;2;0;195;255m█\x1b[38;2;0;192;255m▀\x1b[38;2;0;189;255m \x1b[38;2;0;186;255m "
+    "\x1b[38;2;0;184;255m█\x1b[38;2;0;181;255m▀\x1b[38;2;0;178;255m█\x1b[38;2;0;175;255m "
+    "\x1b[38;2;0;172;255m▄\x1b[38;2;0;169;255m▄\x1b[38;2;0;166;255m█\x1b[38;2;0;163;255m "
+    "\x1b[38;2;0;160;255m \x1b[38;2;0;157;255m█\x1b[38;2;0;155;255m \x1b[38;2;0;152;255m "
+    "\x1b[38;2;0;149;255m█\x1b[38;2;0;146;255m \x1b[38;2;0;143;255m▀\x1b[38;2;0;140;255m \x1b[38;2;0;137;255m█\x1b[38;2;0;134;255m "
+    "\x1b[38;2;0;131;255m█\x1b[38;2;0;128;255m▄\x1b[38;2;0;126;255m▄\x1b[38;2;0;123;255m "
+    "\x1b[38;2;0;120;255m█\x1b[38;2;0;117;255m▀\x1b[38;2;0;114;255m▀\x1b[39m"
+).strip()
+
+# Prints the below in a blue gradient - sylized F
+#  ▄▀▀▀
+#  █▀▀
+# ▀
+LOGO_ASCII_3 = (
+    " \x1b[38;2;0;170;255m▄\x1b[38;2;0;142;255m▀\x1b[38;2;0;114;255m▀\x1b[38;2;0;86;255m▀\x1b[39m\n"
+    " \x1b[38;2;0;170;255m█\x1b[38;2;0;142;255m▀\x1b[38;2;0;114;255m▀\x1b[39m\n"
+    "\x1b[38;2;0;170;255m▀\x1b[39m\n"
+    "\x1b[0m"
+)
+
+# Prints the below in a blue gradient - block logo with slightly stylized F
+#  ▄▀▀ ▄▀█ █▀▀ ▀█▀ █▀▄▀█ █▀▀ █▀█
+#  █▀  █▀█ ▄▄█  █  █ ▀ █ █▄▄ █▀▀
+
+LOGO_ASCII_4 = (
+    "\x1b[38;2;0;198;255m \x1b[38;2;0;195;255m▄\x1b[38;2;0;192;255m▀\x1b[38;2;0;189;255m▀\x1b[38;2;0;186;255m \x1b[38;2;0;184;255m▄\x1b[38;2;0;181;255m▀\x1b[38;2;0;178;255m█\x1b[38;2;0;175;255m "
+    "\x1b[38;2;0;172;255m█\x1b[38;2;0;169;255m▀\x1b[38;2;0;166;255m▀\x1b[38;2;0;163;255m "
+    "\x1b[38;2;0;160;255m▀\x1b[38;2;0;157;255m█\x1b[38;2;0;155;255m▀\x1b[38;2;0;152;255m "
+    "\x1b[38;2;0;149;255m█\x1b[38;2;0;146;255m▀\x1b[38;2;0;143;255m▄\x1b[38;2;0;140;255m▀\x1b[38;2;0;137;255m█\x1b[38;2;0;134;255m "
+    "\x1b[38;2;0;131;255m█\x1b[38;2;0;128;255m▀\x1b[38;2;0;126;255m▀\x1b[38;2;0;123;255m "
+    "\x1b[38;2;0;120;255m█\x1b[38;2;0;117;255m▀\x1b[38;2;0;114;255m█\x1b[39m\n"
+    "\x1b[38;2;0;198;255m \x1b[38;2;0;195;255m█\x1b[38;2;0;192;255m▀\x1b[38;2;0;189;255m \x1b[38;2;0;186;255m \x1b[38;2;0;184;255m█\x1b[38;2;0;181;255m▀\x1b[38;2;0;178;255m█\x1b[38;2;0;175;255m "
+    "\x1b[38;2;0;172;255m▄\x1b[38;2;0;169;255m▄\x1b[38;2;0;166;255m█\x1b[38;2;0;163;255m "
+    "\x1b[38;2;0;160;255m \x1b[38;2;0;157;255m█\x1b[38;2;0;155;255m \x1b[38;2;0;152;255m "
+    "\x1b[38;2;0;149;255m█\x1b[38;2;0;146;255m \x1b[38;2;0;143;255m▀\x1b[38;2;0;140;255m \x1b[38;2;0;137;255m█\x1b[38;2;0;134;255m "
+    "\x1b[38;2;0;131;255m█\x1b[38;2;0;128;255m▄\x1b[38;2;0;126;255m▄\x1b[38;2;0;123;255m "
+    "\x1b[38;2;0;120;255m█\x1b[38;2;0;117;255m▀\x1b[38;2;0;114;255m▀\x1b[39m\n"
+)
+
 
 def log_server_banner(
     server: FastMCP[Any],
@@ -167,10 +216,11 @@ def log_server_banner(
     """
 
     # Create the logo text
-    logo_text = Text(LOGO_ASCII, style="bold green")
+    # Use Text with no_wrap and markup disabled to preserve ANSI escape codes
+    logo_text = Text.from_ansi(LOGO_ASCII_4, no_wrap=True)
 
     # Create the main title
-    title_text = Text("FastMCP  2.0", style="bold blue")
+    title_text = Text(f"FastMCP {fastmcp.__version__}", style="bold blue")
 
     # Create the information table
     info_table = Table.grid(padding=(0, 1))
@@ -180,44 +230,31 @@ def log_server_banner(
 
     match transport:
         case "http" | "streamable-http":
-            display_transport = "Streamable-HTTP"
+            display_transport = "HTTP"
         case "sse":
             display_transport = "SSE"
         case "stdio":
             display_transport = "STDIO"
 
-    info_table.add_row("🖥️", "Server name:", server.name)
+    info_table.add_row("🖥", "Server name:", Text(server.name + "\n", style="bold blue"))
     info_table.add_row("📦", "Transport:", display_transport)
 
     # Show connection info based on transport
-    if transport in ("http", "streamable-http", "sse"):
-        if host and port:
-            server_url = f"http://{host}:{port}"
-            if path:
-                server_url += f"/{path.lstrip('/')}"
-            info_table.add_row("🔗", "Server URL:", server_url)
-
-    # Add version information with explicit style overrides
-    info_table.add_row("", "", "")
-    info_table.add_row(
-        "🏎️",
-        "FastMCP version:",
-        Text(fastmcp.__version__, style="dim white", no_wrap=True),
-    )
-    info_table.add_row(
-        "🤝",
-        "MCP SDK version:",
-        Text(version("mcp"), style="dim white", no_wrap=True),
-    )
+    if transport in ("http", "streamable-http", "sse") and host and port:
+        server_url = f"http://{host}:{port}"
+        if path:
+            server_url += f"/{path.lstrip('/')}"
+        info_table.add_row("🔗", "Server URL:", server_url)
 
     # Add documentation link
     info_table.add_row("", "", "")
     info_table.add_row("📚", "Docs:", "https://gofastmcp.com")
-    info_table.add_row("🚀", "Deploy:", "https://fastmcp.cloud")
+    info_table.add_row("🚀", "Hosting:", "https://fastmcp.cloud")
 
     # Create panel with logo, title, and information using Group
     panel_content = Group(
         Align.center(logo_text),
+        "",
         Align.center(title_text),
         "",
         "",
@@ -228,8 +265,10 @@ def log_server_banner(
         panel_content,
         border_style="dim",
         padding=(1, 4),
-        expand=False,
+        # expand=False,
+        width=80,  # Set max width for the panel
     )
 
     console = Console(stderr=True)
-    console.print(Group("\n", panel, "\n"))
+    # Center the panel itself
+    console.print(Group("\n", Align.center(panel), "\n"))

fastmcp/utilities/components.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from collections.abc import Sequence
-from typing import Annotated, Any, TypedDict
+from typing import Annotated, Any, TypedDict, cast
 
+from mcp.types import Icon
 from pydantic import BeforeValidator, Field, PrivateAttr
 from typing_extensions import Self, TypeVar
 
@@ -39,6 +40,10 @@ class FastMCPComponent(FastMCPBaseModel):
         default=None,
         description="The description of the component.",
     )
+    icons: list[Icon] | None = Field(
+        default=None,
+        description="Optional list of icons for this component to display in user interfaces.",
+    )
     tags: Annotated[set[str], BeforeValidator(_convert_set_default_none)] = Field(
         default_factory=set,
         description="Tags for the component.",
@@ -91,7 +96,7 @@ class FastMCPComponent(FastMCPBaseModel):
 
         return meta or None
 
-    def model_copy(
+    def model_copy(  # type: ignore[override]
         self,
         *,
         update: dict[str, Any] | None = None,
@@ -112,7 +117,7 @@ class FastMCPComponent(FastMCPBaseModel):
         copy = super().model_copy(update=update, deep=deep)
         if key is not None:
             copy._key = key
-        return copy
+        return cast(Self, copy)
 
     def __eq__(self, other: object) -> bool:
         if type(self) is not type(other):
@@ -132,7 +137,7 @@ class FastMCPComponent(FastMCPBaseModel):
         """Disable the component."""
         self.enabled = False
 
-    def copy(self) -> Self:
+    def copy(self) -> Self:  # type: ignore[override]
         """Create a copy of the component."""
         return self.model_copy()
 
@@ -168,7 +173,7 @@ class MirroredComponent(FastMCPComponent):
             )
         super().disable()
 
-    def copy(self) -> Self:
+    def copy(self) -> Self:  # type: ignore[override]
         """Create a copy of the component that can be modified."""
         # Create a copy and mark it as not mirrored
         copied = self.model_copy()

fastmcp/utilities/inspect.py

@@ -28,6 +28,7 @@ class ToolInfo:
     tags: list[str] | None = None
     enabled: bool | None = None
     title: str | None = None
+    icons: list[dict[str, Any]] | None = None
     meta: dict[str, Any] | None = None
 
 
@@ -42,6 +43,7 @@ class PromptInfo:
     tags: list[str] | None = None
     enabled: bool | None = None
     title: str | None = None
+    icons: list[dict[str, Any]] | None = None
     meta: dict[str, Any] | None = None
 
 
@@ -58,6 +60,7 @@ class ResourceInfo:
     tags: list[str] | None = None
     enabled: bool | None = None
     title: str | None = None
+    icons: list[dict[str, Any]] | None = None
     meta: dict[str, Any] | None = None
 
 
@@ -75,6 +78,7 @@ class TemplateInfo:
     tags: list[str] | None = None
     enabled: bool | None = None
     title: str | None = None
+    icons: list[dict[str, Any]] | None = None
     meta: dict[str, Any] | None = None
 
 
@@ -85,6 +89,8 @@ class FastMCPInfo:
     name: str
     instructions: str | None
     version: str | None  # The server's own version string (if specified)
+    website_url: str | None
+    icons: list[dict[str, Any]] | None
     fastmcp_version: str  # Version of FastMCP generating this manifest
     mcp_version: str  # Version of MCP protocol library
     server_generation: int  # Server generation: 1 (mcp package) or 2 (fastmcp)
@@ -104,21 +110,20 @@ async def inspect_fastmcp_v2(mcp: FastMCP[Any]) -> FastMCPInfo:
     Returns:
         FastMCPInfo dataclass containing the extracted information
     """
-    # Get all the components using FastMCP2's direct methods
-    tools_dict = await mcp.get_tools()
-    prompts_dict = await mcp.get_prompts()
-    resources_dict = await mcp.get_resources()
-    templates_dict = await mcp.get_resource_templates()
+    # Get all components via middleware to respect filtering and preserve metadata
+    tools_list = await mcp._list_tools_middleware()
+    prompts_list = await mcp._list_prompts_middleware()
+    resources_list = await mcp._list_resources_middleware()
+    templates_list = await mcp._list_resource_templates_middleware()
 
     # Extract detailed tool information
     tool_infos = []
-    for key, tool in tools_dict.items():
-        # Convert to MCP tool to get input schema
-        mcp_tool = tool.to_mcp_tool(name=key)
+    for tool in tools_list:
+        mcp_tool = tool.to_mcp_tool(name=tool.key)
         tool_infos.append(
             ToolInfo(
-                key=key,
-                name=tool.name or key,
+                key=tool.key,
+                name=tool.name or tool.key,
                 description=tool.description,
                 input_schema=mcp_tool.inputSchema if mcp_tool.inputSchema else {},
                 output_schema=tool.output_schema,
@@ -126,17 +131,20 @@ async def inspect_fastmcp_v2(mcp: FastMCP[Any]) -> FastMCPInfo:
                 tags=list(tool.tags) if tool.tags else None,
                 enabled=tool.enabled,
                 title=tool.title,
+                icons=[icon.model_dump() for icon in tool.icons]
+                if tool.icons
+                else None,
                 meta=tool.meta,
             )
         )
 
     # Extract detailed prompt information
     prompt_infos = []
-    for key, prompt in prompts_dict.items():
+    for prompt in prompts_list:
         prompt_infos.append(
             PromptInfo(
-                key=key,
-                name=prompt.name or key,
+                key=prompt.key,
+                name=prompt.name or prompt.key,
                 description=prompt.description,
                 arguments=[arg.model_dump() for arg in prompt.arguments]
                 if prompt.arguments
@@ -144,17 +152,20 @@ async def inspect_fastmcp_v2(mcp: FastMCP[Any]) -> FastMCPInfo:
                 tags=list(prompt.tags) if prompt.tags else None,
                 enabled=prompt.enabled,
                 title=prompt.title,
+                icons=[icon.model_dump() for icon in prompt.icons]
+                if prompt.icons
+                else None,
                 meta=prompt.meta,
             )
         )
 
     # Extract detailed resource information
     resource_infos = []
-    for key, resource in resources_dict.items():
+    for resource in resources_list:
         resource_infos.append(
             ResourceInfo(
-                key=key,
-                uri=key,  # For v2, key is the URI
+                key=resource.key,
+                uri=resource.key,
                 name=resource.name,
                 description=resource.description,
                 mime_type=resource.mime_type,
@@ -164,17 +175,20 @@ async def inspect_fastmcp_v2(mcp: FastMCP[Any]) -> FastMCPInfo:
                 tags=list(resource.tags) if resource.tags else None,
                 enabled=resource.enabled,
                 title=resource.title,
+                icons=[icon.model_dump() for icon in resource.icons]
+                if resource.icons
+                else None,
                 meta=resource.meta,
             )
         )
 
     # Extract detailed template information
     template_infos = []
-    for key, template in templates_dict.items():
+    for template in templates_list:
         template_infos.append(
             TemplateInfo(
-                key=key,
-                uri_template=key,  # For v2, key is the URI template
+                key=template.key,
+                uri_template=template.key,
                 name=template.name,
                 description=template.description,
                 mime_type=template.mime_type,
@@ -185,6 +199,9 @@ async def inspect_fastmcp_v2(mcp: FastMCP[Any]) -> FastMCPInfo:
                 tags=list(template.tags) if template.tags else None,
                 enabled=template.enabled,
                 title=template.title,
+                icons=[icon.model_dump() for icon in template.icons]
+                if template.icons
+                else None,
                 meta=template.meta,
             )
         )
@@ -197,13 +214,25 @@ async def inspect_fastmcp_v2(mcp: FastMCP[Any]) -> FastMCPInfo:
         "logging": {},
     }
 
+    # Extract server-level icons and website_url
+    server_icons = (
+        [icon.model_dump() for icon in mcp._mcp_server.icons]
+        if hasattr(mcp._mcp_server, "icons") and mcp._mcp_server.icons
+        else None
+    )
+    server_website_url = (
+        mcp._mcp_server.website_url if hasattr(mcp._mcp_server, "website_url") else None
+    )
+
     return FastMCPInfo(
         name=mcp.name,
         instructions=mcp.instructions,
+        version=(mcp.version if hasattr(mcp, "version") else mcp._mcp_server.version),
+        website_url=server_website_url,
+        icons=server_icons,
         fastmcp_version=fastmcp.__version__,
         mcp_version=importlib.metadata.version("mcp"),
         server_generation=2,  # FastMCP v2
-        version=(mcp.version if hasattr(mcp, "version") else mcp._mcp_server.version),
         tools=tool_infos,
         prompts=prompt_infos,
         resources=resource_infos,
@@ -248,6 +277,9 @@ async def inspect_fastmcp_v1(mcp: FastMCP1x) -> FastMCPInfo:
                     tags=None,  # v1 doesn't have tags
                     enabled=None,  # v1 doesn't have enabled field
                     title=None,  # v1 doesn't have title
+                    icons=[icon.model_dump() for icon in mcp_tool.icons]
+                    if hasattr(mcp_tool, "icons") and mcp_tool.icons
+                    else None,
                     meta=None,  # v1 doesn't have meta field
                 )
             )
@@ -269,6 +301,9 @@ async def inspect_fastmcp_v1(mcp: FastMCP1x) -> FastMCPInfo:
                     tags=None,  # v1 doesn't have tags
                     enabled=None,  # v1 doesn't have enabled field
                     title=None,  # v1 doesn't have title
+                    icons=[icon.model_dump() for icon in mcp_prompt.icons]
+                    if hasattr(mcp_prompt, "icons") and mcp_prompt.icons
+                    else None,
                     meta=None,  # v1 doesn't have meta field
                 )
             )
@@ -287,6 +322,9 @@ async def inspect_fastmcp_v1(mcp: FastMCP1x) -> FastMCPInfo:
                     tags=None,  # v1 doesn't have tags
                     enabled=None,  # v1 doesn't have enabled field
                     title=None,  # v1 doesn't have title
+                    icons=[icon.model_dump() for icon in mcp_resource.icons]
+                    if hasattr(mcp_resource, "icons") and mcp_resource.icons
+                    else None,
                     meta=None,  # v1 doesn't have meta field
                 )
             )
@@ -306,6 +344,9 @@ async def inspect_fastmcp_v1(mcp: FastMCP1x) -> FastMCPInfo:
                     tags=None,  # v1 doesn't have tags
                     enabled=None,  # v1 doesn't have enabled field
                     title=None,  # v1 doesn't have title
+                    icons=[icon.model_dump() for icon in mcp_template.icons]
+                    if hasattr(mcp_template, "icons") and mcp_template.icons
+                    else None,
                     meta=None,  # v1 doesn't have meta field
                 )
             )
@@ -318,13 +359,26 @@ async def inspect_fastmcp_v1(mcp: FastMCP1x) -> FastMCPInfo:
             "logging": {},
         }
 
+        # Extract server-level icons and website_url from serverInfo
+        server_info = client.initialize_result.serverInfo
+        server_icons = (
+            [icon.model_dump() for icon in server_info.icons]
+            if hasattr(server_info, "icons") and server_info.icons
+            else None
+        )
+        server_website_url = (
+            server_info.websiteUrl if hasattr(server_info, "websiteUrl") else None
+        )
+
         return FastMCPInfo(
             name=mcp._mcp_server.name,
             instructions=mcp._mcp_server.instructions,
+            version=mcp._mcp_server.version,
+            website_url=server_website_url,
+            icons=server_icons,
             fastmcp_version=fastmcp.__version__,  # Version generating this manifest
             mcp_version=importlib.metadata.version("mcp"),
             server_generation=1,  # MCP v1
-            version=mcp._mcp_server.version,
             tools=tool_infos,
             prompts=prompt_infos,
             resources=resource_infos,
@@ -358,7 +412,7 @@ class InspectFormat(str, Enum):
     MCP = "mcp"
 
 
-async def format_fastmcp_info(info: FastMCPInfo) -> bytes:
+def format_fastmcp_info(info: FastMCPInfo) -> bytes:
     """Format FastMCPInfo as FastMCP-specific JSON.
 
     This includes FastMCP-specific fields like tags, enabled, annotations, etc.
@@ -369,6 +423,8 @@ async def format_fastmcp_info(info: FastMCPInfo) -> bytes:
             "name": info.name,
             "instructions": info.instructions,
             "version": info.version,
+            "website_url": info.website_url,
+            "icons": info.icons,
             "generation": info.server_generation,
             "capabilities": info.capabilities,
         },
@@ -445,6 +501,6 @@ async def format_info(
         # This works for both v1 and v2 servers
         if info is None:
             info = await inspect_fastmcp(mcp)
-        return await format_fastmcp_info(info)
+        return format_fastmcp_info(info)
     else:
         raise ValueError(f"Unknown format: {format}")

fastmcp/utilities/json_schema.py

@@ -98,7 +98,7 @@ def _single_pass_optimize(
         if isinstance(node, dict):
             # Collect $ref references for unused definition removal
             if prune_defs:
-                ref = node.get("$ref")
+                ref = node.get("$ref")  # type: ignore
                 if isinstance(ref, str) and ref.startswith("#/$defs/"):
                     referenced_def = ref.split("/")[-1]
                     if current_def_name:
@@ -127,13 +127,13 @@ def _single_pass_optimize(
                         "required",
                     ]
                 ):
-                    node.pop("title")
+                    node.pop("title")  # type: ignore
 
             if (
                 prune_additional_properties
-                and node.get("additionalProperties") is False
+                and node.get("additionalProperties") is False  # type: ignore
             ):
-                node.pop("additionalProperties")
+                node.pop("additionalProperties")  # type: ignore
 
             # Recursive traversal
             for key, value in node.items():

fastmcp/utilities/json_schema_type.py

@@ -61,7 +61,7 @@ from pydantic import (
 )
 from typing_extensions import NotRequired, TypedDict
 
-__all__ = ["json_schema_to_type", "JSONSchema"]
+__all__ = ["JSONSchema", "json_schema_to_type"]
 
 
 FORMAT_TYPES: dict[str, Any] = {
@@ -248,7 +248,7 @@ def _create_numeric_type(
         if v is not None
     }
 
-    return Annotated[base, Field(**constraints)] if constraints else base
+    return Annotated[base, Field(**constraints)] if constraints else base  # type: ignore[return-value]
 
 
 def _create_enum(name: str, values: list[Any]) -> type:
@@ -265,8 +265,8 @@ def _create_array_type(
     if isinstance(items, list):
         # Handle positional item schemas
         item_types = [_schema_to_type(s, schemas) for s in items]
-        combined = Union[tuple(item_types)]  # type: ignore # noqa: UP007
-        base = list[combined]
+        combined = Union[tuple(item_types)]  # type: ignore[arg-type] # noqa: UP007
+        base = list[combined]  # type: ignore[valid-type]
     else:
         # Handle single item schema
         item_type = _schema_to_type(items, schemas)
@@ -282,7 +282,7 @@ def _create_array_type(
         if v is not None
     }
 
-    return Annotated[base, Field(**constraints)] if constraints else base
+    return Annotated[base, Field(**constraints)] if constraints else base  # type: ignore[return-value]
 
 
 def _return_Any() -> Any:
@@ -368,7 +368,7 @@ def _schema_to_type(
                 return types[0]
         else:
             if has_null:
-                return Union[tuple(types + [type(None)])]  # type: ignore # noqa: UP007
+                return Union[(*types, type(None))]  # type: ignore
             else:
                 return Union[tuple(types)]  # type: ignore # noqa: UP007
 
@@ -389,7 +389,7 @@ def _schema_to_type(
             if len(types) == 1:
                 return types[0] | None  # type: ignore
             else:
-                return Union[tuple(types + [type(None)])]  # type: ignore # noqa: UP007
+                return Union[(*types, type(None))]  # type: ignore
         return Union[tuple(types)]  # type: ignore # noqa: UP007
 
     return _get_from_type_handler(schema, schemas)(schema)
@@ -578,7 +578,7 @@ def _create_dataclass(
             return _merge_defaults(data, original_schema)
         return data
 
-    setattr(cls, "_apply_defaults", _apply_defaults)
+    cls._apply_defaults = _apply_defaults  # type: ignore[attr-defined]
 
     # Store completed class
     _classes[cache_key] = cls