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.

Sign up for GitHub

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

Jump to bottom

refactor/ocp_modernize #6

Merged
merged 3 commits into from
Jun 21, 2024
Merged

refactor/ocp_modernize #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
551d804
refactor/ocp_modernize
JarbasAl Jun 21, 2024
fe9350a
fix/allow_ocp_objects
JarbasAl Jun 21, 2024
fc04055
utils 0.0.38 compat
JarbasAl Jun 21, 2024
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
106 changes: 64 additions & 42 deletions __init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from os.path import join, dirname

from typing import Iterable
import radiosoma
from ovos_utils import classproperty
from ovos_utils.ocp import MediaType, PlaybackType
from ovos_workshop.backwards_compat import MediaType, PlaybackType, MediaEntry, Playlist
from ovos_utils.parse import fuzzy_match
from ovos_utils.process_utils import RuntimeRequirements
from ovos_workshop.decorators.ocp import ocp_search, ocp_featured_media
Expand Down Expand Up @@ -37,38 +37,45 @@ def runtime_requirements(self):
no_gui_fallback=True)

@ocp_featured_media()
def featured_media(self):
return [{
"match_confidence": 90,
"media_type": MediaType.RADIO,
"uri": ch.direct_stream,
"playback": PlaybackType.AUDIO,
"image": ch.image,
"bg_image": ch.image,
"skill_icon": self.skill_icon,
"title": ch.title,
"author": "SomaFM",
"length": 0
} for ch in radiosoma.get_stations()]
def featured_media(self) -> Playlist:
pl = Playlist(media_type=MediaType.RADIO,
title="SomaFM (All stations)",
playback=PlaybackType.AUDIO,
image="https://somafm.com/img3/LoneDJsquare400.jpg",
skill_id=self.skill_id,
artist="SomaFM",
match_confidence=100,
skill_icon=self.skill_icon)
pl += [MediaEntry(media_type=MediaType.RADIO,
uri=ch.direct_stream,
title=ch.title,
playback=PlaybackType.AUDIO,
image=ch.image,
skill_id=self.skill_id,
artist="SomaFM",
match_confidence=90,
length=-1, # live stream
skill_icon=self.skill_icon)
for ch in radiosoma.get_stations()]
return pl

@ocp_search()
def ocp_somafm_playlist(self, phrase):
def ocp_somafm_playlist(self, phrase, media_type) -> Iterable[Playlist]:
phrase = self.remove_voc(phrase, "radio")
if self.voc_match(phrase, "somafm", exact=True):
yield {
"match_confidence": 100,
"media_type": MediaType.RADIO,
"playlist": self.featured_media(),
"playback": PlaybackType.AUDIO,
"skill_icon": self.skill_icon,
"image": "https://somafm.com/img3/LoneDJsquare400.jpg",
"bg_image": "https://somafm.com/about/pics/IMG_0974.jpg",
"title": "SomaFM (All stations)",
"author": "SomaFM"
}
pl = Playlist(media_type=MediaType.RADIO,
title="SomaFM (All stations)",
playback=PlaybackType.AUDIO,
image="https://somafm.com/img3/LoneDJsquare400.jpg",
skill_id=self.skill_id,
artist="SomaFM",
match_confidence=100,
skill_icon=self.skill_icon)
pl += self.featured_media()
yield pl

@ocp_search()
def search_somafm(self, phrase, media_type):
def search_somafm(self, phrase, media_type) -> Iterable[MediaEntry]:
base_score = 0

if media_type == MediaType.RADIO:
Expand All @@ -86,18 +93,33 @@ def search_somafm(self, phrase, media_type):

for ch in radiosoma.get_stations():
score = round(base_score + fuzzy_match(ch.title.lower(), phrase.lower()) * 100)
if score < 50:
if score < 60:
continue
print(ch.title, score)
yield {
"match_confidence": min(100, score),
"media_type": MediaType.RADIO,
"uri": ch.direct_stream,
"playback": PlaybackType.AUDIO,
"image": ch.image,
"bg_image": ch.image,
"skill_icon": self.skill_icon,
"title": ch.title,
"author": "SomaFM",
"length": 0
}
yield MediaEntry(media_type=MediaType.RADIO,
uri=ch.direct_stream,
title=ch.title,
playback=PlaybackType.AUDIO,
image=ch.image,
skill_id=self.skill_id,
artist="SomaFM",
match_confidence=min(100, score),
length=-1, # live stream
skill_icon=self.skill_icon)


if __name__ == "__main__":
from ovos_utils.messagebus import FakeBus
from ovos_utils.log import LOG

LOG.set_level("DEBUG")

s = SomaFMSkill(bus=FakeBus(), skill_id="t.fake")
for r in s.ocp_somafm_playlist("somafm", MediaType.RADIO):
print(r)
# Playlist(title='SomaFM (All stations)', artist='SomaFM', position=0, image='https://somafm.com/img3/LoneDJsquare400.jpg', match_confidence=100, skill_id='t.fake', skill_icon='/home/miro/PycharmProjects/OCPSkills/skill-ovos-somafm/somafm.png', playback=<PlaybackType.AUDIO: 2>, media_type=<MediaType.RADIO: 7>)
for r in s.search_somafm("secret agent", MediaType.RADIO):
print(r)
# MediaEntry(uri='http://ice2.somafm.com/beatblender-128-mp3', title='Beat Blender', artist='SomaFM', match_confidence=62, skill_id='t.fake', playback=<PlaybackType.AUDIO: 2>, status=<TrackState.DISAMBIGUATION: 1>, media_type=<MediaType.RADIO: 7>, length=-1, image='https://api.somafm.com/logos/512/beatblender512.png', skill_icon='/home/miro/PycharmProjects/OCPSkills/skill-ovos-somafm/somafm.png', javascript='')
# MediaEntry(uri='http://ice2.somafm.com/deepspaceone-128-mp3', title='Deep Space One', artist='SomaFM', match_confidence=66, skill_id='t.fake', playback=<PlaybackType.AUDIO: 2>, status=<TrackState.DISAMBIGUATION: 1>, media_type=<MediaType.RADIO: 7>, length=-1, image='https://api.somafm.com/logos/512/deepspaceone512.png', skill_icon='/home/miro/PycharmProjects/OCPSkills/skill-ovos-somafm/somafm.png', javascript='')
# MediaEntry(uri='http://ice2.somafm.com/illstreet-128-mp3', title='Illinois Street Lounge', artist='SomaFM', match_confidence=61, skill_id='t.fake', playback=<PlaybackType.AUDIO: 2>, status=<TrackState.DISAMBIGUATION: 1>, media_type=<MediaType.RADIO: 7>, length=-1, image='https://api.somafm.com/logos/512/illstreet512.png', skill_icon='/home/miro/PycharmProjects/OCPSkills/skill-ovos-somafm/somafm.png', javascript='')
# MediaEntry(uri='http://ice2.somafm.com/secretagent-128-mp3', title='Secret Agent', artist='SomaFM', match_confidence=100, skill_id='t.fake', playback=<PlaybackType.AUDIO: 2>, status=<TrackState.DISAMBIGUATION: 1>, media_type=<MediaType.RADIO: 7>, length=-1, image='https://api.somafm.com/logos/512/secretagent512.png', skill_icon='/home/miro/PycharmProjects/OCPSkills/skill-ovos-somafm/somafm.png', javascript='')
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ovos-utils~=0.0, >=0.1.0a17
ovos-utils >= 0.0.38
ovos-bus-client>=0.0.9a2
ovos-workshop>=0.0.16a5
ovos-workshop>=0.0.16a39
radiosoma~=0.0, >=0.0.1
Loading