From dd18ea4319c81e50cc6d88c5b26ff515fa632aff Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Nov 2023 11:53:12 -0600 Subject: [PATCH] Add Edit>Options>OpenAI... for setting the key --- .../ui/swing/script/OpenAIOptions.java | 54 +++++++++++++++++++ .../scijava/ui/swing/script/TextEditor.java | 17 +++++- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/scijava/ui/swing/script/OpenAIOptions.java diff --git a/src/main/java/org/scijava/ui/swing/script/OpenAIOptions.java b/src/main/java/org/scijava/ui/swing/script/OpenAIOptions.java new file mode 100644 index 00000000..ad7220e4 --- /dev/null +++ b/src/main/java/org/scijava/ui/swing/script/OpenAIOptions.java @@ -0,0 +1,54 @@ +/* + * #%L + * Script Editor and Interpreter for SciJava script languages. + * %% + * Copyright (C) 2009 - 2023 SciJava developers. + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ + +package org.scijava.ui.swing.script; + +import org.scijava.options.OptionsPlugin; +import org.scijava.plugin.Parameter; +import org.scijava.plugin.Plugin; + +/** + * Runs the Edit::Options::OpenAI dialog. + * + * @author Curtis Rueden + */ +@Plugin(type = OptionsPlugin.class, menuPath = "Edit>Options>OpenAI...") +public class OpenAIOptions extends OptionsPlugin { + + @Parameter(label = "OpenAI key") + private String openAIKey; + + public String getOpenAIKey() { + return openAIKey; + } + + public void setOpenAIKey(final String openAIKey) { + this.openAIKey = openAIKey; + } +} diff --git a/src/main/java/org/scijava/ui/swing/script/TextEditor.java b/src/main/java/org/scijava/ui/swing/script/TextEditor.java index fb6f865e..b3d24172 100644 --- a/src/main/java/org/scijava/ui/swing/script/TextEditor.java +++ b/src/main/java/org/scijava/ui/swing/script/TextEditor.java @@ -142,6 +142,7 @@ import org.scijava.log.LogService; import org.scijava.module.ModuleException; import org.scijava.module.ModuleService; +import org.scijava.options.OptionsService; import org.scijava.platform.PlatformService; import org.scijava.plugin.Parameter; import org.scijava.plugin.PluginInfo; @@ -276,6 +277,8 @@ public class TextEditor extends JFrame implements ActionListener, private AppService appService; @Parameter private BatchService batchService; + @Parameter(required = false) + private OptionsService optionsService; private Map languageMenuItems; private JRadioButtonMenuItem noneLanguageItem; @@ -3276,7 +3279,7 @@ public void askChatGPTtoGenerateCode() { private String askChatGPT(String text) { // Modified from: https://github.com/TheoKanning/openai-java/blob/main/example/src/main/java/example/OpenAiApiFunctionsExample.java - String token = System.getenv("OPENAI_API_KEY"); + String token = apiKey(); OpenAiService service = new OpenAiService(token); @@ -3297,6 +3300,18 @@ private String askChatGPT(String text) { return result; } + private String apiKey() { + if (optionsService != null) { + final OpenAIOptions openAIOptions = + optionsService.getOptions(OpenAIOptions.class); + if (openAIOptions != null) { + final String key = openAIOptions.getOpenAIKey(); + if (key != null && !key.isEmpty()) return key; + } + } + return System.getenv("OPENAI_API_KEY"); + } + public void extractSourceJar(final File file) { try { final FileFunctions functions = new FileFunctions(this);