Skip to content

Commit

Permalink
refactor: rename hcn to go_bot
Browse files Browse the repository at this point in the history
  • Loading branch information
vikmary committed Jan 29, 2018
1 parent 5cda841 commit bff01fe
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 65 deletions.
5 changes: 3 additions & 2 deletions deeppavlov/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from deeppavlov.models.trackers.hcn_et import EntityTracker
from deeppavlov.skills.dummy_skill.dummy import DummySkill
from deeppavlov.core.data.vocab import DefaultVocabulary
from deeppavlov.skills.hcn_new.hcn import HybridCodeNetworkModel
from deeppavlov.skills.hcn_new.tracker import FeaturizedTracker
from deeppavlov.skills.go_bot.go_bot import GoalOrientedBot
from deeppavlov.skills.go_bot.network import GoalOrientedBotNetwork
from deeppavlov.skills.go_bot.tracker import FeaturizedTracker
from deeppavlov.vocabs.typos import StaticDictionary, Wiki100KDictionary, RussianWordsVocab
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@
},
"model": {
"train_now": true,
"name": "hcn_new",
"name": "go_bot",
"debug": 0,
"num_epochs": 120,
"val_patience": 5,
"template_path": "../data/dstc2/dstc2-templates.txt",
"network": {
"train_now": true,
"load_path": "../download/go_hcn_rnn/model",
"save_path": "../download/go_hcn_rnn/model",
"name": "custom_rnn",
"load_path": "../download/go_bot_rnn/model",
"save_path": "../download/go_bot_rnn/model",
"name": "go_bot_rnn",
"learning_rate": 0.02,
"hidden_dim": 128,
"obs_size": 830,
Expand Down Expand Up @@ -141,14 +141,7 @@
"bow_encoder": {
"name": "bow"
},
"embedder": {
"name": "fasttext",
"emb_module": "pyfasttext",
"mean": true,
"dim": 300,
"save_path": "../data/embeddings/wiki.en.bin",
"load_path": "../data/embeddings/wiki.en.bin"
},
"embedder": null,
"tokenizer": {
"name": "spacy_tokenizer"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@
from deeppavlov.models.ner.slotfill import DstcSlotFillingNetwork
from deeppavlov.models.tokenizers.spacy_tokenizer import SpacyTokenizer
from deeppavlov.models.trackers.default_tracker import DefaultTracker
from deeppavlov.skills.hcn_new.metrics import DialogMetrics
from deeppavlov.skills.hcn_new.network import HybridCodeNetworkModel
from deeppavlov.skills.hcn_new.templates import Templates, DualTemplate
from deeppavlov.skills.go_bot.metrics import DialogMetrics
from deeppavlov.skills.go_bot.network import GoalOrientedBotNetwork
from deeppavlov.skills.go_bot.templates import Templates, DualTemplate
from deeppavlov.core.common.attributes import check_attr_true


@register("hcn_new")
class HybridCodeNetworkBot(Inferable, Trainable):
@register("go_bot")
class GoalOrientedBot(Inferable, Trainable):
def __init__(self, template_path, vocabs,
template_type: Type = DualTemplate,
bow_encoder: Type = BoW_encoder,
tokenizer: Type = SpacyTokenizer,
tracker: Type = DefaultTracker,
network: Type = HybridCodeNetworkModel,
network: Type = GoalOrientedBotNetwork,
embedder=None,
slot_filler=None,
intent_classifier=None,
Expand Down Expand Up @@ -89,7 +89,7 @@ def __init__(self, template_path, vocabs,
# 'obs_size': 4 + len(self.word_vocab) + self.embedder.dim +\
# self.tracker.num_features + self.n_actions + self.n_intents
# }
# self.network = HybridCodeNetworkModel(opt)
# self.network = GoalOrientedBotNetwork(opt)

def _encode_context(self, context, db_result=None):
# tokenize input
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
from deeppavlov.core.models.tf_model import TFModel


@register('custom_rnn')
class HybridCodeNetworkModel(TFModel):
@register('go_bot_rnn')
class GoalOrientedBotNetwork(TFModel):

def __init__(self, **params):
self.opt = params
Expand Down
File renamed without changes.
File renamed without changes.
42 changes: 0 additions & 42 deletions deeppavlov/skills/hcn_new/intent_config.json

This file was deleted.

0 comments on commit bff01fe

Please sign in to comment.