refactor: from vendor to structural namespaces for models and platforms

php-llm · Oct 5, 2024 · eb8eca5 · eb8eca5
1 parent 7a7d8fa
commit eb8eca5
Show file tree

Hide file tree

Showing 33 changed files with 128 additions and 323 deletions.
diff --git a/examples/chat-claude-anthropic.php b/examples/chat-claude-anthropic.php
@@ -1,10 +1,10 @@
 <?php
 
-use PhpLlm\LlmChain\Anthropic\Model\Claude;
-use PhpLlm\LlmChain\Anthropic\Platform\Anthropic;
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
+use PhpLlm\LlmChain\Model\Language\Claude;
+use PhpLlm\LlmChain\Platform\Anthropic;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\HttpClient;
 

diff --git a/examples/chat-gpt-azure.php b/examples/chat-gpt-azure.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\Azure;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\Azure;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\HttpClient;
 
@@ -24,7 +23,7 @@
     $_ENV['AZURE_OPENAI_VERSION'],
     $_ENV['AZURE_OPENAI_KEY'],
 );
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $chain = new Chain($llm);
 $messages = new MessageBag(

diff --git a/examples/chat-gpt-openai.php b/examples/chat-gpt-openai.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\HttpClient;
 
@@ -18,7 +17,7 @@
 }
 
 $platform = new OpenAI(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini(), [
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI, [
     'temperature' => 0.5, // default options for the model
 ]);
 

diff --git a/examples/embeddings-openai.php b/examples/embeddings-openai.php
@@ -1,8 +1,7 @@
 <?php
 
-use PhpLlm\LlmChain\OpenAI\Model\Embeddings;
-use PhpLlm\LlmChain\OpenAI\Model\Embeddings\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Embeddings\OpenAI as Embeddings;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI as Platform;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\HttpClient;
 
@@ -14,8 +13,8 @@
     exit(1);
 }
 
