updates

Author: tymondesigns

scratchpad.php

@@ -5,7 +5,6 @@
 use Cortex\Cortex;
 use Cortex\Prompts\Prompt;
 use Cortex\JsonSchema\SchemaFactory;
-use Cortex\Prompts\Enums\PromptType;
 use Cortex\LLM\Data\Messages\UserMessage;
 use Cortex\LLM\Data\Messages\SystemMessage;
 
@@ -45,13 +44,13 @@
 $prompt = Cortex::prompt()->factory('langfuse')->make('test-prompt');
 
 // Get a chat prompt builder
-$prompt = Cortex::prompt()->builder(PromptType::Chat)->messages([
+$prompt = Cortex::prompt()->builder('chat')->messages([
     new SystemMessage('You are an expert at geography.'),
     new UserMessage('What is the capital of {country}?'),
 ]);
 
 // Get a text prompt builder
-$prompt = Cortex::prompt()->builder(PromptType::Text);
+$prompt = Cortex::prompt()->builder('text');
 
 $prompt = Prompt::factory()->make('test-prompt');
 $prompt = Prompt::builder()->messages([

src/Cortex.php

@@ -8,7 +8,6 @@
 use Cortex\Prompts\Prompt;
 use Cortex\Facades\Embeddings;
 use Cortex\Tasks\Enums\TaskType;
-use Cortex\Prompts\Enums\PromptType;
 use Cortex\Tasks\Builders\TextTaskBuilder;
 use Cortex\Prompts\Contracts\PromptBuilder;
 use Cortex\LLM\Contracts\LLM as LLMContract;
@@ -21,7 +20,7 @@ class Cortex
     /**
      * Create a prompt builder or factory.
      *
-     * @param \Cortex\LLM\Data\Messages\MessageCollection|array<int, \Cortex\LLM\Contracts\Message>|string|null $messages
+     * @param \Cortex\LLM\Data\Messages\MessageCollection|array<int, \Cortex\LLM\Contracts\Message|\Cortex\LLM\Data\Messages\MessagePlaceholder>|string|null $messages
      *
      * @return ($messages is null ? \Cortex\Prompts\Prompt : ($messages is string ? \Cortex\Prompts\Builders\TextPromptBuilder : \Cortex\Prompts\Builders\ChatPromptBuilder))
      */
@@ -33,8 +32,8 @@ public static function prompt(
         }
 
         return is_string($messages)
-            ? Prompt::builder(PromptType::Text)->text($messages)
-            : Prompt::builder(PromptType::Chat)->messages($messages);
+            ? Prompt::builder('text')->text($messages)
+            : Prompt::builder('chat')->messages($messages);
     }
 
     /**

src/LLM/LLMManager.php

@@ -62,7 +62,7 @@ protected function createDriver($driver): LLM // @pest-ignore-type
     /**
      * Create an OpenAI LLM driver instance.
      *
-     * @param array<string, mixed> $config
+     * @param array{default_model?: string, model_provider?: string, default_parameters: array<string, mixed>, options: array{api_key?: string, organization?: string, base_uri?: string, headers?: array<string, string>, query_params?: array<string, string>}} $config
      */
     public function createOpenAIDriver(array $config, string $name): OpenAIChat|CacheDecorator
     {
@@ -142,7 +142,7 @@ public function createAnthropicDriver(array $config, string $name): AnthropicCha
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array{model_provider?: string} $config
      *
      * @throws \InvalidArgumentException
      */

src/Prompts/Enums/PromptType.php

@@ -4,6 +4,7 @@
 
 namespace Cortex\Prompts\Enums;
 
+use Cortex\Prompts\Contracts\PromptBuilder;
 use Cortex\Prompts\Builders\ChatPromptBuilder;
 use Cortex\Prompts\Builders\TextPromptBuilder;
 
@@ -12,7 +13,12 @@ enum PromptType: string
     case Chat = 'chat';
     case Text = 'text';
 
-    public function builder(): ChatPromptBuilder|TextPromptBuilder
+    /**
+     * Get the prompt builder for the given type.
+     *
+     * @return ($this is \Cortex\Prompts\Enums\PromptType::Chat ? \Cortex\Prompts\Builders\ChatPromptBuilder : \Cortex\Prompts\Builders\TextPromptBuilder)
+     */
+    public function builder(): PromptBuilder
     {
         return match ($this) {
             self::Chat => new ChatPromptBuilder(),

src/Prompts/Factories/LangfusePromptFactory.php

@@ -63,6 +63,9 @@ class LangfusePromptFactory implements PromptFactory
 {
     use DiscoversPsrImplementations;
 
+    /**
+     * @param \Closure(array<string, mixed>): \Cortex\Prompts\Data\PromptMetadata $metadataResolver
+     */
     public function __construct(
         #[SensitiveParameter]
         protected string $username,

src/Prompts/Factories/McpPromptFactory.php

@@ -13,6 +13,10 @@
  */
 class McpPromptFactory implements PromptFactory
 {
+    public function __construct(
+        protected string $baseUri,
+    ) {}
+
     public function make(string $name, array $config = []): PromptTemplate
     {
         // TODO: Implement

src/Prompts/Prompt.php

@@ -6,20 +6,21 @@
 
 use Cortex\Facades\PromptFactory;
 use Cortex\Prompts\Enums\PromptType;
-use Cortex\Prompts\Builders\ChatPromptBuilder;
-use Cortex\Prompts\Builders\TextPromptBuilder;
+use Cortex\Prompts\Contracts\PromptBuilder;
 use Cortex\Prompts\Contracts\PromptFactory as PromptFactoryContract;
 
 class Prompt
 {
     /**
      * Get the prompt builder for the given type.
      *
-     * @return ($type is \Cortex\Prompts\Enums\PromptType::Chat ? \Cortex\Prompts\Builders\ChatPromptBuilder : \Cortex\Prompts\Builders\TextPromptBuilder)
+     * @param value-of<\Cortex\Prompts\Enums\PromptType> $type
+     *
+     * @return ($type is 'chat' ? \Cortex\Prompts\Builders\ChatPromptBuilder : \Cortex\Prompts\Builders\TextPromptBuilder)
      */
-    public static function builder(PromptType $type = PromptType::Chat): ChatPromptBuilder|TextPromptBuilder
+    public static function builder(string $type = 'chat'): PromptBuilder
     {
-        return $type->builder();
+        return PromptType::from($type)->builder();
     }
 
     /**

src/Prompts/PromptFactoryManager.php

@@ -5,6 +5,7 @@
 namespace Cortex\Prompts;
 
 use Illuminate\Support\Manager;
+use Cortex\Prompts\Factories\McpPromptFactory;
 use Cortex\Prompts\Factories\LangfusePromptFactory;
 
 class PromptFactoryManager extends Manager
@@ -16,7 +17,7 @@ public function getDefaultDriver(): string
 
     public function createLangfuseDriver(): LangfusePromptFactory
     {
-        /** @var array<string, mixed> $config */
+        /** @var array{username?: string, password?: string, base_uri?: string} $config */
         $config = $this->config->get('cortex.prompt_factory.langfuse');
 
         return new LangfusePromptFactory(
@@ -25,4 +26,14 @@ public function createLangfuseDriver(): LangfusePromptFactory
             $config['base_uri'] ?? 'https://cloud.langfuse.com',
         );
     }
+
+    public function createMcpDriver(): McpPromptFactory
+    {
+        /** @var array{base_uri?: string} $config */
+        $config = $this->config->get('cortex.prompt_factory.mcp');
+
+        return new McpPromptFactory(
+            $config['base_uri'] ?? 'http://localhost:3000',
+        );
+    }
 }