Release version 0.12.0

ddebowczyk · ddebowczyk · commit 506fdda65e62 · 2025-02-21T07:47:29.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,10 +1,5 @@
 # Exclude unnecessary files from Composer and Git exports
-/docs/            export-ignore
-#/evals/           export-ignore # include this one with distribution
-#/examples/        export-ignore # include this one with distribution
 /.github/         export-ignore
-/notes/           export-ignore
-/tests/           export-ignore
 /.gitignore       export-ignore
 /.gitattributes   export-ignore
 /.cursorignore    export-ignore
@@ -21,6 +16,16 @@
 *.md              export-ignore
 *.mdx             export-ignore
 
+# Project specific ignores
+/archived/        export-ignore
+/docs/            export-ignore
+#/evals/           export-ignore # include this one with distribution
+#/examples/        export-ignore # include this one with distribution
+/experimental/    export-ignore
+/notes/           export-ignore
+/tests/           export-ignore
+/src-experimental/ export-ignore
+
 # Line ending normalization
 # Ensure PHP, JS, and text files have consistent line endings
 *.php             text eol=lf
diff --git a/composer.json b/composer.json
@@ -1,109 +1,165 @@
 {
-    "name": "cognesy/instructor-php",
-    "description": "Structured data extraction in PHP, powered by LLMs",
-    "keywords": ["llm", "language models", "inference", "ai", "genai", "openai", "anthropic", "cohere", "ollama", "structured output", "semantic processing", "automation", "data processing", "data extraction"],
-    "type": "library",
-    "license": "MIT",
-    "bin": [
-        "bin/instructor"
-    ],
-    "autoload": {
-        "psr-4": {
-            "Cognesy\\Instructor\\": "src/",
-            "Cognesy\\Utils\\": "src-utils/",
-            "Cognesy\\Addons\\": "src-addons/",
-            "Cognesy\\Aux\\": "src-aux/",
-            "Cognesy\\LLM\\": "src-llm/",
-            "Cognesy\\Setup\\": "src-setup/",
-            "Cognesy\\Tell\\": "src-tell/",
-            "Cognesy\\Experimental\\": "src-experimental/",
-            "Cognesy\\InstructorHub\\": "src-hub/"
-        },
-        "files": [
-        ]
+  "name": "cognesy/instructor-php",
+  "description": "Structured data extraction in PHP, powered by LLMs",
+  "keywords": [
+    "llm",
+    "language models",
+    "inference",
+    "ai",
+    "genai",
+    "openai",
+    "anthropic",
+    "cohere",
+    "ollama",
+    "structured output",
+    "semantic processing",
+    "automation",
+    "data processing",
+    "data extraction"
+  ],
+  "type": "library",
+  "license": "MIT",
+  "bin": [
+    "bin/instructor"
+  ],
+  "autoload": {
+    "psr-4": {
+      "Cognesy\\Instructor\\": "src/",
+      "Cognesy\\Utils\\": "src-utils/",
+      "Cognesy\\Addons\\": "src-addons/",
+      "Cognesy\\Aux\\": "src-aux/",
+      "Cognesy\\LLM\\": "src-llm/",
+      "Cognesy\\Setup\\": "src-setup/",
+      "Cognesy\\Tell\\": "src-tell/",
+      "Cognesy\\Experimental\\": "src-experimental/",
+      "Cognesy\\InstructorHub\\": "src-hub/"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/",
-            "Examples\\": "examples/",
-            "Cognesy\\Evals\\": "evals/",
-            "Cognesy\\Experimental\\": "experimental/"
-        },
-        "files": [
-            "tests/Examples/Call/test_functions.php"
-        ]
+    "files": []
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/",
+      "Examples\\": "examples/",
+      "Cognesy\\Evals\\": "evals/",
+      "Cognesy\\Experimental\\": "experimental/"
     },
-    "authors": [
-        {
-            "name": "Dariusz Debowczyk",
-            "email": "ddebowczyk@gmail.com"
-        }
-    ],
-    "require-dev": {
-        "ext-curl": "*",
-        "ext-dom": "*",
-        "cebe/markdown": "^1.2",
-        "duzun/hquery": "^3.1",
-        "eftec/bladeone": "^4.16",
-        "gioni06/gpt3-tokenizer": "^1.2",
-        "guzzlehttp/psr7": "^2.7",
-        "illuminate/database": "^11.10",
-        "illuminate/http": "^11.37",
-        "league/html-to-markdown": "^5.1",
-        "mockery/mockery": "^1.6",
-        "nyholm/psr7": "^1.8",
-        "pestphp/pest": "^2.34",
-        "php-http/discovery": "^1.20",
-        "phpstan/phpstan": "^1.11",
-        "psr/http-factory-implementation": "*",
-        "psy/psysh": "@stable",
-        "spatie/browsershot": "^4.1",
-        "symfony/browser-kit": "^7.1",
-        "symfony/console": "^7.1",
-        "symfony/css-selector": "^7.1",
-        "symfony/dom-crawler": "^7.1",
-        "symfony/http-client": "^7.1",
-        "symfony/psr-http-message-bridge": "^7.1",
-        "symfony/var-dumper": "^6.4 || ^7.0",
-        "toolkit/cli-utils": "^2.0",
-        "twig/twig": "^3.0",
-        "vimeo/psalm": "dev-master",
-        "webuni/front-matter": "^2.0"
+    "files": [
+      "tests/Examples/Call/test_functions.php"
+    ]
+  },
+  "authors": [
+    {
+      "name": "Dariusz Debowczyk",
+      "email": "ddebowczyk@gmail.com"
+    }
+  ],
+  "require-dev": {
+    "ext-curl": "*",
+    "ext-dom": "*",
+    "cebe/markdown": "^1.2",
+    "cognesy/aux-tools": "^0.12.0",
+    "cognesy/experimental": "^0.12.0",
+    "cognesy/instructor-php-hub": "^0.12.0",
+    "cognesy/instructor-php-setup": "^0.12.0",
+    "cognesy/tell": "^0.12.0",
+    "duzun/hquery": "^3.1",
+    "eftec/bladeone": "^4.16",
+    "gioni06/gpt3-tokenizer": "^1.2",
+    "guzzlehttp/psr7": "^2.7",
+    "illuminate/database": "^11.10",
+    "illuminate/http": "^11.37",
+    "league/html-to-markdown": "^5.1",
+    "mockery/mockery": "^1.6",
+    "nyholm/psr7": "^1.8",
+    "pestphp/pest": "^2.34",
+    "php-http/discovery": "^1.20",
+    "phpstan/phpstan": "^1.11",
+    "psr/http-factory-implementation": "*",
+    "psy/psysh": "@stable",
+    "spatie/browsershot": "^4.1",
+    "symfony/browser-kit": "^7.1",
+    "symfony/console": "^7.1",
+    "symfony/css-selector": "^7.1",
+    "symfony/dom-crawler": "^7.1",
+    "symfony/http-client": "^7.1",
+    "symfony/psr-http-message-bridge": "^7.1",
+    "symfony/var-dumper": "^6.4 || ^7.0",
+    "toolkit/cli-utils": "^2.0",
+    "twig/twig": "^3.0",
+    "vimeo/psalm": "dev-master",
+    "webuni/front-matter": "^2.0"
+  },
+  "config": {
+    "allow-plugins": {
+      "pestphp/pest-plugin": true,
+      "php-http/discovery": true
+    },
+    "sort-packages": true
+  },
+  "require": {
+    "php": "^8.2",
+    "ext-fileinfo": "*",
+    "ext-libxml": "*",
+    "ext-simplexml": "*",
+    "ext-xmlreader": "*",
+    "adbario/php-dot-notation": "^3.3",
+    "aimeos/map": "^3.8",
+    "cognesy/utils": "^0.12.0",
+    "cognesy/instructor-php-addons": "^0.12.0",
+    "cognesy/llm": "^0.12.0",
+    "guzzlehttp/guzzle": "^7.8",
+    "phpdocumentor/reflection-docblock": "^5.4",
+    "phpstan/phpdoc-parser": "^1.29",
+    "psr/event-dispatcher": "^1.0",
+    "psr/log": "^3.0",
+    "symfony/filesystem": "^7.1",
+    "symfony/intl": "^7.1",
+    "symfony/property-access": "^6.4 || ^7.0",
+    "symfony/property-info": "^6.4 || ^7.0",
+    "symfony/serializer": "^6.4 || ^7.0",
+    "symfony/type-info": "^7.1",
+    "symfony/validator": "^6.4 || ^7.0",
+    "symfony/yaml": "^7.1",
+    "vlucas/phpdotenv": "^5.6"
+  },
+  "scripts": {
+    "tests": "@php vendor/bin/pest",
+    "phpstan": "@php vendor/bin/phpstan -c phpstan.neon",
+    "psalm": "@php vendor/bin/psalm",
+    "instructor": "php ./bin/instructor"
+  },
+  "repositories": [
+    {
+      "type": "path",
+      "url": "./src-addons"
+    },
+    {
+      "type": "path",
+      "url": "./src-aux"
+    },
+    {
+      "type": "path",
+      "url": "./src-experimental"
+    },
+    {
+      "type": "path",
+      "url": "./src-hub"
+    },
+    {
+      "type": "path",
+      "url": "./src-llm"
     },
-    "config": {
-        "allow-plugins": {
-            "pestphp/pest-plugin": true,
-            "php-http/discovery": true
-        },
-        "sort-packages": true
+    {
+      "type": "path",
+      "url": "./src-setup"
     },
-    "require": {
-        "php": "^8.2",
-        "ext-fileinfo": "*",
-        "ext-libxml": "*",
-        "ext-simplexml": "*",
-        "ext-xmlreader": "*",
-        "adbario/php-dot-notation": "^3.3",
-        "aimeos/map": "^3.8",
-        "guzzlehttp/guzzle": "^7.8",
-        "phpdocumentor/reflection-docblock": "^5.4",
-        "phpstan/phpdoc-parser": "^1.29",
-        "psr/event-dispatcher": "^1.0",
-        "psr/log": "^3.0",
-        "symfony/filesystem": "^7.1",
-        "symfony/intl": "^7.1",
-        "symfony/property-access": "^6.4 || ^7.0",
-        "symfony/property-info": "^6.4 || ^7.0",
-        "symfony/serializer": "^6.4 || ^7.0",
-        "symfony/type-info": "^7.1",
-        "symfony/validator": "^6.4 || ^7.0",
-        "symfony/yaml": "^7.1",
-        "vlucas/phpdotenv": "^5.6"
+    {
+      "type": "path",
+      "url": "./src-tell"
     },
-    "scripts": {
-        "tests": "@php vendor/bin/pest",
-        "phpstan": "@php vendor/bin/phpstan -c phpstan.neon",
-        "psalm": "@php vendor/bin/psalm",
-        "instructor": "php ./bin/instructor"
+    {
+      "type": "path",
+      "url": "./src-utils"
     }
+  ]
 }
diff --git a/examples/A05_Extras/ReasoningContent/run.php b/examples/A05_Extras/ReasoningContent/run.php
@@ -17,6 +17,7 @@
 $loader->add('Cognesy\\Instructor\\', __DIR__ . '../../src/');
 
 use Cognesy\LLM\LLM\Inference;
+use Cognesy\Utils\Debug\Debug;
 use Cognesy\Utils\Str;
 
 //Debug::enable();
diff --git a/src-utils/Xml/Xml.php b/src-utils/Xml/Xml.php
@@ -8,7 +8,7 @@
  *
  * Convert XML to array
  *
- * @package Cognesy\Instructor\Utils
+ * @package Cognesy\Utils
  */
 class Xml
 {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Convert XML to array`
`10`	`10`	`*`
`11`		`- * @package Cognesy\Instructor\Utils`
	`11`	`+ * @package Cognesy\Utils`
`12`	`12`	`*/`
`13`	`13`	`class Xml`
`14`	`14`	`{`