commit

app.py

@@ -99,21 +99,21 @@ def safe_eval(encodings):
         
         # Replace newline characters and multiple spaces
         sanitized = encodings.replace('\n', ',').replace(' ', '')
-        # Remove any accidental double commas
-        sanitized = sanitized.replace(',,', ',')
+        sanitized = sanitized.replace(',,', ',')  # Remove accidental double commas
         
-        # Make sure we have removed any trailing commas
-        if sanitized.endswith(','):
-            sanitized = sanitized[:-1]
+        # Ensure the string starts and ends properly for evaluation
+        if not sanitized.startswith("["):
+            sanitized = "[" + sanitized
+        if not sanitized.endswith("]"):
+            sanitized = sanitized + "]"
 
-        # Debugging: Print the sanitized string
         print("Sanitized Encodings String:", sanitized)
         
-        # Use eval to convert the string to a list or array
         return eval(sanitized)
     except SyntaxError as e:
         raise ValueError(f"Failed to safely parse the encodings string: {e}")
 
+
 def encode_quantize(test_file, eval_key, encodings):
     ugly = ['Machine', 'SizeOfOptionalHeader', 'Characteristics',
        'MajorLinkerVersion', 'MinorLinkerVersion', 'SizeOfCode',
@@ -155,11 +155,10 @@ def encrypt_encoded_quantize(encodings):
     fhe_api.load()
 
     encodings = encodings[0]
-    
-    if isinstance(encodings, str):
-        encodings = safe_eval(encodings)
 
-    encodings = np.array(encodings, dtype=np.float32)
+    # Ensure encodings is a proper NumPy array
+    if isinstance(encodings, str):
+        encodings = np.fromstring(encodings.strip("[]"), sep=',', dtype=np.float32)
 
     if np.isnan(encodings).any() or np.isinf(encodings).any():
         raise ValueError("Encodings contain NaN or Inf values, which cannot be processed.")