matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(hass): add PlayAlbum voice command
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-10-08 02:07:05 -04:00
parent 6936895cf9
commit 98c27b1051
9 changed files with 184 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/PlayAlbum.cs Normal file
View file

@ -0,0 +1,54 @@
namespace Spotify;
using HomeAssistantGenerated;
using NetDaemon.AppModel;
using NetDaemon.HassModel;
using NetDaemon.HassModel.Integration;
using System.Text.Json;
record PlayAlbumData(string? artist, string? album);
[NetDaemonApp]
public class PlayAlbum
{
// Snake-case json options
private readonly JsonSerializerOptions _jsonOptions = new JsonSerializerOptions
{
PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
};
public PlayAlbum(IHaContext ha)
{
ha.RegisterServiceCallBack<PlayAlbumData>(
"spotify_play_album",
async (e) =>
{
var result = (await ha.CallServiceWithResponseAsync(
"spotifyplus",
"search_albums",
data: new SpotifyplusSearchAlbumsParameters
{
Criteria = $"{e?.artist} {e?.album}",
Limit = 1,
EntityId = "media_player.spotifyplus"
}
)).Value.Deserialize<SpotifyplusSearchAlbumsResponse>(_jsonOptions);
string? uri = result?.Result?.Items?[0]?.Uri;
if (uri is not null)
{
ha.CallService(
"spotifyplus",
"player_media_play_context",
data: new SpotifyplusPlayerMediaPlayContextParameters
{
ContextUri = uri,
EntityId = "media_player.spotifyplus"
}
);
}
}
);
}
}

1
devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/PlayAlbum.yaml Normal file
View file

@ -0,0 +1 @@

39
devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayAlbum/SpotifyplusSearchAlbumsResponse.cs Normal file
View file

@ -0,0 +1,39 @@
namespace Spotify;
using System.Collections.Generic;
public record AlbumItem
{
public string? AlbumType { get; set; }
public List<Artist>? Artists { get; set; }
public List<string?>? AvailableMarkets { get; set; }
public ExternalUrls? ExternalUrls { get; set; }
public string? Href { get; set; }
public string? Id { get; set; }
public string? ImageUrl { get; set; }
public List<Image>? Images { get; set; }
public string? Name { get; set; }
public string? ReleaseDate { get; set; }
public string? ReleaseDatePrecision { get; set; }
public Restrictions? Restrictions { get; set; }
public int TotalTracks { get; set; }
public string? Type { get; set; }
public string? Uri { get; set; }
}
public record AlbumResult
{
public string? Href { get; set; }
public int Limit { get; set; }
public string? Next { get; set; }
public int Offset { get; set; }
public object? Previous { get; set; }
public int Total { get; set; }
public List<AlbumItem>? Items { get; set; }
}
public class SpotifyplusSearchAlbumsResponse
{
public UserProfile? UserProfile { get; set; }
public AlbumResult? Result { get; set; }
}

6
devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/PlayArtist.cs
View file

