type hints fixes

This commit is contained in:
Yinon Polak 2023-03-20 20:22:28 +02:00
parent c06cd38951
commit a4b617e482
2 changed files with 6 additions and 9 deletions

View File

@ -13,8 +13,7 @@ class PyTorchMLPClassifier(PyTorchClassifier):
This class implements the fit method of IFreqaiModel. This class implements the fit method of IFreqaiModel.
in the fit method we initialize the model and trainer objects. in the fit method we initialize the model and trainer objects.
the only requirement from the model is to be aligned to PyTorchClassifier the only requirement from the model is to be aligned to PyTorchClassifier
predict method that expects the model to predict tensor of type long. predict method that expects the model to predict a tensor of type long.
the trainer defines the training loop.
parameters are passed via `model_training_parameters` under the freqai parameters are passed via `model_training_parameters` under the freqai
section in the config file. e.g: section in the config file. e.g:
@ -37,8 +36,6 @@ class PyTorchMLPClassifier(PyTorchClassifier):
} }
} }
} }
""" """
def __init__( def __init__(
@ -51,15 +48,15 @@ class PyTorchMLPClassifier(PyTorchClassifier):
super().__init__(**kwargs) super().__init__(**kwargs)
config = self.freqai_info.get("model_training_parameters", {}) config = self.freqai_info.get("model_training_parameters", {})
self.learning_rate: float = config.get("learning_rate", learning_rate) self.learning_rate: float = config.get("learning_rate", learning_rate)
self.model_kwargs: Dict[str, any] = config.get("model_kwargs", model_kwargs) self.model_kwargs: Dict[str, Any] = config.get("model_kwargs", model_kwargs)
self.trainer_kwargs: Dict[str, any] = config.get("trainer_kwargs", trainer_kwargs) self.trainer_kwargs: Dict[str, Any] = config.get("trainer_kwargs", trainer_kwargs)
def fit(self, data_dictionary: Dict, dk: FreqaiDataKitchen, **kwargs) -> Any: def fit(self, data_dictionary: Dict, dk: FreqaiDataKitchen, **kwargs) -> Any:
""" """
User sets up the training and test data to fit their desired model here User sets up the training and test data to fit their desired model here
:param data_dictionary: the dictionary constructed by DataHandler to hold :param data_dictionary: the dictionary constructed by DataHandler to hold
all the training and test data/labels. all the training and test data/labels.
:raises ValueError: If self.class_names is not defined in the parent class. :raises ValueError: If self.class_names is empty.
""" """
class_names = self.get_class_names() class_names = self.get_class_names()

View File

@ -49,8 +49,8 @@ class PyTorchMLPRegressor(PyTorchRegressor):
super().__init__(**kwargs) super().__init__(**kwargs)
config = self.freqai_info.get("model_training_parameters", {}) config = self.freqai_info.get("model_training_parameters", {})
self.learning_rate: float = config.get("learning_rate", learning_rate) self.learning_rate: float = config.get("learning_rate", learning_rate)
self.model_kwargs: Dict[str, any] = config.get("model_kwargs", model_kwargs) self.model_kwargs: Dict[str, Any] = config.get("model_kwargs", model_kwargs)
self.trainer_kwargs: Dict[str, any] = config.get("trainer_kwargs", trainer_kwargs) self.trainer_kwargs: Dict[str, Any] = config.get("trainer_kwargs", trainer_kwargs)
def fit(self, data_dictionary: Dict, dk: FreqaiDataKitchen, **kwargs) -> Any: def fit(self, data_dictionary: Dict, dk: FreqaiDataKitchen, **kwargs) -> Any:
""" """