Skip to content

Commit ca7b0e0

Browse files
JarbasAlJarbasAl
committed
fix:standardize_lang
1 parent 4ebb7b3 commit ca7b0e0

13 files changed

+50
-50
lines changed

‎requirements/lgpl.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ovos_padatious>=0.1.2,<1.0.0
1+
ovos_padatious>=0.1.3,<1.0.0
22
fann2>=1.0.7, < 1.1.0

‎requirements/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ovos_ocp_pipeline_plugin>=0.1.3, <1.0.0
99
ovos-common-query-pipeline-plugin>=0.1.4, <1.0.0
1010

1111
ovos-utils>=0.3.5,<1.0.0
12-
ovos_bus_client>=0.1.0,<1.0.0
12+
ovos_bus_client>=0.1.4,<1.0.0
1313
ovos-plugin-manager>=0.0.26,<1.0.0
1414
ovos-config>=0.0.13,<1.0.0
1515
ovos-lingua-franca>=0.4.7,<1.0.0

‎test/end2end/routing/test_sched.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def setUp(self):
1616
def test_no_session(self):
1717
SessionManager.sessions = {}
1818
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
19-
SessionManager.default_session.lang = "en-us"
19+
SessionManager.default_session.lang = "en-US"
2020
SessionManager.pipeline = ["adapt_high"]
2121

2222
messages = []

‎test/end2end/routing/test_session.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def tearDown(self) -> None:
2121
def test_no_session(self):
2222
SessionManager.sessions = {}
2323
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
24-
SessionManager.default_session.lang = "en-us"
24+
SessionManager.default_session.lang = "en-US"
2525
SessionManager.pipeline = ["adapt_high"]
2626

2727
messages = []

‎test/end2end/session/test_blacklist.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def tearDown(self) -> None:
2121
def test_blacklist(self):
2222
SessionManager.sessions = {}
2323
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
24-
SessionManager.default_session.lang = "en-us"
24+
SessionManager.default_session.lang = "en-US"
2525
SessionManager.default_session.pipeline = ["adapt_high"]
2626
SessionManager.default_session.blacklisted_skills = []
2727
SessionManager.default_session.blacklisted_intents = []
@@ -309,7 +309,7 @@ def tearDown(self) -> None:
309309
def test_fallback(self):
310310
SessionManager.sessions = {}
311311
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
312-
SessionManager.default_session.lang = "en-us"
312+
SessionManager.default_session.lang = "en-US"
313313
SessionManager.default_session.pipeline = [
314314
"fallback_high"
315315
]
@@ -400,7 +400,7 @@ def tearDown(self) -> None:
400400
def test_common_qa(self):
401401
SessionManager.sessions = {}
402402
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
403-
SessionManager.default_session.lang = "en-us"
403+
SessionManager.default_session.lang = "en-US"
404404
SessionManager.default_session.pipeline = ["common_qa"]
405405
messages = []
406406

