pyholos 0.1.3__tar.gz → 0.1.4__tar.gz

{pyholos-0.1.3/src/pyholos.egg-info → pyholos-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyholos
-Version: 0.1.3
+Version: 0.1.4
 Summary: A Python package for running the HOLOS 4.0 CLI.
 Author-email: Rami ALBASHA <ralbasha@msfourrager.com>
 Project-URL: Homepage, https://github.com/Mon-Systeme-Fourrager/pyholos

{pyholos-0.1.3 → pyholos-0.1.4}/src/pyholos/farm/farm.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+from typing import Generator
 
 from pandas import DataFrame
 
@@ -34,20 +35,32 @@ class Farm:
     def _set_dir_name(entry: str) -> str:
         return ' '.join([s.capitalize() for s in entry.split('_')])
 
+    def _iter_over_animal_components(self) -> Generator:
+        for k, v in self.__dict__.items():
+            if (v is not None) and (not isinstance(v, ParamsFarmSettings)):
+                yield k, v
+
     def write_files(
             self,
             path_dir_farm: Path
     ):
         path_dir_farm.mkdir(parents=True, exist_ok=True)
         self.farm_settings.write(path_dir_farm=path_dir_farm)
-        for k, v in self.__dict__.items():
-            if (v is not None) and (not isinstance(v, ParamsFarmSettings)):
-                path_dir = path_dir_farm / self._set_dir_name(entry=k)
-                path_dir.mkdir(parents=True, exist_ok=True)
-                dfs = [DataFrame.from_records([v.to_dict() for v in component]) for component in v]
-                for df in dfs:
-                    name_output_file = df['Name'].unique()[0]
-                    df.to_csv(path_dir / f'{name_output_file}.csv', index=False)
+        for k, v in self._iter_over_animal_components():
+            path_dir = path_dir_farm / self._set_dir_name(entry=k)
+            path_dir.mkdir(parents=True, exist_ok=True)
+            dfs = [DataFrame.from_records([v.to_dict() for v in component]) for component in v]
+            for df in dfs:
+                name_output_file = df['Name'].unique()[0]
+                df.to_csv(path_dir / f'{name_output_file}.csv', index=False)
+
+    def export_to_dict(self) -> dict:
+        res = {**self.farm_settings.export_to_dict()}
+        for k, v in self._iter_over_animal_components():
+            dir_name = self._set_dir_name(entry=k)
+            res[dir_name] = [[v.to_dict() for v in component] for component in v]
+
+        return res
 
 
 def create_farm(

{pyholos-0.1.3 → pyholos-0.1.4}/src/pyholos/farm/farm_settings.py

@@ -531,12 +531,20 @@ class ParamsFarmSettings:
             year=year,
             **soil_properties)
 
+        self._file_name = "Farm.settings"
+
     def get_params(self) -> list[ParamGeneric]:
         return [getattr(self, v) for v in self.__dict__ if all([not v.startswith(('_', '__')), not callable(v)])]
 
-    def write(self, path_dir_farm: Path):
+    def _get_data(self) -> list[str]:
         sections = self.get_params()
-        res = [x for y in [v.to_list() + [''] for v in sections[:-1]] for x in y] + sections[-1].to_list()
-        with (path_dir_farm / 'Farm.settings').open(mode='w', encoding='utf-8') as f:
+        return [x for y in [v.to_list() + [''] for v in sections[:-1]] for x in y] + sections[-1].to_list()
+
+    def write(self, path_dir_farm: Path):
+        res = self._get_data()
+        with (path_dir_farm / self._file_name).open(mode='w', encoding='utf-8') as f:
             f.writelines('\n'.join(res))
         pass
+
+    def export_to_dict(self) -> dict[str, list[str]]:
+        return {self._file_name: self._get_data()}

pyholos-0.1.4/src/pyholos/version.py

@@ -0,0 +1,5 @@
+major = 0
+minor = 1
+post = 4
+
+__version__ = ".".join([str(s) for s in (major, minor, post)])

{pyholos-0.1.3 → pyholos-0.1.4/src/pyholos.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyholos
-Version: 0.1.3
+Version: 0.1.4
 Summary: A Python package for running the HOLOS 4.0 CLI.
 Author-email: Rami ALBASHA <ralbasha@msfourrager.com>
 Project-URL: Homepage, https://github.com/Mon-Systeme-Fourrager/pyholos

{pyholos-0.1.3 → pyholos-0.1.4}/src/pyholos.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ src/pyholos/farm/farm_settings.py
 src/pyholos/postprocessing/__init__.py
 src/pyholos/postprocessing/plots.py
 src/pyholos/postprocessing/postprocessing.py
+src/pyholos/resources/soil_landscapes_of_canada_v3r2.zip
 src/pyholos/resources/holos/Table_16_Livestock_Coefficients_BeefAndDairy_Cattle_Provider.csv
 src/pyholos/resources/holos/Table_21_Average_Milk_Production_For_Dairy_Cows_By_Province.csv
 src/pyholos/resources/holos/Table_22_Livestock_Coefficients_For_Sheep.csv

pyholos-0.1.3/src/pyholos/version.py

@@ -1,5 +0,0 @@
-major = 0
-minor = 1
-post = 3
-
-__version__ = ".".join([str(s) for s in (major, minor, post)])