Skip to content
This repository was archived by the owner on Apr 15, 2022. It is now read-only.

Commit b62e8a4

Browse files
Ben Epsteinabaveja313
andauthored
Dbaas 4217 (DBAAS-4377) (#78)
* DBAAS-4217: Updated Pysplice logging to use mlmodel * DBAAS-4217: Reverted Spark2.2 Changes * more testing * DBAAS-4217: more testing 2 * more testinfg 3 * fixed bytearray bug * DBAAS-4217: some new 🐹 * DBAAS-4217: some new stuff * DBAAS-4217: ben is that goat * DBAAS-4217: ben is the goat * DBAAS-4217: some new stuff * DBAAS-4217: Removed mlruns * fixed logging bugs * Added DB Deploy and cleaned up and added k8s * fixed df bool check * added k8s deploy to targets * added reference table * fixed api endpoint * fixed delay on rt log watching * fixed api endpoint * better algorithm for log streaming * testing log watching from ip * fixed watch logs * fixed some new stuff * auto login * logs * pickle Co-authored-by: Amrit Baveja <[email protected]>
1 parent 7b24863 commit b62e8a4

File tree

15 files changed

+360
-2831
lines changed

15 files changed

+360
-2831
lines changed

docs/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
# -- Path setup --------------------------------------------------------------
88

9+
import inspect
910
# If extensions (or modules to document with autodoc) are in another directory,
1011
# add these directories to sys.path here. If the directory is relative to the
1112
# documentation root, use os.path.abspath to make it absolute, like shown here.
1213
#
1314
import os
1415
import sys
15-
import inspect
16+
1617
sys.path.insert(0, os.path.abspath('..'))
1718

1819

requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
py4j==0.10.7
1+
py4j==0.10.7.0
22
pytest==5.1.3
3-
mlflow==1.6.0
3+
mlflow==1.8.0
4+
pyyaml==5.3.1
45
mleap==0.15.0
56
graphviz==0.13
67
requests
@@ -15,3 +16,4 @@ pyspark
1516
h2o-pysparkling-2.4==3.28.1.2-1
1617
sphinx-tabs
1718
IPython
19+
cloudpickle==1.6.0

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
limitations under the License.
1515
"""
1616

17-
from setuptools import setup, find_packages
17+
from setuptools import find_packages, setup
1818

1919
REQUIREMENTS_FILE = "requirements.txt"
2020

splicemachine.egg-info/PKG-INFO

Lines changed: 0 additions & 1317 deletions
This file was deleted.

splicemachine.egg-info/SOURCES.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

splicemachine.egg-info/dependency_links.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

splicemachine.egg-info/requires.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

splicemachine.egg-info/top_level.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

splicemachine/mlflow_support/constants.py

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,4 @@
1-
from enum import Enum
2-
3-
# When storing models for in-DB deployment, we save the model with a name.
4-
class DBLibraries():
5-
MLeap = 'mleap'
6-
H2OMOJO = 'h2omojo'
7-
SKLearn = 'sklearn'
8-
Keras = 'keras'
9-
SUPPORTED_LIBRARIES = [MLeap, H2OMOJO, SKLearn, Keras]
10-
11-
class H2OModelType(Enum): # Based off https://github.com/h2oai/h2o-3/blob/master/h2o-genmodel/src/main/java/hex/ModelCategory.java
12-
REGRESSION = 0 # Models that return a single Double value (Regression, HGLMRegression)
13-
SINGULAR = 1 # Models that return a single Int value (Clustering)
14-
CLASSIFICATION = 2 # Models that only return N classes with values associated (Binomial, Multinomial, Ordinal)
15-
KEY_VALUE = 3 # Models whose output labels are known (AutoEncoder, TargetEncoder, DimReduction, WordEmbedding, AnomalyDetection)
16-
17-
18-
class SparkModelType(Enum):
19-
"""
20-
Model types for MLeap Deployment to DB
21-
"""
22-
CLASSIFICATION = 0
23-
REGRESSION = 1
24-
CLUSTERING_WITH_PROB = 2
25-
CLUSTERING_WO_PROB = 3
26-
27-
class SklearnModelType(Enum):
28-
"""
29-
Model Types for SKLearn models
30-
Sklearn isn't as well defined in their model categories, so we are going to classify them by their return values
31-
"""
32-
REGRESSION = 0
33-
POINT_PREDICTION_CLF = 1
34-
KEY_VALUE = 2
35-
36-
class KerasModelType(Enum):
37-
"""
38-
Model Types for SKLearn models
39-
Sklearn isn't as well defined in their model categories, so we are going to classify them by their return values
40-
"""
41-
REGRESSION = 0
42-
KEY_VALUE = 1
43-
44-
45-
class FileExtensions():
1+
class FileExtensions:
462
"""
473
Class containing names for
484
valid File Extensions
@@ -63,6 +19,7 @@ def get_valid() -> tuple:
6319
FileExtensions.spark, FileExtensions.keras, FileExtensions.h2o, FileExtensions.sklearn
6420
)
6521

22+
6623
class ModelStatuses():
6724
"""
6825
Class containing names

0 commit comments

Comments
 (0)