Skip to content

Commit

Permalink
Fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
Adrien Ball committed Jan 24, 2018
1 parent 3cdb375 commit e7c365a
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 27 deletions.
6 changes: 4 additions & 2 deletions snips_nlu/data_augmentation.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from __future__ import unicode_literals
from builtins import next

from copy import deepcopy
from itertools import cycle

from builtins import next

from snips_nlu.builtin_entities import is_builtin_entity
from snips_nlu.constants import (UTTERANCES, DATA, ENTITY, TEXT, INTENTS,
ENTITIES, CAPITALIZE)
Expand Down Expand Up @@ -67,7 +68,8 @@ def get_contexts_iterator(dataset, intent_name, random_state):
def get_entities_iterators(intent_entities, random_state):
entities_its = dict()
for entity_name, entity in intent_entities.items():
shuffled_values = random_state.permutation(list(entity[UTTERANCES].keys()))
shuffled_values = random_state.permutation(
list(entity[UTTERANCES].keys()))
entities_its[entity_name] = cycle(shuffled_values)
return entities_its

Expand Down
3 changes: 2 additions & 1 deletion snips_nlu/intent_classifier/intent_classifier.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from abc import ABCMeta, abstractmethod

from snips_nlu.pipeline.processing_unit import ProcessingUnit
from future.utils import with_metaclass

from snips_nlu.pipeline.processing_unit import ProcessingUnit


class IntentClassifier(with_metaclass(ABCMeta, ProcessingUnit)):
@abstractmethod
Expand Down
19 changes: 10 additions & 9 deletions snips_nlu/intent_classifier/log_reg_classifier_utils.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from __future__ import unicode_literals
from __future__ import division
from builtins import str
from builtins import zip
from builtins import next
from builtins import range
from __future__ import unicode_literals

import itertools
import re
from builtins import next
from builtins import range
from builtins import str
from builtins import zip
from copy import deepcopy
from uuid import uuid4

import itertools
import numpy as np

from snips_nlu.builtin_entities import is_builtin_entity
Expand All @@ -20,7 +20,7 @@
from snips_nlu.resources import get_noises
from snips_nlu.tokenization import tokenize_light

NOISE_NAME = str(uuid4()).decode()
NOISE_NAME = str(uuid4())
WORD_REGEX = re.compile(r"\w+(\s+\w+)*")
UNKNOWNWORD_REGEX = re.compile(r"%s(\s+%s)*" % (UNKNOWNWORD, UNKNOWNWORD))

Expand Down Expand Up @@ -48,7 +48,9 @@ def get_noise_it(noise, mean_length, std_length, random_state):
it = itertools.cycle(noise)
while True:
noise_length = int(random_state.normal(mean_length, std_length))
# pylint: disable=stop-iteration-return
yield " ".join(next(it) for _ in range(noise_length))
# pylint: enable=stop-iteration-return


