Merge pull request #63 from diffgram/depend

Move requirements to be optional

Author: anthony-chaudhary

sdk/diffgram/brain/brain.py

@@ -2,21 +2,7 @@
 
 import tempfile
 
-try:
-    import cv2
-except:
-    print("Warning: Could not import cv2. Some SDK functions may not be available.")
-
-try:
-    import tensorflow as tf
-except:
-    print("Warning: Could not import tensorflow. Some SDK functions may not be available")
-
-import numpy as np
 import requests
-import scipy.misc
-
-import diffgram.utils.visualization_utils as vis_util
 
 
 class Brain():
@@ -37,6 +23,20 @@ def __init__(
         if local is true will perform additional setup work local_setup()
 
         """
+        try:
+            import cv2
+        except:
+            print("Info: Could not import cv2. Some SDK functions may not be available.")
+
+        try:
+            import tensorflow as tf
+        except:
+            print("Info: Could not import tensorflow. Some SDK functions may not be available")
+
+        import numpy as np
+        import scipy.misc
+        import diffgram.utils.visualization_utils as vis_util
+
 
         self.client = client
 

sdk/diffgram/core/diffgram_dataset_iterator.py

@@ -1,8 +1,5 @@
 import logging
 
-from PIL import Image, ImageDraw
-from imageio import imread
-import numpy as np
 import traceback
 import sys
 from threading import Thread
@@ -137,6 +134,7 @@ def set_custom_url_signer(self, signer_fn: Callable):
         self.custom_signer_fn = signer_fn
 
     def get_image_data(self, diffgram_file):
+        from imageio import imread
         MAX_RETRIES = 10
         image = None
         if hasattr(diffgram_file, 'image'):
@@ -254,6 +252,8 @@ def get_file_instances(self, diffgram_file) -> dict:
         return sample
 
     def extract_masks_from_polygon(self, instance_list, diffgram_file, empty_value = 0):
+        from PIL import Image, ImageDraw
+        import numpy as np
         nx, ny = diffgram_file.image['width'], diffgram_file.image['height']
         mask_list = []
         if nx is None or ny is None:

sdk/requirements.txt

@@ -1,8 +1 @@
 requests>=2.20.1
-opencv-python>=4.0.0.21
-scipy>=1.1.0
-six>=1.9.0
-tensorflow>=1.12.0
-pillow
-torch
-imageio>=2.9.0

sdk/setup.py

@@ -24,10 +24,16 @@
         "Operating System :: OS Independent",
     ],
 	install_requires=[
-	   'requests>=2.20.1',
-	   'scipy>=1.1.0',
-	   'six>=1.9.0',
-	   'pillow>=6.1.0',
-       'imageio>=2.9.0'
-	]
+	   'requests>=2.20.1'
+	],
+    extras_require = {
+        'ml':  ["opencv-python>=4.0.0.21",
+                'pillow>=6.1.0',
+                'scipy>=1.1.0',
+                	'pillow>=6.1.0',
+                'imageio>=2.9.0',
+                'tensorflow>=1.12.0',
+                'torch'
+                ]
+    }
 )