Fixed PartialsGenerator

cognesy · Oct 2, 2024 · c75edf5 · c75edf5
1 parent adede3c
commit c75edf5
Show file tree

Hide file tree

Showing 11 changed files with 295 additions and 106 deletions.
diff --git a/README.md b/README.md
@@ -673,7 +673,10 @@ $yourApiKey = Env::get('OPENAI_API_KEY'); // use your own API key
 $driver = new OpenAIDriver(new LLMConfig(
     apiUrl: 'https://api.openai.com/v1', // you can change base URI
     apiKey: $yourApiKey,
+    endpoint: '/chat/completions',
     metadata: ['organization' => ''],
+    model: 'gpt-4o-mini',
+    maxTokens: 128,
 ));
 
 /// Get Instructor with the default client component overridden with your own

diff --git a/docs/advanced/model_options.mdx b/docs/advanced/model_options.mdx
@@ -31,7 +31,10 @@ use Cognesy\Instructor\Extras\LLM\Drivers\OpenAIDriver;
 $driver = new OpenAIDriver(new LLMConfig(
     apiUrl: 'https://api.openai.com/v1', // you can change base URI
     apiKey: $yourApiKey,
+    endpoint: '/chat/completions',
     metadata: ['organization' => ''],
+    model: 'gpt-4o-mini',
+    maxTokens: 128,
 ));
 
 /// Get Instructor with the default client component overridden with your own

diff --git a/docs/cookbook/examples/advanced/context_cache.mdx b/docs/cookbook/examples/advanced/context_cache.mdx
@@ -46,7 +46,7 @@ class Project {
     public array $applications;
     #[Description('Explain the purpose of the project and the domain specific problems it solves')]
     public string $description;
-    #[Description('Example code in Markdown demonstrating domain specific application of the library')]
+    #[Description('Example code as Markdown fragment, demonstrating domain specific application of the library')]
     public string $code;
 }
 ?>
@@ -93,7 +93,7 @@ which results in faster processing and lower costs.
 ```php
 <?php
 $project = $cached->respond(
-    messages: "Describe the project in a way compelling to my audience: boutique CMS consulting company owner.",
+    messages: "Describe the project in a way compelling to my audience: lead gen software vendor.",
     responseModel: Project::class,
     options: ['max_tokens' => 4096],
     mode: Mode::Json,

diff --git a/docs/cookbook/examples/advanced/custom_client.mdx b/docs/cookbook/examples/advanced/custom_client.mdx
@@ -32,7 +32,10 @@ class User {
 $driver = new OpenAIDriver(new LLMConfig(
         apiUrl: 'https://api.openai.com/v1',
         apiKey: Env::get('OPENAI_API_KEY'),
+        endpoint: '/chat/completions',
         metadata: ['organization' => ''],
+        model: 'gpt-4o-mini',
+        maxTokens: 128,
     )
 );
 

diff --git a/docs/cookbook/examples/advanced/partials.mdx b/docs/cookbook/examples/advanced/partials.mdx
@@ -18,6 +18,7 @@ response is received.
 $loader = require 'vendor/autoload.php';
 $loader->add('Cognesy\\Instructor\\', __DIR__ . '../../src/');
 
+use Cognesy\Instructor\Events\Event;
 use Cognesy\Instructor\Instructor;
 
 class UserRole

diff --git a/examples/A02_Advanced/ContextCaching/run.php b/examples/A02_Advanced/ContextCaching/run.php
@@ -46,7 +46,7 @@ class Project {
     public array $applications;
     #[Description('Explain the purpose of the project and the domain specific problems it solves')]
     public string $description;
-    #[Description('Example code in Markdown demonstrating domain specific application of the library')]
+    #[Description('Example code as Markdown fragment, demonstrating domain specific application of the library')]
     public string $code;
 }
 ?>
@@ -93,7 +93,7 @@ class Project {
 ```php
 <?php
 $project = $cached->respond(
-    messages: "Describe the project in a way compelling to my audience: boutique CMS consulting company owner.",
+    messages: "Describe the project in a way compelling to my audience: lead gen software vendor.",
     responseModel: Project::class,
     options: ['max_tokens' => 4096],
     mode: Mode::Json,

diff --git a/examples/A02_Advanced/CustomClientParameters/run.php b/examples/A02_Advanced/CustomClientParameters/run.php
@@ -32,7 +32,10 @@ class User {
 $driver = new OpenAIDriver(new LLMConfig(
         apiUrl: 'https://api.openai.com/v1',
         apiKey: Env::get('OPENAI_API_KEY'),
+        endpoint: '/chat/completions',
         metadata: ['organization' => ''],
+        model: 'gpt-3.5-turbo',
+        maxTokens: 128,
     )
 );
 

diff --git a/examples/A02_Advanced/PartialUpdates/run.php b/examples/A02_Advanced/PartialUpdates/run.php
@@ -18,6 +18,7 @@
 $loader = require 'vendor/autoload.php';
 $loader->add('Cognesy\\Instructor\\', __DIR__ . '../../src/');
 
+use Cognesy\Instructor\Events\Event;
 use Cognesy\Instructor\Instructor;
 
 class UserRole

diff --git a/src/Core/StreamResponse/PartialsGenerator.php b/src/Core/StreamResponse/PartialsGenerator.php
@@ -146,7 +146,13 @@ protected function tryGetPartialObject(
         string $partialJsonData,
         ResponseModel $responseModel,
     ) : Result {
-        return Chain::from(fn() => Json::fix(Json::find($partialJsonData)))
+//        dump('raw:', $partialJsonData);
+//        $found = Json::findPartial($partialJsonData);
+//        dump('found:', $found);
+//        $json = Json::fix($found);
+//        dump('fixed:', $json);
+
+        return Chain::from(fn() => Json::fix(Json::findPartial($partialJsonData)))
             ->through(fn($jsonData) => $this->responseDeserializer->deserialize($jsonData, $responseModel, $this?->toolCalls->last()->name))
             ->through(fn($object) => $this->responseTransformer->transform($object))
             ->result();