Add Database Migration for sorting images:

app/Jobs/GenerateHashValue.php

@@ -82,7 +82,7 @@ public function handle()
     {
         $hashValue = $this->getHashValue($this->image);
         if ($hashValue !== null) {
-            $this->image->hash = $hashValue["hash"];
+            $this->image->hash = $hashValue;
             $this->image->save();
         }
     }
@@ -122,10 +122,8 @@ protected function getHashValue(Image $image)
             $script = config('biigle.hash_value_generator');
 
             try {
-                $outputPath = $this->getOutputJsonPath($image);
                 $inputPath = $this->createInputJson($image, $imageByteString);
-                $output = $this->python("{$script} {$inputPath} {$outputPath}");
-                $hashValue = $this->decodeOutputJson($outputPath);
+                $hashValue = $this->python("{$script} {$inputPath}")[0];
             } catch (Exception $e) {
                 $input = File::get($inputPath);
                 $hashValue = null;
@@ -134,10 +132,6 @@ protected function getHashValue(Image $image)
                 if (isset($inputPath)) {
                     $this->maybeDeleteFile($inputPath);
                 }
-
-                if (isset($outputPath)) {
-                    $this->maybeDeleteFile($outputPath);
-                }
             }
             return $hashValue;
         } else {
@@ -181,7 +175,7 @@ protected function python($command)
      */
     protected function getInputJsonPath(Image $image)
     {
-        return config('hash.tmp_dir')."/generate_hash_value_input_{$image->id}.json";
+        return config('biigle.tmp_dir')."/generate_hash_value_input_{$image->id}";
     }
 
     /**
@@ -195,38 +189,11 @@ protected function getInputJsonPath(Image $image)
     protected function createInputJson(Image $image, $imageAsByteString)
     {
         $path = $this->getInputJsonPath($image);
-        $content = json_encode([
-            'image_as_byte_string' => base64_encode($imageAsByteString),
-            'image_id' => $image->id,
-        ]);
 
-        File::put($path, $content);
+        File::put($path, $imageAsByteString);
         return $path;
     }
 
-    /**
-     * Get the path to to output file for the HashValueGenerator script.
-     *
-     * @param Image $image
-     *
-     * @return string
-     */
-    protected function getOutputJsonPath(Image $image)
-    {
-        return config('hash.tmp_dir')."/generate_hash_value_output_{$image->id}.json";
-    }
-
-    /**
-     * @param path Opens the ouput path after the python script and decodes it
-     *
-     * @return mixed
-     */
-    protected function decodeOutputJson($path)
-    {
-        return json_decode(File::get($path), true);
-
-    }
-
 
     /**
      * Delete a file if it exists.

app/Jobs/GenerateSimilarityIndex.php

@@ -129,8 +129,8 @@ public function createSimilarityIndexArray(array $imageHashArray)
             $outputPath = $this->getOutputJsonPath($this->volume);
             $inputPath = $this->createInputJson($this->volume, $imageHashArray);
             $output = $this->python("{$script} {$inputPath} {$outputPath}");
-            $similarityIndexArray = $this->decodeOutputJson($outputPath);
-        } catch (Exception $e) {
+            $similarityIndexArray = json_decode(File::get($outputPath), true);
+      } catch (Exception $e) {
             $input = File::get($inputPath);
             $similarityIndexArray = null;
             throw new Exception("Input: {$input}\n" . $e->getMessage());
@@ -180,7 +180,7 @@ protected function python($command)
      */
     protected function getInputJsonPath(Volume $volume)
     {
-        return config('hash.tmp_dir')."/generate_sim_index_input_{$volume->id}.json";
+        return config('biigle.tmp_dir')."/generate_sim_index_input_{$volume->id}.json";
     }
 
     /**
@@ -192,7 +192,7 @@ protected function getInputJsonPath(Volume $volume)
      */
     protected function getOutputJsonPath(Volume $volume)
     {
-        return config('hash.tmp_dir')."/generate_sim_index_output_{$volume->id}.json";
+        return config('biigle.tmp_dir')."/generate_sim_index_output_{$volume->id}.json";
     }
 
     /**
@@ -211,17 +211,6 @@ protected function createInputJson(Volume $volume, Array $imagesHashArray)
         return $path;
     }
 
-    /**
-     * @param path Opens the ouput path after the python script and decodes it
-     *
-     * @return mixed
-     */
-    protected function decodeOutputJson($path)
-    {
-        return json_decode(File::get($path), true);
-
-    }
-
     /**
      * Delete a file if it exists.
      *

database/migrations/2021_05_31_125925_add_hash_to_images_table.php

@@ -14,7 +14,7 @@ class AddHashToImagesTable extends Migration
     public function up()
     {
         Schema::table('images', function (Blueprint $table) {
-            $table->string('hash')->nullable();
+            $table->longText('hash')->nullable();
         });
     }
 

resources/scripts/HashValueGenerator.py

@@ -15,21 +15,10 @@ def createHashValue(img):
     return createdHash
 
 
-with open(sys.argv[1]) as inputJson:
-    image_data = json.load(inputJson)
 
-id = image_data['image_id']
-imageBytes = image_data['image_as_byte_string']
-
-with Image.open(io.BytesIO(base64.b64decode(imageBytes))) as img:
+with Image.open(sys.argv[1]) as img:
     createdHash = createHashValue(img)
 
 
-returnData = {
-    'id': id,
-    'hash': str(createdHash)
-}
-
-with open(sys.argv[2], 'w') as f:
-    json.dump(returnData, f)
 
+print(str(createdHash))

tests/php/Jobs/GenerateHashValueTest.php

@@ -21,10 +21,15 @@ public function setUp(): void
     }
     public function testHandle()
     {
-        Storage::disk(config('thumbnails.storage_disk'))->put('test.jpg', 'test_data');
+
         $image = ImageTest::create([
             'filename' => 'test.jpg'
         ]);
+        $prefix = fragment_uuid_path($image->uuid);
+        $format = config('thumbnails.format');
+
+        Storage::disk(config('thumbnails.storage_disk'))->put("{$prefix}.{$format}", $image);
+
 
         with(new GenerateHashValueStub($image))->handle();
 
@@ -38,37 +43,15 @@ public function testHashInitialization()
             'filename' => 'test.jpg'
         ]);
 
-        assertNull($image->hash);
+        $this->assertNull($image->hash);
     }
 }
 
 class GenerateHashValueStub extends GenerateHashValue
 {
     protected function python($command)
     {
-        return "{'hash': 'jmhsdgfmasgh'}";
-    }
-
-
-    protected function getThumbnail(Image $image)
-    {
-        return b'\xe1\x88\xb4';
-    }
-
-
-
-    protected function decodeOutputJson($path) {
-        return [
-            "id" => 1,
-            "hash" => 'hopfullyAHashValue'
-        ];
-    }
-
-
-
-     protected function createInputJson(Image $image, $imageAsByteString)
-    {
-        return 'abcd';
+        return array('024a60dfefffcfff02486dcfcffeffff010c07f1bffeffff0144907dbfffffff004018ffbbffffff00661c077ffbffff006c1e007ff7fbff8a021e679fffffef830307879707efff02c6c311af07ffff108303ebc9e9ff7f00800280c519ffff00100680c703feff018264e01217fff3018026d04100cfe3068193c0808007eb0007fb48000027bf0044df586031c7bf00093f01c003fb3f00083e226007fcd0001c78c13887e4d000143be0c265fe13000418fcf60dff1f00240bfe1e08ffe6000a0346320a6bdf000f90cff7c6e7bf000981ee334ff76f000100fff3dfffbf0137807fa9df3fbf0021813ff89e3fed0010070fbc0cbeef00020307bd0fceff00000047bf8fefff0000507f1f0fffff0000c0023c07fedf000180001c0ffd9f00000000003fffff00018000001efff3000200000666f7ff01c0000004faffefc0c0180000fbdfffc080000001ffe73f41000000496fe7330000020403ffff9f0000020c00dfffff09000006103fedff00002023833f63ff00000022c3ff479f10c8016efffff7df102200fa7ef7cbdf002200106209ee370000300d218fee1b0000060f191bf71f000001020a1ff33f000080e2248efa73000000430778f9f7000000010278e07f00012008d87fae6f00020009f99bfe6f00103418c884fb3b000010004e0ce73d0000003fd84007bf0000213dfe4e17ff00005307601cf4df');
     }
 
 }

tests/php/Jobs/GenerateSimilarityIndexTest.php

@@ -41,7 +41,7 @@ public function testHandle()
     public function testSimilarityIndexInitialization()
     {
         $volume = VolumeTest::create();
-        $i1 = ImageTest::create(['filename' => 'test.jpg', 'volume_id' => $volume->id, 'hash' => 'dqhdkjhqlwdlhlbsbjkk']);
+        $i1 = ImageTest::create(['filename' => 'test.jpg', 'volume_id' => $volume->id, 'hash' => '024a60dfefffcfff02486dcfcffeffff010c07f1bffeffff0144907dbfffffff004018ffbbffffff00661c077ffbffff006c1e007ff7fbff8a021e679fffffef830307879707efff02c6c311af07ffff108303ebc9e9ff7f00800280c519ffff00100680c703feff018264e01217fff3018026d04100cfe3068193c0808007eb0007fb48000027bf0044df586031c7bf00093f01c003fb3f00083e226007fcd0001c78c13887e4d000143be0c265fe13000418fcf60dff1f00240bfe1e08ffe6000a0346320a6bdf000f90cff7c6e7bf000981ee334ff76f000100fff3dfffbf0137807fa9df3fbf0021813ff89e3fed0010070fbc0cbeef00020307bd0fceff00000047bf8fefff0000507f1f0fffff0000c0023c07fedf000180001c0ffd9f00000000003fffff00018000001efff3000200000666f7ff01c0000004faffefc0c0180000fbdfffc080000001ffe73f41000000496fe7330000020403ffff9f0000020c00dfffff09000006103fedff00002023833f63ff00000022c3ff479f10c8016efffff7df102200fa7ef7cbdf002200106209ee370000300d218fee1b0000060f191bf71f000001020a1ff33f000080e2248efa73000000430778f9f7000000010278e07f00012008d87fae6f00020009f99bfe6f00103418c884fb3b000010004e0ce73d0000003fd84007bf0000213dfe4e17ff00005307601cf4df']);
         $i2 = ImageTest::create(['volume_id' => $volume->id, 'filename' => 'a.jpg', 'hash' => 'o8793r2hriuh9e2i3bd9']);
         $i3 = ImageTest::create(['volume_id' => $volume->id, 'filename' => 'b.jpg', 'hash' => 'dqhdkjhqlwdlhlbsbjkk']);
         $i4 = ImageTest::create(['volume_id' => $volume->id, 'filename' => 'c.jpg', 'hash' => 'kjsbfabefhlbeqwhkcbd']);
@@ -75,21 +75,12 @@ class GenerateSimilarityIndexStub extends GenerateSimilarityIndex
 
     protected function python($path)
     {
-        return "{2: 0, 5: 1, 4: 2, 1: 3, 3: 4}";
-    }
-
-    protected function createInputJson(Volume $volume, Array $imagesHashArray)
-    {
-        return 'abcd';
+        $i = 10;
+        $imageArray = $this->volume->images()->pluck("hash", "id");
+        foreach ($imageArray as $id => $hash) {
+            $imageArray[$id] = $i % 5;
+            $i++;
+        }
+        return File::put($this->getOutputJsonPath($this->volume), $imageArray);
     }
-
-    protected function decodeOutputJson($path) {
-        return [
-            2 => 0,
-            5 => 1,
-            4 => 2,
-            1 => 3,
-            3 => 4
-        ];
     }
-}