Skip to content

Commit 3e68319

Browse files
committed
more clear naming in handlers
1 parent 5743f1b commit 3e68319

4 files changed

Lines changed: 16 additions & 66 deletions

File tree

vetiver/handlers/base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ def __init__(self, model, ptype_data):
1818
self.ptype_data = ptype_data
1919

2020

21-
def create_description(self):
21+
def describe(self):
2222
"""Create description for model"""
2323
desc = f"{self.model.__class__} model"
2424
return desc
2525

26-
def vetiver_create_meta(
26+
def create_meta(
2727
user: list = None,
2828
version: str = None,
2929
url: str = None,
@@ -34,7 +34,7 @@ def vetiver_create_meta(
3434

3535
return meta
3636

37-
def ptype(self):
37+
def construct_ptype(self):
3838
"""Create data prototype for torch model
3939
4040
Parameters

vetiver/handlers/sklearn.py

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
from vetiver.handlers.base import VetiverHandler
2-
from ..ptype import vetiver_create_ptype
3-
from ..meta import vetiver_meta
4-
51
import pandas as pd
62
import sklearn
73

4+
from .base import VetiverHandler
5+
from ..meta import vetiver_meta
6+
87
class SKLearnHandler(VetiverHandler):
98
"""Handler class for creating VetiverModels with sklearn.
109
@@ -18,13 +17,13 @@ class SKLearnHandler(VetiverHandler):
1817
def __init__(self, model, ptype_data):
1918
super().__init__(model, ptype_data)
2019

21-
def create_description(self):
20+
def describe(self):
2221
"""Create description for sklearn model
2322
"""
2423
desc = f"Scikit-learn {self.model.__class__} model"
2524
return desc
2625

27-
def vetiver_create_meta(
26+
def construct_meta(
2827
user: list = None,
2928
version: str = None,
3029
url: str = None,
@@ -36,30 +35,6 @@ def vetiver_create_meta(
3635

3736
return meta
3837

39-
def ptype(self):
40-
"""Create data prototype for torch model
41-
42-
Parameters
43-
----------
44-
ptype_data : pd.DataFrame, np.ndarray, or None
45-
Training data to create ptype
46-
47-
Returns
48-
-------
49-
ptype : pd.DataFrame or None
50-
Zero-row DataFrame for storing data types
51-
"""
52-
ptype = vetiver_create_ptype(self.ptype_data)
53-
return ptype
54-
55-
def handler_startup():
56-
"""Include required packages for prediction
57-
58-
The `handler_startup` function executes when the API starts. Use this
59-
function for tasks like loading packages.
60-
"""
61-
...
62-
6338

6439
def handler_predict(self, input_data, check_ptype):
6540
"""Generates method for /predict endpoint in VetiverAPI

vetiver/handlers/torch.py

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from vetiver.handlers.base import VetiverHandler
2-
from ..meta import vetiver_meta
3-
from ..ptype import vetiver_create_ptype
41
import numpy as np
52

3+
from .base import VetiverHandler
4+
from ..meta import vetiver_meta
5+
66
torch_exists = True
77
try:
88
import torch
@@ -22,13 +22,13 @@ class TorchHandler(VetiverHandler):
2222
def __init__(self, model, ptype_data):
2323
super().__init__(model, ptype_data)
2424

25-
def create_description(self):
25+
def describe(self):
2626
"""Create description for torch model
2727
"""
2828
desc = f"Pytorch model of type {type(self.model)}"
2929
return desc
3030

31-
def vetiver_create_meta(
31+
def create_meta(
3232
user: list = None,
3333
version: str = None,
3434
url: str = None,
@@ -41,31 +41,6 @@ def vetiver_create_meta(
4141

4242
return meta
4343

44-
def ptype(self):
45-
"""Create data prototype for torch model
46-
47-
Parameters
48-
----------
49-
ptype_data : pd.DataFrame, np.ndarray, or None
50-
Training data to create ptype
51-
52-
Returns
53-
-------
54-
ptype : pd.DataFrame or None
55-
Zero-row DataFrame for storing data types
56-
"""
57-
ptype = vetiver_create_ptype(self.ptype_data)
58-
59-
return ptype
60-
61-
def handler_startup():
62-
"""Include required packages for prediction
63-
64-
The `handler_startup` function executes when the API starts. Use this
65-
function for tasks like loading packages.
66-
"""
67-
...
68-
6944
def handler_predict(self, input_data, check_ptype):
7045
"""Generates method for /predict endpoint in VetiverAPI
7146

vetiver/vetiver_model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ def __init__(
6060
translator = create_handler(model, ptype_data)
6161

6262
self.model = translator.model
63-
self.ptype = translator.ptype()
63+
self.ptype = translator.construct_ptype()
6464
self.model_name = model_name
65-
self.description = description if description else translator.create_description()
65+
self.description = description if description else translator.describe()
6666
self.versioned = versioned
67-
self.metadata = translator.vetiver_create_meta(
67+
self.metadata = translator.create_meta(
6868
metadata, required_pkgs=["vetiver"]
6969
)
7070
self.handler_predict = translator.handler_predict

0 commit comments

Comments
 (0)