Remove defunct code for from_db and dereference_files

Author: ml-evs

pydatalab/src/pydatalab/blocks/base.py

@@ -202,23 +202,6 @@ def to_db(self) -> dict:
         LOGGER.debug("Casting block %s to database object.", self.__class__.__name__)
         return self.block_db_model(**self.data).dict(exclude_unset=True)
 
-    @classmethod
-    def from_db(cls, block: dict):
-        """Create a block from data stored in the database."""
-        LOGGER.debug("Loading block %s from database object.", cls.__class__.__name__)
-        new_block = cls(
-            item_id=block.get("item_id"),
-            collection_id=block.get("collection_id"),
-            init_data=block,
-        )
-        if "file_id" in new_block.data:
-            new_block.data["file_id"] = str(new_block.data["file_id"])
-
-        if new_block.data.get("title", "") == new_block.description:
-            new_block.data["title"] = new_block.name
-
-        return new_block
-
     def to_web(self) -> dict[str, Any]:
         """Returns a JSON serializable dictionary to render the data block on the web."""
         block_errors = []

pydatalab/src/pydatalab/routes/v0_1/blocks.py

@@ -32,10 +32,6 @@ def add_data_block():
 
     block = BLOCK_TYPES[block_type](item_id=item_id)
 
-    data = block.to_db()
-
-    # currently, adding to both blocks and blocks_obj to mantain compatibility with
-    # the old site. The new site only uses blocks_obj
     if insert_index:
         display_order_update = {
             "$each": [block.block_id],
@@ -47,8 +43,8 @@ def add_data_block():
     result = flask_mongo.db.items.update_one(
         {"item_id": item_id, **get_default_permissions(user_only=True)},
         {
-            "$push": {"blocks": data, "display_order": display_order_update},
-            "$set": {f"blocks_obj.{block.block_id}": data},
+            "$push": {"display_order": display_order_update},
+            "$set": {f"blocks_obj.{block.block_id}": block.to_db()},
         },
     )
 

pydatalab/src/pydatalab/routes/v0_1/items.py

@@ -28,61 +28,6 @@
 def _(): ...
 
 
-def reserialize_blocks(display_order: list[str], blocks_obj: dict[str, dict]) -> dict[str, dict]:
-    """Create the corresponding Python objects from JSON block data, then
-    serialize it again as JSON to populate any missing properties.
-
-    Parameters:
-        blocks_obj: A dictionary containing the JSON block data, keyed by block ID.
-
-    Returns:
-        A dictionary with the re-serialized block data.
-
-    """
-    for block_id in display_order:
-        try:
-            block_data = blocks_obj[block_id]
-        except KeyError:
-            LOGGER.warning(f"block_id {block_id} found in display order but not in blocks_obj")
-            continue
-        blocktype = block_data["blocktype"]
-        blocks_obj[block_id] = (
-            BLOCK_TYPES.get(blocktype, BLOCK_TYPES["notsupported"]).from_db(block_data).to_web()
-        )
-
-    return blocks_obj
-
-
-# Seems to be obselete now?
-def dereference_files(file_ids: list[str | ObjectId]) -> dict[str, dict]:
-    """For a list of Object IDs (as strings or otherwise), query the files collection
-    and return a dictionary of the data stored under each ID.
-
-    Parameters:
-        file_ids: The list of IDs of files to return;
-
-    Returns:
-        The dereferenced data as a dictionary with (string) ID keys.
-
-    """
-    results = {
-        str(f["_id"]): f
-        for f in flask_mongo.db.files.find(
-            {
-                "_id": {"$in": [ObjectId(_id) for _id in file_ids]},
-            }
-        )
-    }
-    if len(results) != len(file_ids):
-        raise RuntimeError(
-            "Some file IDs did not have corresponding database entries.\n"
-            f"Returned: {list(results.keys())}\n"
-            f"Requested: {file_ids}\n"
-        )
-
-    return results
-
-
 @ITEMS.route("/equipment/", methods=["GET"])
 def get_equipment_summary():
     _project = {
@@ -837,12 +782,6 @@ def get_item_data(
 ):
     """Generates a JSON response for the item with the given `item_id`,
     or `refcode` additionally resolving relationships to files and other items.
-
-    Parameters:
-       load_blocks: Whether to regenerate any data blocks associated with this
-           sample (i.e., create the Python object corresponding to the block and
-           call its render function).
-
     """
     redirect_to_ui = bool(request.args.get("redirect-to-ui", default=False, type=json.loads))
     if refcode and redirect_to_ui and CONFIG.APP_URL:
@@ -911,8 +850,6 @@ def get_item_data(
             raise KeyError(f"Item {item_id=} has no type field in document.")
 
     doc = ItemModel(**doc)
-    if load_blocks:
-        doc.blocks_obj = reserialize_blocks(doc.display_order, doc.blocks_obj)
 
     # find any documents with relationships that mention this document
     relationships_query_results = flask_mongo.db.items.find(