foxes 0.5.0.1__py3-none-any.whl → 0.5.1__py3-none-any.whl

foxes/VERSION

@@ -1 +1 @@
-0.5.0.1
+0.5.1

foxes/input/windio/windio.py

@@ -6,15 +6,10 @@ from foxes.models import ModelBook
 from foxes.input.states import StatesTable
 from foxes.input.farm_layout import add_from_df
 from foxes.models.turbine_types import CpCtFromTwo
+from foxes.utils import import_module
 import foxes.constants as FC
 import foxes.variables as FV
 
-try:
-    from windIO.utils.yml_utils import load_yaml
-except ModuleNotFoundError:
-    def load_yaml(*args, **kwargs):
-        raise ModuleNotFoundError("Please install windio, e.g. by 'pip install windio'")
-
 def read_resource(res, fixed_vars={}, **kwargs):
     """
     Reads a WindIO energy resource
@@ -264,7 +259,8 @@ def read_case(case_yaml, site_pars={}, farm_pars={}, ana_pars={}):
     :group: input.windio
 
     """
-    case = load_yaml(case_yaml)
+    yml_utils = import_module("windIO.utils.yml_utils", hint="pip install windio")
+    case = yml_utils.load_yaml(case_yaml)
 
     site_yaml = case["site"]
     states = read_site(site_yaml, **site_pars)

foxes/models/model_book.py

@@ -1,13 +1,6 @@
 import foxes.models as fm
 import foxes.variables as FV
 from foxes.utils import Dict
-from foxes.core import (
-    TurbineModel,
-    RotorModel,
-    FarmModel,
-    PointDataModel,
-    FarmController,
-)
 
 
 class ModelBook:

foxes/utils/__init__.py

@@ -9,6 +9,7 @@ from .data_book import DataBook
 from .plotly_helpers import show_plotly_fig
 from .cubic_roots import cubic_roots
 from .geopandas_helpers import read_shp, shp2csv, read_shp_polygons, shp2geom2d
+from .load import import_module
 
 from . import two_circles
 from . import abl

foxes/utils/load.py

@@ -0,0 +1,30 @@
+import importlib
+
+def import_module(name, package=None, hint=None):
+    """
+    Imports a module dynamically.
+    
+    Parameters
+    ----------
+    name: str
+        The module name
+    package: str, optional
+        The explicit package name, deduced from name
+        if not given
+    hint: str, optional
+        Installation advice, in case the import fails
+    
+    Returns
+    -------
+    mdl: module
+        The imnported package
+    
+    :group: utils
+    
+    """
+    try:
+        return importlib.import_module(name, package)
+    except ModuleNotFoundError:
+        mdl = name if package is None else f"{package}.{name}"
+        hint = hint if hint is not None else f"pip install {name}"
+        raise ModuleNotFoundError(f"Module '{mdl}' not found, maybe try '{hint}'")

{foxes-0.5.0.1.dist-info → foxes-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foxes
-Version: 0.5.0.1
+Version: 0.5.1
 Summary: Farm Optimization and eXtended yield Evaluation Software
 Author: Fraunhofer IWES
 Author-email: jonas.schmidt@iwes.fraunhofer.de
@@ -26,6 +26,16 @@ Requires-Dist: plotly
 Requires-Dist: kaleido
 Requires-Dist: iwopy >=0.1.4
 Requires-Dist: pymoo >=0.6
+Provides-Extra: all
+Requires-Dist: windio >=1.0 ; extra == 'all'
+Requires-Dist: flake8 ; extra == 'all'
+Requires-Dist: pytest ; extra == 'all'
+Requires-Dist: sphinx ; extra == 'all'
+Requires-Dist: sphinx-immaterial ; extra == 'all'
+Requires-Dist: nbsphinx ; extra == 'all'
+Requires-Dist: ipykernel ; extra == 'all'
+Requires-Dist: ipywidgets ; extra == 'all'
+Requires-Dist: m2r2 ; extra == 'all'
 Provides-Extra: doc
 Requires-Dist: sphinx ; extra == 'doc'
 Requires-Dist: sphinx-immaterial ; extra == 'doc'

{foxes-0.5.0.1.dist-info → foxes-0.5.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-foxes/VERSION,sha256=aO6EvDqOKUx-PwkLO8cm01QuHGIilLCoOGTyiIBQ0eQ,8
+foxes/VERSION,sha256=q6lRYmyGkM5JPLyPAYIFu0aAA_YfvwD9PTxxzrq8AXc,6
 foxes/__init__.py,sha256=erRuJI5EwU2AT9VtAshlP6DAmKO4kh0lfpnMw1sdlsM,717
 foxes/constants.py,sha256=5MhlbsIEpOyisYwG9DfJarB0xCIcaDyhNMnnzbEr7Aw,2373
 foxes/variables.py,sha256=GX_UonLKorN4ptypR5mLqbISfM-nLHpOv8v0tRcJmto,4261
@@ -77,9 +77,9 @@ foxes/input/states/states_table.py,sha256=e-sdZxrC72PmZTuLUy8z-k2O5MU13mt1A3lmbG
 foxes/input/states/create/__init__.py,sha256=hSJWySDF0PXB9Tpw45je0wIDAQ8U-bEa4qxsb44aKBk,81
 foxes/input/states/create/random_abl_states.py,sha256=3_CogT5CWjk63VBIkUaHI_fVjaepg8kX4JBAqU-atOg,3262
 foxes/input/windio/__init__.py,sha256=QcOt6QfCBR_Fkh-EkCYrlXTTKMphTa-1rK0hmVnM5X4,88
-foxes/input/windio/windio.py,sha256=ekx18PxCDQxkspoTEga0GHT27LJDmkdnkFIi1XViGeQ,8024
+foxes/input/windio/windio.py,sha256=dP4O6A1o8d6DNKd_GKhxf74Dcit4jCLR0A_ZnRs_5Cs,7947
 foxes/models/__init__.py,sha256=qrt0eueFjM5BZP53WtLBTIJyJHZz9w5wv6QWJVdXThM,375
-foxes/models/model_book.py,sha256=CNSvwhS5J7xjhibbapkBI8Tcr-XKAvX7LFwAnI0NazY,15008
+foxes/models/model_book.py,sha256=tx-CUu10iSvyd1ol7t5EGJMOqDHu8lIOIJcgRL7Av2I,14892
 foxes/models/farm_controllers/__init__.py,sha256=MY4IpcE8qw8WPdgMbyCWYOHJ49W-U3eHrBfJxaH9Ayc,71
 foxes/models/farm_controllers/basic.py,sha256=6pinNXiyfoG3apXhqQWcnxx4vN_7Q63YryXX5Z7kTE0,249
 foxes/models/farm_models/__init__.py,sha256=HoyMo2pDgJw770_wc4T5-VkPJpOsvkwILWusrsadICk,65
@@ -195,11 +195,12 @@ foxes/output/flow_plots_2d/__init__.py,sha256=llzVADTeEjpd7gtH9nvDch38Cu7Lzm0pMM
 foxes/output/flow_plots_2d/common.py,sha256=D9ijH0p7FDGzvPMjJ8cx42eUL2EW2eIQra3M2Ka2heA,15993
 foxes/output/flow_plots_2d/flow_plots.py,sha256=1PvMs2rFZMNSrb0mHhAO9qDmb5SUeT2Y2_NRc0vIUvc,33736
 foxes/output/flow_plots_2d/seq_flow_ani_plugin.py,sha256=E5BWEXEZiwb7ju32ONzerJOpaUdQMOkld-Hez7SuEwM,2395
-foxes/utils/__init__.py,sha256=DHlKLlrvmUuLrZNO-344o7iHkjlpOvGR2KnSZzewA8Y,480
+foxes/utils/__init__.py,sha256=1hZgQd5uG-3sVMuuwL_jk9d1cUvp-DBfEkTwfkX6BrU,512
 foxes/utils/cubic_roots.py,sha256=u2Pf-yHZ6EASpFONMfkv0mvldmd1E1VRZxj69YabDoc,3321
 foxes/utils/data_book.py,sha256=DgxusriNH-fhHNN_v6TY3QWcAnrAcw20Wgz7lDfbMeg,5302
 foxes/utils/dict.py,sha256=s922OY22wOKBMbzQ_g-T-MhEw1dga0d3CCwFwd0nI78,886
 foxes/utils/geopandas_helpers.py,sha256=inVQHMco6Op7YN3VFH1DGAJZWREuveJUS7gyoRudw2A,7895
+foxes/utils/load.py,sha256=rR04QsJ8MTzTgyDPTHPYpllFHAzWtrR8QuAXYZ1SiBc,781
 foxes/utils/pandas_helpers.py,sha256=iFijkt7GfsWYhP9Cn92zg8Wj-BPaihJfmYBXTddQQc4,4627
 foxes/utils/plotly_helpers.py,sha256=MHwyKGjajkgwcF2kDUMT6Midd-GCw3dChMvXBqLw5YY,369
 foxes/utils/subclasses.py,sha256=bnlZaLgGjq9cQC9dvsxahUmLQQlSmmun35TjWYyX9CA,380
@@ -219,9 +220,9 @@ foxes/utils/geom2d/half_plane.py,sha256=kzZD6pkZxZ03MK9WAboWzXb5Ws5dWLQY9GIahD4D
 foxes/utils/geom2d/polygon.py,sha256=8ASfy7No_-Pt_xDSeNsDtLEkCjBWsNZK8nIxDQtqeOE,5534
 foxes/utils/runners/__init__.py,sha256=-WL4ZmdgNYldkqhCV6dR-aXCumBrH-Ea-V1shsRhsbs,55
 foxes/utils/runners/runners.py,sha256=cQo_s4v0VRPyfLn3KDubQWDMCcirWs_IgtKMtD23CH4,6502
-foxes-0.5.0.1.dist-info/LICENSE,sha256=bBCH6mYTPzSepk2s2UUZ3II_ZYXrn1bnSqB85-aZHxU,1071
-foxes-0.5.0.1.dist-info/METADATA,sha256=HOuROLlVzySZHQsVTvO0FJiO_nW62I-qDL_O-eUNCvU,8686
-foxes-0.5.0.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-foxes-0.5.0.1.dist-info/top_level.txt,sha256=B4spGR6JHsVHz7CEXsa68xsjYalAA70nBwHa1gfyRHc,6
-foxes-0.5.0.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-foxes-0.5.0.1.dist-info/RECORD,,
+foxes-0.5.1.dist-info/LICENSE,sha256=bBCH6mYTPzSepk2s2UUZ3II_ZYXrn1bnSqB85-aZHxU,1071
+foxes-0.5.1.dist-info/METADATA,sha256=yHjTbze2rotdPNoBQoOIhdP7ra9-oXIzr9fgCLJzkng,9079
+foxes-0.5.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+foxes-0.5.1.dist-info/top_level.txt,sha256=B4spGR6JHsVHz7CEXsa68xsjYalAA70nBwHa1gfyRHc,6
+foxes-0.5.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+foxes-0.5.1.dist-info/RECORD,,