Update app.py

app.py

@@ -816,37 +816,42 @@ class NutrientCalculator:
         }
 
 @app.route('/calculation', methods=['POST'])
-def handle_calculation():
+def calculate_nutrients():
     try:
-        data = request.json
-        
-        # Валидация входных данных
-        if 'profileSettings' not in data or 'fertilizerConstants' not in data:
-            return jsonify({'status': 'error', 'message': 'Invalid request format'}), 400
-        
-        # Инициализация и расчет
+        data = request.get_json()
+
+        # Входные данные
+        fertilizer_constants = data.get("fertilizerConstants")
+        base_profile = data.get("targetProfile")
+        total_nitrogen = data.get("totalNitrogen", 125.0)
+        no3_ratio = data.get("no3Ratio", 8.25)
+        nh4_ratio = data.get("nh4Ratio", 1.0)
+        volume = data.get("volume", 100)
+
         calculator = NutrientCalculator(
-            profile_settings=data['profileSettings'],
-            fertilizer_constants=data['fertilizerConstants']
+            volume_liters=volume,
+            base_profile=base_profile,
+            fertilizer_constants=fertilizer_constants,
+            total_nitrogen=total_nitrogen,
+            no3_ratio=no3_ratio,
+            nh4_ratio=nh4_ratio
         )
-        
-        if calculator.calculate():
-            return jsonify({
-                'status': 'success',
-                'data': calculator.get_results()
-            })
-        else:
-            return jsonify({
-                'status': 'error',
-                'message': 'Calculation failed'
-            }), 500
-            
-    except Exception as e:
+
+        calculator.calculate()
+
         return jsonify({
-            'status': 'error',
-            'message': f"Server error: {str(e)}"
-        }), 500
+            "profile": calculator.actual_profile,
+            "ec": calculator.calculate_ec(),
+            "fertilizers": calculator.results,
+            "deficit": {
+                k: round(calculator.target_profile[k] - calculator.actual_profile[k], 1)
+                for k in calculator.target_profile
+                if abs(calculator.target_profile[k] - calculator.actual_profile[k]) > 0.1
+            }
+        })
 
+    except Exception as e:
+        return jsonify({"error": str(e)}), 400