Upgraded gRPC versions and fixed compose file

flavienbwk · May 31, 2021 · 20a41f5 · 20a41f5
1 parent 29033a4
commit 20a41f5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -22,36 +22,36 @@ Our `requirements.txt` file :
 
 ```python-requirements
 numpy==1.19.0
-Pillow==7.2.0
-grpcio==1.30.0
-protobuf==3.12.2
+Pillow==8.1.1
+grpcio==1.38.0
+protobuf==3.17.1
 ```
 
 ## 2. Docker-compose file
 
 To bind our local files to our container files and execute the program easily, let's create a [`docker-compose.yml`](./docker-compose.yml) file :
 
 ```yml
-version: '3'
+version: '3.3'
 
 services:
 
     client:
         build: .
         command: python3 /usr/app/client.py
         volumes:
-            - ${PWD}/eiffel-tower.jpg:/usr/app/eiffel-tower.jpg # Our input image
-            - ${PWD}/eiffel-tower-transformed.jpg:/usr/app/eiffel-tower-transformed.jpg # Our output image
-            - ${PWD}/client.py:/usr/app/client.py
+            - ./input:/usr/app/input    # Our input image directory
+            - ./output:/usr/app/output  # Our output image directory
+            - ./client.py:/usr/app/client.py:ro
             - ./grpc_compiled:/usr/app/grpc_compiled
-        depends_on:
+        depends_on: 
             - server
 
     server:
         build: .
         command: python3 /usr/app/server.py
         volumes:
-            - ${PWD}/server.py:/usr/app/server.py
+            - ./server.py:/usr/app/server.py:ro
             - ./grpc_compiled:/usr/app/grpc_compiled
 ```
 
@@ -119,7 +119,7 @@ import image_transform_pb2_grpc
 def run():
     channel = grpc.insecure_channel('server:13000')
     stub = image_transform_pb2_grpc.EncodeServiceStub(channel)
-    image_np = np.array(Image.open('/usr/app/eiffel-tower.jpg'))
+    image_np = np.array(Image.open('/usr/app/input/eiffel-tower.jpg'))
     image = Image.fromarray(image_np.astype('uint8')) # Transforming np array image into Pillow's Image class
     query = image_transform_pb2.sourceImage(
         image=pickle.dumps(image),
@@ -128,7 +128,7 @@ def run():
     )
     response = stub.GetEncode(query)
     image_transformed = pickle.loads(response.image)
-    image_transformed.save('/usr/app/eiffel-tower-transformed.jpg')
+    image_transformed.save('/usr/app/output/eiffel-tower-transformed.jpg')
 
 if __name__ == "__main__":
     run()
@@ -193,6 +193,6 @@ So let's run `docker-compose up` !
 
 You will see our original `eiffel-tower.jpg` image will transform into its negative and resized version `eiffel-tower-transformed.jpg`
 
-| [eiffel-tower.jpg](./eiffel-tower.jpg) (640px / 360px) | [eiffel-tower-transformed.jpg](./eiffel-tower-transformed.jpg) (320px / 180px) |
+| [eiffel-tower.jpg](./inpupt/eiffel-tower.jpg) (640px / 360px) | [eiffel-tower-transformed.jpg](./output/eiffel-tower-transformed.jpg) (320px / 180px) |
 | ------------------------------------------------------ | ------------------------------------------------------------------------------ |
-| ![Original image](./eiffel-tower.jpg)                  | ![Transformed image](./eiffel-tower-transformed.jpg)                           |
+| ![Original image](./input/eiffel-tower.jpg)                  | ![Transformed image](./output/eiffel-tower-transformed.jpg)                           |
diff --git a/client.py b/client.py
@@ -11,7 +11,7 @@
 def run():
     channel = grpc.insecure_channel('server:13000')
     stub = image_transform_pb2_grpc.EncodeServiceStub(channel)
-    image_np = np.array(Image.open('/usr/app/eiffel-tower.jpg'))
+    image_np = np.array(Image.open('/usr/app/input/eiffel-tower.jpg'))
     image = Image.fromarray(image_np.astype('uint8')) # Transforming np array image into Pillow's Image class
     query = image_transform_pb2.sourceImage(
         image=pickle.dumps(image),
@@ -20,7 +20,7 @@ def run():
     )
     response = stub.GetEncode(query)
     image_transformed = pickle.loads(response.image)
-    image_transformed.save('/usr/app/eiffel-tower-transformed.jpg')
+    image_transformed.save('/usr/app/output/eiffel-tower-transformed.jpg')
 
 if __name__ == "__main__":
     run()
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,14 +1,14 @@
-version: '3'
+version: '3.3'
 
 services:
 
     client:
         build: .
         command: python3 /usr/app/client.py
         volumes:
-            - ${PWD}/eiffel-tower.jpg:/usr/app/eiffel-tower.jpg # Our input image
-            - ${PWD}/eiffel-tower-transformed.jpg:/usr/app/eiffel-tower-transformed.jpg # Our output image
-            - ${PWD}/client.py:/usr/app/client.py
+            - ./input:/usr/app/input    # Our input image directory
+            - ./output:/usr/app/output  # Our output image directory
+            - ./client.py:/usr/app/client.py:ro
             - ./grpc_compiled:/usr/app/grpc_compiled
         depends_on: 
             - server
@@ -17,5 +17,5 @@ services:
         build: .
         command: python3 /usr/app/server.py
         volumes:
-            - ${PWD}/server.py:/usr/app/server.py
+            - ./server.py:/usr/app/server.py:ro
             - ./grpc_compiled:/usr/app/grpc_compiled
diff --git a/eiffel-tower.jpg → input/eiffel-tower.jpg b/eiffel-tower.jpg → input/eiffel-tower.jpg
diff --git a/eiffel-tower-transformed.jpg → output/eiffel-tower-transformed.jpg b/eiffel-tower-transformed.jpg → output/eiffel-tower-transformed.jpg
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 numpy==1.19.0
 Pillow==8.1.1
-grpcio==1.30.0
-protobuf==3.12.2
+grpcio==1.38.0
+protobuf==3.17.1