thechaiexperiment commited on
Commit
9866ed8
·
verified ·
1 Parent(s): ea7cf68

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +15 -10
app.py CHANGED
@@ -311,19 +311,27 @@ def retrieve_rec_texts(
311
  print(f"Error in retrieve_rec_texts: {e}")
312
  return []
313
 
314
- def retrieve_metadata(document_indices: List[str], metadata_path: str = 'recipes_metadata.xlsx') -> Dict[str, Dict[str, str]]:
315
  try:
316
- metadata_df = pd.read_excel(metadata_path)
317
  required_columns = {'id', 'original_file_name', 'url'}
318
  if not required_columns.issubset(metadata_df.columns):
319
- raise ValueError(f"Metadata file must contain the following columns: {required_columns}")
320
- metadata_mapping = metadata_df.set_index('id')[['original_file_name', 'url']].to_dict('index')
321
- result = {doc_id: metadata_mapping.get(doc_id, {}) for doc_id in document_indices}
322
- return result
 
 
 
 
 
 
 
323
  except Exception as e:
324
  print(f"Error retrieving metadata: {e}")
325
  return {}
326
 
 
327
  def retrieve_metadata(document_indices: List[str], metadata_path: str = 'recipes_metadata.xlsx') -> Dict[str, Dict[str, str]]:
328
  try:
329
  metadata_df = pd.read_excel(metadata_path)
@@ -598,10 +606,7 @@ async def recipes_endpoint(profile: MedicalProfile):
598
  metadata = retrieve_metadata(document_indices, metadata_path=metadata_path)
599
  print(f"Retrieved Metadata: {metadata}")
600
  response = {
601
- "metadata": [
602
- {"id": doc_id, "original_file_name": metadata.get(doc_id, {}).get("original_file_name"), "url": metadata.get(doc_id, {}).get("url")}
603
- for doc_id in document_indices
604
- ],
605
  }
606
  return response
607
  except ValueError as ve:
 
311
  print(f"Error in retrieve_rec_texts: {e}")
312
  return []
313
 
314
+ def retrieve_metadata(document_indices: List[int], metadata_path: str = 'recipes_metadata.xlsx') -> Dict[int, Dict[str, str]]:
315
  try:
316
+ metadata_df = pd.read_excel(metadata_path)
317
  required_columns = {'id', 'original_file_name', 'url'}
318
  if not required_columns.issubset(metadata_df.columns):
319
+ raise ValueError(f"Metadata file must contain columns: {required_columns}")
320
+ metadata_df['id'] = metadata_df['id'].astype(int) # Ensure 'id' is of type int
321
+ filtered_metadata = metadata_df[metadata_df['id'].isin(document_indices)]
322
+ metadata_dict = {
323
+ int(row['id']): {
324
+ "original_file_name": row['original_file_name'],
325
+ "url": row['url']
326
+ }
327
+ for _, row in filtered_metadata.iterrows()
328
+ }
329
+ return metadata_dict
330
  except Exception as e:
331
  print(f"Error retrieving metadata: {e}")
332
  return {}
333
 
334
+
335
  def retrieve_metadata(document_indices: List[str], metadata_path: str = 'recipes_metadata.xlsx') -> Dict[str, Dict[str, str]]:
336
  try:
337
  metadata_df = pd.read_excel(metadata_path)
 
606
  metadata = retrieve_metadata(document_indices, metadata_path=metadata_path)
607
  print(f"Retrieved Metadata: {metadata}")
608
  response = {
609
+ "metadata": metadata,
 
 
 
610
  }
611
  return response
612
  except ValueError as ve: