Merge pull request #27 from fhswf/updates

Refact: API cleanup - Export lists __all__

Author: detlefarend

.zenodo.json

@@ -0,0 +1,37 @@
+{
+  "title": "MLPro-Int-scikit-learn - Integration of scikit-learn into MLPro",
+  "description": "This repository provides wrapper classes that enable the use of selected scikit-learn functionalities in your MLPro applications.",
+  "creators": [
+    {
+      "name": "Arend, Detlef",
+      "affiliation": "South Westphalia University of Applied Sciences, Germany",
+      "orcid": "0000-0002-8315-2346"
+    },
+    {
+      "name": "Yuwono, Steve",
+      "affiliation": "South Westphalia University of Applied Sciences, Germany",
+      "orcid": "0000-0001-7570-2726"
+    },
+    {
+      "name": "Kumar, Syamraj Purushamparambil Satheesh",
+      "affiliation": "South Westphalia University of Applied Sciences, Germany"
+    }
+  ],
+  "license": "Apache-2.0",
+  "upload_type": "software",
+  "keywords": [
+    "online machine learning",
+    "Python",
+    "MLPro",
+    "scikit-learn",
+    "framework",
+    "open source"
+  ],
+  "communities": [
+    {
+      "identifier": "mlpro"
+    }
+  ],
+  "language": "eng",
+  "access_right": "open"
+}

src/mlpro_int_sklearn/__init__.py

@@ -1 +1 @@
-from mlpro_int_sklearn.wrappers import *
+from .wrappers import *

src/mlpro_int_sklearn/wrappers/__init__.py

@@ -1,3 +1,3 @@
-from mlpro_int_sklearn.wrappers.basics import *
-from mlpro_int_sklearn.wrappers.streams import *
-from mlpro_int_sklearn.wrappers.anomalydetectors import *
+from .basics import *
+from .streams import *
+from .anomalydetectors import *

src/mlpro_int_sklearn/wrappers/anomalydetectors/__init__.py

@@ -1 +1 @@
-from mlpro_int_sklearn.wrappers.anomalydetectors.basics import WrAnomalyDetectorSklearn2MLPro
+from .basics import *

src/mlpro_int_sklearn/wrappers/anomalydetectors/basics.py

@@ -19,10 +19,11 @@
 ## -- 2025-05-30  2.2.0     DA/DS    Alignment with MLPro 2.0.2
 ## -- 2025-06-12  2.3.0     DA/DS    - Alignment with MLPro 2.0.2
 ## --                                - Rework and optimization
+## -- 2025-07-23  2.4.0     DA       Refactoring 
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 2.3.0 (2025-06-12)
+Ver. 2.4.0 (2025-07-23)
 
 This module provides wrapper root classes from Scikit-learn to MLPro, specifically for anomaly detectors. 
 
@@ -34,8 +35,7 @@
 import numpy as np
 from sklearn.base import OutlierMixin
 
-from mlpro.bf.various import Log
-from mlpro.bf.exceptions import ParamError
+from mlpro.bf import Log, ParamError
 from mlpro.bf.streams import StreamTask, Instance
 from mlpro.oa.streams.tasks.changedetectors.anomalydetectors.instancebased import AnomalyDetectorIBPG
 from mlpro.oa.streams.tasks.changedetectors.anomalydetectors.anomalies.instancebased import PointAnomaly
@@ -44,6 +44,12 @@
 
 
 
+# Export list for public API
+__all__ = [ 'WrAnomalyDetectorSklearn2MLPro' ]
+
+
+
+
 ## -------------------------------------------------------------------------------------------------
 ## -------------------------------------------------------------------------------------------------
 class WrAnomalyDetectorSklearn2MLPro (AnomalyDetectorIBPG, WrapperSklearn):

src/mlpro_int_sklearn/wrappers/basics.py

@@ -8,10 +8,11 @@
 ## -- 2024-02-16  1.0.0     DA       First version
 ## -- 2024-04-18  1.1.0     DA       Alignment ot MLPro 1.4.0
 ## -- 2025-03-05  1.2.0     DA       Update of minimum release of scikit-learn to 1.6.1
+## -- 2025-07-23  1.3.0     DA       Refactoring 
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 1.2.0 (2025-03-05)
+Ver. 1.3.0 (2025-07-23)
 
 This module contains the abstract root class for all scikit-learn wrapper classes.
 
@@ -25,6 +26,11 @@
 
 
 
+# Export list for public API
+__all__ = [ 'WrapperSklearn' ]
+
+
+
 
 ## -------------------------------------------------------------------------------------------------
 ## -------------------------------------------------------------------------------------------------

src/mlpro_int_sklearn/wrappers/streams.py

@@ -17,10 +17,12 @@
 ## -- 2022-12-13  1.3.2     DA       Bugfix
 ## -- 2023-06-09  1.4.0     DA       Made the wrapper a sub-package
 ## -- 2024-02-16  1.5.0     DA       Refactoring
+## -- 2024-02-16  1.6.0     DA       Refactoring
+## -- 2025-07-23  1.7.0     DA       Refactoring 
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 1.5.0 (2024-02-16)
+Ver. 1.7.0 (2025-07-23)
 
 This module provides wrapper functionalities to incorporate public data sets of the scikit-learn ecosystem.
 
@@ -30,11 +32,20 @@
 """
 
 
-from mlpro_int_sklearn.wrappers import WrapperSklearn
-from mlpro.bf.streams import *
-from mlpro.bf.math import *
-from sklearn import datasets as sklearn_datasets
 import numpy
+from sklearn import datasets as sklearn_datasets
+
+from mlpro.bf import Log, Mode
+from mlpro.bf.various import ScientificObject
+from mlpro.bf.math import *
+from mlpro.bf.streams import *
+
+from mlpro_int_sklearn.wrappers import WrapperSklearn
+
+
+
+# Export list for public API
+__all__ = [ 'WrStreamProviderSklearn' ]
 
 
 

test/howtos/bf/howto_bf_streams_001_accessing_data_from_scikitlearn.py

@@ -32,8 +32,10 @@
 """
 
 
+from datetime import datetime
+
 from mlpro_int_sklearn import *
-from mlpro.bf.various import Log
+from mlpro.bf import Log