feat: use intersection type AbstractUid&TimeBasedUidInterface for flexible message IDs

src/Platform/Message/AssistantMessage.php

@@ -5,14 +5,16 @@
 namespace PhpLlm\LlmChain\Platform\Message;
 
 use PhpLlm\LlmChain\Platform\Response\ToolCall;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\Uuid;
 
 /**
  * @author Denis Zunke <denis.zunke@gmail.com>
  */
 final readonly class AssistantMessage implements MessageInterface
 {
-    public Uuid $id;
+    public AbstractUid&TimeBasedUidInterface $id;
 
     /**
      * @param ?ToolCall[] $toolCalls
@@ -29,7 +31,7 @@ public function getRole(): Role
         return Role::Assistant;
     }
 
-    public function getId(): Uuid
+    public function getId(): AbstractUid&TimeBasedUidInterface
     {
         return $this->id;
     }

src/Platform/Message/MessageInterface.php

@@ -4,7 +4,8 @@
 
 namespace PhpLlm\LlmChain\Platform\Message;
 
-use Symfony\Component\Uid\Uuid;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 
 /**
  * @author Denis Zunke <denis.zunke@gmail.com>
@@ -13,5 +14,5 @@ interface MessageInterface
 {
     public function getRole(): Role;
 
-    public function getId(): Uuid;
+    public function getId(): AbstractUid&TimeBasedUidInterface;
 }

src/Platform/Message/SystemMessage.php

@@ -4,14 +4,16 @@
 
 namespace PhpLlm\LlmChain\Platform\Message;
 
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\Uuid;
 
 /**
  * @author Denis Zunke <denis.zunke@gmail.com>
  */
 final readonly class SystemMessage implements MessageInterface
 {
-    public Uuid $id;
+    public AbstractUid&TimeBasedUidInterface $id;
 
     public function __construct(public string $content)
     {
@@ -23,7 +25,7 @@ public function getRole(): Role
         return Role::System;
     }
 
-    public function getId(): Uuid
+    public function getId(): AbstractUid&TimeBasedUidInterface
     {
         return $this->id;
     }

src/Platform/Message/ToolCallMessage.php

@@ -5,14 +5,16 @@
 namespace PhpLlm\LlmChain\Platform\Message;
 
 use PhpLlm\LlmChain\Platform\Response\ToolCall;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\Uuid;
 
 /**
  * @author Denis Zunke <denis.zunke@gmail.com>
  */
 final readonly class ToolCallMessage implements MessageInterface
 {
-    public Uuid $id;
+    public AbstractUid&TimeBasedUidInterface $id;
 
     public function __construct(
         public ToolCall $toolCall,
@@ -26,7 +28,7 @@ public function getRole(): Role
         return Role::ToolCall;
     }
 
-    public function getId(): Uuid
+    public function getId(): AbstractUid&TimeBasedUidInterface
     {
         return $this->id;
     }

src/Platform/Message/UserMessage.php

@@ -8,6 +8,8 @@
 use PhpLlm\LlmChain\Platform\Message\Content\ContentInterface;
 use PhpLlm\LlmChain\Platform\Message\Content\Image;
 use PhpLlm\LlmChain\Platform\Message\Content\ImageUrl;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\Uuid;
 
 /**
@@ -20,7 +22,7 @@
      */
     public array $content;
 
-    public Uuid $id;
+    public AbstractUid&TimeBasedUidInterface $id;
 
     public function __construct(
         ContentInterface ...$content,
@@ -34,7 +36,7 @@ public function getRole(): Role
         return Role::User;
     }
 
-    public function getId(): Uuid
+    public function getId(): AbstractUid&TimeBasedUidInterface
     {
         return $this->id;
     }

tests/Platform/ContractTest.php

@@ -35,6 +35,8 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\Uuid;
 
 #[Large]
@@ -201,7 +203,7 @@ public function getRole(): Role
                 return Role::User;
             }
 
-            public function getId(): Uuid
+            public function getId(): AbstractUid&TimeBasedUidInterface
             {
                 return Uuid::v7();
             }

tests/Platform/Message/AssistantMessageTest.php

@@ -13,6 +13,8 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\UuidV7;
 
 #[CoversClass(AssistantMessage::class)]
@@ -79,4 +81,14 @@ public function sameMessagesHaveDifferentUids(): void
         self::assertIsUuidV7($message1->getId()->toRfc4122());
         self::assertIsUuidV7($message2->getId()->toRfc4122());
     }
+
+    #[Test]
+    public function messageIdImplementsRequiredInterfaces(): void
+    {
+        $message = new AssistantMessage('test');
+
+        self::assertInstanceOf(AbstractUid::class, $message->getId());
+        self::assertInstanceOf(TimeBasedUidInterface::class, $message->getId());
+        self::assertInstanceOf(UuidV7::class, $message->getId());
+    }
 }

tests/Platform/Message/SystemMessageTest.php

@@ -11,6 +11,8 @@
 use PHPUnit\Framework\Attributes\Small;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\UuidV7;
 
 #[CoversClass(SystemMessage::class)]
@@ -59,4 +61,14 @@ public function sameMessagesHaveDifferentUids(): void
         self::assertIsUuidV7($message1->getId()->toRfc4122());
         self::assertIsUuidV7($message2->getId()->toRfc4122());
     }
+
+    #[Test]
+    public function messageIdImplementsRequiredInterfaces(): void
+    {
+        $message = new SystemMessage('test');
+
+        self::assertInstanceOf(AbstractUid::class, $message->getId());
+        self::assertInstanceOf(TimeBasedUidInterface::class, $message->getId());
+        self::assertInstanceOf(UuidV7::class, $message->getId());
+    }
 }

tests/Platform/Message/ToolCallMessageTest.php

@@ -12,6 +12,8 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\UuidV7;
 
 #[CoversClass(ToolCallMessage::class)]
@@ -65,4 +67,15 @@ public function sameMessagesHaveDifferentUids(): void
         self::assertIsUuidV7($message1->getId()->toRfc4122());
         self::assertIsUuidV7($message2->getId()->toRfc4122());
     }
+
+    #[Test]
+    public function messageIdImplementsRequiredInterfaces(): void
+    {
+        $toolCall = new ToolCall('foo', 'bar');
+        $message = new ToolCallMessage($toolCall, 'test');
+
+        self::assertInstanceOf(AbstractUid::class, $message->getId());
+        self::assertInstanceOf(TimeBasedUidInterface::class, $message->getId());
+        self::assertInstanceOf(UuidV7::class, $message->getId());
+    }
 }

tests/Platform/Message/UserMessageTest.php

@@ -15,6 +15,8 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\Attributes\UsesClass;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\TimeBasedUidInterface;
 use Symfony\Component\Uid\UuidV7;
 
 #[CoversClass(UserMessage::class)]
@@ -109,4 +111,14 @@ public function sameMessagesHaveDifferentUids(): void
         self::assertIsUuidV7($message1->getId()->toRfc4122());
         self::assertIsUuidV7($message2->getId()->toRfc4122());
     }
+
+    #[Test]
+    public function messageIdImplementsRequiredInterfaces(): void
+    {
+        $message = new UserMessage(new Text('test'));
+
+        self::assertInstanceOf(AbstractUid::class, $message->getId());
+        self::assertInstanceOf(TimeBasedUidInterface::class, $message->getId());
+        self::assertInstanceOf(UuidV7::class, $message->getId());
+    }
 }