WidgetIcon is now an alias for IconName instead of being a duplicate type

Author: jiwon-oai

chatkit/icons.py

@@ -0,0 +1,74 @@
+from typing import Annotated, Literal
+
+from pydantic import StringConstraints
+
+VendorIconName = Annotated[str, StringConstraints(pattern=r"^vendor:")]
+
+IconName = (
+    Literal[
+        "agent",
+        "analytics",
+        "atom",
+        "batch",
+        "bolt",
+        "book-open",
+        "book-closed",
+        "book-clock",
+        "bug",
+        "calendar",
+        "chart",
+        "check",
+        "check-circle",
+        "check-circle-filled",
+        "chevron-left",
+        "chevron-right",
+        "circle-question",
+        "compass",
+        "confetti",
+        "cube",
+        "desktop",
+        "document",
+        "dot",
+        "dots-horizontal",
+        "dots-vertical",
+        "empty-circle",
+        "external-link",
+        "globe",
+        "keys",
+        "lab",
+        "images",
+        "info",
+        "lifesaver",
+        "lightbulb",
+        "mail",
+        "map-pin",
+        "maps",
+        "mobile",
+        "name",
+        "notebook",
+        "notebook-pencil",
+        "page-blank",
+        "phone",
+        "play",
+        "plus",
+        "profile",
+        "profile-card",
+        "reload",
+        "star",
+        "star-filled",
+        "search",
+        "sparkle",
+        "sparkle-double",
+        "square-code",
+        "square-image",
+        "square-text",
+        "suitcase",
+        "settings-slider",
+        "user",
+        "wreath",
+        "write",
+        "write-alt",
+        "write-alt2",
+    ]
+    | VendorIconName
+)

chatkit/types.py

@@ -3,12 +3,13 @@
 from datetime import datetime
 from typing import Any, Generic, Literal
 
-from pydantic import AnyUrl, BaseModel, Field, StringConstraints
+from pydantic import AnyUrl, BaseModel, Field
 from typing_extensions import Annotated, TypeIs, TypeVar
 
 from chatkit.errors import ErrorCode
 
 from .actions import Action
+from .icons import IconName
 from .widgets import WidgetComponent, WidgetRoot
 
 T = TypeVar("T")
@@ -828,74 +829,3 @@ class EntitySource(SourceBase):
 
 FeedbackKind = Literal["positive", "negative"]
 """Literal type for feedback sentiment."""
-
-VendorIconName = Annotated[str, StringConstraints(pattern=r"^vendor:")]
-
-IconName = (
-    Literal[
-        "agent",
-        "analytics",
-        "atom",
-        "batch",
-        "bolt",
-        "book-open",
-        "book-closed",
-        "book-clock",
-        "bug",
-        "calendar",
-        "chart",
-        "check",
-        "check-circle",
-        "check-circle-filled",
-        "chevron-left",
-        "chevron-right",
-        "circle-question",
-        "compass",
-        "confetti",
-        "cube",
-        "desktop",
-        "document",
-        "dot",
-        "dots-horizontal",
-        "dots-vertical",
-        "empty-circle",
-        "external-link",
-        "globe",
-        "keys",
-        "lab",
-        "images",
-        "info",
-        "lifesaver",
-        "lightbulb",
-        "mail",
-        "map-pin",
-        "maps",
-        "mobile",
-        "name",
-        "notebook",
-        "notebook-pencil",
-        "page-blank",
-        "phone",
-        "play",
-        "plus",
-        "profile",
-        "profile-card",
-        "reload",
-        "star",
-        "star-filled",
-        "search",
-        "sparkle",
-        "sparkle-double",
-        "square-code",
-        "square-image",
-        "square-text",
-        "suitcase",
-        "settings-slider",
-        "user",
-        "wreath",
-        "write",
-        "write-alt",
-        "write-alt2",
-    ]
-    | VendorIconName
-)

chatkit/widgets.py

@@ -14,7 +14,8 @@
 )
 from typing_extensions import NotRequired, TypedDict
 
-from chatkit.actions import ActionConfig
+from .actions import ActionConfig
+from .icons import IconName
 
 
 class ThemeColor(TypedDict):
@@ -1039,69 +1040,5 @@ class LineSeries(BaseModel):
 """Union of all renderable widget components."""
 
 
-WidgetIcon = Literal[
-    "agent",
-    "analytics",
-    "atom",
-    "batch",
-    "bolt",
-    "book-open",
-    "book-clock",
-    "book-closed",
-    "bug",
-    "calendar",
-    "chart",
-    "check",
-    "check-circle",
-    "check-circle-filled",
-    "chevron-left",
-    "chevron-right",
-    "circle-question",
-    "compass",
-    "confetti",
-    "cube",
-    "desktop",
-    "document",
-    "dot",
-    "dots-horizontal",
-    "dots-vertical",
-    "empty-circle",
-    "external-link",
-    "globe",
-    "keys",
-    "lab",
-    "images",
-    "info",
-    "lifesaver",
-    "lightbulb",
-    "mail",
-    "map-pin",
-    "maps",
-    "mobile",
-    "name",
-    "notebook",
-    "notebook-pencil",
-    "page-blank",
-    "phone",
-    "play",
-    "plus",
-    "profile",
-    "profile-card",
-    "reload",
-    "star",
-    "star-filled",
-    "search",
-    "sparkle",
-    "sparkle-double",
-    "square-code",
-    "square-image",
-    "square-text",
-    "suitcase",
-    "settings-slider",
-    "user",
-    "wreath",
-    "write",
-    "write-alt",
-    "write-alt2",
-]
+WidgetIcon = IconName
 """Icon names accepted by widgets that render icons."""

tests/test_types.py renamed to tests/test_icons.py

@@ -1,7 +1,7 @@
 import pytest
 from pydantic import TypeAdapter, ValidationError
 
-from chatkit.types import IconName
+from chatkit.icons import IconName
 
 
 def test_vendor_icon_names_are_valid():