‎test/end2end/session/test_complete_failure.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def tearDown(self) -> None:
1919
def test_complete_failure(self):
2020
SessionManager.sessions = {}
2121
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
22-
SessionManager.default_session.lang = "en-us"
22+
SessionManager.default_session.lang = "en-US"
2323
SessionManager.default_session.active_skills = [(self.skill_id, time.time())]
2424
SessionManager.default_session.pipeline = [
2525
"stop_high",
@@ -105,7 +105,7 @@ def wait_for_n_messages(n):
105105
def test_complete_failure_lang_detect(self):
106106
SessionManager.sessions = {}
107107
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
108-
SessionManager.default_session.lang = "en-us"
108+
SessionManager.default_session.lang = "en-US"
109109
SessionManager.default_session.active_skills = [(self.skill_id, time.time())]
110110
SessionManager.default_session.pipeline = [
111111
"stop_high",
@@ -144,7 +144,7 @@ def wait_for_n_messages(n):
144144

145145
self.core.bus.on("message", new_msg)
146146

147-
SessionManager.default_session.valid_languages = ["en-us", stt_lang_detect, "fr-fr"]
147+
SessionManager.default_session.valid_languages = ["en-US", stt_lang_detect, "fr-fr"]
148148
utt = Message("recognizer_loop:utterance",
149149
{"utterances": ["hello world"]},
150150
{"session": SessionManager.default_session.serialize(),
@@ -247,4 +247,4 @@ def wait_for_n_messages(n):
247247
self.assertEqual(messages[18].data["session_data"]["lang"], "pt-pt")
248248
self.assertEqual(SessionManager.default_session.lang, "pt-pt")
249249

250-
SessionManager.default_session.lang = "en-us"
250+
SessionManager.default_session.lang = "en-US"

‎test/end2end/session/test_converse.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def tearDown(self) -> None:
2121
def test_no_session(self):
2222
SessionManager.sessions = {}
2323
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
24-
SessionManager.default_session.lang = "en-us"
24+
SessionManager.default_session.lang = "en-US"
2525
SessionManager.default_session.pipeline = [
2626
"converse",
2727
"padatious_high",
@@ -85,7 +85,7 @@ def wait_for_n_messages(n):
8585
# (missing in utterance message) and kept in all messages
8686
for m in messages[1:]:
8787
self.assertEqual(m.context["session"]["session_id"], "default")
88-
self.assertEqual(m.context["lang"], "en-us")
88+
self.assertEqual(m.context["lang"], "en-US")
8989

9090
# verify skill is activated
9191
self.assertEqual(messages[1].msg_type, "intent.service.skills.activated")
@@ -157,7 +157,7 @@ def wait_for_n_messages(n):
157157
# (missing in utterance message) and kept in all messages
158158
for m in messages[1:]:
159159
self.assertEqual(m.context["session"]["session_id"], "default")
160-
self.assertEqual(m.context["lang"], "en-us")
160+
self.assertEqual(m.context["lang"], "en-US")
161161

162162
# verify that "lang" is injected by converse.ping
163163
# (missing in utterance message) and kept in all messages
@@ -250,7 +250,7 @@ def wait_for_n_messages(n):
250250
# (missing in utterance message) and kept in all messages
251251
for m in messages[1:]:
252252
self.assertEqual(m.context["session"]["session_id"], "default")
253-
self.assertEqual(m.context["lang"], "en-us")
253+
self.assertEqual(m.context["lang"], "en-US")
254254

255255
# converse
256256
self.assertEqual(messages[1].msg_type, f"{self.other_skill_id}.converse.ping")
@@ -339,7 +339,7 @@ def wait_for_n_messages(n):
339339
# (missing in utterance message) and kept in all messages
340340
for m in messages[1:]:
341341
self.assertEqual(m.context["session"]["session_id"], "default")
342-
self.assertEqual(m.context["lang"], "en-us")
342+
self.assertEqual(m.context["lang"], "en-US")
343343

344344
# converse
345345
self.assertEqual(messages[1].msg_type, f"{self.skill_id}.converse.ping")

‎test/end2end/session/test_fallback.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def tearDown(self) -> None:
1919
def test_fallback(self):
2020
SessionManager.sessions = {}
2121
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
22-
SessionManager.default_session.lang = "en-us"
22+
SessionManager.default_session.lang = "en-US"
2323
SessionManager.default_session.pipeline = [
2424
"converse",
2525
"fallback_high",
@@ -142,7 +142,7 @@ def wait_for_n_messages(n):
142142
def test_fallback_with_session(self):
143143
SessionManager.sessions = {}
144144
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
145-
SessionManager.default_session.lang = "en-us"
145+
SessionManager.default_session.lang = "en-US"
146146
SessionManager.default_session.pipeline = [
147147
"fallback_high",
148148
"fallback_medium",
@@ -316,7 +316,7 @@ def tearDown(self) -> None:
316316
def test_fallback(self):
317317
SessionManager.sessions = {}
318318
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
319-
SessionManager.default_session.lang = "en-us"
319+
SessionManager.default_session.lang = "en-US"
320320
SessionManager.default_session.pipeline = [
321321
"fallback_medium",
322322
"fallback_low"

‎test/end2end/session/test_get_response.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def tearDown(self) -> None:
2020
def test_no_response(self):
2121
SessionManager.sessions = {}
2222
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
23-
SessionManager.default_session.lang = "en-us"
23+
SessionManager.default_session.lang = "en-US"
2424
SessionManager.default_session.pipeline = [
2525
"converse",
2626
"padatious_high",
@@ -100,7 +100,7 @@ def on_speak(msg):
100100
# (missing in utterance message) and kept in all messages
101101
for m in messages[1:]:
102102
self.assertEqual(m.context["session"]["session_id"], "default")
103-
self.assertEqual(m.context["lang"], "en-us")
103+
self.assertEqual(m.context["lang"], "en-US")
104104

105105
# verify intent triggers
106106
self.assertEqual(messages[3].msg_type, f"{self.skill_id}:test_get_response.intent")
@@ -125,7 +125,7 @@ def on_speak(msg):
125125
self.assertEqual(messages[7].msg_type, "enclosure.active_skill")
126126
self.assertEqual(messages[7].data["skill_id"], self.skill_id)
127127
self.assertEqual(messages[8].msg_type, "speak")
128-
self.assertEqual(messages[8].data["lang"], "en-us")
128+
self.assertEqual(messages[8].data["lang"], "en-US")
129129
self.assertTrue(messages[8].data["expect_response"]) # listen after dialog
130130
self.assertEqual(messages[8].data["meta"]["skill"], self.skill_id)
131131
self.assertEqual(messages[9].msg_type, "recognizer_loop:audio_output_start")
@@ -142,7 +142,7 @@ def on_speak(msg):
142142
self.assertEqual(messages[14].msg_type, "enclosure.active_skill")
143143
self.assertEqual(messages[14].data["skill_id"], self.skill_id)
144144
self.assertEqual(messages[15].msg_type, "speak")
145-
self.assertEqual(messages[15].data["lang"], "en-us")
145+
self.assertEqual(messages[15].data["lang"], "en-US")
146146
self.assertFalse(messages[15].data["expect_response"])
147147
self.assertEqual(messages[15].data["utterance"], "ERROR")
148148
self.assertEqual(messages[15].data["meta"]["skill"], self.skill_id)
@@ -163,7 +163,7 @@ def on_speak(msg):
163163
def test_with_response(self):
164164
SessionManager.sessions = {}
165165
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
166-
SessionManager.default_session.lang = "en-us"
166+
SessionManager.default_session.lang = "en-US"
167167
SessionManager.default_session.pipeline = [
168168
"converse",
169169
"padatious_high",
@@ -279,7 +279,7 @@ def answer_get_response(msg):
279279
self.assertEqual(messages[7].data["skill_id"], self.skill_id)
280280
self.assertEqual(messages[8].msg_type, "speak")
281281
self.assertEqual(messages[8].data["utterance"], "give me an answer", )
282-
self.assertEqual(messages[8].data["lang"], "en-us")
282+
self.assertEqual(messages[8].data["lang"], "en-US")
283283
self.assertTrue(messages[8].data["expect_response"]) # listen after dialog
284284
self.assertEqual(messages[8].data["meta"]["skill"], self.skill_id)
285285
# ovos-audio speak execution (simulated)
@@ -308,7 +308,7 @@ def answer_get_response(msg):
308308
self.assertEqual(messages[19].msg_type, "enclosure.active_skill")
309309
self.assertEqual(messages[19].data["skill_id"], self.skill_id)
310310
self.assertEqual(messages[20].msg_type, "speak")
311-
self.assertEqual(messages[20].data["lang"], "en-us")
311+
self.assertEqual(messages[20].data["lang"], "en-US")
312312
self.assertFalse(messages[20].data["expect_response"])
313313
self.assertEqual(messages[20].data["utterance"], "ok")
314314
self.assertEqual(messages[20].data["meta"]["skill"], self.skill_id)
@@ -329,7 +329,7 @@ def answer_get_response(msg):
329329
def test_cancel_response(self):
330330
SessionManager.sessions = {}
331331
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
332-
SessionManager.default_session.lang = "en-us"
332+
SessionManager.default_session.lang = "en-US"
333333
SessionManager.default_session.pipeline = [
334334
"converse",
335335
"padatious_high",
@@ -445,7 +445,7 @@ def answer_get_response(msg):
445445
self.assertEqual(messages[7].data["skill_id"], self.skill_id)
446446
self.assertEqual(messages[8].msg_type, "speak")
447447
self.assertEqual(messages[8].data["utterance"], "give me an answer", )
448-
self.assertEqual(messages[8].data["lang"], "en-us")
448+
self.assertEqual(messages[8].data["lang"], "en-US")
449449
self.assertTrue(messages[8].data["expect_response"]) # listen after dialog
450450
self.assertEqual(messages[8].data["meta"]["skill"], self.skill_id)
451451
# ovos-audio speak execution (simulated)
@@ -473,7 +473,7 @@ def answer_get_response(msg):
473473
self.assertEqual(messages[19].msg_type, "enclosure.active_skill")
474474
self.assertEqual(messages[19].data["skill_id"], self.skill_id)
475475
self.assertEqual(messages[20].msg_type, "speak")
476-
self.assertEqual(messages[20].data["lang"], "en-us")
476+
self.assertEqual(messages[20].data["lang"], "en-US")
477477
self.assertFalse(messages[20].data["expect_response"])
478478
self.assertEqual(messages[20].data["utterance"], "ERROR")
479479
self.assertEqual(messages[20].data["meta"]["skill"], self.skill_id)
@@ -494,7 +494,7 @@ def answer_get_response(msg):
494494
def test_with_reprompt(self):
495495
SessionManager.sessions = {}
496496
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
497-
SessionManager.default_session.lang = "en-us"
497+
SessionManager.default_session.lang = "en-US"
498498
SessionManager.default_session.pipeline = [
499499
"converse",
500500
"padatious_high",
@@ -629,7 +629,7 @@ def answer_get_response(msg):
629629
self.assertEqual(messages[18].msg_type, "enclosure.active_skill")
630630
self.assertEqual(messages[18].data["skill_id"], self.skill_id)
631631
self.assertEqual(messages[19].msg_type, "speak")
632-
self.assertEqual(messages[19].data["lang"], "en-us")
632+
self.assertEqual(messages[19].data["lang"], "en-US")
633633
self.assertFalse(messages[19].data["expect_response"])
634634
self.assertEqual(messages[19].data["utterance"], "ok")
635635
self.assertEqual(messages[19].data["meta"]["skill"], self.skill_id)
@@ -647,7 +647,7 @@ def answer_get_response(msg):
647647
def test_nested(self):
648648
SessionManager.sessions = {}
649649
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
650-
SessionManager.default_session.lang = "en-us"
650+
SessionManager.default_session.lang = "en-US"
651651
SessionManager.default_session.pipeline = [
652652
"converse",
653653
"padatious_high",
@@ -801,7 +801,7 @@ def answer_get_response(msg):
801801
self.assertEqual(messages[5].msg_type, "enclosure.active_skill")
802802
self.assertEqual(messages[5].data["skill_id"], self.skill_id)
803803
self.assertEqual(messages[6].msg_type, "speak")
804-
self.assertEqual(messages[6].data["lang"], "en-us")
804+
self.assertEqual(messages[6].data["lang"], "en-US")
805805
self.assertFalse(messages[6].data["expect_response"])
806806
self.assertEqual(messages[6].data["utterance"], "give me items")
807807
self.assertEqual(messages[6].data["meta"]["skill"], self.skill_id)
@@ -847,7 +847,7 @@ def answer_get_response(msg):
847847
def test_kill_response(self):
848848
SessionManager.sessions = {}
849849
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
850-
SessionManager.default_session.lang = "en-us"
850+
SessionManager.default_session.lang = "en-US"
851851
SessionManager.default_session.pipeline = [
852852
"converse",
853853
"padatious_high",

‎test/end2end/session/test_sched.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def setUp(self):
1616
def test_no_session(self):
1717
SessionManager.sessions = {}
1818
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
19-
SessionManager.default_session.lang = "en-us"
19+
SessionManager.default_session.lang = "en-US"
2020
SessionManager.default_session.pipeline = [
2121
"adapt_high"
2222
]
@@ -74,7 +74,7 @@ def wait_for_n_messages(n):
7474
# (missing in utterance message) and kept in all messages
7575
for m in messages[1:]:
7676
self.assertEqual(m.context["session"]["session_id"], "default")
77-
self.assertEqual(m.context["lang"], "en-us")
77+
self.assertEqual(m.context["lang"], "en-US")
7878

7979
# verify skill_id is now present in every message.context
8080
self.assertEqual(messages[1].msg_type, "intent.service.skills.activated")
@@ -94,7 +94,7 @@ def wait_for_n_messages(n):
9494
self.assertEqual(messages[5].msg_type, "enclosure.active_skill")
9595
self.assertEqual(messages[5].data["skill_id"], self.skill_id)
9696
self.assertEqual(messages[6].msg_type, "speak")
97-
self.assertEqual(messages[6].data["lang"], "en-us")
97+
self.assertEqual(messages[6].data["lang"], "en-US")
9898
self.assertFalse(messages[6].data["expect_response"])
9999
self.assertEqual(messages[6].data["meta"]["dialog"], "done")
100100
self.assertEqual(messages[6].data["meta"]["skill"], self.skill_id)
@@ -122,7 +122,7 @@ def wait_for_n_messages(n):
122122
self.assertEqual(messages[12].msg_type, "enclosure.active_skill")
123123
self.assertEqual(messages[12].context, intent_context)
124124
self.assertEqual(messages[13].msg_type, "speak")
125-
self.assertEqual(messages[13].data["lang"], "en-us")
125+
self.assertEqual(messages[13].data["lang"], "en-US")
126126
self.assertFalse(messages[13].data["expect_response"])
127127
self.assertEqual(messages[13].data["meta"]["dialog"], "trigger")
128128
self.assertEqual(messages[13].data["meta"]["skill"], self.skill_id)
@@ -131,7 +131,7 @@ def wait_for_n_messages(n):
131131
def test_explicit_session(self):
132132
SessionManager.sessions = {}
133133
SessionManager.default_session = SessionManager.sessions["default"] = Session("default")
134-
SessionManager.default_session.lang = "en-us"
134+
SessionManager.default_session.lang = "en-US"
135135
SessionManager.default_session.pipeline = [
136136
"adapt_high"
137137
]
@@ -212,7 +212,7 @@ def wait_for_n_messages(n):
212212
self.assertEqual(messages[5].msg_type, "enclosure.active_skill")
213213
self.assertEqual(messages[5].data["skill_id"], self.skill_id)
214214
self.assertEqual(messages[6].msg_type, "speak")
215-
self.assertEqual(messages[6].data["lang"], "en-us")
215+
self.assertEqual(messages[6].data["lang"], "en-US")
216216
self.assertFalse(messages[6].data["expect_response"])
217217
self.assertEqual(messages[6].data["meta"]["dialog"], "done")
218218
self.assertEqual(messages[6].data["meta"]["skill"], self.skill_id)
@@ -229,7 +229,7 @@ def wait_for_n_messages(n):
229229
self.assertEqual(messages[11].msg_type, "enclosure.active_skill")
230230
self.assertEqual(messages[11].context, intent_context)
231231
self.assertEqual(messages[12].msg_type, "speak")
232-
self.assertEqual(messages[12].data["lang"], "en-us")
232+
self.assertEqual(messages[12].data["lang"], "en-US")
233233
self.assertFalse(messages[12].data["expect_response"])
234234
self.assertEqual(messages[12].data["meta"]["dialog"], "trigger")
235235
self.assertEqual(messages[12].data["meta"]["skill"], self.skill_id)

0 commit comments

Comments
 (0)