feat: enhance color handling by introducing LiteralColor and to_color function

Author: ya7010

examples/dataflame_table.py

@@ -3,7 +3,6 @@
 from pathlib import Path
 
 import tppt
-from tppt.types import Color
 
 # Flag to determine whether to use Polars
 EXAMPLE_DIR = Path(__file__).parent
@@ -44,7 +43,7 @@ def main():
                 height=(50, "pt"),
                 size=(44, "pt"),
                 bold=True,
-                color=Color("#0066CC"),
+                color="#0066CC",
             )
             .text(
                 "Easily convert Polars dataframes to presentations with tppt library",

src/tppt/_pptx/converter.py

@@ -8,7 +8,7 @@
 from pptx.util import Length as PptxLength
 from pptx.util import Pt as PptxPt
 
-from tppt.types._color import Color
+from tppt.types._color import Color, LiteralColor, to_color
 from tppt.types._length import (
     Centimeter,
     Inch,
@@ -60,5 +60,7 @@ def to_pptx_length(length: Length | LiteralLength | None) -> PptxLength | None:
             assert_never(length)
 
 
-def to_pptx_color(color: Color) -> PptxRGBColor:
+def to_pptx_color(color: Color | LiteralColor) -> PptxRGBColor:
+    color = to_color(color)
+
     return PptxRGBColor(color.r, color.g, color.b)

src/tppt/_pptx/shape/text.py

@@ -4,7 +4,7 @@
 from pptx.shapes.autoshape import Shape as PptxShape
 
 from tppt._pptx.converter import to_pptx_color, to_pptx_length
-from tppt.types._color import Color
+from tppt.types._color import Color, LiteralColor
 from tppt.types._length import Length, LiteralLength
 
 from . import RangeProps, Shape
@@ -16,7 +16,7 @@ class TextProps(RangeProps):
     size: NotRequired[Length | LiteralLength]
     bold: NotRequired[bool]
     italic: NotRequired[bool]
-    color: NotRequired[Color]
+    color: NotRequired[Color | LiteralColor]
     margin_bottom: NotRequired[Length | LiteralLength]
     margin_left: NotRequired[Length | LiteralLength]
     vertical_anchor: NotRequired[MSO_ANCHOR]

src/tppt/types/_color.py

@@ -1,9 +1,11 @@
 """Color types for tppt."""
 
-from typing import overload
+from typing import TypeAlias, overload
 
 from tppt.exception import ColorInvalidFormatError
 
+LiteralColor: TypeAlias = tuple[int, int, int] | str
+
 
 class Color:
     """Represents a color in RGB or by hex code.
@@ -49,3 +51,13 @@ def __init__(self, r: str | int, g: int | None = None, b: int | None = None):
     def __repr__(self) -> str:
         """Return string representation."""
         return f"Color({self.r}, {self.g}, {self.b})"
+
+
+def to_color(color: Color | LiteralColor) -> Color:
+    if isinstance(color, Color):
+        return color
+    else:
+        if isinstance(color, tuple):
+            return Color(*color)
+        else:
+            return Color(color)

tests/test_color.py

@@ -3,7 +3,7 @@
 import unittest
 
 from tppt.exception import ColorInvalidFormatError
-from tppt.types._color import Color
+from tppt.types._color import Color, to_color
 
 
 class TestColor(unittest.TestCase):
@@ -44,3 +44,37 @@ def test_repr(self):
         """Test string representation."""
         color = Color(10, 20, 30)
         assert repr(color) == "Color(10, 20, 30)"
+
+
+class TestToColor(unittest.TestCase):
+    """Test cases for to_color function."""
+
+    def test_to_color_with_color_instance(self):
+        """Test to_color with a Color instance."""
+        original = Color(10, 20, 30)
+        result = to_color(original)
+        assert result is original
+
+    def test_to_color_with_tuple(self):
+        """Test to_color with a RGB tuple."""
+        result = to_color((10, 20, 30))
+        assert isinstance(result, Color)
+        assert result.r == 10
+        assert result.g == 20
+        assert result.b == 30
+
+    def test_to_color_with_str(self):
+        """Test to_color with a hex string."""
+        result = to_color("#123456")
+        assert isinstance(result, Color)
+        assert result.r == 0x12
+        assert result.g == 0x34
+        assert result.b == 0x56
+
+    def test_to_color_with_short_hex(self):
+        """Test to_color with a short hex string."""
+        result = to_color("#123")
+        assert isinstance(result, Color)
+        assert result.r == 0x11
+        assert result.g == 0x22
+        assert result.b == 0x33