Update app.py

app.py

@@ -983,47 +983,47 @@ if __name__ == "__main__":
 @app.route('/calculation', methods=['POST'])
 def handle_calculation():
     try:
-        # 1. Жесткая проверка данных
+        # Получаем данные запроса
         data = request.get_json()
-        if not data:
-            return jsonify({"error": "No JSON data"}), 400
-
-        # 2. Валидация структуры
-        required = {'fertilizerConstants', 'profileSettings'}
-        if not required.issubset(data.keys()):
-            return jsonify({"error": f"Required fields: {required}"}), 400
-
-        # 3. Конвертация данных
-        try:
-            server_data = {
-                'fertilizerConstants': convert_client_data(data['fertilizerConstants']),
-                'profileSettings': {
-                    'P': float(data['profileSettings']['P']),
-                    'K': float(data['profileSettings']['K']),
-                    'Mg': float(data['profileSettings']['Mg']),
-                    'Ca': float(data['profileSettings']['Ca']),
-                    'S': float(data['profileSettings']['S']),
-                    'N (NO3-)': float(data['profileSettings']['N (NO3-)']),
-                    'N (NH4+)': float(data['profileSettings']['N (NH4+)']),
-                    'liters': int(data['profileSettings']['liters'])
-                }
-            }
-        except (ValueError, KeyError) as e:
-            return jsonify({"error": f"Invalid data format: {str(e)}"}), 400
-
-        # 4. Расчет
-        calculator = NutrientCalculator(volume_liters=server_data['profileSettings']['liters'])
-        calculator.target_profile.update(server_data['profileSettings'])
-        calculator.fertilizers = server_data['fertilizerConstants']
+        
+        # Проверяем наличие необходимых данных
+        if not data or 'profileSettings' not in data:
+            return jsonify({"error": "Invalid request data"}), 400
+
+        # Получаем значения из запроса
+        profile_settings = data['profileSettings']
+        no3_ratio = float(profile_settings.get('NO3_RATIO', NO3_RATIO))
+        nh4_ratio = float(profile_settings.get('NH4_RATIO', NH4_RATIO))
+        total_nitrogen = float(profile_settings.get('TOTAL_NITROGEN', TOTAL_NITROGEN))
+        liters = int(profile_settings.get('liters', VOLUME_LITERS))
+
+        # Создаем калькулятор
+        calculator = NutrientCalculator(volume_liters=liters)
+        
+        # Обновляем целевый профиль с учетом новых значений
+        calculator.target_profile.update({
+            'N (NO3-)': total_nitrogen * (no3_ratio / (no3_ratio + nh4_ratio)),
+            'N (NH4+)': total_nitrogen * (nh4_ratio / (no3_ratio + nh4_ratio))
+        })
+        
+        # Выполняем расчет
         calculator.calculate()
         
-        return jsonify(calculator.get_web_results())
+        # Возвращаем результаты
+        return jsonify({
+            "fertilizers": calculator._format_fertilizers(),
+            "profile": calculator._format_profile(),
+            "ec": calculator.calculate_ec(),
+            "deficits": calculator.calculate_deficits(),
+            "used_ratios": {
+                "NO3_RATIO": no3_ratio,
+                "NH4_RATIO": nh4_ratio
+            }
+        })
 
     except Exception as e:
-        # Логируем ошибку для диагностики
-        print(f"Calculation error: {str(e)}")
         return jsonify({
-            "error": "Internal server error",
+            "error": "Calculation failed",
             "details": str(e)
         }), 500