Update Concrete ML version and re-generate development files

client_server_interface.py

@@ -1,6 +1,6 @@
 "Client-server interface custom implementation for filter models."
 
-import concrete.numpy as cnp
+from concrete import fhe
 
 from filters import Filter
 
@@ -17,7 +17,7 @@ class FHEServer:
         self.path_dir = path_dir
 
         # Load the FHE circuit
-        self.server = cnp.Server.load(self.path_dir / "server.zip")
+        self.server = fhe.Server.load(self.path_dir / "server.zip")
 
     def run(self, serialized_encrypted_image, serialized_evaluation_keys):
         """Run the filter on the server over an encrypted image.
@@ -30,20 +30,14 @@ class FHEServer:
             bytes: The filter's output.
         """
         # Deserialize the encrypted input image and the evaluation keys
-        encrypted_image = self.server.client_specs.unserialize_public_args(
-            serialized_encrypted_image
-        )
-        evaluation_keys = cnp.EvaluationKeys.unserialize(serialized_evaluation_keys)
+        encrypted_image = fhe.Value.deserialize(serialized_encrypted_image)
+        evaluation_keys = fhe.EvaluationKeys.deserialize(serialized_evaluation_keys)
 
         # Execute the filter in FHE
-        encrypted_output = self.server.run(
-            encrypted_image, evaluation_keys
-        )
+        encrypted_output = self.server.run(encrypted_image, evaluation_keys=evaluation_keys)
 
         # Serialize the encrypted output image
-        serialized_encrypted_output = self.server.client_specs.serialize_public_result(
-            encrypted_output
-        )
+        serialized_encrypted_output = encrypted_output.serialize()
 
         return serialized_encrypted_output
 
@@ -98,7 +92,7 @@ class FHEClient:
         assert path_dir.exists(), f"{path_dir} does not exist. Please specify a valid path."
 
         # Load the client
-        self.client = cnp.Client.load(self.path_dir / "client.zip", self.key_dir)
+        self.client = fhe.Client.load(self.path_dir / "client.zip", self.key_dir)
 
         # Instantiate the filter
         self.filter = Filter(filter_name)
@@ -132,7 +126,7 @@ class FHEClient:
         encrypted_image = self.client.encrypt(input_image)
 
         # Serialize the encrypted image to be sent to the server
-        serialized_encrypted_image = self.client.specs.serialize_public_args(encrypted_image)
+        serialized_encrypted_image = encrypted_image.serialize()
         return serialized_encrypted_image
 
     def deserialize_decrypt_post_process(self, serialized_encrypted_output_image):
@@ -145,7 +139,7 @@ class FHEClient:
             numpy.ndarray: The decrypted, deserialized and post-processed image.
         """
         # Deserialize the encrypted image
-        encrypted_output_image = self.client.specs.unserialize_public_result(
+        encrypted_output_image = fhe.Value.deserialize(
             serialized_encrypted_output_image
         )
 

filters.py

@@ -5,7 +5,7 @@ import torch
 from torch import nn
 from common import AVAILABLE_FILTERS, INPUT_SHAPE
 
-from concrete.numpy.compilation.compiler import Compiler
+from concrete.fhe.compilation.compiler import Compiler
 from concrete.ml.common.utils import generate_proxy_function
 from concrete.ml.torch.numpy_module import NumpyModule
 

filters/black and white/deployment/client.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:009a1f53994ae2776806eef65f516b40b8366b7e16d28b4037bdeebf3f742261
-size 378
+oid sha256:2f224e21a8a189c8b9431de533c3401f174fe97f455b347309256d5c61c91c2f
+size 348

filters/black and white/deployment/server.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1e3227d75f87cad545ba34391f23b1aa37fc808cb6a2e3ec34f76e3ab1af0b9
-size 5871
+oid sha256:6811bb8621f87ceb1c7eaa18439daabe0400d3f206e6fb7d034b7258ab3f47e7
+size 5120

filters/blur/deployment/client.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad80a31b1f0aae22fa3520319f30ccea41210223946e74c00a8c7493cc1c7b46
-size 391
+oid sha256:784113c8aa6256ae136dcdcef246eb726c0a30a7bf79f91fc458e13cfdaeed66
+size 360

filters/blur/deployment/server.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c58d04b6c75c926a0d98dc3376761dea78445a27224d63ab37e01a062b1781d
-size 8716
+oid sha256:fc03fc47e2f1c4ddedcf9e0dd9c46890b79e0de5c75bc3523c0be9eb504fc544
+size 7356

filters/identity/deployment/client.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69590288fb2da2e41d772572e959e6ea01e26836ae412e36f927b1a4e7998fb0
-size 376
+oid sha256:e2ff4b6d075e418d6577f88fe77e580949023837708a52cd377fa4388d38ad1f
+size 347

filters/identity/deployment/server.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8221f0473d76d0df4242e03b339068276e865b67748cb87f4a3c71eebf99ffe
-size 2537
+oid sha256:e5a2cd8e175ff9b99dc1b9700884ae40c24afc7375005833f7410dcd73f0cfee
+size 2818

filters/inverted/deployment/client.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:433a5406b400f59ada754ebd0ff1cc55cdcffaf628acf82f24820fdb2b3d3fb4
-size 376
+oid sha256:e2ff4b6d075e418d6577f88fe77e580949023837708a52cd377fa4388d38ad1f
+size 347

filters/inverted/deployment/server.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16ee970649f7dcc0be9fe5ca4de1fd0077b307956761aa45b48ae78eb3ab2f7a
-size 4152
+oid sha256:eb99ecacca176c7f5cca0fbf577af46495e028074169495aa3f6af5beafa1855
+size 4026

filters/ridge detection/deployment/client.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:233f8eb49ac2a5d4fe6bb761c1234249c18f13c6a6158548f5489f78bdb780ed
-size 396
+oid sha256:b6d461d356570d465d012715048d824b76b31668d80678e5e5083e9c8a93e6e6
+size 369

filters/ridge detection/deployment/server.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b662157b5b7517a18b0a6cacb9c1800b124424f38a5a4230829c7a1ddb2a62b
-size 6697
+oid sha256:0275c0bc7fbc90b19ccc16b87d220fd9be72cef303775245725845b1f1f918d7
+size 6082

filters/rotate/deployment/client.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:433a5406b400f59ada754ebd0ff1cc55cdcffaf628acf82f24820fdb2b3d3fb4
-size 376
+oid sha256:e2ff4b6d075e418d6577f88fe77e580949023837708a52cd377fa4388d38ad1f
+size 347

filters/rotate/deployment/server.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b55e20b3c46d9609a1f2c0be3b3db5bd0d4e288061a1428e17c9abbe67ed3e10
-size 4387
+oid sha256:dfc258c33a41a748949729e0a443c7f667b1b5b52db43966d2e8257979a82b36
+size 3831

filters/sharpen/deployment/client.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:789caedfe972a3108187614b66d15bca0a64fa0bb24840cbec9e8f93211f3750
-size 396
+oid sha256:63bdea70a18addfa2ee8667a6be682f4b9856b9776a707f2ecebe56359066897
+size 369

filters/sharpen/deployment/server.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23fe93ee2d0154c15eeae9aacc2f1b4bb41c3a832b9c71b91406e0190138e451
-size 8735
+oid sha256:0635f6e814ad6a55806d93d804afea95c264b30c08dc81b110d4a8b348b701f9
+size 7891

requirements.txt

@@ -1,4 +1,2 @@
-concrete-ml==0.6.1
+concrete-ml==1.1.0
 gradio==3.11.0
-uvicorn==0.20.0
-fastapi==0.87.0