autopep8 (#33)

authored-by: jarbasai <jarbasai@mailfence.com>

Author: JarbasAl

mycroft/__init__.py

@@ -16,6 +16,7 @@
 import mycroft.configuration
 from mycroft.api import Api
 from mycroft.messagebus.message import Message
+
 # don't require adapt to be installed to import non-skill stuff
 try:
     from mycroft.skills.context import adds_context, removes_context

mycroft/api/__init__.py

@@ -24,7 +24,6 @@
 from mycroft.version import VersionManager
 from mycroft.util import get_arch, connected, LOG
 
-
 _paired_cache = False
 
 
@@ -167,9 +166,10 @@ def get_response(self, response, no_refresh=False):
 
         if 200 <= response.status_code < 300:
             return data
-        elif (not no_refresh and response.status_code == 401 and not
-                response.url.endswith("auth/token") and
-                self.identity.is_expired()):
+        elif all([not no_refresh,
+                  response.status_code == 401,
+                  not response.url.endswith("auth/token"),
+                  self.identity.is_expired()]):
             self.refresh_token()
             return self.send(self.old_params, no_refresh=True)
         raise HTTPError(data, response=response)
@@ -419,7 +419,7 @@ def upload_skills_data(self, data):
             "method": "PUT",
             "path": "/" + UUID + "/skillJson",
             "json": to_send
-            })
+        })
 
 
 class STTApi(Api):

mycroft/audio/services/__init__.py

@@ -1,2 +1 @@
 from ovos_plugin_manager.templates.audio import AudioBackend, RemoteAudioBackend
-

mycroft/audio/speech.py

@@ -23,6 +23,7 @@
 from mycroft.util.log import LOG
 from mycroft.messagebus.message import Message
 from mycroft.tts.remote_tts import RemoteTTSException
+
 try:
     from ovos_tts_plugin_mimic import MimicTTSPlugin
 except ImportError:

mycroft/client/enclosure/generic/__init__.py

@@ -9,4 +9,3 @@
 """
 
 from mycroft.client.enclosure.base import Enclosure as EnclosureGeneric
-

mycroft/client/enclosure/mark1/__init__.py

@@ -49,6 +49,7 @@
 from queue import Queue
 from mycroft.util.file_utils import get_temp_path
 
+
 # The Mark 1 hardware consists of a Raspberry Pi main CPU which is connected
 # to an Arduino over the serial port.  A custom serial protocol sends
 # commands to control various visual elements which are controlled by the

mycroft/client/speech/data_structures.py

@@ -24,6 +24,7 @@ class RollingMean:
     Args:
         mean_samples: Number of samples to use for mean value
     """
+
     def __init__(self, mean_samples):
         self.num_samples = mean_samples
         self.samples = []
@@ -70,13 +71,14 @@ class CyclicAudioBuffer:
         size (int): size in bytes
         initial_data (bytes): initial buffer data
     """
+
     def __init__(self, size, initial_data):
         self.size = size
         # Get at most size bytes from the end of the initial data
         self._buffer = initial_data[-size:]
 
     def clear(self):
-       self._buffer = b'\0' * self.size
+        self._buffer = b'\0' * self.size
 
     def append(self, data):
         """Add new data to the buffer, and slide out data if the buffer is full

mycroft/client/speech/listener.py

@@ -14,30 +14,21 @@
 #
 import time
 from threading import Thread
-import speech_recognition as sr
 import pyaudio
 from pyee import EventEmitter
-from requests import RequestException
-from requests.exceptions import ConnectionError
-
-from mycroft import dialog
 from mycroft.client.speech.hotword_factory import HotWordFactory
 from mycroft.client.speech.mic import MutableMicrophone, ResponsiveRecognizer
 from mycroft.configuration import Configuration
-from mycroft.metrics import MetricsAggregator, Stopwatch, report_timing
+from mycroft.metrics import Stopwatch, report_timing
 from mycroft.session import SessionManager
 from mycroft.stt import STTFactory
-from mycroft.util import connected
 from mycroft.util.log import LOG
 from mycroft.util import find_input_device
 from queue import Queue, Empty
 import json
-from copy import deepcopy
-
 
 MAX_MIC_RESTARTS = 20
 
