refactor: Simplify library components and improve error handling

- Updated Samplerate FFI method to handle errors more robustly
- Modified Audio and Image utility classes to use new constructor patterns

Author: CodeWithKyrian

examples/pipelines/text-generation.php

@@ -14,8 +14,8 @@
 
 //$generator = pipeline('text-generation', 'Xenova/gpt2');
 //$generator = pipeline('text-generation', 'Xenova/Qwen1.5-0.5B-Chat');
-//$generator = pipeline('text-generation', 'Xenova/TinyLlama-1.1B-Chat-v1.0');
-$generator = pipeline('text-generation', 'onnx-community/Llama-3.2-1B-Instruct', modelFilename: 'model_q4');
+$generator = pipeline('text-generation', 'Xenova/TinyLlama-1.1B-Chat-v1.0');
+// $generator = pipeline('text-generation', 'onnx-community/Llama-3.2-1B-Instruct', modelFilename: 'model_q4');
 
 $streamer = TextStreamer::make()->shouldSkipPrompt();
 

src/FFI/Libvips.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Codewithkyrian\Transformers\FFI;
+
+class Libvips extends NativeLibrary 
+{
+    public function __construct()
+    {
+        parent::__construct(false);
+    }
+
+    protected function getHeaderName(): string
+    {
+        return 'vips';
+    }
+    
+    protected function getLibraryName(): string
+    {
+        return 'libvips';
+    }
+}

src/FFI/NativeLibrary.php

@@ -103,14 +103,19 @@ public function getLibraryPath(): string
         return joinPaths($this->getLibDirectory(), "{$this->getLibraryName()}.{$this->getLibraryExtension()}");
     }
 
+    public function getPlatformPath(): string
+    {
+        return joinPaths(dirname(__DIR__, 2), 'shared', $this->platformConfig['directory']);
+    }
+
     public function getIncludeDirectory(): string
     {
-        return joinPaths(dirname(__DIR__, 2), 'shared', $this->platformConfig['directory'], 'include');
+        return joinPaths($this->getPlatformPath(), 'include');
     }
 
     public function getLibDirectory(): string
     {
-        return joinPaths(dirname(__DIR__, 2), 'shared', $this->platformConfig['directory'], 'lib');
+        return joinPaths($this->getPlatformPath(), 'lib');
     }
 
     public function getLibraryExtension(): string

src/FFI/Samplerate.php

@@ -38,20 +38,21 @@ protected function getLibraryName(): string
      *
      * @param int $converter_type The type of converter to create.
      * @param int $channels The number of channels.
-     * @param int $error A pointer to an error code.
      *
      * @return CData|null The sample rate converter, or null if creation failed.
      * @throws Exception
      */
-    public function src_new(int $converter_type, int $channels, int &$error): ?CData
+    public function src_new(int $converter_type, int $channels): ?CData
     {
-        $errorPtr = $this->new('int');
-        $errorPtr->cdata = $error;
+        $error = $this->new('int32_t');
 
-        $src = $this->ffi->{'src_new'}($converter_type, $channels, $errorPtr);
-        $error = $errorPtr->cdata;
+        $state = $this->ffi->{'src_new'}($converter_type, $channels, \FFI::addr($error));
+
+        if ($error->cdata !== 0) {
+            throw new RuntimeException($this->strerror($error->cdata));
+        }
 
-        return $src;
+        return $state;
     }
 
     /**

src/Pipelines/AudioClassificationPipeline.php

@@ -54,7 +54,7 @@ public function __invoke(array|string $inputs, ...$args): array
         $toReturn = [];
 
         foreach ($inputs as $input) {
-            $audio = Audio::read($input);
+            $audio = new Audio($input);
             $audioTensor = $audio->toTensor(samplerate: $sampleRate);
 
             $processedInputs = ($this->processor)($audioTensor);

src/Pipelines/AutomaticSpeechRecognitionPipeline.php

@@ -150,7 +150,7 @@ private function __invokeWhisper(array|string $inputs, ...$args): array|Tensor|I
             ?->setTimestampBegin($timestampBegin);
 
         foreach ($inputs as $input) {
-            $audio = Audio::read($input);
+            $audio = new Audio($input);
             $audioTensor = $audio->toTensor(samplerate: $samplingRate);
 
             $chunks = [];

src/Utils/Audio.php

@@ -56,7 +56,7 @@ public function toTensor(int $samplerate = 41000, int $chunkSize = 2048): Tensor
         $tensorData = '';
         $totalOutputFrames = 0;
 
-        $state = $this->src->src_new($this->src->enum('SRC_SINC_FASTEST'), $this->channels(), $error);
+        $state = $this->src->src_new($this->src->enum('SRC_SINC_FASTEST'), $this->channels());
 
         $inputSize = $chunkSize * $this->channels();
         $inputData = $this->src->new("float[$inputSize]");

src/Utils/Image.php

@@ -1,9 +1,10 @@
-r<?php
+<?php
 
 declare(strict_types=1);
 
 namespace Codewithkyrian\Transformers\Utils;
 
+use Codewithkyrian\Transformers\FFI\Libvips;
 use Codewithkyrian\Transformers\Tensor\Tensor;
 use Codewithkyrian\Transformers\Transformers;
 use Exception;
@@ -96,8 +97,8 @@ public static function setDriver(ImageDriver $imageDriver): void
         };
 
         if ($imageDriver === ImageDriver::VIPS) {
-            $libsDir = basePath('libs');
-            putenv("VIPSHOME=$libsDir");
+            $libvips = new Libvips();
+            putenv("VIPSHOME={$libvips->getPlatformPath()}");
         }
     }