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

[chatgpt] Fix ConfigOptionProvider #16131

Merged
merged 4 commits into from
Dec 29, 2023
Merged

[chatgpt] Fix ConfigOptionProvider #16131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4158288
[chatgpt] Fix ConfigOptionProvider
J-N-K Dec 29, 2023
1e1dc00
remove component annotation
J-N-K Dec 29, 2023
b447ee2
remove unused imports
J-N-K Dec 29, 2023
9f24db3
improvement
J-N-K Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...g.chatgpt/src/main/java/org/openhab/binding/chatgpt/internal/ChatGPTBindingConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.core.thing.ThingTypeUID;
import org.openhab.core.thing.type.ChannelTypeUID;

/**
* The {@link ChatGPTBindingConstants} class defines common constants, which are
Expand All @@ -31,4 +32,6 @@ public class ChatGPTBindingConstants {

// List of all Channel ids
public static final String CHANNEL_CHAT = "chat";

public static final ChannelTypeUID CHANNEL_TYPE_UID_CHAT = new ChannelTypeUID(BINDING_ID, CHANNEL_CHAT);
}
5 changes: 3 additions & 2 deletions ...hatgpt/src/main/java/org/openhab/binding/chatgpt/internal/ChatGPTModelOptionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
*/
package org.openhab.binding.chatgpt.internal;

import static org.openhab.binding.chatgpt.internal.ChatGPTBindingConstants.CHANNEL_TYPE_UID_CHAT;

import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -39,8 +41,7 @@ public class ChatGPTModelOptionProvider implements ThingHandlerService, ConfigOp
@Override
public @Nullable Collection<ParameterOption> getParameterOptions(URI uri, String param, @Nullable String context,
@Nullable Locale locale) {
String accountParameterUrl = "thing-type:" + ChatGPTBindingConstants.THING_TYPE_ACCOUNT.getAsString();
if (accountParameterUrl.equals(uri.toString())) {
if (CHANNEL_TYPE_UID_CHAT.getAsString().equals(uri.toString())) {
if ("model".equals(param)) {
List<ParameterOption> options = new ArrayList<>();
if (thingHandler instanceof ChatGPTHandler chatGPTHandler) {
Expand Down