Markishime commited on
Commit
fb295dc
·
1 Parent(s): ddd3171

Fix: Correct indentation error in upload.py

Browse files

- Fixed IndentationError on line 1080
- Properly indented code block under if statement on line 1077

Files changed (1) hide show
  1. modules/upload.py +43 -43
modules/upload.py CHANGED
@@ -1075,56 +1075,56 @@ def upload_section():
1075
  pass
1076
 
1077
  if soil_uploaded and leaf_uploaded and land_yield_provided:
1078
- # Show upload limit info if available
1079
- # CRITICAL: Always refresh from URL params to get latest count (parent may have updated it)
1080
- try:
1081
- query_params = st.query_params
1082
- url_uploads_used = query_params.get('uploadsUsed', '')
1083
- url_uploads_limit = query_params.get('uploadsLimit', '')
1084
- url_uploads_remaining = query_params.get('uploadsRemaining', '')
1085
-
1086
- # Use URL params if available (most up-to-date), otherwise use limit_info
1087
- if url_uploads_used and url_uploads_limit:
1088
- try:
1089
- uploads_used = int(url_uploads_used)
1090
- uploads_limit = int(url_uploads_limit)
1091
- if url_uploads_remaining:
1092
- try:
1093
- uploads_remaining = int(url_uploads_remaining) if url_uploads_remaining != 'infinity' and url_uploads_remaining != '-1' else float('inf')
1094
- except (ValueError, TypeError):
 
 
1095
  uploads_remaining = max(0, uploads_limit - uploads_used)
1096
- else:
1097
- uploads_remaining = max(0, uploads_limit - uploads_used)
1098
-
1099
- # Update session state with latest values
1100
- st.session_state.uploads_used = uploads_used
1101
- st.session_state.uploads_limit = uploads_limit
1102
- st.session_state.uploads_remaining = uploads_remaining
1103
- except (ValueError, TypeError):
1104
- # Fallback to limit_info if URL params invalid
 
 
 
1105
  uploads_used = limit_info.get('uploads_used', 0) if limit_info else 0
1106
  uploads_limit = limit_info.get('uploads_limit', 0) if limit_info else 0
1107
  uploads_remaining = limit_info.get('uploads_remaining', 0) if limit_info else 0
1108
- else:
1109
- # Use limit_info if URL params not available
1110
  uploads_used = limit_info.get('uploads_used', 0) if limit_info else 0
1111
  uploads_limit = limit_info.get('uploads_limit', 0) if limit_info else 0
1112
  uploads_remaining = limit_info.get('uploads_remaining', 0) if limit_info else 0
1113
- except Exception as e:
1114
- # Fallback to limit_info on error
1115
- uploads_used = limit_info.get('uploads_used', 0) if limit_info else 0
1116
- uploads_limit = limit_info.get('uploads_limit', 0) if limit_info else 0
1117
- uploads_remaining = limit_info.get('uploads_remaining', 0) if limit_info else 0
1118
-
1119
- if limit_info or (uploads_limit > 0):
1120
- # Only show limit info if limit is set (greater than 0)
1121
- if uploads_limit > 0:
1122
- if uploads_remaining == float('inf') or uploads_remaining == -1:
1123
- st.info(f"📊 **Analyses:** Unlimited")
1124
- else:
1125
- # Display: X/Y used (Z remaining)
1126
- # Example: 0/2 used (2 remaining), 1/2 used (1 remaining), 2/2 used (0 remaining)
1127
- st.info(f"📊 **Analyses:** {uploads_used}/{uploads_limit} used ({uploads_remaining} remaining)")
1128
 
1129
  # Check if limit exceeded
1130
  if not can_start:
 
1075
  pass
1076
 
1077
  if soil_uploaded and leaf_uploaded and land_yield_provided:
1078
+ # Show upload limit info if available
1079
+ # CRITICAL: Always refresh from URL params to get latest count (parent may have updated it)
1080
+ try:
1081
+ query_params = st.query_params
1082
+ url_uploads_used = query_params.get('uploadsUsed', '')
1083
+ url_uploads_limit = query_params.get('uploadsLimit', '')
1084
+ url_uploads_remaining = query_params.get('uploadsRemaining', '')
1085
+
1086
+ # Use URL params if available (most up-to-date), otherwise use limit_info
1087
+ if url_uploads_used and url_uploads_limit:
1088
+ try:
1089
+ uploads_used = int(url_uploads_used)
1090
+ uploads_limit = int(url_uploads_limit)
1091
+ if url_uploads_remaining:
1092
+ try:
1093
+ uploads_remaining = int(url_uploads_remaining) if url_uploads_remaining != 'infinity' and url_uploads_remaining != '-1' else float('inf')
1094
+ except (ValueError, TypeError):
1095
+ uploads_remaining = max(0, uploads_limit - uploads_used)
1096
+ else:
1097
  uploads_remaining = max(0, uploads_limit - uploads_used)
1098
+
1099
+ # Update session state with latest values
1100
+ st.session_state.uploads_used = uploads_used
1101
+ st.session_state.uploads_limit = uploads_limit
1102
+ st.session_state.uploads_remaining = uploads_remaining
1103
+ except (ValueError, TypeError):
1104
+ # Fallback to limit_info if URL params invalid
1105
+ uploads_used = limit_info.get('uploads_used', 0) if limit_info else 0
1106
+ uploads_limit = limit_info.get('uploads_limit', 0) if limit_info else 0
1107
+ uploads_remaining = limit_info.get('uploads_remaining', 0) if limit_info else 0
1108
+ else:
1109
+ # Use limit_info if URL params not available
1110
  uploads_used = limit_info.get('uploads_used', 0) if limit_info else 0
1111
  uploads_limit = limit_info.get('uploads_limit', 0) if limit_info else 0
1112
  uploads_remaining = limit_info.get('uploads_remaining', 0) if limit_info else 0
1113
+ except Exception as e:
1114
+ # Fallback to limit_info on error
1115
  uploads_used = limit_info.get('uploads_used', 0) if limit_info else 0
1116
  uploads_limit = limit_info.get('uploads_limit', 0) if limit_info else 0
1117
  uploads_remaining = limit_info.get('uploads_remaining', 0) if limit_info else 0
1118
+
1119
+ if limit_info or (uploads_limit > 0):
1120
+ # Only show limit info if limit is set (greater than 0)
1121
+ if uploads_limit > 0:
1122
+ if uploads_remaining == float('inf') or uploads_remaining == -1:
1123
+ st.info(f"📊 **Analyses:** Unlimited")
1124
+ else:
1125
+ # Display: X/Y used (Z remaining)
1126
+ # Example: 0/2 used (2 remaining), 1/2 used (1 remaining), 2/2 used (0 remaining)
1127
+ st.info(f"📊 **Analyses:** {uploads_used}/{uploads_limit} used ({uploads_remaining} remaining)")
 
 
 
 
 
1128
 
1129
  # Check if limit exceeded
1130
  if not can_start: