privatize other code

Author: Rpan4853

tests/labeling/test_data_labeler.py

@@ -2,7 +2,7 @@
 
 import featuretools as ft
 
-from zephyr_ml.labeling import DataLabeler
+from zephyr_ml._labeling.data_labeler import DataLabeler
 
 
 class TestDataLabeler:

tests/labeling/test_helpers.py

@@ -2,7 +2,7 @@
 import numpy as np
 import pandas as pd
 
-from zephyr_ml.labeling.utils import (
+from zephyr_ml._labeling.utils import (
     aggregate_by_column, categorical_presence, denormalize, greater_than, keyword_in_text,
     merge_binary_labeling_functions, total_duration)
 

tests/test_entityset.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import pytest
 
-from zephyr_ml import _create_entityset
+from zephyr_ml._entityset import create_entityset
 
 
 @pytest.fixture
@@ -120,11 +120,11 @@ def scada_dfs(base_dfs):
 
 
 def create_pidata_entityset(pidata_dfs):
-    return _create_entityset(pidata_dfs, es_type="pidata")
+    return create_entityset(pidata_dfs, es_type="pidata")
 
 
 def create_scada_entityset(scada_dfs):
-    return _create_entityset(scada_dfs, es_type="scada")
+    return create_entityset(scada_dfs, es_type="scada")
 
 
 def test_create_pidata_missing_entities(pidata_dfs):

tests/test_feature_engineering.py

@@ -1,8 +1,8 @@
 import pandas as pd
 import pytest
 
-from zephyr_ml import _create_entityset
-from zephyr_ml.feature_engineering import process_signals
+from zephyr_ml._entityset import create_entityset
+from zephyr_ml._feature_engineering import process_signals
 
 
 @pytest.fixture
@@ -122,12 +122,12 @@ def scada_dfs(base_dfs):
 
 @pytest.fixture
 def pidata_es(pidata_dfs):
-    return _create_entityset(pidata_dfs, "pidata")
+    return create_entityset(pidata_dfs, "pidata")
 
 
 @pytest.fixture
 def scada_es(scada_dfs):
-    return _create_entityset(scada_dfs, "scada")
+    return create_entityset(scada_dfs, "scada")
 
 
 @pytest.fixture
@@ -153,8 +153,8 @@ def test_process_signals_pidata(pidata_es, transformations, aggregations):
     replace_dataframe = False
     before = pidata_es['pidata'].copy()
 
-    process_signals(pidata_es, signal_dataframe_name, signal_column, transformations, aggregations,
-                    window_size, replace_dataframe)
+    process_signals(pidata_es, signal_dataframe_name, signal_column, transformations,
+                    aggregations, window_size, replace_dataframe)
 
     processed = pidata_es['pidata_processed'].copy()
     after = pidata_es['pidata'].copy()
@@ -189,8 +189,8 @@ def test_process_signals_pidata_replace(
     window_size = '1m'
     replace_dataframe = True
 
-    process_signals(pidata_es, signal_dataframe_name, signal_column, transformations, aggregations,
-                    window_size, replace_dataframe)
+    process_signals(pidata_es, signal_dataframe_name, signal_column, transformations,
+                    aggregations, window_size, replace_dataframe)
 
     processed = pidata_es['pidata'].copy()
 
@@ -224,8 +224,8 @@ def test_process_signals_scada(scada_es, transformations, aggregations):
     replace_dataframe = False
     before = scada_es['scada'].copy()
 
-    process_signals(scada_es, signal_dataframe_name, signal_column, transformations, aggregations,
-                    window_size, replace_dataframe)
+    process_signals(scada_es, signal_dataframe_name, signal_column, transformations,
+                    aggregations, window_size, replace_dataframe)
 
     expected = pd.DataFrame({
         "_index": [0, 1, 2],
@@ -256,8 +256,8 @@ def test_process_signals_scada_replace(
     window_size = '1m'
     replace_dataframe = True
 
-    process_signals(scada_es, signal_dataframe_name, signal_column, transformations, aggregations,
-                    window_size, replace_dataframe)
+    process_signals(scada_es, signal_dataframe_name, signal_column, transformations,
+                    aggregations, window_size, replace_dataframe)
 
     expected = pd.DataFrame({
         "_index": [0, 1, 2],

tests/test_guide.py

@@ -1,4 +1,4 @@
-from zephyr_ml.core import GuideHandler, guide
+from zephyr_ml._guide_handler import GuideHandler, guide
 
 
 class DummyObject:

tests/test_metadata.py

@@ -1,6 +1,6 @@
 import pytest
 
-from zephyr_ml.metadata import DEFAULT_ES_KWARGS, DEFAULT_ES_TYPE_KWARGS, get_mapped_kwargs
+from zephyr_ml._metadata import DEFAULT_ES_KWARGS, DEFAULT_ES_TYPE_KWARGS, get_mapped_kwargs
 
 
 def test_default_scada_mapped_kwargs():

zephyr_ml/__init__.py

@@ -9,8 +9,6 @@
 import os
 
 from zephyr_ml.core import Zephyr
-from zephyr_ml.entityset import VALIDATE_DATA_FUNCTIONS, _create_entityset
-from zephyr_ml.labeling import DataLabeler
 
 MLBLOCKS_PRIMITIVES = os.path.join(
     os.path.dirname(__file__), "primitives", "jsons")

zephyr_ml/entityset.py renamed to zephyr_ml/_entityset.py

@@ -2,7 +2,7 @@
 
 import featuretools as ft
 
-from zephyr_ml.metadata import get_mapped_kwargs
+from zephyr_ml._metadata import get_mapped_kwargs
 
 
 def _validate_data(dfs, es_type, es_kwargs):
@@ -159,7 +159,7 @@ def validate_vibrations_data(dfs, new_kwargs_mapping=None):
 }
 
 
-def _create_entityset(entities, es_type, new_kwargs_mapping=None):
+def create_entityset(entities, es_type, new_kwargs_mapping=None):
 
     validate_func = VALIDATE_DATA_FUNCTIONS[es_type]
     es_kwargs = validate_func(entities, new_kwargs_mapping)