pyholos 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

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/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/version.py

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

{pyholos-0.1.3.dist-info → pyholos-0.1.4.dist-info}/METADATA

@@ -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.dist-info → pyholos-0.1.4.dist-info}/RECORD

@@ -7,7 +7,7 @@ pyholos/defaults.py,sha256=n0qKQcKv7ey7ze4lONTSwYGfd7y3RogGEmXkyV8WHig,4842
 pyholos/launching.py,sha256=e1Jcu7w2BDMnG5xxXQhxkqL-aqrQ5qQ6e7mw9mHmM4E,2530
 pyholos/soil.py,sha256=LbQ1yDdmg8QRLxPWe0ORX69aMEdiNL5tLY_4Ll4q-xs,20167
 pyholos/utils.py,sha256=IPb7Sx0jw-w7r46t0MXgVqHZIiJwBbVei8gPqcoHO7s,2571
-pyholos/version.py,sha256=qfDiOsy6LZxfXnbbq8EKve6eOBNAWk8wl5Kre0ViA9E,96
+pyholos/version.py,sha256=JxXZFxP_j6wliY_CBOesvw3xRoGBfq0G1IgITXDXeIk,96
 pyholos/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyholos/components/common.py,sha256=ZEt4GOjJGRN66chjtSPHo2R-u9wnrkpUkV17W0m7BF8,6788
 pyholos/components/animals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,12 +27,13 @@ pyholos/components/land_management/carbon/relative_biomass_information.py,sha256
 pyholos/components/land_management/carbon/tillage.py,sha256=bjpkz90DLIPaZXHgRN3hMQ5KJj08_-qpviF1aWQ31J0,3110
 pyholos/farm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyholos/farm/enums.py,sha256=DEMGOTB-VmILVCcpoNfWV1FViiJ0TeJkG36_HRiLKEY,1978
-pyholos/farm/farm.py,sha256=XiiDtxoIEwu_uGu2f7A_qUMjYO04g6ZPt_MUf275u_4,4056
+pyholos/farm/farm.py,sha256=mdEWBmurla93_VfNoDJf310wX3H-6pPG4OoK_AF5qHw,4519
 pyholos/farm/farm_inputs.py,sha256=g3WKw4lqIcmEOVYpUU73uQlAp9VhGJPsTa462lzWlMk,26749
-pyholos/farm/farm_settings.py,sha256=KJhz39K0zUGt269zBh_E_YXA6JXkzvoGAvQMzCE9Amc,28952
+pyholos/farm/farm_settings.py,sha256=p6Ew_RAF_fpHyQbKTCmh-5pWRRwsRtkjFwwHlWSlVR8,29180
 pyholos/postprocessing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyholos/postprocessing/plots.py,sha256=LvucTQQQCO6mjZavSRlECOA7KNtOIhNmsOLkLKoRYCE,5522
 pyholos/postprocessing/postprocessing.py,sha256=Q7r8ceUEJymBztSdFB46YxoZ0Gyik1VwVWZGVvQ8XuE,1400
+pyholos/resources/soil_landscapes_of_canada_v3r2.zip,sha256=I_o0MLq0_1URoQadjpkpn1c9P0tkDJgaE5sheuSS-zM,48732693
 pyholos/resources/holos/Table_16_Livestock_Coefficients_BeefAndDairy_Cattle_Provider.csv,sha256=ettBji-ROISVa6fj_HB59bk2tX9PyZZRiU0hJkE8SVo,1039
 pyholos/resources/holos/Table_21_Average_Milk_Production_For_Dairy_Cows_By_Province.csv,sha256=wkk4BEKJpCs42Y4yFuDR8-SohZQ8tSYzo-8_phf16jQ,1300
 pyholos/resources/holos/Table_22_Livestock_Coefficients_For_Sheep.csv,sha256=fjEgAuEAR9FXBEx5NIUND0YeX3_CWe9LOjZbAk6_Bwk,1305
@@ -60,8 +61,8 @@ pyholos/resources/soil_landscapes_of_canada_v3r2/soil_landscapes_of_canada_v3r2_
 pyholos/resources/soil_landscapes_of_canada_v3r2/soil_landscapes_of_canada_v3r2_csv/ca_all_slc_v3r2_lst.csv,sha256=I_gEngvoUi_1YRi9rhwnU2HvT4TVNUpsj-nJHQGWNtw,2764500
 pyholos/resources/soil_landscapes_of_canada_v3r2/soil_landscapes_of_canada_v3r2_csv/ca_all_slc_v3r2_slt.csv,sha256=0HxKAWBcWH9PIB0TL8cTY4JC2f5xTd8UIlIw9fDfjaY,8957879
 pyholos/resources/soil_landscapes_of_canada_v3r2/soil_landscapes_of_canada_v3r2_csv/ca_all_slc_v3r2_snt.csv,sha256=jBrpCpZ1ziMAxBYWXXWaTFkuF1WcBF5bzD5effZsPKg,1360046
-pyholos-0.1.3.dist-info/licenses/LICENSE,sha256=C8amDSvgy941IWtTFploX0NSyjBHHB0biiEKEX85XM0,35976
-pyholos-0.1.3.dist-info/METADATA,sha256=RuehcHvwWPT8DJ87ZxEOwKK1lTD0qXC_0qlfkPp-6Q8,751
-pyholos-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyholos-0.1.3.dist-info/top_level.txt,sha256=-OdNFZ9lbJWvWGkFjszJHZdIr8ggnJnnIaNMaCfdwuI,8
-pyholos-0.1.3.dist-info/RECORD,,
+pyholos-0.1.4.dist-info/licenses/LICENSE,sha256=C8amDSvgy941IWtTFploX0NSyjBHHB0biiEKEX85XM0,35976
+pyholos-0.1.4.dist-info/METADATA,sha256=nUohc9UiVUMkUnmzv3-5UOIsG1ylakDYH2YMxcO-Mlk,751
+pyholos-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyholos-0.1.4.dist-info/top_level.txt,sha256=-OdNFZ9lbJWvWGkFjszJHZdIr8ggnJnnIaNMaCfdwuI,8
+pyholos-0.1.4.dist-info/RECORD,,