feat: code style improvements across board

Author: CodeWithKyrian

composer.json

@@ -16,13 +16,13 @@
     "php": "^8.1",
     "ext-ffi": "*",
     "codewithkyrian/jinja-php": "^1.0",
+    "codewithkyrian/platform-package-installer": "^1.0",
     "imagine/imagine": "^1.3",
     "rindow/rindow-math-matrix": "^2.1",
     "rindow/rindow-matlib-ffi": "^1.1",
     "rindow/rindow-openblas-ffi": "^1.0",
     "rokka/imagine-vips": "^0.40",
-    "symfony/console": "^6.4|^7.0",
-    "codewithkyrian/platform-package-installer": "^1.0"
+    "symfony/console": "^6.4|^7.0"
   },
   "require-dev": {
     "ffi/var-dumper": "^1.0",

examples/bootstrap.php

@@ -7,6 +7,8 @@
 
 require_once './vendor/autoload.php';
 
+$cacheDir = '/Volumes/KYRIAN SSD/Transformers';
+
 Transformers::setup()
-    ->setCacheDir('/Users/Kyrian/.transformers')
+    ->setCacheDir($cacheDir)
     ->setImageDriver(ImageDriver::VIPS);

examples/nextTokenScores.json

@@ -27,9 +27,6 @@ public function __construct()
      */
     public function extend(array $texts): void
     {
-//        foreach ($texts as $text) {
-//            $this->push($text);
-//        }
         array_map([$this, 'push'], $texts);
     }
 
@@ -61,7 +58,7 @@ public function commonPrefixSearch(string $text): Generator
         $node = $this->root;
         $prefix = "";
         $length = mb_strlen($text);
-        
+
         for ($i = 0; $i < $length && $node != null; $i++) {
             $ch = mb_substr($text, $i, 1);
             $prefix .= $ch;
@@ -72,4 +69,4 @@ public function commonPrefixSearch(string $text): Generator
             }
         }
     }
-}
+}

index.php

@@ -7,8 +7,8 @@
 
 class ModelExecutionException extends \Exception implements TransformersException
 {
-public static function make(string $message): self
+    public static function make(string $message, ?\Throwable $previous = null): self
     {
-        return new self("An error occurred during model execution: $message");
+        return new self("An error occurred during model execution: $message", 0, $previous);
     }
-}
+}

src/DataStructures/CharTrie.php

@@ -10,7 +10,10 @@
  */
 class FeatureExtractor
 {
-    public function __construct(public array $config)
+    public function __construct(public array $config) {}
+
+    public function __invoke(mixed $input, ...$args)
     {
+        return $input;
     }
-}
+}

src/Exceptions/ModelExecutionException.php

@@ -35,7 +35,7 @@ class Downloader
      * @param callable|null $onProgress Callback to notify about the download progress
      * @return false|string
      */
-    public static function download(string $url, string $to, array $options = [], callable $onProgress = null): bool|string
+    public static function download(string $url, string $to, array $options = [], ?callable $onProgress = null): bool|string
     {
         $curlHandle = curl_init();
 
@@ -137,4 +137,4 @@ public static function download(string $url, string $to, array $options = [], ca
 
         return $headers;
     }
-}
+}

src/FeatureExtractors/FeatureExtractor.php

@@ -8,7 +8,6 @@
 use Codewithkyrian\Transformers\Transformers;
 use Exception;
 use RuntimeException;
-use Symfony\Component\Console\Helper\ProgressBar;
 
 /**
  * Utility class to download files from the Hugging Face Hub
@@ -55,8 +54,7 @@ public static function getFile(
         string    $subFolder = '',
         bool      $fatal = true,
         ?callable $onProgress = null
-    ): ?string
-    {
+    ): ?string {
         # Local cache and file paths
         $cacheDir ??= Transformers::getCacheDir();
 
@@ -72,17 +70,17 @@ public static function getFile(
         $partCounter = 1;
         $partBasePath = "$filePath.part";
 
-        while (file_exists($partBasePath.$partCounter)) {
+        while (file_exists($partBasePath . $partCounter)) {
             $partCounter++;
         }
 
-        $partPath = $partBasePath.$partCounter;
+        $partPath = $partBasePath . $partCounter;
 
         # Resume download if partially downloaded
         $downloadedBytes = 0;
         if ($partCounter > 1) {
             for ($i = 1; $i < $partCounter; $i++) {
-                $downloadedBytes += filesize($partBasePath.$i);
+                $downloadedBytes += filesize($partBasePath . $i);
             }
         }
 
@@ -92,14 +90,14 @@ public static function getFile(
         $options = [
             'http' => [
                 'header' => [
-                    'Range: bytes='.$downloadedBytes.'-',
+                    'Range: bytes=' . $downloadedBytes . '-',
                 ],
                 'User-Agent' => Transformers::getUserAgent(),
             ],
         ];
 
         if (Transformers::getAuthToken()) {
-            $options['http']['header'][] = 'Authorization: Bearer '.Transformers::getAuthToken();
+            $options['http']['header'][] = 'Authorization: Bearer ' . Transformers::getAuthToken();
         }
 
         try {
@@ -146,8 +144,7 @@ public static function getJson(
         string    $subFolder = '',
         bool      $fatal = true,
         ?callable $onProgress = null
-    ): ?array
-    {
+    ): ?array {
         $file = self::getFile($pathOrRepoID, $fileName, $cacheDir, $revision, $subFolder, $fatal, $onProgress);
 
         if ($file === null) {
@@ -166,23 +163,11 @@ public static function getJson(
         return $data;
     }
 
-
-    private static function onProgress(ProgressBar $progressBar): callable
-    {
-        return function ($totalDownload, $downloadedBytes) use ($progressBar) {
-            if ($totalDownload == 0) return;
-
-            $percent = round(($downloadedBytes / $totalDownload) * 100, 2);
-            $progressBar->setProgress((int)$percent);
-        };
-    }
-
-
     public static function combinePartFiles($filePath, $partBasePath, $partCount): void
     {
         $fileHandle = fopen($filePath, 'w');
         for ($i = 1; $i <= $partCount; $i++) {
-            $partPath = $partBasePath.$i;
+            $partPath = $partBasePath . $i;
             $partFileHandle = fopen($partPath, 'r');
             stream_copy_to_stream($partFileHandle, $fileHandle);
             fclose($partFileHandle);