Update app.py

app.py

@@ -729,6 +729,124 @@ EC_COEFFICIENTS = {
 
 
 
+# Список питательных веществ
+nutrients_stencil = [
+    'N (NO3-)',
+    'N (NH4+)',
+    'P',
+    'K',
+    'Mg',
+    'Ca',
+    'S',
+    'Fe',
+    'Zn',
+    'B',
+    'Mn',
+    'Cu',
+    'Mo',
+]
+
+
+class Composition:
+    def __init__(self, name='', vector=None):
+        self.name = name
+        if vector is None:
+            self.vector = np.zeros(len(nutrients_stencil))
+        else:
+            if len(vector) != len(nutrients_stencil):
+                raise ValueError(f"Vector length ({len(vector)}) does not match "
+                                 f"nutrients stencil length ({len(nutrients_stencil)}).")
+            self.vector = np.array(vector)
+
+    @classmethod
+    def from_dict(cls, composition_dict):
+        if not composition_dict:
+            raise ValueError("Empty composition dictionary provided.")
+        name, nutrients_dict = tuple(composition_dict.items())[0]
+        vector = np.zeros(len(nutrients_stencil))
+        for i, nutrient in enumerate(nutrients_stencil):
+            if nutrient in nutrients_dict:
+                vector[i] = nutrients_dict[nutrient]
+        return cls(name, vector)
+
+    def __add__(self, composition):
+        if not isinstance(composition, Composition):
+            raise TypeError("Can only add Composition objects.")
+        name = f'{self.name} + {composition.name}'
+        vector = self.vector + composition.vector
+        return Composition(name, vector)
+
+    def __neg__(self):
+        return Composition(f'- ({self.name})', -self.vector)
+
+    def __sub__(self, composition):
+        if not isinstance(composition, Composition):
+            raise TypeError("Can only subtract Composition objects.")
+        name = f'{self.name} - {composition.name}'
+        vector = self.vector - composition.vector
+        return Composition(name, vector)
+
+    def __eq__(self, other):
+        if not isinstance(other, Composition):
+            return False
+        return np.all(self.vector == other.vector)
+
+    def __repr__(self):
+        return self.table()
+
+    def __str__(self):
+        return f'{self.name} :: ' + ', '.join(
+                    f'{nutrient}: {amount_ppm:.2f}'
+                    for nutrient, amount_ppm
+                    in zip(nutrients_stencil, 10**6 * self.vector)
+                    )
+
+    def __rmul__(self, number):
+        if not isinstance(number, (int, float)):
+            raise TypeError("Can only multiply by a scalar.")
+        name = f'{number} * ({self.name})'
+        vector = self.vector * number
+        return Composition(name, vector)
+
+    def __len__(self):
+        return len(self.vector)
+
+    def as_dict(self):
+        nutrients_dict = {
+                nutrient: float(value)
+                for nutrient, value in zip(nutrients_stencil, self.vector)
+                if value != 0
+                }
+        return {self.name: nutrients_dict}
+
+    def table(self, sparse=True, ref=None, tablefmt='simple'):
+        description = f'Composition: {self.name}'
+        nutrients = np.array(nutrients_stencil)
+        vector = self.vector
+        if ref is not None:
+            if not isinstance(ref, Composition):
+                raise TypeError("Reference must be a Composition object.")
+            vector_ref = ref.vector
+        else:
+            vector_ref = np.zeros(len(nutrients_stencil))
+        if sparse:
+            mask_nonzero = (vector != 0) | (vector_ref != 0)
+            nutrients = nutrients[mask_nonzero]
+            vector = vector[mask_nonzero]
+            vector_ref = vector_ref[mask_nonzero]
+        table_dict = {
+                'Nutrient': nutrients,
+                'Ratio': vector,
+                'Amount mg/kg': 10**6 * vector,
+                }
+        if ref is not None:
+            description += f'\nReference: {ref.name}'
+            table_dict['Diff mg/kg'] = 10**6 * (vector - vector_ref)
+        table = tabulate(table_dict, headers='keys', tablefmt=tablefmt)
+        return '\n\n'.join((description, table))
+
+
+# Ваш калькулятор удобрений
 class NutrientCalculator:
     def __init__(self, volume_liters=1.0):
         self.volume = volume_liters
@@ -751,6 +869,7 @@ class NutrientCalculator:
         # Целевой профиль как объект Composition
         self.target_composition = Composition('Target Profile', list(self.target_profile.values()))
 
+
     def calculate(self):
         try:
             self.actual_profile = {k: 0.0 for k in self.target_profile}