def generate_smart_noise(augmented_utterances, replacement_string, language):
Expand Down Expand Up @@ -116,8 +118,7 @@ def build_training_data(dataset, language, data_augmentation_config,

augmented_utterances = []
utterance_classes = []
for nb_utterance, intent_name in itertools.izip(nb_utterances,
intents.keys()):
for nb_utterance, intent_name in zip(nb_utterances, intents.keys()):
min_utterances_to_generate = max(
data_augmentation_config.min_utterances, nb_utterance)
utterances = augment_utterances(
Expand Down
3 changes: 2 additions & 1 deletion snips_nlu/intent_parser/intent_parser.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from abc import ABCMeta, abstractmethod

from snips_nlu.pipeline.processing_unit import ProcessingUnit
from future.utils import with_metaclass

from snips_nlu.pipeline.processing_unit import ProcessingUnit


class IntentParser(with_metaclass(ABCMeta, ProcessingUnit)):
@abstractmethod
Expand Down
5 changes: 3 additions & 2 deletions snips_nlu/pipeline/configs/config.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from builtins import object
from abc import ABCMeta, abstractmethod
from builtins import object

from snips_nlu.utils import classproperty
from future.utils import with_metaclass

from snips_nlu.utils import classproperty


class Config(with_metaclass(ABCMeta, object)):
@abstractmethod
Expand Down
3 changes: 3 additions & 0 deletions snips_nlu/pipeline/configs/intent_classifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def from_dict(cls, obj_dict):


class IntentClassifierConfig(ProcessingUnitConfig):
# pylint: disable=super-init-not-called
def __init__(self, data_augmentation_config=None, featurizer_config=None,
random_seed=None):
if data_augmentation_config is None:
Expand All @@ -54,6 +55,8 @@ def __init__(self, data_augmentation_config=None, featurizer_config=None,
self.featurizer_config = featurizer_config
self.random_seed = random_seed

# pylint: enable=super-init-not-called

@property
def data_augmentation_config(self):
return self._data_augmentation_config
Expand Down
6 changes: 6 additions & 0 deletions snips_nlu/pipeline/configs/intent_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@


class ProbabilisticIntentParserConfig(ProcessingUnitConfig):
# pylint: disable=super-init-not-called
def __init__(self, intent_classifier_config=None, slot_filler_config=None):
if intent_classifier_config is None:
intent_classifier_config = IntentClassifierConfig()
Expand All @@ -18,6 +19,8 @@ def __init__(self, intent_classifier_config=None, slot_filler_config=None):
self.slot_filler_config = get_processing_unit_config(
slot_filler_config)

# pylint: enable=super-init-not-called

@classproperty
def unit_name(cls): # pylint:disable=no-self-argument
from snips_nlu.intent_parser.probabilistic_intent_parser import \
Expand All @@ -41,10 +44,13 @@ def from_dict(cls, obj_dict):


class DeterministicIntentParserConfig(ProcessingUnitConfig):
# pylint: disable=super-init-not-called
def __init__(self, max_queries=50, max_entities=200):
self.max_queries = max_queries
self.max_entities = max_entities

# pylint: enable=super-init-not-called

@classproperty
def unit_name(cls): # pylint:disable=no-self-argument
from snips_nlu.intent_parser.deterministic_intent_parser import \
Expand Down
8 changes: 6 additions & 2 deletions snips_nlu/pipeline/configs/nlu_engine.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from builtins import map
from copy import deepcopy

from builtins import map

from snips_nlu.pipeline.configs.config import ProcessingUnitConfig
from snips_nlu.pipeline.configs.intent_parser import (
ProbabilisticIntentParserConfig, DeterministicIntentParserConfig)
Expand All @@ -9,14 +10,17 @@


class NLUEngineConfig(ProcessingUnitConfig):
# pylint: disable=super-init-not-called
def __init__(self, intent_parsers_configs=None):
if intent_parsers_configs is None:
intent_parsers_configs = [
DeterministicIntentParserConfig(),
ProbabilisticIntentParserConfig()
]
self.intent_parsers_configs = list(map(get_processing_unit_config,
intent_parsers_configs))
intent_parsers_configs))

# pylint: enable=super-init-not-called

@classproperty
def unit_name(cls): # pylint:disable=no-self-argument
Expand Down
3 changes: 3 additions & 0 deletions snips_nlu/pipeline/configs/slot_filler.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def _default_entities_offsets():


class CRFSlotFillerConfig(ProcessingUnitConfig):
# pylint: disable=super-init-not-called
def __init__(self, feature_factory_configs=None,
tagging_scheme=TaggingScheme.BIO, crf_args=None,
entities_offsets=None,
Expand All @@ -55,6 +56,8 @@ def __init__(self, feature_factory_configs=None,
self.data_augmentation_config = data_augmentation_config
self.random_seed = random_seed

# pylint: enable=super-init-not-called

@property
def tagging_scheme(self):
return self._tagging_scheme
Expand Down
5 changes: 3 additions & 2 deletions snips_nlu/pipeline/processing_unit.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from builtins import object
from abc import ABCMeta, abstractmethod
from builtins import object

from future.utils import with_metaclass

from snips_nlu.pipeline.configs.config import ProcessingUnitConfig
from snips_nlu.utils import classproperty
from future.utils import with_metaclass


class ProcessingUnit(with_metaclass(ABCMeta, object)):
Expand Down
6 changes: 3 additions & 3 deletions snips_nlu/slot_filler/feature_factory.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from __future__ import unicode_literals
from builtins import map
from builtins import object

from abc import ABCMeta, abstractmethod
from builtins import map
from builtins import object

from future.utils import with_metaclass
from nlu_utils import normalize

from snips_nlu.builtin_entities import get_builtin_entities, \
Expand All @@ -18,7 +19,6 @@
from snips_nlu.slot_filler.features_utils import get_word_chunk, get_shape, \
get_all_ngrams, initial_string_from_tokens, entity_filter, \
get_intent_custom_entities
from future.utils import with_metaclass


class CRFFeatureFactory(with_metaclass(ABCMeta, object)):
Expand Down
3 changes: 2 additions & 1 deletion snips_nlu/slot_filler/slot_filler.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from abc import ABCMeta, abstractmethod

from snips_nlu.pipeline.processing_unit import ProcessingUnit
from future.utils import with_metaclass

from snips_nlu.pipeline.processing_unit import ProcessingUnit


class SlotFiller(with_metaclass(ABCMeta, ProcessingUnit)):
@abstractmethod
Expand Down
3 changes: 1 addition & 2 deletions snips_nlu/tests/test_crf_slot_filler.py
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,7 @@ def test_filter_overlapping_builtins(self):
language = Language.EN
text = "Find me a flight before 10pm and after 8pm"
tokens = tokenize(text, language)
tags = ['O' for _ in range(5)] + ['B-flight'] + ['O' for _ in
range(3)]
tags = ['O' for _ in range(5)] + ['B-flight'] + ['O' for _ in range(3)]
tagging_scheme = TaggingScheme.BIO
builtin_entities = [
{
Expand Down
2 changes: 1 addition & 1 deletion snips_nlu/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def check_random_state(seed):
# pylint: disable=W0212
# pylint: disable=c-extension-no-member
if seed is None or seed is np.random:
return np.random.mtrand._rand
return np.random.mtrand._rand # pylint: disable=c-extension-no-member
if isinstance(seed, (numbers.Integral, np.integer)):
return np.random.RandomState(seed)
if isinstance(seed, np.random.RandomState):
Expand Down
2 changes: 1 addition & 1 deletion tools/pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ enable=indexing-exception,old-raise-syntax
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
disable=design,similarities,no-self-use,attribute-defined-outside-init,locally-disabled,star-args,pointless-except,bad-option-value,global-statement,fixme,suppressed-message,useless-suppression,locally-enabled,no-member,no-name-in-module,import-error,unsubscriptable-object,unbalanced-tuple-unpacking,undefined-variable,not-context-manager,missing-docstring,cyclic-import
disable=design,similarities,no-self-use,attribute-defined-outside-init,locally-disabled,star-args,pointless-except,bad-option-value,global-statement,fixme,suppressed-message,useless-suppression,locally-enabled,no-member,no-name-in-module,import-error,unsubscriptable-object,unbalanced-tuple-unpacking,undefined-variable,not-context-manager,missing-docstring,cyclic-import,redefined-builtin


# Set the cache size for astng objects.
Expand Down

0 comments on commit e7c365a

Please sign in to comment.