grid_id is set to grids created via get_grid

Kully · Kully · commit 253228fe9f8b · 2016-11-24T14:55:58.000-05:00
diff --git a/plotly/grid_objs/grid_objs.py b/plotly/grid_objs/grid_objs.py
@@ -118,12 +118,17 @@ class Grid(MutableSequence):
     py.plot([trace], filename='graph from grid')
     ```
     """
-    def __init__(self, columns_or_json):
+    def __init__(self, columns_or_json, grid_id=None):
         """
         Initialize a grid with an iterable of `plotly.grid_objs.Column`
         objects or a json/dict describing a grid. See second usage example
         below for the necessary structure of the dict.
 
+        :param (str|bool) grid_id: should not be accessible to users. Default
+            is 'None' but if a grid is retrieved via `py.get_grid()` then the
+            retrieved grid response will contain the grid_id which will be
+            necessary to set `self.id` and `self._columns.id` below.
+
         Example from iterable of columns:
         ```
         column_1 = Column([1, 2, 3], 'time')
@@ -141,9 +146,19 @@ def __init__(self, columns_or_json):
         grid = Grid(grid_json)
         ```
         """
-
         # TODO: verify that columns are actually columns
         if isinstance(columns_or_json, dict):
+            # check that grid_id is entered
+            if grid_id is None:
+                raise exceptions.PlotlyError(
+                    "If you are manually converting a raw json/dict grid "
+                    "into a Grid instance, you must ensure that make "
+                    "'grid_id' is set to your file ID. This looks like "
+                    "'username:187'."
+                )
+            # TODO: verify that grid_id is a correct fid if a string
+            self.id = grid_id
+
             # check if 'cols' is a root key
             if 'cols' not in columns_or_json:
                 raise exceptions.PlotlyError(
@@ -182,7 +197,8 @@ def __init__(self, columns_or_json):
 
             # fill in uids
             for column in self:
-                column.id = columns_or_json['cols'][column.name]['uid']
+                column.id = self.id + ':' + columns_or_json['cols'][column.name]['uid']
+
         else:
             column_names = [column.name for column in columns_or_json]
             duplicate_name = utils.get_first_duplicate(column_names)
@@ -193,8 +209,6 @@ def __init__(self, columns_or_json):
             self._columns = list(columns_or_json)
             self.id = ''
 
-        #self._fid = ''
-
     def __repr__(self):
         return self._columns.__repr__()
 
@@ -241,7 +255,7 @@ def get_column(self, column_name):
             if column.name == column_name:
                 return column
 
-    def get_uid(self, column_name):
+    def get_fid_uid(self, column_name):
         """
         Return uid of given column name in the grid by column name.
 
diff --git a/plotly/plotly/plotly.py b/plotly/plotly/plotly.py
@@ -977,7 +977,6 @@ def upload(cls, grid, filename,
         cls._fill_in_response_column_ids(grid, response_columns, grid_id)
 
         grid.id = grid_id
-        #grid._fid = res['file']['fid']
 
         if meta is not None:
             meta_ops.upload(meta, grid=grid)
@@ -1476,13 +1475,20 @@ def get_grid(grid_url, raw=False):
     if url_path[-1] == '/':
         url_path = url_path[0: -1]
     url_path = url_path.replace('/', ':')
-    get_url = upload_url + '/' + url_path + '/content'
-    print url_path
+
+    meta_get_url = upload_url + '/' + url_path
+    get_url = meta_get_url + '/content'
 
     r = requests.get(get_url, headers=headers)
     json_res = json.loads(r.text)
+
+    # make request to grab the grid id (fid)
+    r_meta = requests.get(meta_get_url, headers=headers)
+    json_res_meta = json.loads(r_meta.text)
+    retrieved_grid_id = json_res_meta['fid']
+
     if raw is False:
-        return Grid(json_res)
+        return Grid(json_res, retrieved_grid_id)
     else:
         return json_res
 