-
 AUDIO_DATA = 0
 STREAM_START = 1
 STREAM_DATA = 2
@@ -167,7 +158,7 @@ def read(self):
     @staticmethod
     def _audio_length(audio):
         return float(len(audio.frame_data)) / (
-            audio.sample_rate * audio.sample_width)
+                audio.sample_rate * audio.sample_width)
 
     def process(self, audio, lang=None):
         if audio is None:
@@ -281,7 +272,7 @@ def _load_config(self):
         if not device_index and device_name:
             device_index = find_input_device(device_name)
 
-        LOG.debug('Using microphone (None = default): '+str(device_index))
+        LOG.debug('Using microphone (None = default): ' + str(device_index))
 
         self.microphone = MutableMicrophone(device_index, rate,
                                             mute=self.mute_calls > 0)

mycroft/client/speech/mic.py

@@ -49,7 +49,6 @@
     CyclicAudioBuffer
 from mycroft.util import resolve_resource_file
 
-
 WakeWordData = namedtuple('WakeWordData',
                           ['audio', 'found', 'stopped', 'end_audio'])
 
@@ -223,6 +222,7 @@ class NoiseTracker:
         silence_after_loud (float): time of silence to finalize the sentence.
                                     default 0.25 seconds.
     """
+
     def __init__(self, minimum, maximum, sec_per_buffer, loud_time_limit,
                  silence_time_limit, silence_after_loud_time=0.25):
         self.min_level = minimum
@@ -439,11 +439,11 @@ def check_for_hotwords(self, audio_data):
                 yield ww
 
     def _record_phrase(
-        self,
-        source,
-        sec_per_buffer,
-        stream=None,
-        ww_frames=None
+            self,
+            source,
+            sec_per_buffer,
+            stream=None,
+            ww_frames=None
     ):
         """Record an entire spoken phrase.
 
@@ -517,7 +517,7 @@ def write_mic_level(self, energy, source):
                     energy,
                     self.energy_threshold,
                     int(source.muted)
-                    )
+                )
                 )
 
     def _skip_wake_word(self):
@@ -718,7 +718,7 @@ def _wait_until_wake_word(self, source, sec_per_buffer):
         while not said_wake_word and not self._stop_signaled:
             if self._skip_wake_word():
                 return WakeWordData(audio_data, False,
-                                    self._stop_signaled, ww_frames),  \
+                                    self._stop_signaled, ww_frames), \
                        self.config.get("lang", "en-us")
             chunk = self.record_sound_chunk(source)
             audio_buffer.append(chunk)
@@ -754,7 +754,7 @@ def _wait_until_wake_word(self, source, sec_per_buffer):
                     self._handle_hotword_found(hotword, audio_data, source)
                     if listen and not self.loop.state.sleeping:
                         return WakeWordData(audio_data, said_wake_word,
-                            self._stop_signaled, ww_frames), stt_lang
+                                            self._stop_signaled, ww_frames), stt_lang
 
                 if said_hot_word:
                     # reset bytearray to store wake word audio in, else many
@@ -834,8 +834,8 @@ def _adjust_threshold(self, energy, seconds_per_buffer):
         if self.dynamic_energy_threshold and energy > 0:
             # account for different chunk sizes and rates
             damping = (
-                self.dynamic_energy_adjustment_damping ** seconds_per_buffer)
+                    self.dynamic_energy_adjustment_damping ** seconds_per_buffer)
             target_energy = energy * self.energy_ratio
             self.energy_threshold = (
-                self.energy_threshold * damping +
-                target_energy * (1 - damping))
+                    self.energy_threshold * damping +
+                    target_energy * (1 - damping))

mycroft/client/text/__main__.py

@@ -19,10 +19,10 @@
 import curses
 from mycroft.util import get_ipc_directory
 from mycroft.client.text.text_client import (
-        load_settings, save_settings, simple_cli, gui_main,
-        start_log_monitor, start_mic_monitor, connect_to_mycroft,
-        ctrl_c_handler
-    )
+    load_settings, save_settings, simple_cli, gui_main,
+    start_log_monitor, start_mic_monitor, connect_to_mycroft,
+    ctrl_c_handler
+)
 from mycroft.configuration import Configuration, setup_locale
 
 sys.stdout = io.StringIO()