Shuairong commited on
Commit
7314c74
·
verified ·
1 Parent(s): db401bb

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +26 -12
app.py CHANGED
@@ -7,6 +7,9 @@ import easyocr
7
  import numpy as np
8
  from tqdm import tqdm # For progress tracking
9
  from datetime import datetime # Import for handling dates
 
 
 
10
 
11
  # Initialize variables
12
  annotations = []
@@ -132,28 +135,36 @@ def export_to_excel(room_numbers_state, meter_values_state):
132
  "room_number": room_number,
133
  "meter_value": meter_value
134
  })
135
- # Create a DataFrame and export to Excel
136
  df = pd.DataFrame(data)
137
- output_excel = "results.xlsx"
 
 
 
138
  df.to_excel(output_excel, index=False)
139
- # Create a folder with today's date
140
- today_date = datetime.now().strftime("%Y-%m-%d") # Format: YYYY-MM-DD
 
141
  folder_name = f"electricity_meter_values_{today_date}"
142
- os.makedirs(folder_name, exist_ok=True)
 
143
 
144
- # Save original images renamed to room numbers
145
  for annotation, room_number in zip(annotations, room_numbers_state):
146
- if room_number: # Only proceed if room number is not empty
147
  original_image_path = annotation["image_path"]
148
  original_image = Image.open(original_image_path)
149
- new_image_name = f"{room_number}.jpg"
150
- new_image_path = os.path.join(folder_name, new_image_name)
151
  original_image.save(new_image_path)
152
 
153
- return f"Excel file and images saved successfully in '{folder_name}' folder."
 
 
 
 
 
 
154
 
155
  except Exception as e:
156
- return str(e)
157
 
158
  # Function to update room number
159
  def update_room_number(room_number):
@@ -266,7 +277,10 @@ with gr.Blocks() as demo:
266
  export_button.click(
267
  fn=export_to_excel,
268
  inputs=[room_numbers_state, meter_values_state],
269
- outputs=[gr.Textbox(label="Status")]
 
 
 
270
  )
271
 
272
  # Launch the app
 
7
  import numpy as np
8
  from tqdm import tqdm # For progress tracking
9
  from datetime import datetime # Import for handling dates
10
+ import zipfile
11
+ import tempfile
12
+ from pathlib import Path
13
 
14
  # Initialize variables
15
  annotations = []
 
135
  "room_number": room_number,
136
  "meter_value": meter_value
137
  })
 
138
  df = pd.DataFrame(data)
139
+
140
+ # Create a temporary directory to store results
141
+ temp_dir = tempfile.mkdtemp()
142
+ output_excel = Path(temp_dir) / "results.xlsx"
143
  df.to_excel(output_excel, index=False)
144
+
145
+ # Zip image folder
146
+ today_date = datetime.now().strftime("%Y-%m-%d")
147
  folder_name = f"electricity_meter_values_{today_date}"
148
+ images_dir = Path(temp_dir) / folder_name
149
+ images_dir.mkdir(exist_ok=True)
150
 
 
151
  for annotation, room_number in zip(annotations, room_numbers_state):
152
+ if room_number:
153
  original_image_path = annotation["image_path"]
154
  original_image = Image.open(original_image_path)
155
+ new_image_path = images_dir / f"{room_number}.jpg"
 
156
  original_image.save(new_image_path)
157
 
158
+ # Create zip file
159
+ zip_path = Path(temp_dir) / f"{folder_name}_images.zip"
160
+ with zipfile.ZipFile(zip_path, 'w') as zipf:
161
+ for img_file in images_dir.glob("*.jpg"):
162
+ zipf.write(img_file, arcname=img_file.name)
163
+
164
+ return str(output_excel), str(zip_path)
165
 
166
  except Exception as e:
167
+ return str(e), None
168
 
169
  # Function to update room number
170
  def update_room_number(room_number):
 
277
  export_button.click(
278
  fn=export_to_excel,
279
  inputs=[room_numbers_state, meter_values_state],
280
+ outputs=[
281
+ gr.File(label="Download Excel File"),
282
+ gr.File(label="Download Images (ZIP)")
283
+ ]
284
  )
285
 
286
  # Launch the app