Merge pull request #24 from mlfoundations/etashg/eval_database_fix

added database fix

Author: EtashGuha

eval/eval.py

@@ -35,7 +35,9 @@ def setup_custom_parser():
 
     db_group.add_argument("--model_id", type=str, default=None, help="Model UUID for direct database tracking")
 
-    parser.add_argument("--use_database", action="store_true", help="Where to use PostgreSQL Database to track results.")
+    parser.add_argument(
+        "--use_database", action="store_true", help="Where to use PostgreSQL Database to track results."
+    )
     parser.add_argument(
         "--model_name",
         type=str,
@@ -232,12 +234,12 @@ def cli_evaluate(args: Optional[argparse.Namespace] = None) -> None:
         args.hf_hub_log_args += f",output_path={args.output_path}"
     evaluation_tracker = setup_evaluation_tracker(args.output_path, args.use_database)
 
-    # If model_id is provided, lookup model name from database
+    # If model_id is provided, lookup model weights location from database
     if args.model_id:
         if not args.use_database:
             raise ValueError("--use_database must be set to use --model_id.")
         try:
-            model_name = evaluation_tracker.get_model_name_from_db(args.model_id)
+            model_name = evaluation_tracker.get_model_attribute_from_db(args.model_id, "weights_location")
             args.model_args = update_model_args_with_name(args.model_args or "", model_name)
             utils.eval_logger.info(f"Retrieved model name from database: {model_name}")
         except Exception as e:

eval/eval_tracker.py

@@ -370,27 +370,30 @@ def update_evalresults_db(
                 session=session,
             )
 
-    def get_model_name_from_db(
-        self,
-        model_id: str,
-    ) -> str:
+    def get_model_attribute_from_db(self, model_id: str, attribute: str) -> str:
         """
-        Retrieve model name from database using model_id.
+        Retrieve a specific attribute from a model in the database.
 
         Args:
             model_id: UUID string of the model
+            attribute: Name of the attribute to retrieve (e.g., 'name', 'weights_location')
 
         Returns:
-            str: Model name from database
+            str: Value of the requested attribute
 
         Raises:
-            RuntimeError: If model_id is not found in database or if database operation fails
+            RuntimeError: If model_id is not found in database or if attribute doesn't exist
+            ValueError: If model_id is not a valid UUID
         """
         with self.session_scope() as session:
             try:
                 model = session.get(Model, uuid.UUID(model_id))
                 if model is None:
                     raise RuntimeError(f"Model with id {model_id} not found in database")
-                return model.name
+                if not hasattr(model, attribute):
+                    raise RuntimeError(f"Attribute '{attribute}' does not exist on Model")
+                return getattr(model, attribute)
+            except ValueError as e:
+                raise ValueError(f"Invalid UUID format: {str(e)}")
             except Exception as e:
-                raise RuntimeError(f"Database error in get_model_name_from_db: {str(e)}")
+                raise RuntimeError(f"Database error in get_model_attribute_from_db: {str(e)}")