Remove camera creation from Observatory

pocs/camera/__init__.py

@@ -1,4 +1,7 @@
 from collections import OrderedDict
+import re
+import shutil
+import subprocess
 
 from pocs.utils import error
 from pocs.utils import load_module
@@ -7,29 +10,55 @@
 from pocs.camera.camera import AbstractCamera  # pragma: no flakes
 from pocs.camera.camera import AbstractGPhotoCamera  # pragma: no flakes
 
-from pocs.utils import list_connected_cameras
 from pocs.utils import logger as logger_module
 
 
-def create_cameras_from_config(config=None, logger=None, **kwargs):
-    """Creates a camera object(s)
+def list_connected_cameras():
+    """Detect connected cameras.
+
+    Uses gphoto2 to try and detect which cameras are connected. Cameras should
+    be known and placed in config but this is a useful utility.
+
+    Returns:
+        list: A list of the ports with detected cameras.
+    """
+
+    gphoto2 = shutil.which('gphoto2')
+    command = [gphoto2, '--auto-detect']
+    result = subprocess.check_output(command)
+    lines = result.decode('utf-8').split('\n')
 
-    Loads the cameras via the configuration.
+    ports = []
+
+    for line in lines:
+        camera_match = re.match(r'([\w\d\s_\.]{30})\s(usb:\d{3},\d{3})', line)
+        if camera_match:
+            # camera_name = camera_match.group(1).strip()
+            port = camera_match.group(2).strip()
+            ports.append(port)
+
+    return ports
+
+
+def create_cameras_from_config(config=None, logger=None, **kwargs):
+    """Create camera object(s) based on the config.
 
     Creates a camera for each camera item listed in the config. Ensures the
     appropriate camera module is loaded.
 
     Note:
         This does not actually make a connection to the camera. To do so,
-        call 'camera.connect()' explicitly.
+        call 'camera.connect()' explicitly on each camera.
 
     Args:
         **kwargs (dict): Can pass a `cameras` object that overrides the info in
             the configuration file. Can also pass `auto_detect`(bool) to try and
             automatically discover the ports.
 
     Returns:
-        OrderedDict: An ordered dictionary of created camera objects.
+        OrderedDict: An ordered dictionary of created camera objects, with the
+            camera name as key and camera instance as value. Returns an empty
+            OrderedDict if there is no camera configuration items.
 
     Raises:
         error.CameraNotFound: Description
@@ -41,20 +70,21 @@ def create_cameras_from_config(config=None, logger=None, **kwargs):
     if not config:
         config = load_config(**kwargs)
 
-    if 'cameras' not in config:
-        logger.info('No camera information in config.')
-        return None
-
     # Helper method to first check kwargs then config
     def kwargs_or_config(item, default=None):
         return kwargs.get(item, config.get(item, default))
 
+    cameras = OrderedDict()
     camera_info = kwargs_or_config('cameras')
-    a_simulator = 'camera' in kwargs_or_config('simulator', default=list())
-    auto_detect = kwargs_or_config('auto_detect', default=False)
+    if not camera_info:
+        logger.info('No camera information in config.')
+        return cameras
 
     logger.debug("Camera config: {}".format(camera_info))
 
+    a_simulator = 'camera' in kwargs_or_config('simulator', default=list())
+    auto_detect = kwargs_or_config('auto_detect', default=False)
+
     ports = list()
 
     # Lookup the connected ports if not using a simulator
@@ -71,7 +101,6 @@ def kwargs_or_config(item, default=None):
         else:
             logger.debug("Detected Ports: {}".format(ports))
 
-    cameras = OrderedDict()
     primary_camera = None
 
     device_info = camera_info['devices']

pocs/tests/utils/test_utils.py

@@ -5,10 +5,10 @@
 
 
 from pocs.utils import current_time
-from pocs.utils import list_connected_cameras
 from pocs.utils import listify
 from pocs.utils import load_module
 from pocs.utils.error import NotFound
+from pocs.camera import list_connected_cameras
 
 
 def test_bad_load_module():

pocs/utils/__init__.py

@@ -1,7 +1,5 @@
 import os
-import re
 import shutil
-import subprocess
 import time
 
 from astropy import units as u
@@ -119,29 +117,6 @@ def get_free_space(dir=None):
     return free_space
 
 
-def list_connected_cameras():
-    """
-    Uses gphoto2 to try and detect which cameras are connected.
-    Cameras should be known and placed in config but this is a useful utility.
-    """
-
-    gphoto2 = shutil.which('gphoto2')
-    command = [gphoto2, '--auto-detect']
-    result = subprocess.check_output(command)
-    lines = result.decode('utf-8').split('\n')
-
-    ports = []
-
-    for line in lines:
-        camera_match = re.match('([\w\d\s_\.]{30})\s(usb:\d{3},\d{3})', line)
-        if camera_match:
-            # camera_name = camera_match.group(1).strip()
-            port = camera_match.group(2).strip()
-            ports.append(port)
-
-    return ports
-
-
 def load_module(module_name):
     """ Dynamically load a module