fix: reverting to the latest version with some updates

server.py

@@ -14,14 +14,11 @@ import recolorLumaConverterAlgo
 import recolorPaletteBasedTransfer
 import recolorReinhardV2Algo
 import recolorLinearColorTransfer
-import recolorStrictTransfer
 import matchCollection
 import ColorReplacer
 import ColorMask
 from typing import Optional
 
-import random
-
 app = FastAPI()
 
 app.add_middleware(
@@ -32,7 +29,7 @@ app.add_middleware(
     allow_headers=["*"],
 )
 @app.post("/dominantColor")
-async def dominant_color(file: UploadFile = File(...), num_colors: int = Form(...), ordered: bool = Form(False)):
+async def dominant_color(file: UploadFile = File(...), num_colors: int = Form(...)):
     """
     Receive an image file and an integer and return the dominant color(s).
     """
@@ -44,7 +41,6 @@ async def dominant_color(file: UploadFile = File(...), num_colors: int = Form(..
     dominantColorsHex = [dominantColors.rgb_to_hex(color) for color in dominantColorsRGB]
     return {"dominantColors": dominantColorsHex}
 
-
 @app.post("/ColorPalettes/")
 async def color_palettes(colors: str = Form(...)):
     """
@@ -77,14 +73,13 @@ async def color_palettes(colors: str = Form(...)):
     return {"inputColor": colors, "complementaryColors": complementaryColors, "adjacentColors": adjacentColors, "gradientColors": gradientColors}
 
 @app.post("/recolor/")
-async def recolor(file: UploadFile = File(...), colors: str = Form(...), new_colors: str = Form(...), random_colors: bool = Form(False),  model: str = Form(...), mask: Optional[UploadFile] = File(None)):
+async def recolor(file: UploadFile = File(...), colors: str = Form(...),  model: str = Form(...), mask: Optional[UploadFile] = File(None)):
     """
     Receive an image file and an array of strings representing colors of a selected pallete and recolor an image.
     """
     method = model
     invertColors = False
     colors = [color.strip() for color in colors.split(',')]
-    new_colors = [new_color.strip() for new_color in new_colors.split(',')]
     file_content = await file.read()
     image_bytes = io.BytesIO(file_content)
     image = Image.open(image_bytes)
@@ -96,43 +91,34 @@ async def recolor(file: UploadFile = File(...), colors: str = Form(...), new_col
         print('CCA generated')
         #Characteristic Color Analysis
         recolorReinhardAlgo.recolor(image_np, colors)
-
     elif method == "OTA":
         print('OTA generated')
         #Optimal Transport Algorithm transfer
         recolorOTAlgo.recolor(image_np, colors)
-
     elif method =="KMEANS":
         print('KMEANS generated')
         #K-means clustering transfer
         recolorTransferAlgo.recolor(image_np, colors)
-
     elif method == "LUMA":
         print('Luma generated')
         #Luma converter transfer
         recolorLumaConverterAlgo.remap_image_colors(image_np, colors)
-
     elif method == "palette":
         #palette transfer
         print('palette generated')
         recolorPaletteBasedTransfer.recolor(image_np, colors)
-
     elif method == "Reinhardv2":
         print('Reinhardv2 generated')
         recolorReinhardV2Algo.recolor(image_np, colors)
-
     elif method == "LinearColorTransfer":
         print('LinearColorTransfer generated')
         recolorLinearColorTransfer.recolor(image_np, colors)
-
-    elif method == "StrictTransfer":
-        print('StrictTransfer started')
-        if random_colors:
-            random.shuffle(new_colors)            
-        recolorStrictTransfer.recolor(image_np, colors, new_colors)        
-        
+    elif method == "ColorReplacer":
+        print('ColorReplacer started')
+        ColorReplacer.recolor_selected_area(image_np, colors[0], colors[1])
     elif method == "ColorMask":
         print('ColorMask started')
+        print(colors)
         ColorMask.create_mask(image_np, colors[0])
 
     #mask image: