openstef 3.2.28__tar.gz → 3.4.30__tar.gz

{openstef-3.2.28 → openstef-3.4.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openstef
-Version: 3.2.28
+Version: 3.4.30
 Summary: Open short term energy forecaster
 Home-page: https://github.com/OpenSTEF/openstef
 Author: Alliander N.V
@@ -10,24 +10,42 @@ Keywords: energy,forecasting,machinelearning
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.7.0
+Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
-Provides-Extra: proloaf
 License-File: LICENSE
+Requires-Dist: holidays==0.21
+Requires-Dist: joblib==1.3.2
+Requires-Dist: lightgbm~=3.3
+Requires-Dist: matplotlib~=3.7
+Requires-Dist: mlflow~=2.3
+Requires-Dist: networkx~=3.1
+Requires-Dist: optuna~=3.1
+Requires-Dist: optuna-integration~=3.6
+Requires-Dist: pandas~=2.2.0
+Requires-Dist: plotly~=5.18
+Requires-Dist: pvlib==0.9.4
+Requires-Dist: pydantic~=2.4
+Requires-Dist: pydantic-settings~=2.3
+Requires-Dist: pymsteams~=0.2.2
+Requires-Dist: scikit-learn~=1.3
+Requires-Dist: scipy~=1.10
+Requires-Dist: statsmodels~=0.13.5
+Requires-Dist: structlog<25,>=23.1
+Requires-Dist: xgboost~=2.0
 
 <!--
-SPDX-FileCopyrightText: 2017-2022 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
+SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
 
 SPDX-License-Identifier: MPL-2.0
 -->
 
-<!-- Github Actions badges -->
-[![Python Build](https://github.com/openstef/openstef/actions/workflows/python-build.yaml/badge.svg)](https://github.com/openstef/openstef/actions/workflows/python-build.yaml)
-[![REUSE Compliance Check](https://github.com/openstef/openstef/actions/workflows/reuse-compliance.yaml/badge.svg)](https://github.com/openstef/openstef/actions/workflows/reuse-compliance.yaml)
+# OpenSTEF
+<!-- Badges -->
+[![Downloads](https://static.pepy.tech/badge/openstef)](https://pepy.tech/project/openstef)
+[![Downloads](https://static.pepy.tech/badge/openstef/month)](https://pepy.tech/project/openstef)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5585/badge)](https://bestpractices.coreinfrastructure.org/projects/5585)
 <!-- SonarCloud badges -->
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=bugs)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
 [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=code_smells)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
@@ -38,21 +56,29 @@ SPDX-License-Identifier: MPL-2.0
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=security_rating)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
 [![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=sqale_index)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5585/badge)](https://bestpractices.coreinfrastructure.org/projects/5585)
-
-# OpenSTEF
-
-OpenSTEF is a Python package which is used to make short term forecasts for the energy sector. This repository contains all components for the machine learning pipeline required to make a forecast. In order to use the package you need to provide your own data storage and retrieval interface. 
 
-Find the latest information on the project on [the project's website](https://www.lfenergy.org/projects/openstef/).
-
-The `openstef` Python package is available at: https://pypi.org/project/openstef/. 
-
-Documentation is available at: https://openstef.github.io/openstef/index.html. 
-
-You can also watch a [video about OpenSTEF](https://www.lfenergy.org/forecasting-to-create-a-more-resilient-optimized-grid/) instead of reading about the project.
-
-Want to join the discussion? Join our [Teams channel](https://teams.microsoft.com/l/team/19%3ac08a513650524fc988afb296cd0358cc%40thread.tacv2/conversations?groupId=bfcb763a-3a97-4938-81d7-b14512aa537d&tenantId=697f104b-d7cb-48c8-ac9f-bd87105bafdc).
+OpenSTEF is a Python package designed for generating short-term forecasts in the energy sector. The repository includes all the essential components required for machine learning pipelines that facilitate the forecasting process. To utilize the package, users are required to furnish their own data storage and retrieval interface.
+
+# Table of contents
+- [OpenSTEF](#openstef)
+- [Table of contents](#table-of-contents)
+- [External information sources](#external-information-sources)
+- [Installation](#install)
+- [Usage](#usage)
+    - [Example notebooks](#example-notebooks)
+    - [Reference Implementation](#reference-implementation)
+    - [Database connector for OpenSTEF](#database-connector-for-openstef)
+- [License](license)
+- [Contributing](#contributing)
+- [Contact](#contact)
+
+# External information sources
+- [Documentation website](https://openstef.github.io/openstef/index.html);
+- [Python package](https://pypi.org/project/openstef/);
+- [Linux Foundation project page](https://www.lfenergy.org/projects/openstef/);
+- [Documentation on dashboard](https://raw.githack.com/OpenSTEF/.github/main/profile/html/openstef_dashboard_doc.html);
+- [Video about OpenSTEF](https://www.lfenergy.org/forecasting-to-create-a-more-resilient-optimized-grid/);
+- [Teams channel](https://teams.microsoft.com/l/team/19%3ac08a513650524fc988afb296cd0358cc%40thread.tacv2/conversations?groupId=bfcb763a-3a97-4938-81d7-b14512aa537d&tenantId=697f104b-d7cb-48c8-ac9f-bd87105bafdc)
 
 # Installation
 
@@ -62,10 +88,6 @@ Want to join the discussion? Join our [Teams channel](https://teams.microsoft.co
 pip install openstef
 ```
 
-_**Optional**_: if you would like to use the proloaf model with OpenSTEF install the proloaf dependencies by running:
-```shell
-pip install openstef[proloaf]
-```
 ### Remark regarding installation within a **conda environment on Windows**:
 
 A version of the pywin32 package will be installed as a secondary dependency along with the installation of the openstef package. Since conda relies on an old version of pywin32, the new installation can break conda's functionality. The following command can solve this issue:
@@ -76,27 +98,34 @@ For more information on this issue see the [readme of pywin32](https://github.co
 
 # Usage
 
+## Example notebooks
+To help you get started, a set of fundamental example notebooks has been created. You can access these offline examples [here](https://github.com/OpenSTEF/openstef-offline-example).
+
+## Reference Implementation
+A complete implementation including databases, user interface, example data, etc. is available at: https://github.com/OpenSTEF/openstef-reference
+
+![screenshot](https://user-images.githubusercontent.com/60883372/146760483-29af3ac7-62af-4f13-98c7-982a79c517d1.jpg)
+Screenshot of the operational dashboard showing the key functionality of OpenSTEF.
+Dashboard documentation can be found [here](https://raw.githack.com/OpenSTEF/.github/main/profile/html/openstef_dashboard_doc.html).
+
 To run a task use:
 
 ```shell
 python -m openstef task <task_name>
 ```
 
-## Reference Implementation
-A complete implementation including databases, user interface, example data, etc. is available at: https://github.com/OpenSTEF/openstef-reference
-
-![screenshot](https://user-images.githubusercontent.com/60883372/146760483-29af3ac7-62af-4f13-98c7-982a79c517d1.jpg)
-Screenshot of the operational dashboard showing the key functionality of OpenSTEF. 
-Dashboard documentation can be found [here](https://github.com/OpenSTEF/.github/blob/main/profile/README.md).
+## Database connector for openstef
+This repository provides an interface to OpenSTEF (reference) databases. The repository can be found [here](https://github.com/OpenSTEF/openstef-dbc).
 
-## License
+# License
 This project is licensed under the Mozilla Public License, version 2.0 - see LICENSE for details.
 
 ## Licenses third-party libraries
 This project includes third-party libraries, which are licensed under their own respective Open-Source licenses. SPDX-License-Identifier headers are used to show which license is applicable. The concerning license files can be found in the LICENSES directory.
 
-## Contributing
+# Contributing
 Please read [CODE_OF_CONDUCT.md](https://github.com/OpenSTEF/.github/blob/main/CODE_OF_CONDUCT.md), [CONTRIBUTING.md](https://github.com/OpenSTEF/.github/blob/main/CONTRIBUTING.md) and [PROJECT_GOVERNANCE.md](https://github.com/OpenSTEF/.github/blob/main/PROJECT_GOVERNANCE.md) for details on the process for submitting pull requests to us.
 
-## Contact
+# Contact
 Please read [SUPPORT.md](https://github.com/OpenSTEF/.github/blob/main/SUPPORT.md) for how to connect and get into contact with the OpenSTEF project
+ 

{openstef-3.2.28 → openstef-3.4.30}/README.md

@@ -1,12 +1,14 @@
 <!--
-SPDX-FileCopyrightText: 2017-2022 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
+SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
 
 SPDX-License-Identifier: MPL-2.0
 -->
 
-<!-- Github Actions badges -->
-[![Python Build](https://github.com/openstef/openstef/actions/workflows/python-build.yaml/badge.svg)](https://github.com/openstef/openstef/actions/workflows/python-build.yaml)
-[![REUSE Compliance Check](https://github.com/openstef/openstef/actions/workflows/reuse-compliance.yaml/badge.svg)](https://github.com/openstef/openstef/actions/workflows/reuse-compliance.yaml)
+# OpenSTEF
+<!-- Badges -->
+[![Downloads](https://static.pepy.tech/badge/openstef)](https://pepy.tech/project/openstef)
+[![Downloads](https://static.pepy.tech/badge/openstef/month)](https://pepy.tech/project/openstef)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5585/badge)](https://bestpractices.coreinfrastructure.org/projects/5585)
 <!-- SonarCloud badges -->
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=bugs)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
 [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=code_smells)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
@@ -17,21 +19,29 @@ SPDX-License-Identifier: MPL-2.0
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=security_rating)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
 [![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=sqale_index)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=OpenSTEF_openstef&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=OpenSTEF_openstef)
-[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5585/badge)](https://bestpractices.coreinfrastructure.org/projects/5585)
-
-# OpenSTEF
-
-OpenSTEF is a Python package which is used to make short term forecasts for the energy sector. This repository contains all components for the machine learning pipeline required to make a forecast. In order to use the package you need to provide your own data storage and retrieval interface. 
 
-Find the latest information on the project on [the project's website](https://www.lfenergy.org/projects/openstef/).
-
-The `openstef` Python package is available at: https://pypi.org/project/openstef/. 
-
-Documentation is available at: https://openstef.github.io/openstef/index.html. 
-
-You can also watch a [video about OpenSTEF](https://www.lfenergy.org/forecasting-to-create-a-more-resilient-optimized-grid/) instead of reading about the project.
-
-Want to join the discussion? Join our [Teams channel](https://teams.microsoft.com/l/team/19%3ac08a513650524fc988afb296cd0358cc%40thread.tacv2/conversations?groupId=bfcb763a-3a97-4938-81d7-b14512aa537d&tenantId=697f104b-d7cb-48c8-ac9f-bd87105bafdc).
+OpenSTEF is a Python package designed for generating short-term forecasts in the energy sector. The repository includes all the essential components required for machine learning pipelines that facilitate the forecasting process. To utilize the package, users are required to furnish their own data storage and retrieval interface.
+
+# Table of contents
+- [OpenSTEF](#openstef)
+- [Table of contents](#table-of-contents)
+- [External information sources](#external-information-sources)
+- [Installation](#install)
+- [Usage](#usage)
+    - [Example notebooks](#example-notebooks)
+    - [Reference Implementation](#reference-implementation)
+    - [Database connector for OpenSTEF](#database-connector-for-openstef)
+- [License](license)
+- [Contributing](#contributing)
+- [Contact](#contact)
+
+# External information sources
+- [Documentation website](https://openstef.github.io/openstef/index.html);
+- [Python package](https://pypi.org/project/openstef/);
+- [Linux Foundation project page](https://www.lfenergy.org/projects/openstef/);
+- [Documentation on dashboard](https://raw.githack.com/OpenSTEF/.github/main/profile/html/openstef_dashboard_doc.html);
+- [Video about OpenSTEF](https://www.lfenergy.org/forecasting-to-create-a-more-resilient-optimized-grid/);
+- [Teams channel](https://teams.microsoft.com/l/team/19%3ac08a513650524fc988afb296cd0358cc%40thread.tacv2/conversations?groupId=bfcb763a-3a97-4938-81d7-b14512aa537d&tenantId=697f104b-d7cb-48c8-ac9f-bd87105bafdc)
 
 # Installation
 
@@ -41,10 +51,6 @@ Want to join the discussion? Join our [Teams channel](https://teams.microsoft.co
 pip install openstef
 ```
 
-_**Optional**_: if you would like to use the proloaf model with OpenSTEF install the proloaf dependencies by running:
-```shell
-pip install openstef[proloaf]
-```
 ### Remark regarding installation within a **conda environment on Windows**:
 
 A version of the pywin32 package will be installed as a secondary dependency along with the installation of the openstef package. Since conda relies on an old version of pywin32, the new installation can break conda's functionality. The following command can solve this issue:
@@ -55,27 +61,34 @@ For more information on this issue see the [readme of pywin32](https://github.co
 
 # Usage
 
+## Example notebooks
+To help you get started, a set of fundamental example notebooks has been created. You can access these offline examples [here](https://github.com/OpenSTEF/openstef-offline-example).
+
+## Reference Implementation
+A complete implementation including databases, user interface, example data, etc. is available at: https://github.com/OpenSTEF/openstef-reference
+
+![screenshot](https://user-images.githubusercontent.com/60883372/146760483-29af3ac7-62af-4f13-98c7-982a79c517d1.jpg)
+Screenshot of the operational dashboard showing the key functionality of OpenSTEF.
+Dashboard documentation can be found [here](https://raw.githack.com/OpenSTEF/.github/main/profile/html/openstef_dashboard_doc.html).
+
 To run a task use:
 
 ```shell
 python -m openstef task <task_name>
 ```
 
-## Reference Implementation
-A complete implementation including databases, user interface, example data, etc. is available at: https://github.com/OpenSTEF/openstef-reference
-
-![screenshot](https://user-images.githubusercontent.com/60883372/146760483-29af3ac7-62af-4f13-98c7-982a79c517d1.jpg)
-Screenshot of the operational dashboard showing the key functionality of OpenSTEF. 
-Dashboard documentation can be found [here](https://github.com/OpenSTEF/.github/blob/main/profile/README.md).
+## Database connector for openstef
+This repository provides an interface to OpenSTEF (reference) databases. The repository can be found [here](https://github.com/OpenSTEF/openstef-dbc).
 
-## License
+# License
 This project is licensed under the Mozilla Public License, version 2.0 - see LICENSE for details.
 
 ## Licenses third-party libraries
 This project includes third-party libraries, which are licensed under their own respective Open-Source licenses. SPDX-License-Identifier headers are used to show which license is applicable. The concerning license files can be found in the LICENSES directory.
 
-## Contributing
+# Contributing
 Please read [CODE_OF_CONDUCT.md](https://github.com/OpenSTEF/.github/blob/main/CODE_OF_CONDUCT.md), [CONTRIBUTING.md](https://github.com/OpenSTEF/.github/blob/main/CONTRIBUTING.md) and [PROJECT_GOVERNANCE.md](https://github.com/OpenSTEF/.github/blob/main/PROJECT_GOVERNANCE.md) for details on the process for submitting pull requests to us.
 
-## Contact
+# Contact
 Please read [SUPPORT.md](https://github.com/OpenSTEF/.github/blob/main/SUPPORT.md) for how to connect and get into contact with the OpenSTEF project
+ 

{openstef-3.2.28 → openstef-3.4.30}/openstef/__init__.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2017-2022 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
+# SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
 #
 # SPDX-License-Identifier: MPL-2.0
 

openstef-3.4.30/openstef/__main__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
+#
+# SPDX-License-Identifier: MPL-2.0

openstef-3.4.30/openstef/app_settings.py

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
+#
+# SPDX-License-Identifier: MPL-2.0
+
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class AppSettings(BaseSettings):
+    """Global app settings."""
+
+    model_config = SettingsConfigDict(
+        env_prefix="openstef_", env_file=".env", extra="ignore"
+    )
+
+    post_teams_messages: bool = True
+
+    # Logging settings.
+    log_level: str = Field("INFO", description="Log level used for logging statements.")

openstef-3.2.28/openstef/data/dazls_stored.sav.license → openstef-3.4.30/openstef/data/dutch_holidays_2020-2022.csv.license

@@ -1,3 +1,3 @@
-SPDX-FileCopyrightText: 2017-2022 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
+SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
 
 SPDX-License-Identifier: MPL-2.0

openstef-3.4.30/openstef/data/pv_single_coefs.csv.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
+
+SPDX-License-Identifier: MPL-2.0

{openstef-3.2.28/openstef/model → openstef-3.4.30/openstef/data_classes}/__init__.py

@@ -1,3 +1,3 @@
-# SPDX-FileCopyrightText: 2017-2022 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
+# SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
 #
 # SPDX-License-Identifier: MPL-2.0

openstef-3.4.30/openstef/data_classes/data_prep.py

@@ -0,0 +1,99 @@
+# SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
+#
+# SPDX-License-Identifier: MPL-2.0
+"""Specifies the split function dataclass."""
+import inspect
+import json
+from importlib import import_module
+from typing import Any, Sequence, TypeVar, Union
+
+from pydantic.v1 import BaseModel
+
+DataPrepClass = TypeVar("DataPrepClass")
+
+
+class DataPrepDataClass(BaseModel):
+    """Class that allows to specify a custom class to prepare the data (feature engineering , etc ...)."""
+
+    klass: Union[str, type[DataPrepClass]]
+    arguments: Union[
+        str, dict[str, Any]
+    ]  # JSON string holding the function parameters or dict
+
+    def __getitem__(self, key: str):
+        """Allows us to use subscription to get the items from the object."""
+        return getattr(self, key)
+
+    def __setitem__(self, key: str, value: any):
+        """Allows us to use subscription to set the items in the object."""
+        if hasattr(self, key):
+            self.__dict__[key] = value
+        else:
+            raise AttributeError(f"{key} not an attribute of prediction job.")
+
+    def _load_klass(
+        self, required_arguments: Sequence[str] = None
+    ) -> type[DataPrepClass]:
+        """Load data prep class from path.
+
+        Args:
+            klass_path (str): The path to the data prep class
+
+        Returns:
+            klass (type[AbstractDataPreparation]): The loaded data prep class
+
+        """
+        if isinstance(self.klass, str):
+            path_elements = self.klass.split(".")
+            module_path = ".".join(path_elements[:-1])
+            module = import_module(module_path)
+            klass_name = path_elements[-1]
+            klass = getattr(module, klass_name)
+        else:
+            klass = self.klass
+
+        # Check that the klass accepts mandatory arguments
+        if not inspect.isclass(klass):
+            raise ValueError("The loaded object is not a class: {klass!r}")
+
+        if required_arguments is not None:
+            klass_params = set(inspect.signature(klass).parameters)
+
+            if len(set(required_arguments) - klass_params) > 0:
+                raise ValueError(
+                    "The loaded data prep class does not have the required arguments"
+                )
+
+        return klass
+
+    def _load_arguments(self) -> dict[str, Any]:
+        """Load the arguments.
+
+        Convert the arguments from JSON if they are given as strings or simply return them otherwise.
+
+        Returns:
+            arguments (dict[str, Any]): The additional arguments to be passed to the class
+
+        """
+        if isinstance(self.arguments, str):
+            return json.loads(self.arguments)
+        else:
+            return self.arguments
+
+    def load(
+        self, required_arguments: Sequence[str] = None
+    ) -> tuple[type[DataPrepClass], dict[str, Any]]:
+        """Load the function and its arguments.
+
+        If the function and the arguments are given as strings in the instane attributes, load them as Python objects
+        otherwise just return them from the instance attributes.
+
+        Args:
+            required_arguments (list[str]): list of arguments the loaded class must have
+
+        Returns:
+            - class (type[AbstractDataPreparation])
+            - arguments (dict[str, Any])
+
+        """
+        return self._load_klass(required_arguments), self._load_arguments()

{openstef-3.2.28 → openstef-3.4.30}/openstef/data_classes/model_specifications.py

@@ -1,10 +1,10 @@
-# SPDX-FileCopyrightText: 2017-2022 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
+# SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>
 #
 # SPDX-License-Identifier: MPL-2.0
 """Specifies the dataclass for model specifications."""
 from typing import Optional, Union
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 class ModelSpecificationDataClass(BaseModel):

{openstef-3.2.28 → openstef-3.4.30}/openstef/data_classes/prediction_job.py

@@ -1,13 +1,15 @@
-# SPDX-FileCopyrightText: 2017-2022 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
+# SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
 #
 # SPDX-License-Identifier: MPL-2.0
 """Specifies the prediction job dataclass."""
-from typing import List, Optional, Union
+from typing import Optional, Union
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
-from .model_specifications import ModelSpecificationDataClass
-from .split_function import SplitFuncDataClass
+from openstef.data_classes.data_prep import DataPrepDataClass
+from openstef.data_classes.model_specifications import ModelSpecificationDataClass
+from openstef.data_classes.split_function import SplitFuncDataClass
+from openstef.enums import PipelineType
 
 
 class PredictionJobDataClass(BaseModel):
@@ -17,61 +19,65 @@ class PredictionJobDataClass(BaseModel):
     """The predictions job id (often abreviated as pid)."""
     model: str
     """The model type that should be used.
-    
+
     Options are:
         - ``"xgb"``
         - ``"xgb_quantile"``
         - ``"lgb"``
         - ``"linear"``
-        - ``"proloaf"`` (extra dependencies requiered, see README)
-    
+        - ``"linear_quantile"``
+        - ``"xgb_multioutput_quantile"``
+        - ``"flatliner"``
+
     If unsure what to pick, choose ``"xgb"``.
-    
+
     """
+    model_kwargs: Optional[dict]
+    """The model parameters that should be used."""
     forecast_type: str
     """The type of forecasts that should be made.
-    
+
     Options are:
         - ``"demand"``
         - ``"wind"``
-        - ``"basecase"``   
-        
+        - ``"basecase"``
+
     If unsure what to pick, choose ``"demand"``.
-    
+
     """
-    horizon_minutes: int
-    """The horizon of the desired forecast in minutes."""
+    horizon_minutes: Optional[int] = 2880
+    """The horizon of the desired forecast in minutes used in tasks. Defaults to 2880 minutes (i.e. 2 days)."""
     resolution_minutes: int
     """The resolution of the desired forecast in minutes."""
-    lat: float
-    """Latitude of the forecasted location in degrees."""
-    lon: float
-    """Longitude of the forecasted location in degrees."""
+    lat: Optional[float] = 52.132633
+    """Latitude of the forecasted location in degrees. Used for fetching weather data in tasks, calculating derrived features and component splitting."""
+    lon: Optional[float] = 5.291266
+    """Longitude of the forecasted location in degrees. Used for fetching weather data in tasks, calculating derrived features and component splitting."""
     name: str
     """Name of the forecast, e.g. the location name."""
     train_components: Optional[bool]
     """Whether splitting the forecasts in wind, solar, rest is desired."""
     description: Optional[str]
     """Optional description of the prediction job for human reference."""
-    quantiles: Optional[List[float]]
+    quantiles: Optional[list[float]]
     """Quantiles that have to be forecasted."""
     train_split_func: Optional[SplitFuncDataClass]
     """Optional custom splitting function for operational procces."""
     backtest_split_func: Optional[SplitFuncDataClass]
     """Optional custom splitting function for backtesting."""
-    train_horizons_minutes: Optional[List[int]]
+    train_horizons_minutes: Optional[list[int]]
     """List of horizons that should be taken into account during training."""
     default_modelspecs: Optional[ModelSpecificationDataClass]
     """Default model specifications"""
     save_train_forecasts: bool = False
     """Indicate wether the forecasts produced during the training process should be saved."""
-    completeness_treshold: float = 0.5
+    completeness_threshold: float = 0.5
     """Minimum fraction of data that should be available for making a regular forecast."""
     minimal_table_length: int = 100
     """Minimum length (in rows) of the forecast input for making a regular forecast."""
-    flatliner_treshold: int = 24
-    """Number of consecutive values that have to be constant to detect a flatliner. """
-    depends_on: Optional[List[Union[int, str]]]
+    flatliner_threshold_minutes: int = 1440
+    """Number of minutes that the load has to be constant to detect a flatliner. """
+    depends_on: Optional[list[Union[int, str]]]
     """Link to another prediction job on which this prediction job might depend."""
     sid: Optional[str]
     """Only required for create_solar_forecast task"""
@@ -81,6 +87,16 @@ class PredictionJobDataClass(BaseModel):
     """Only required for create_wind_forecast task"""
     hub_height: Optional[float]
     """Only required for create_wind_forecast task"""
+    pipelines_to_run: list[PipelineType] = [
+        PipelineType.TRAIN,
+        PipelineType.HYPER_PARMATERS,
+        PipelineType.FORECAST,
+    ]
+    """The pipelines to run for this pj"""
+    alternative_forecast_model_pid: Optional[Union[int, str]]
+    """The pid that references another prediction job from which the model should be used for making forecasts."""
+    data_prep_class: Optional[DataPrepDataClass]
+    """The import string for the custom data prep class"""
 
     class Config:
         """Pydantic model configuration.

{openstef-3.2.28 → openstef-3.4.30}/openstef/data_classes/split_function.py

@@ -1,13 +1,13 @@
-# SPDX-FileCopyrightText: 2017-2022 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
+# SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
 #
 # SPDX-License-Identifier: MPL-2.0
 """Specifies the split function dataclass."""
 import inspect
 import json
 from importlib import import_module
-from typing import Any, Callable, Dict, Sequence, Tuple, Union
+from typing import Any, Callable, Sequence, Union
 
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 
 class SplitFuncDataClass(BaseModel):
@@ -15,7 +15,7 @@ class SplitFuncDataClass(BaseModel):
 
     function: Union[str, Callable]
     arguments: Union[
-        str, Dict[str, Any]
+        str, dict[str, Any]
     ]  # JSON string holding the function parameters or dict
 
     def __getitem__(self, key: str):
@@ -64,13 +64,13 @@ class SplitFuncDataClass(BaseModel):
 
         return split_func
 
-    def _load_arguments(self) -> Dict[str, Any]:
+    def _load_arguments(self) -> dict[str, Any]:
         """Load the arguments.
 
         Convert the arguments from JSON if they are given as strings or simply return them otherwise.
 
         Returns:
-            arguments (Dict[str, Any]): The additional arguments to be passed to he function
+            arguments (dict[str, Any]): The additional arguments to be passed to he function
 
         """
         if isinstance(self.arguments, str):
@@ -80,18 +80,18 @@ class SplitFuncDataClass(BaseModel):
 
     def load(
         self, required_arguments: Sequence[str] = None
-    ) -> Tuple[Callable, Dict[str, Any]]:
+    ) -> tuple[Callable, dict[str, Any]]:
         """Load the function and its arguments.
 
         If the function and the arguments are given as strings in the instane attributes, load them as Python objects
         otherwise just return them from the instance attributes.
 
         Args:
-            required_arguments (List[str]): list of arguments the loaded function must have
+            required_arguments (list[str]): list of arguments the loaded function must have
 
         Returns:
             - function (Callable)
-            - arguments (Dict[str, Any])
+            - arguments (dict[str, Any])
 
         """
         return self._load_split_function(required_arguments), self._load_arguments()