This commit is contained in:
Enrico Ros
2023-05-18 19:59:35 -07:00
parent acbb4dac04
commit 4a4e516f37
8 changed files with 17 additions and 17 deletions
+2 -2
View File
@@ -5,7 +5,7 @@ import { OpenAI } from '~/modules/openai/openai.types';
import { autoTitle } from '~/modules/aifn/autotitle/autoTitle';
import { findOpenAILlmRefOrThrow } from '~/modules/llms/store-llms';
import { speakText } from '~/modules/elevenlabs/elevenlabs.client';
import { useModuleElevenlabsStore } from '~/modules/elevenlabs/store-module-elevenlabs';
import { useElevenlabsStore } from '~/modules/elevenlabs/store-elevenlabs';
import { createDMessage, DMessage, useChatStore } from '~/common/state/store-chats';
import { useSettingsStore } from '~/common/state/store-settings';
@@ -71,7 +71,7 @@ async function streamAssistantMessage(
const openAILlmId = findOpenAILlmRefOrThrow(llmId);
const { modelTemperature, modelMaxResponseTokens } = useSettingsStore.getState();
const { elevenLabsAutoSpeak } = useModuleElevenlabsStore.getState();
const { elevenLabsAutoSpeak } = useElevenlabsStore.getState();
const payload: OpenAI.API.Chat.Request = {
api: getOpenAISettings(),
model: openAILlmId,
+2 -2
View File
@@ -1,6 +1,6 @@
import { Prodia } from '~/modules/prodia/prodia.types';
import { prodiaDefaultModelId } from '~/modules/prodia/prodia.client';
import { useModuleProdiaStore } from '~/modules/prodia/store-module-prodia';
import { useProdiaStore } from '~/modules/prodia/store-prodia';
import { useChatStore } from '~/common/state/store-chats';
@@ -20,7 +20,7 @@ export const runImageGenerationUpdatingState = async (conversationId: string, im
`Give me a few seconds while I draw ${imageText?.length > 20 ? 'that' : '"' + imageText + '"'}...`);
// generate the image
const { prodiaApiKey: apiKey, prodiaModelId, prodiaNegativePrompt: negativePrompt, prodiaSteps: steps, prodiaCfgScale: cfgScale, prodiaSeed: seed } = useModuleProdiaStore.getState();
const { prodiaApiKey: apiKey, prodiaModelId, prodiaNegativePrompt: negativePrompt, prodiaSteps: steps, prodiaCfgScale: cfgScale, prodiaSeed: seed } = useProdiaStore.getState();
const input: Prodia.API.Imagine.RequestBody = {
...(apiKey && { apiKey }),
prompt: imageText,
@@ -12,7 +12,7 @@ import { Section } from '~/common/components/Section';
import { settingsCol1Width, settingsGap } from '~/common/theme';
import { isElevenLabsEnabled, requireUserKeyElevenLabs, useElevenLabsVoices } from './elevenlabs.client';
import { useModuleElevenlabsStore } from './store-module-elevenlabs';
import { useElevenlabsStore } from './store-elevenlabs';
export function ElevenlabsSettings() {
@@ -20,7 +20,7 @@ export function ElevenlabsSettings() {
const [showApiKeyValue, setShowApiKeyValue] = React.useState(false);
// external state
const { apiKey, setApiKey, voiceId, setVoiceId, autoSpeak, setAutoSpeak } = useModuleElevenlabsStore(state => ({
const { apiKey, setApiKey, voiceId, setVoiceId, autoSpeak, setAutoSpeak } = useElevenlabsStore(state => ({
apiKey: state.elevenLabsApiKey, setApiKey: state.setElevenLabsApiKey,
voiceId: state.elevenLabsVoiceId, setVoiceId: state.setElevenLabsVoiceId,
autoSpeak: state.elevenLabsAutoSpeak, setAutoSpeak: state.setElevenLabsAutoSpeak,
+3 -3
View File
@@ -3,12 +3,12 @@ import { useQuery } from '@tanstack/react-query';
import { useUIPreferencesStore } from '~/common/state/store-ui';
import { useModuleElevenlabsStore } from './store-module-elevenlabs';
import { useElevenlabsStore } from './store-elevenlabs';
export const requireUserKeyElevenLabs = !process.env.HAS_SERVER_KEY_ELEVENLABS;
export const canUseElevenLabs = (): boolean => !!useModuleElevenlabsStore.getState().elevenLabsVoiceId || !requireUserKeyElevenLabs;
export const canUseElevenLabs = (): boolean => !!useElevenlabsStore.getState().elevenLabsVoiceId || !requireUserKeyElevenLabs;
export const isValidElevenLabsApiKey = (apiKey?: string) => !!apiKey && apiKey.trim()?.length >= 32;
@@ -19,7 +19,7 @@ export async function speakText(text: string) {
if (!(text?.trim())) return;
const { preferredLanguage } = useUIPreferencesStore.getState();
const { elevenLabsApiKey, elevenLabsVoiceId } = useModuleElevenlabsStore.getState();
const { elevenLabsApiKey, elevenLabsVoiceId } = useElevenlabsStore.getState();
if (!isElevenLabsEnabled(elevenLabsApiKey)) return;
try {
@@ -2,7 +2,7 @@ import { create } from 'zustand';
import { persist } from 'zustand/middleware';
interface ModuleElevenlabsStore {
interface ElevenlabsStore {
// ElevenLabs Text to Speech settings
@@ -17,7 +17,7 @@ interface ModuleElevenlabsStore {
}
export const useModuleElevenlabsStore = create<ModuleElevenlabsStore>()(
export const useElevenlabsStore = create<ElevenlabsStore>()(
persist(
(set) => ({
+2 -2
View File
@@ -15,7 +15,7 @@ import { settingsGap } from '~/common/theme';
import { Prodia } from './prodia.types';
import { isValidProdiaApiKey, prodiaDefaultModelId, requireUserKeyProdia } from './prodia.client';
import { useModuleProdiaStore } from './store-module-prodia';
import { useProdiaStore } from './store-prodia';
export function ProdiaSettings() {
@@ -23,7 +23,7 @@ export function ProdiaSettings() {
const [showApiKeyValue, setShowApiKeyValue] = React.useState(false);
// external state
const { apiKey, setApiKey, modelId, setModelId, negativePrompt, setNegativePrompt, cfgScale, setCfgScale, steps, setSteps, seed, setSeed } = useModuleProdiaStore(state => ({
const { apiKey, setApiKey, modelId, setModelId, negativePrompt, setNegativePrompt, cfgScale, setCfgScale, steps, setSteps, seed, setSeed } = useProdiaStore(state => ({
apiKey: state.prodiaApiKey, setApiKey: state.setProdiaApiKey,
modelId: state.prodiaModelId, setModelId: state.setProdiaModelId,
negativePrompt: state.prodiaNegativePrompt, setNegativePrompt: state.setProdiaNegativePrompt,
+2 -2
View File
@@ -1,8 +1,8 @@
import { useModuleProdiaStore } from './store-module-prodia';
import { useProdiaStore } from './store-prodia';
export const requireUserKeyProdia = !process.env.HAS_SERVER_KEY_PRODIA;
export const canUseProdia = (): boolean => !!useModuleProdiaStore.getState().prodiaModelId || !requireUserKeyProdia;
export const canUseProdia = (): boolean => !!useProdiaStore.getState().prodiaModelId || !requireUserKeyProdia;
export const isValidProdiaApiKey = (apiKey?: string) => !!apiKey && apiKey.trim()?.length >= 36;
@@ -2,7 +2,7 @@ import { create } from 'zustand';
import { persist } from 'zustand/middleware';
interface ModuleProdiaStore {
interface ProdiaStore {
// Prodia Image Generation settings
@@ -26,7 +26,7 @@ interface ModuleProdiaStore {
}
export const useModuleProdiaStore = create<ModuleProdiaStore>()(
export const useProdiaStore = create<ProdiaStore>()(
persist(
(set) => ({