Skip to content
This repository has been archived by the owner on Nov 20, 2024. It is now read-only.

Commit

Permalink
fix Configuration.get (#32)
Browse files Browse the repository at this point in the history
  • Loading branch information
@builderjer
builderjer authored Apr 7, 2023
1 parent faf81f2 commit cc626d8
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 47 deletions.
12 changes: 6 additions & 6 deletions ovos_backend_client/api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,12 +666,12 @@ def delete_device(self, uuid):

def add_device(self, uuid, token, name=None,
device_location="somewhere",
opt_in=Configuration.get("opt_in", False),
location=Configuration.get("location"),
lang=Configuration.get("lang"),
date_format=Configuration.get("date_format", "DMY"),
system_unit=Configuration.get("system_unit", "metric"),
time_format=Configuration.get("date_format", "full"),
opt_in=Configuration().get("opt_in", False),
location=Configuration().get("location"),
lang=Configuration().get("lang"),
date_format=Configuration().get("date_format", "DMY"),
system_unit=Configuration().get("system_unit", "metric"),
time_format=Configuration().get("date_format", "full"),
email=None,
isolated_skills=False,
ww_id=None,
Expand Down
12 changes: 6 additions & 6 deletions ovos_backend_client/backends/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,12 +478,12 @@ def db_delete_device(self, uuid):
@abc.abstractmethod
def db_post_device(self, uuid, token, name=None,
device_location="somewhere",
opt_in=Configuration.get("opt_in", False),
location=Configuration.get("location"),
lang=Configuration.get("lang"),
date_format=Configuration.get("date_format", "DMY"),
system_unit=Configuration.get("system_unit", "metric"),
time_format=Configuration.get("date_format", "full"),
opt_in=Configuration().get("opt_in", False),
location=Configuration().get("location"),
lang=Configuration().get("lang"),
date_format=Configuration().get("date_format", "DMY"),
system_unit=Configuration().get("system_unit", "metric"),
time_format=Configuration().get("date_format", "full"),
email=None,
isolated_skills=False,
ww_id=None,
Expand Down
26 changes: 13 additions & 13 deletions ovos_backend_client/backends/offline.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,26 +577,26 @@ def stt_get(self, audio, language="en-us", limit=1):
def db_list_devices(self):
_mail_cfg = self.credentials.get("email", {})

tts_plug = Configuration.get("tts").get("module")
tts_config = Configuration.get("tts")[tts_plug]
tts_plug = Configuration().get("tts").get("module")
tts_config = Configuration().get("tts")[tts_plug]

default_ww = Configuration.get("listener").get("wake_word", "hey_mycroft")
ww_config = Configuration.get("hotwords")[default_ww]
default_ww = Configuration().get("listener").get("wake_word", "hey_mycroft")
ww_config = Configuration().get("hotwords")[default_ww]

device = {
"uuid": self.uuid,
"token": "DUMMYTOKEN123",
"isolated_skills": True,
"opt_in": Configuration.get("opt_in", False),
"opt_in": Configuration().get("opt_in", False),
"name": f"Device-{self.uuid}",
"device_location": "somewhere",
"email": _mail_cfg.get("recipient") or
_mail_cfg.get("smtp", {}).get("username"),
"time_format": Configuration.get("date_format", "full"),
"date_format": Configuration.get("date_format", "DMY"),
"system_unit": Configuration.get("system_unit", "metric"),
"lang": Configuration.get("lang") or "en-us",
"location": Configuration.get("location"),
"time_format": Configuration().get("date_format", "full"),
"date_format": Configuration().get("date_format", "DMY"),
"system_unit": Configuration().get("system_unit", "metric"),
"lang": Configuration().get("lang") or "en-us",
"location": Configuration().get("location"),
"default_tts": tts_plug,
"default_tts_cfg": tts_config,
"default_ww": default_ww,
Expand Down Expand Up @@ -841,7 +841,7 @@ def db_delete_stt_recording(self, rec_id):

def db_post_stt_recording(self, byte_data, transcription, metadata=None):
# TODO - metadata unused, extend db
save_path = Configuration.get("listener", {}).get('save_path') or \
save_path = Configuration().get("listener", {}).get('save_path') or \
f"{get_xdg_data_save_path()}/listener/utterances"
os.makedirs(save_path, exist_ok=True)

Expand Down Expand Up @@ -909,7 +909,7 @@ def db_list_ww_definitions(self):
"name": ww_cfg.get("display_name") or name,
"lang": ww_cfg.get("stt_lang") or
ww_cfg.get("lang") or
Configuration.get("lang", "en-us"),
Configuration().get("lang", "en-us"),
"plugin": ww_cfg.get("module") or plugin,
"ww_config": ww_cfg
})
Expand All @@ -930,7 +930,7 @@ def db_update_ww_definition(self, ww_id, name=None, lang=None, ww_config=None, p
path = f"{ww_folders}/{l}/{ww_id}.json"
break
else:
lang = Configuration.get("lang")
lang = Configuration().get("lang")

path = path or f"{ww_folders}/{lang}/{ww_id}.json"

Expand Down
12 changes: 6 additions & 6 deletions ovos_backend_client/backends/personal.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,12 +465,12 @@ def db_delete_device(self, uuid):

def db_post_device(self, uuid, token, name=None,
device_location="somewhere",
opt_in=Configuration.get("opt_in", False),
location=Configuration.get("location"),
lang=Configuration.get("lang"),
date_format=Configuration.get("date_format", "DMY"),
system_unit=Configuration.get("system_unit", "metric"),
time_format=Configuration.get("date_format", "full"),
opt_in=Configuration().get("opt_in", False),
location=Configuration().get("location"),
lang=Configuration().get("lang"),
date_format=Configuration().get("date_format", "DMY"),
system_unit=Configuration().get("system_unit", "metric"),
time_format=Configuration().get("date_format", "full"),
email=None,
isolated_skills=False,
ww_id=None,
Expand Down
12 changes: 6 additions & 6 deletions ovos_backend_client/backends/selene.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ def db_delete_device(self, uuid):

def db_post_device(self, uuid, token, name=None,
device_location="somewhere",
opt_in=Configuration.get("opt_in", False),
location=Configuration.get("location"),
lang=Configuration.get("lang"),
date_format=Configuration.get("date_format", "DMY"),
system_unit=Configuration.get("system_unit", "metric"),
time_format=Configuration.get("date_format", "full"),
opt_in=Configuration().get("opt_in", False),
location=Configuration().get("location"),
lang=Configuration().get("lang"),
date_format=Configuration().get("date_format", "DMY"),
system_unit=Configuration().get("system_unit", "metric"),
time_format=Configuration().get("date_format", "full"),
email=None,
isolated_skills=False,
ww_id=None,
Expand Down
20 changes: 10 additions & 10 deletions ovos_backend_client/database.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ class DeviceModel(DatabaseModel):
def __init__(self):
identity = IdentityManager.get()

default_ww = Configuration.get("listener", {}).get("wake_word", "hey_mycroft")
default_tts = Configuration.get("tts", {}).get("module", "ovos-tts-plugin-mimic3-server")
mail_cfg = Configuration.get("email", {})
default_ww = Configuration().get("listener", {}).get("wake_word", "hey_mycroft")
default_tts = Configuration().get("tts", {}).get("module", "ovos-tts-plugin-mimic3-server")
mail_cfg = Configuration().get("email", {})

uuid = identity["uuid"]
super().__init__(uuid=uuid, token=identity["access"],
Expand All @@ -171,16 +171,16 @@ def __init__(self):
device_location="somewhere", # indoor location
email=mail_cfg.get("recipient") or \
mail_cfg.get("smtp", {}).get("username"),
date_format=Configuration.get("date_format") or "DMY",
system_unit=Configuration.get("system_unit") or "metric",
time_format=Configuration.get("time_format") or "full",
opt_in=Configuration.get("opt_in") or False,
lang=Configuration.get("lang") or "en-us",
date_format=Configuration().get("date_format") or "DMY",
system_unit=Configuration().get("system_unit") or "metric",
time_format=Configuration().get("time_format") or "full",
opt_in=Configuration().get("opt_in") or False,
lang=Configuration().get("lang") or "en-us",
location=Configuration["location"],
default_tts=default_tts,
default_tts_cfg=Configuration.get("tts", {}).get(default_tts, {}),
default_tts_cfg=Configuration().get("tts", {}).get(default_tts, {}),
default_ww=default_ww.replace(" ", "_"),
default_ww_cfg=Configuration.get("hotwords", {}).get(default_ww, {})
default_ww_cfg=Configuration().get("hotwords", {}).get(default_ww, {})
)

@property
Expand Down

0 comments on commit cc626d8

Please sign in to comment.