@ -6,7 +6,7 @@ using NetDaemon.HassModel;
using NetDaemon.HassModel.Integration;
using System.Text.Json;
record ServiceData(string? criteria);
record PlayArtistData(string? artist);
[NetDaemonApp]
public class PlayArtist
@ -19,7 +19,7 @@ public class PlayArtist
public PlayArtist(IHaContext ha)
{
ha.RegisterServiceCallBack<ServiceData>(
ha.RegisterServiceCallBack<PlayArtistData>(
"spotify_play_artist",
async (e) =>
{
@ -28,7 +28,7 @@ public class PlayArtist
"search_artists",
data: new SpotifyplusSearchArtistsParameters
{
Criteria = e?.criteria,
Criteria = e?.artist,
Limit = 1,
EntityId = "media_player.spotifyplus"
}

37
devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/SpotifyTypes.cs → devices/homie/modules/home-assistant/netdaemon/apps/Spotify/PlayArtist/SpotifyplusSearchArtistsResponse.cs
View file

@ -2,25 +2,7 @@ namespace Spotify;
using System.Collections.Generic;
public record ExternalUrls
{
public string? Spotify { get; init; }
}
public record Followers
{
public string? Href { get; init; }
public int Total { get; init; }
}
public record Image
{
public string? Url { get; init; }
public int Height { get; init; }
public int Width { get; init; }
}
public record Item
public record ArtistItem
{
public ExternalUrls? External_urls { get; init; }
public Followers? Followers { get; init; }
@ -35,7 +17,7 @@ public record Item
public string? Uri { get; init; }
}
public record Result
public record ArtistResult
{
public string? Href { get; init; }
public int Limit { get; init; }
@ -43,22 +25,11 @@ public record Result
public int Offset { get; set; }
public object? Previous { get; init; }
public int Total { get; init; }
public List<Item>? Items { get; init; }
public List<ArtistItem>? Items { get; init; }
}
public record SpotifyplusSearchArtistsResponse
{
public UserProfile? UserProfile { get; init; }
public Result? Result { get; init; }
}
public record UserProfile
{
public string? Country { get; init; }
public string? DisplayName { get; init; }
public string? Email { get; init; }
public string? Id { get; init; }
public string? Product { get; init; }
public string? Type { get; init; }
public string? Uri { get; init; }
public ArtistResult? Result { get; init; }
}

42
devices/homie/modules/home-assistant/netdaemon/apps/Spotify/Types.cs Normal file
View file

@ -0,0 +1,42 @@
namespace Spotify;
public record UserProfile
{
public string? Country { get; init; }
public string? DisplayName { get; init; }
public string? Email { get; init; }
public string? Id { get; init; }
public string? Product { get; init; }
public string? Type { get; init; }
public string? Uri { get; init; }
}
public record Artist
{
public ExternalUrls? ExternalUrls { get; set; }
public string? Href { get; set; }
public string? Id { get; set; }
public string? Name { get; set; }
public string? Type { get; set; }
public string? Uri { get; set; }
}
public record ExternalUrls
{
public string? Spotify { get; init; }
}
public record Followers
{
public string? Href { get; init; }
public int Total { get; init; }
}
public record Image
{
public string? Url { get; init; }
public int Height { get; init; }
public int Width { get; init; }
}
public record Restrictions { }

26
devices/homie/modules/home-assistant/spotify-sentences.nix
View file

@ -5,19 +5,43 @@
PlayArtist.data = [
{
sentences = [
"play [some] music from [artist] {artist}"
"play[ing] [some] music from [the] [artist] {artist}"
"play[ing] [the] artist {artist}"
];
}
];
PlayAlbum.data = [
{
sentences = [
"play[ing] [the] album {album} from [the] [artist] {artist}"
];
}
{
sentences = [
"play[ing] [the] album {album}"
];
slots.artist = "";
}
];
};
lists = {
artist.wildcard = true;
album.wildcard = true;
};
responses.intents = {
PlayArtist.default = ''
Searching for {{ slots.artist }} on Spotify and playing their top songs.
'';
PlayAlbum.default = ''
Searching for the album {{ slots.album }}
{% if slots.artist != "" %}
by {{ slots.artist }}
{% endif %}
on Spotify and playing it.
'';
};
}

17
devices/homie/modules/home-assistant/spotify.nix
View file

@ -17,7 +17,7 @@ in {
name = "spotify-files";
text = ''
mkdir -p ${WorkingDirectory}/custom_sentences/en
cp -f ${spotify} ${WorkingDirectory}/custom_sentences/en
cp -f ${spotify} ${WorkingDirectory}/custom_sentences/en/assist_spotify.yaml
cp -f ${creds} ${WorkingDirectory}/.storage/SpotifyWebApiPython_librespot_credentials.json
'';
});
@ -40,7 +40,20 @@ in {
action = [
{
service = "netdaemon.spotify_play_artist";
data.criteria = "{{ artist }}";
data.artist = "{{ artist }}";
}
];
};
PlayAlbum = {
async_action = "false";
action = [
{
service = "netdaemon.spotify_play_album";
data = {
artist = "{{ artist }}";
album = "{{ album }}";
};
}
];
};

2
devices/homie/modules/home-assistant/timer.nix
View file

@ -52,7 +52,7 @@ in {
name = "timer-files";
text = ''
mkdir -p ${WorkingDirectory}/custom_sentences/en
cp -f ${timer} ${WorkingDirectory}/custom_sentences/en
cp -f ${timer} ${WorkingDirectory}/custom_sentences/en/assist_timers.yaml
'';
});