Moved schema code out of instructor repo into a separate one

Author: ddebowczyk

README.md.bak

@@ -465,7 +465,7 @@ use Cognesy\Instructor\StructuredOutput;
 $value = (new StructuredOutput)->with(
     messages: "His name is Jason, he is 28 years old.",
     responseModel: Scalar::integer('age'),
-)->getInt();
+)->create()->getInt();
 
 var_dump($value);
 // int(28)
@@ -787,7 +787,7 @@ class Skill {
 You can use ValidationMixin trait to add ability of easy, custom data object validation.
 
 ```php
-use Cognesy\Instructor\Features\Validation\Traits\ValidationMixin;
+use Cognesy\Instructor\Validation\Traits\ValidationMixin;
 
 class User {
     use ValidationMixin;
@@ -883,7 +883,7 @@ $structuredOutput = (new StructuredOutput)
 $structuredOutput->with(
     messages: "What is the population of Paris?",
     responseModel: Scalar::integer(),
-)->getInt();
+)->create()->getInt();
 // check your console for the details on the Instructor execution
 ```
 

bin/bootstrap.php.bak

@@ -1,7 +1,5 @@
 #!/usr/bin/env php
 <?php
-namespace Cognesy\Setup;
-
 function findAutoload()
 {
     $dir = __DIR__;
@@ -21,11 +19,10 @@ function findAutoload()
 
 require findAutoload();
 
-use RuntimeException;
 use Symfony\Component\Console\Application;
 
 $application = new Application('Instructor setup tool', '1.0.0');
-$application->add(new PublishCommand());
+$application->add(new Cognesy\Setup\PublishCommand());
 $application->run();
 
 exit(0);

bin/instructor-setup

@@ -27,6 +27,7 @@ echo "Using release notes from: $NOTES_FILE"
 # Define packages - must match those in sync-ver.sh
 declare -A PACKAGES
 PACKAGES["packages/utils"]="cognesy/instructor-utils"
+PACKAGES["packages/schema"]="cognesy/instructor-schema"
 PACKAGES["packages/http-client"]="cognesy/instructor-http-client"
 PACKAGES["packages/templates"]="cognesy/instructor-templates"
 PACKAGES["packages/polyglot"]="cognesy/instructor-polyglot"

bin/publish-ver.sh

@@ -21,6 +21,7 @@ echo "Updating to version $VERSION (dependency constraint ^$MAJOR_MINOR)"
 # Define packages and their sections based on composer.json
 declare -A PACKAGES
 PACKAGES["packages/utils"]="cognesy/instructor-utils"
+PACKAGES["packages/schema"]="cognesy/instructor-schema"
 PACKAGES["packages/templates"]="cognesy/instructor-templates"
 #PACKAGES["packages/experimental"]="cognesy/instructor-experimental"
 PACKAGES["packages/http-client"]="cognesy/instructor-http-client"
@@ -36,6 +37,7 @@ PACKAGES["packages/auxiliary"]="cognesy/instructor-auxiliary"
 # Define which packages go in which section of the main composer.json
 declare -A MAIN_REQUIRE_PACKAGES
 MAIN_REQUIRE_PACKAGES["packages/addons"]="cognesy/instructor-addons"
+MAIN_REQUIRE_PACKAGES["packages/schema"]="cognesy/instructor-schema"
 MAIN_REQUIRE_PACKAGES["packages/http-client"]="cognesy/instructor-http-client"
 MAIN_REQUIRE_PACKAGES["packages/instructor"]="cognesy/instructor-struct"
 MAIN_REQUIRE_PACKAGES["packages/polyglot"]="cognesy/instructor-polyglot"

bin/sync-ver.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env php
 <?php
-namespace Cognesy\Tell;
-
 function findAutoload()
 {
     $dir = __DIR__;
@@ -24,7 +22,7 @@ require findAutoload();
 use Symfony\Component\Console\Application;
 
 $application = new Application('Instructor Tell', '1.0.0');
-$application->add(new TellCommand());
+$application->add(new Cognesy\Tell\TellCommand());
 $application->setDefaultCommand('tell', true);
 $application->run();
 

bin/tell

@@ -31,6 +31,7 @@ echo "Using release notes from: $NOTES_FILE"
 # Define packages - must match those in sync-ver.sh
 declare -A PACKAGES
 PACKAGES["packages/addons"]="cognesy/instructor-addons"
+PACKAGES["packages/schema"]="cognesy/instructor-schema"
 PACKAGES["packages/auxiliary"]="cognesy/instructor-auxiliary"
 PACKAGES["packages/evals"]="cognesy/instructor-evals"
 #PACKAGES["packages/experimental"]="cognesy/instructor-experimental"

bin/test-publish.sh

@@ -25,6 +25,7 @@
   "autoload": {
     "psr-4": {
       "Cognesy\\Addons\\": "packages/addons/src/",
+      "Cognesy\\Schema\\": "packages/schema/src/",
       "Cognesy\\Http\\": "packages/http-client/src/",
       "Cognesy\\Instructor\\": "packages/instructor/src/",
       "Cognesy\\Polyglot\\": "packages/polyglot/src/",
@@ -49,6 +50,7 @@
       "Cognesy\\InstructorHub\\Tests\\": "packages/hub/tests/",
       "Cognesy\\Instructor\\Tests\\": "packages/instructor/tests/",
       "Cognesy\\Polyglot\\Tests\\": "packages/polyglot/tests/",
+      "Cognesy\\Schema\\Tests\\": "packages/schema/tests/",
       "Cognesy\\Setup\\Tests\\": "packages/setup/tests/",
       "Cognesy\\Tell\\Tests\\": "packages/tell/tests/",
       "Cognesy\\Templates\\Tests\\": "packages/templates/tests/",

composer.json

@@ -10,10 +10,16 @@
     // should Instructor use object references or quote objects
     'useObjectReferences' => false,
 
+    // default schema name
+    'defaultSchemaName' => 'default_schema',
+
     // default tool name and description
     'defaultToolName' => 'extracted_data',
     'defaultToolDescription' => 'Function call based on user instructions.',
 
+    // default output class
+    'defaultOutputClass' => 'Cognesy\Instructor\Extras\Structure\Structure',
+
     // default prompts
     'defaultRetryPrompt' => "JSON generated incorrectly, fix following errors:\n",
     'defaultJsonPrompt' => "Response must follow JSON Schema:\n<|json_schema|>\n. Respond correctly with strict JSON object.\n",
@@ -26,10 +32,9 @@
         // potentially cached - predefined sections used to construct the script
         'system',
         'pre-cached',
-        'pre-cached-prompt', 'cached-prompt', 'post-cached-prompt',
-        'pre-cached-examples', 'cached-examples', 'post-cached-examples',
-        'pre-cached-input', 'cached-input', 'post-cached-input',
-        'cached-messages',
+            'pre-cached-prompt', 'cached-prompt', 'post-cached-prompt',
+            'pre-cached-examples', 'cached-examples', 'post-cached-examples',
+            'cached-messages',
         'post-cached',
         // never cached
         'pre-prompt', 'prompt', 'post-prompt',

config/structured.php

@@ -2,7 +2,7 @@
 
 namespace Evals\SimpleExtraction;
 
-use Cognesy\Instructor\Features\Schema\Attributes\Description;
+use Cognesy\Schema\Attributes\Description;
 
 class Company {
     #[Description("The name of the company")]