Update object model to retrieve gridinfo

ispyb/model/__future__.py

@@ -79,20 +79,9 @@ def __exit__(cm, *args):
 
   import ispyb.model.datacollection
   ispyb.model.datacollection.DataCollection.integrations = _get_linked_autoprocintegration_for_dc
-  import ispyb.model.gridinfo
-  ispyb.model.gridinfo.GridInfo.reload = _get_gridinfo
   import ispyb.model.processingprogram
   ispyb.model.processingprogram.ProcessingProgram.reload = _get_autoprocprogram
 
-def _get_gridinfo(self):
-  # https://jira.diamond.ac.uk/browse/MXSW-1173
-  with _db_cc() as cursor:
-    cursor.run("SELECT * "
-               "FROM GridInfo "
-               "WHERE dataCollectionGroupId = %s "
-               "LIMIT 1;", self._dcgid)
-    self._data = cursor.fetchone()
-
 def _get_autoprocprogram(self):
   # https://jira.diamond.ac.uk/browse/SCI-7414
   with _db_cc() as cursor:

ispyb/model/gridinfo.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
+import ispyb.exception
 import ispyb.model
 
 class GridInfo(ispyb.model.DBCache):
@@ -24,7 +25,10 @@ def __init__(self, dcgid, db_conn, preload=None):
 
   def reload(self):
     '''Load/update information from the database.'''
-    raise NotImplementedError('TODO: Not implemented yet')
+    try:
+      self._data = self._db.mx_acquisition.get_dcg_grid(self._dcgid)[0]
+    except ispyb.exception.ISPyBNoResultException:
+      self._data = None
 
   @property
   def dcgid(self):