Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: drop lingua_franca #593

Merged
merged 7 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/constraint_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
constraints_file: ['stable', 'testing']
constraints_file: ['testing']

steps:
- name: Checkout repository
Expand Down
5 changes: 0 additions & 5 deletions ovos_core/intent_services/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,6 @@ def handle_utterance(self, message: Message):
# tag language of this utterance
lang = self.disambiguate_lang(message)

try: # TODO - uncouple lingua franca from core, up to skills to ensure locale is loaded if needed
setup_locale(lang)
except Exception as e:
LOG.exception(f"Failed to set lingua_franca default lang to {lang}")

utterances = message.data.get('utterances', [])

stopwatch = Stopwatch()
Expand Down
5 changes: 0 additions & 5 deletions ovos_core/intent_services/converse_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,6 @@ def handle_deactivate_skill_request(self, message: Message):
def reset_converse(self, message: Message):
"""Let skills know there was a problem with speech recognition"""
lang = get_message_lang()
try:
setup_locale(lang) # restore default lang
except Exception as e:
LOG.exception(f"Failed to set lingua_franca default lang to {lang}")

self.converse_with_skills([], lang, message)

def handle_get_active_skills(self, message: Message):
Expand Down
1 change: 1 addition & 0 deletions requirements/extra-deprecated.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pyaudio

# mycroft-core imports / default plugins
# for compat with mycroft namespace
ovos-lingua-franca>=0.4.7,<1.0.0
# NOTE: ovos-listener is causing conflicts in dependency resolution, blocks ovos-bus-client 1.0.0
ovos-listener>=0.0.3,<1.0.0
ovos-tts-plugin-mimic>=0.2.8, <1.0.0
Expand Down
3 changes: 2 additions & 1 deletion requirements/plugins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ovos-utterance-plugin-cancel>=0.2.2, <1.0.0
ovos-bidirectional-translation-plugin>=0.1.0, <1.0.0
ovos-translate-server-plugin>=0.0.2, <1.0.0
ovos-utterance-normalizer>=0.2.1, <1.0.0

ovos-number-parser>=0.0.1,<1.0.0
ovos-date-parser>=0.0.3,<1.0.0
# still in alpha
ovos-classifiers
4 changes: 2 additions & 2 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ padacioso>=1.0.0, <2.0.0
ovos-adapt-parser>=1.0.4, <2.0.0
ovos_ocp_pipeline_plugin>=1.0.5, <2.0.0
ovos-common-query-pipeline-plugin>=1.0.4, <2.0.0

ovos-utils>=0.3.5,<1.0.0
ovos_bus_client>=0.1.4,<2.0.0
ovos-plugin-manager>=0.5.6,<1.0.0
ovos-config>=0.0.13,<1.0.0
ovos-lingua-franca>=0.4.7,<1.0.0
ovos-backend-client>=0.1.0,<2.0.0
ovos-workshop>=2.0.1,<3.0.0
ovos-workshop>=2.2.2,<3.0.0
Loading