-$platform = new OpenAI(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
-$embeddings = new Embeddings($platform, Version::textEmbedding3Small());
+$platform = new Platform(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
+$embeddings = new Embeddings($platform);
 
 $vector = $embeddings->create(<<<TEXT
     Once upon a time, there was a country called Japan. It was a beautiful country with a lot of mountains and rivers.

diff --git a/examples/embeddings-voyage.php b/examples/embeddings-voyage.php
@@ -1,7 +1,7 @@
 <?php
 
-use PhpLlm\LlmChain\Voyage\Model\Voyage;
-use PhpLlm\LlmChain\Voyage\Platform\Voyage as VoyagePlatform;
+use PhpLlm\LlmChain\Model\Embeddings\Voyage;
+use PhpLlm\LlmChain\Platform\Voyage as Platform;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\HttpClient;
 
@@ -13,7 +13,7 @@
     exit(1);
 }
 
-$platform = new VoyagePlatform(HttpClient::create(), $_ENV['VOYAGE_API_KEY']);
+$platform = new Platform(HttpClient::create(), $_ENV['VOYAGE_API_KEY']);
 $embeddings = new Voyage($platform);
 
 $vector = $embeddings->create(<<<TEXT

diff --git a/examples/image-describer-url.php b/examples/image-describer-url.php
@@ -4,9 +4,8 @@
 use PhpLlm\LlmChain\Message\Content\Image;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\HttpClient;
 
@@ -19,7 +18,7 @@
 }
 
 $platform = new OpenAI(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $chain = new Chain($llm);
 $messages = new MessageBag(

diff --git a/examples/reasoning-openai.php b/examples/reasoning-openai.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\HttpClient;
 
@@ -23,7 +22,7 @@
 }
 
 $platform = new OpenAI(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::o1Preview());
+$llm = new Gpt($platform, Gpt::O1_PREVIEW);
 
 $prompt = <<<PROMPT
 I want to build a Symfony app in PHP 8.2 that takes user questions and looks them

diff --git a/examples/store-mongodb-similarity-search.php b/examples/store-mongodb-similarity-search.php
@@ -7,10 +7,9 @@
 use PhpLlm\LlmChain\DocumentEmbedder;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Embeddings;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Embeddings\OpenAI as Embeddings;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI as Platform;
 use PhpLlm\LlmChain\Store\MongoDB\Store;
 use PhpLlm\LlmChain\ToolBox\ChainProcessor;
 use PhpLlm\LlmChain\ToolBox\Tool\SimilaritySearch;
@@ -54,14 +53,14 @@
 }
 
 // create embeddings for documents
-$platform = new OpenAI(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
+$platform = new Platform(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
 $embedder = new DocumentEmbedder($embeddings = new Embeddings($platform), $store);
 $embedder->embed($documents);
 
 // initialize the index
 $store->initialize();
 
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $similaritySearch = new SimilaritySearch($embeddings, $store);
 $toolBox = new ToolBox(new ToolAnalyzer(), [$similaritySearch]);

diff --git a/examples/store-pinecone-similarity-search.php b/examples/store-pinecone-similarity-search.php
@@ -6,10 +6,9 @@
 use PhpLlm\LlmChain\DocumentEmbedder;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Embeddings;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Embeddings\OpenAI as Embeddings;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI as Platform;
 use PhpLlm\LlmChain\Store\Pinecone\Store;
 use PhpLlm\LlmChain\ToolBox\ChainProcessor;
 use PhpLlm\LlmChain\ToolBox\Tool\SimilaritySearch;
@@ -48,11 +47,11 @@
 }
 
 // create embeddings for documents
-$platform = new OpenAI(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
+$platform = new Platform(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
 $embedder = new DocumentEmbedder($embeddings = new Embeddings($platform), $store);
 $embedder->embed($documents);
 
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $similaritySearch = new SimilaritySearch($embeddings, $store);
 $toolBox = new ToolBox(new ToolAnalyzer(), [$similaritySearch]);

diff --git a/examples/stream-claude-anthropic.php b/examples/stream-claude-anthropic.php
@@ -1,10 +1,10 @@
 <?php
 
-use PhpLlm\LlmChain\Anthropic\Model\Claude;
-use PhpLlm\LlmChain\Anthropic\Platform\Anthropic;
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
+use PhpLlm\LlmChain\Model\Language\Claude;
+use PhpLlm\LlmChain\Platform\Anthropic;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\HttpClient;
 

diff --git a/examples/stream-gpt-openai.php b/examples/stream-gpt-openai.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpClient\EventSourceHttpClient;
 
@@ -18,7 +17,7 @@
 }
 
 $platform = new OpenAI(new EventSourceHttpClient(), $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $chain = new Chain($llm);
 $messages = new MessageBag(

diff --git a/examples/structured-output-math.php b/examples/structured-output-math.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use PhpLlm\LlmChain\StructuredOutput\ChainProcessor;
 use PhpLlm\LlmChain\StructuredOutput\ResponseFormatFactory;
 use PhpLlm\LlmChain\Tests\StructuredOutput\Data\MathReasoning;
@@ -24,7 +23,7 @@
 }
 
 $platform = new OpenAI(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 $serializer = new Serializer([new ObjectNormalizer()], [new JsonEncoder()]);
 
 $processor = new ChainProcessor(new ResponseFormatFactory(), $serializer);

diff --git a/examples/toolbox-clock.php b/examples/toolbox-clock.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use PhpLlm\LlmChain\ToolBox\ChainProcessor;
 use PhpLlm\LlmChain\ToolBox\Tool\Clock;
 use PhpLlm\LlmChain\ToolBox\ToolAnalyzer;
@@ -23,7 +22,7 @@
 }
 
 $platform = new OpenAI(HttpClient::create(), $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $clock = new Clock(new SymfonyClock());
 $toolBox = new ToolBox(new ToolAnalyzer(), [$clock]);

diff --git a/examples/toolbox-serpapi.php b/examples/toolbox-serpapi.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use PhpLlm\LlmChain\ToolBox\ChainProcessor;
 use PhpLlm\LlmChain\ToolBox\Tool\SerpApi;
 use PhpLlm\LlmChain\ToolBox\ToolAnalyzer;
@@ -22,7 +21,7 @@
 }
 $httpClient = HttpClient::create();
 $platform = new OpenAI($httpClient, $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $serpApi = new SerpApi($httpClient, $_ENV['SERP_API_KEY']);
 $toolBox = new ToolBox(new ToolAnalyzer(), [$serpApi]);

diff --git a/examples/toolbox-weather.php b/examples/toolbox-weather.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use PhpLlm\LlmChain\ToolBox\ChainProcessor;
 use PhpLlm\LlmChain\ToolBox\Tool\OpenMeteo;
 use PhpLlm\LlmChain\ToolBox\ToolAnalyzer;
@@ -23,7 +22,7 @@
 
 $httpClient = HttpClient::create();
 $platform = new OpenAI($httpClient, $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $wikipedia = new OpenMeteo($httpClient);
 $toolBox = new ToolBox(new ToolAnalyzer(), [$wikipedia]);

diff --git a/examples/toolbox-wikipedia.php b/examples/toolbox-wikipedia.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use PhpLlm\LlmChain\ToolBox\ChainProcessor;
 use PhpLlm\LlmChain\ToolBox\Tool\Wikipedia;
 use PhpLlm\LlmChain\ToolBox\ToolAnalyzer;
@@ -23,7 +22,7 @@
 
 $httpClient = HttpClient::create();
 $platform = new OpenAI($httpClient, $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $wikipedia = new Wikipedia($httpClient);
 $toolBox = new ToolBox(new ToolAnalyzer(), [$wikipedia]);

diff --git a/examples/toolbox-youtube.php b/examples/toolbox-youtube.php
@@ -3,9 +3,8 @@
 use PhpLlm\LlmChain\Chain;
 use PhpLlm\LlmChain\Message\Message;
 use PhpLlm\LlmChain\Message\MessageBag;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt;
-use PhpLlm\LlmChain\OpenAI\Model\Gpt\Version;
-use PhpLlm\LlmChain\OpenAI\Platform\OpenAI;
+use PhpLlm\LlmChain\Model\Language\Gpt;
+use PhpLlm\LlmChain\Platform\OpenAI\OpenAI;
 use PhpLlm\LlmChain\ToolBox\ChainProcessor;
 use PhpLlm\LlmChain\ToolBox\Tool\YouTubeTranscriber;
 use PhpLlm\LlmChain\ToolBox\ToolAnalyzer;
@@ -23,7 +22,7 @@
 
 $httpClient = HttpClient::create();
 $platform = new OpenAI($httpClient, $_ENV['OPENAI_API_KEY']);
-$llm = new Gpt($platform, Version::gpt4oMini());
+$llm = new Gpt($platform, Gpt::GPT_4O_MINI);
 
 $transcriber = new YouTubeTranscriber($httpClient);
 $toolBox = new ToolBox(new ToolAnalyzer(), [$transcriber]);

diff --git a/src/Anthropic/Model/Claude/Version.php b/src/Anthropic/Model/Claude/Version.php