Update app.py

app.py

@@ -680,6 +680,7 @@ def view_image():
 
 
 
+from tabulate import tabulate
 
 TOMATO_PROFILE = {
     'N (NO3-)': 200,
@@ -691,6 +692,17 @@ TOMATO_PROFILE = {
     'S': 100
 }
 
+# Коэффициенты для перевода ppm в mS/cm (примерные)
+EC_FACTORS = {
+    'N (NO3-)': 0.71,
+    'N (NH4+)': 0.71,
+    'P': 0.51,
+    'K': 0.50,
+    'Mg': 0.39,
+    'Ca': 0.40,
+    'S': 0.43
+}
+
 fertilizers_db = {
     "Кальциевая селитра": {
         "N (NO3-)": 0.118,
@@ -714,18 +726,19 @@ fertilizers_db = {
     }
 }
 
-
 class NutrientCalculator:
     def __init__(self, volume_liters=1.0):
         self.volume = volume_liters
         self.results = {}
+        self.final_profile = {}
 
     def calculate(self, profile):
-        self._apply_magnesium_sulfate(profile)
-        self._apply_calcium_nitrate(profile)
-        self._apply_mkp(profile)
-        self._apply_potassium_nitrate(profile)
-        self._apply_ammonium_nitrate(profile)
+        self.final_profile = profile.copy()
+        self._apply_magnesium_sulfate()
+        self._apply_calcium_nitrate()
+        self._apply_mkp()
+        self._apply_potassium_nitrate()
+        self._apply_ammonium_nitrate()
         return self.results
 
     def _apply_fertilizer(self, fert_name, grams, additions):
@@ -735,59 +748,76 @@ class NutrientCalculator:
         }
         self.results[fert_name].update(additions)
 
-    def _apply_magnesium_sulfate(self, profile):
-        mg_need = profile['Mg']
+    def _apply_magnesium_sulfate(self):
+        mg_need = self.final_profile['Mg']
         mg_content = fertilizers_db["Сульфат магния"]["Mg"]
         grams = (mg_need * self.volume) / (mg_content * 1000)
         added_s = grams * fertilizers_db["Сульфат магния"]["S"] * 1000 / self.volume
 
-        profile['S'] -= added_s
+        self.final_profile['S'] -= added_s
         self._apply_fertilizer("Сульфат магния", grams, {'внесет S': round(added_s, 1)})
+        self.final_profile['Mg'] = 0
 
-    def _apply_calcium_nitrate(self, profile):
-        ca_need = profile['Ca']
+    def _apply_calcium_nitrate(self):
+        ca_need = self.final_profile['Ca']
         ca_content = fertilizers_db["Кальциевая селитра"]["Ca"]
         grams = (ca_need * self.volume) / (ca_content * 1000)
         added_n = grams * fertilizers_db["Кальциевая селитра"]["N (NO3-)"] * 1000 / self.volume
 
-        profile['N (NO3-)'] -= added_n
+        self.final_profile['N (NO3-)'] -= added_n
         self._apply_fertilizer("Кальциевая селитра", grams, {'внесет NO3': round(added_n, 1)})
+        self.final_profile['Ca'] = 0
 
-    def _apply_mkp(self, profile):
-        p_need = profile['P']
+    def _apply_mkp(self):
+        p_need = self.final_profile['P']
         p_content = fertilizers_db["Монофосфат калия"]["P"]
         grams = (p_need * self.volume) / (p_content * 1000)
         added_k = grams * fertilizers_db["Монофосфат калия"]["K"] * 1000 / self.volume
 
-        profile['K'] -= added_k
+        self.final_profile['K'] -= added_k
         self._apply_fertilizer("Монофосфат калия", grams, {'внесет K': round(added_k, 1)})
+        self.final_profile['P'] = 0
 
-    def _apply_potassium_nitrate(self, profile):
-        k_need = profile['K']
+    def _apply_potassium_nitrate(self):
+        k_need = self.final_profile['K']
         if k_need <= 0:
             return
         k_content = fertilizers_db["Калий азотнокислый"]["K"]
         grams = (k_need * self.volume) / (k_content * 1000)
         added_n = grams * fertilizers_db["Калий азотнокислый"]["N (NO3-)"] * 1000 / self.volume
 
-        profile['N (NO3-)'] -= added_n
+        self.final_profile['N (NO3-)'] -= added_n
         self._apply_fertilizer("Калий азотнокислый", grams, {'внесет NO3': round(added_n, 1)})
+        self.final_profile['K'] = 0
 
-    def _apply_ammonium_nitrate(self, profile):
-        nh4_need = profile['N (NH4+)']
+    def _apply_ammonium_nitrate(self):
+        nh4_need = self.final_profile['N (NH4+)']
         if nh4_need <= 0:
             return
         nh4_content = fertilizers_db["Аммоний азотнокислый"]["N (NH4+)"]
         grams = (nh4_need * self.volume) / (nh4_content * 1000)
         added_n = grams * fertilizers_db["Аммоний азотнокислый"]["N (NO3-)"] * 1000 / self.volume
 
-        profile['N (NO3-)'] -= added_n
+        self.final_profile['N (NO3-)'] -= added_n
         self._apply_fertilizer("Аммоний азотнокислый", grams, {'внесет NO3': round(added_n, 1)})
-
-    def print_report(self, profile):
+        self.final_profile['N (NH4+)'] = 0
+
+    def calculate_ec(self):
+        """Расчет электропроводимости (EC) в mS/cm"""
+        total_ec = 0.0
+        for element, concentration in TOMATO_PROFILE.items():
+            if element in EC_FACTORS:
+                total_ec += concentration * EC_FACTORS[element] / 1000
+        return round(total_ec, 2)
+
+    def print_report(self):
+        ec_value = self.calculate_ec()
+        
         print("=" * 50)
         print(f"РАСЧЕТ ДЛЯ {self.volume} ЛИТРОВ РАСТВОРА")
         print("=" * 50)
+        
+        print(f"\nРАСЧЕТНАЯ ЭЛЕКТРОПРОВОДИМОСТЬ (EC): {ec_value} mS/cm")
 
         print("\nРЕКОМЕНДУЕМЫЕ УДОБРЕНИЯ:")
         for fert, data in self.results.items():
@@ -797,15 +827,19 @@ class NutrientCalculator:
                     print(f"  ➕ {k}: {v} ppm")
 
         print("\nОСТАТОЧНЫЙ ДЕФИЦИТ:")
-        for el, val in profile.items():
+        deficit_found = False
+        for el, val in self.final_profile.items():
             if val > 0.1:
                 print(f"  🔸 {el}: {round(val, 1)} ppm")
+                deficit_found = True
+        if not deficit_found:
+            print("  Все элементы полностью покрыты удобрениями")
 
 
 # Пример использования
 calc = NutrientCalculator(volume_liters=10)
 results = calc.calculate(TOMATO_PROFILE.copy())
-calc.print_report(TOMATO_PROFILE.copy())
+calc.print_report()