From 3d2f49c2c922d3057e4748d14368d544af4d2d4a Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 Sep 2024 19:18:16 -0700 Subject: [PATCH] HOTFIX: Turn off use of user service --- .../src/components/Newsidebar/AgentMenu.tsx | 7 ++- .../src/components/Newsidebar/index.tsx | 9 ++-- .../CompletionProviderOptions.tsx | 26 +++++------ .../EmbeddingProviderOptions.tsx | 33 +++++++------- .../client/editor/src/hooks/useFeatureFlag.ts | 45 ++++++++++--------- .../agents/AgentWindow/AgentCredentials.tsx | 33 +++++++------- packages/client/editor/src/screens/index.tsx | 10 ++--- .../src/lib/embedding/config-embeddings.tsx | 29 ++++++------ .../src/lib/embedding/embedding-model.tsx | 2 - 9 files changed, 98 insertions(+), 96 deletions(-) diff --git a/packages/client/editor/src/components/Newsidebar/AgentMenu.tsx b/packages/client/editor/src/components/Newsidebar/AgentMenu.tsx index c93f494f09..e832940358 100644 --- a/packages/client/editor/src/components/Newsidebar/AgentMenu.tsx +++ b/packages/client/editor/src/components/Newsidebar/AgentMenu.tsx @@ -40,10 +40,15 @@ export function AgentMenu({ data }) { const [createAgentRelease] = useCreateAgentReleaseMutation() const setCurrentAgent = useCallback((agent: AgentInterface) => { + if (!agent) { + console.error('AGENT IS NULL IN AGENT MENU') + return + } + console.log('CREATING AGENT IN AGENT MENU') // onlt create agent if it is enabled - if (agent.enabled) { + if (agent?.enabled) { client.service('agents').createAgent(agent.id) } diff --git a/packages/client/editor/src/components/Newsidebar/index.tsx b/packages/client/editor/src/components/Newsidebar/index.tsx index 2f180462e6..d03fcb6d26 100644 --- a/packages/client/editor/src/components/Newsidebar/index.tsx +++ b/packages/client/editor/src/components/Newsidebar/index.tsx @@ -14,7 +14,6 @@ import { useCreateAgentMutation, useCreateAgentReleaseMutation, useGetAgentsQuery, - useGetUserQuery, } from 'client/state' import { useModal } from '../../contexts/ModalProvider' @@ -44,9 +43,9 @@ export function NewSidebar(): React.JSX.Element { RootState['globalConfig'] >(state => state.globalConfig) - const { data: userData, isLoading: userLoading } = useGetUserQuery({ - projectId: config.projectId, - }) + // const { data: userData, isLoading: userLoading } = useGetUserQuery({ + // projectId: config.projectId, + // }) // stopgap until I patch the agent menu with new redux stuff useEffect(() => { @@ -201,7 +200,7 @@ export function NewSidebar(): React.JSX.Element { - + {/* */} ) } diff --git a/packages/client/editor/src/components/PropertiesWindow/CompletionProviderOptions.tsx b/packages/client/editor/src/components/PropertiesWindow/CompletionProviderOptions.tsx index 57a6ff5cb9..2d444061d0 100644 --- a/packages/client/editor/src/components/PropertiesWindow/CompletionProviderOptions.tsx +++ b/packages/client/editor/src/components/PropertiesWindow/CompletionProviderOptions.tsx @@ -1,9 +1,8 @@ import React, { useEffect, useState } from 'react' import { ConfigurationComponentProps } from './PropertiesWindow' import { useConfig } from '@magickml/providers' -import { useListCredentialsQuery, useGetUserQuery } from 'client/state' +import { useListCredentialsQuery } from 'client/state' import { - isModelAvailableToUser, Model, getProvidersWithUserKeys, getProviderIdMapping, @@ -38,16 +37,16 @@ export const CompletionProviderOptions: React.FC< const { data: credentials } = useListCredentialsQuery({ projectId: config.projectId, }) - const { data: userData, isLoading: isUserDataLoading } = useGetUserQuery({ - projectId: config.projectId, - }) + // const { data: userData, isLoading: isUserDataLoading } = useGetUserQuery({ + // projectId: config.projectId, + // }) // Handle initial loading useEffect(() => { if (props.node && props.node.id === lastActiveNodeId) return setLastActiveNodeId(props.node?.id || '') - if (!userData && !providerData) return + // if (!userData && !providerData) return // get the model provider let modelProvider = getProviderIdMapping( @@ -89,7 +88,7 @@ export const CompletionProviderOptions: React.FC< // set loading to false setIsLoading(false) - }, [userData, providerData, props.node]) + }, [providerData, props.node]) useEffect(() => { if (!providerData) return @@ -125,7 +124,7 @@ export const CompletionProviderOptions: React.FC< }) } - if (isLoading || isUserDataLoading || !userData) { + if (isLoading) { return
Loading...
} @@ -170,11 +169,12 @@ export const CompletionProviderOptions: React.FC< {activeModels.map(model => { - const isAvailable = isModelAvailableToUser({ - userData, - model, - providersWithUserKeys, - }) + // const isAvailable = isModelAvailableToUser({ + // userData, + // model, + // providersWithUserKeys, + // }) + const isAvailable = true return ( { const fetchData = async () => { @@ -58,13 +58,11 @@ export const EmbeddingProviderOptions: React.FC< setProviderData(groupedModels) - if (userData) { - setSelectedProvider(props.fullConfig.modelProvider || '') - setSelectedModel(props.fullConfig.model || '') - setActiveModels( - groupedModels[props.fullConfig.modelProvider].models || [] - ) - } + setSelectedProvider(props.fullConfig.modelProvider || '') + setSelectedModel(props.fullConfig.model || '') + setActiveModels( + groupedModels[props.fullConfig.modelProvider].models || [] + ) setIsLoading(false) } catch (error) { @@ -74,7 +72,7 @@ export const EmbeddingProviderOptions: React.FC< } fetchData() - }, [userData]) + }, []) useEffect(() => { if (!providerData) return @@ -91,7 +89,7 @@ export const EmbeddingProviderOptions: React.FC< } }, [selectedProvider]) - if (isLoading || isUserDataLoading || !userData) { + if (isLoading) { return
Loading...
} @@ -132,11 +130,12 @@ export const EmbeddingProviderOptions: React.FC< {activeModels.map(model => { - const isAvailable = isModelAvailableToUser({ - userData, - model, - providersWithUserKeys, - }) + // const isAvailable = isModelAvailableToUser({ + // userData, + // model, + // providersWithUserKeys, + // }) + const isAvailable = true return ( = // [Features.SERAPH_CHAT_WINDOW]: [WIZARD, APPRENTICE, NEOPHYTE, ADMIN], } export const useFeatureFlag = (feature: Features): boolean => { - const config = useConfig() - const { data: userData } = useGetUserQuery({ - projectId: config.projectId, - }) + // const config = useConfig() + // const { data: userData } = useGetUserQuery({ + // projectId: config.projectId, + // }) + const [hasAccess, setHasAccess] = useState(false) - useEffect(() => { - // Checking for local environment override - const envOverride = flags[feature] + // useEffect(() => { + // // Checking for local environment override + // const envOverride = flags[feature] - if (envOverride !== undefined) { - setHasAccess(envOverride === 'true') - return - } + // if (envOverride !== undefined) { + // setHasAccess(envOverride === 'true') + // return + // } - if (userData && userData.user) { - const posthogFlagEnabled = posthog.isFeatureEnabled(feature) - const hogFlagIsTrue = posthogFlagEnabled === true + // if (userData && userData.user) { + // const posthogFlagEnabled = posthog.isFeatureEnabled(feature) + // const hogFlagIsTrue = posthogFlagEnabled === true - const userHasAccess = - featureList[feature].includes(userData.user.subscriptionName) || - featureList[feature].includes(userData.user.role) || - featureList[feature].includes(true) || - hogFlagIsTrue + // const userHasAccess = + // featureList[feature].includes(userData.user.subscriptionName) || + // featureList[feature].includes(userData.user.role) || + // featureList[feature].includes(true) || + // hogFlagIsTrue - setHasAccess(userHasAccess) - } - }, [userData, feature]) + // setHasAccess(userHasAccess) + // } + // }, [userData, feature]) return hasAccess } diff --git a/packages/client/editor/src/screens/agents/AgentWindow/AgentCredentials.tsx b/packages/client/editor/src/screens/agents/AgentWindow/AgentCredentials.tsx index c3f5a5b130..0235aa7658 100644 --- a/packages/client/editor/src/screens/agents/AgentWindow/AgentCredentials.tsx +++ b/packages/client/editor/src/screens/agents/AgentWindow/AgentCredentials.tsx @@ -121,9 +121,9 @@ const Header = ({ agentId }: { agentId: string }): JSX.Element => { projectId: config.projectId, }) - const { data: userData } = useGetUserQuery({ - projectId: config.projectId, - }) + // const { data: userData } = useGetUserQuery({ + // projectId: config.projectId, + // }) const [updateAgent] = useUpdateAgentMutation() @@ -160,14 +160,14 @@ const Header = ({ agentId }: { agentId: string }): JSX.Element => { ) }, [selectedEmbeddingProvider]) - useEffect(() => { - if (userData) { - const provider = userData.embeddingProvider - const model = userData.embeddingModel - setSelectedEmbeddingProvider(provider) - setSelectedEmbeddingModel(model) - } - }, [userData]) + // useEffect(() => { + // if (userData) { + // const provider = userData.embeddingProvider + // const model = userData.embeddingModel + // setSelectedEmbeddingProvider(provider) + // setSelectedEmbeddingModel(model) + // } + // }, [userData]) const openSecrets = () => { openTab({ @@ -195,11 +195,12 @@ const Header = ({ agentId }: { agentId: string }): JSX.Element => { } const modelOptions = activeEmbeddingModels.map(model => { - const isAvailable = isModelAvailableToUser({ - userData, - model: model, - providersWithUserKeys, - }) + // const isAvailable = isModelAvailableToUser({ + // userData, + // model: model, + // providersWithUserKeys, + // }) + const isAvailable = true return { value: model.model_name, label: model.display_name, diff --git a/packages/client/editor/src/screens/index.tsx b/packages/client/editor/src/screens/index.tsx index 89314111e9..a164573a36 100644 --- a/packages/client/editor/src/screens/index.tsx +++ b/packages/client/editor/src/screens/index.tsx @@ -76,14 +76,14 @@ const MagickV2 = () => { const { getLayout, setApi } = useGlobalLayout() const { theme } = useDockviewTheme() const config = useConfig() - const { data: userData, isLoading } = useGetUserQuery({ - projectId: config.projectId, - }) + // const { data: userData, isLoading } = useGetUserQuery({ + // projectId: config.projectId, + // }) const dispatch = useDispatch() - if (isLoading) return null + // if (isLoading) return null - posthog.setPersonPropertiesForFlags({ email: userData?.user?.email }) + // posthog.setPersonPropertiesForFlags({ email: userData?.user?.email }) const withClickHandler = (WrappedComponent: React.ComponentType) => { return (props: IGridviewPanelProps<{ title: string }>) => { diff --git a/packages/client/windows/config/src/lib/embedding/config-embeddings.tsx b/packages/client/windows/config/src/lib/embedding/config-embeddings.tsx index 2e67d6ecc0..5f4b1e3c97 100644 --- a/packages/client/windows/config/src/lib/embedding/config-embeddings.tsx +++ b/packages/client/windows/config/src/lib/embedding/config-embeddings.tsx @@ -17,20 +17,20 @@ export const ConfigEmbeddings = ({ const config = useConfig() - const { data: userData, isLoading: isUserDataLoading } = useGetUserQuery({ - projectId: config.projectId, - }) + // const { data: userData, isLoading: isUserDataLoading } = useGetUserQuery({ + // projectId: config.projectId, + // }) const [updateAgent] = useUpdateAgentMutation() - useEffect(() => { - if (userData) { - const provider = userData.embeddingProvider - const model = userData.embeddingModel - setSelectedEmbeddingProvider(provider) - setSelectedEmbeddingModel(model) - } - }, [userData]) + // useEffect(() => { + // if (userData) { + // const provider = userData.embeddingProvider + // const model = userData.embeddingModel + // setSelectedEmbeddingProvider(provider) + // setSelectedEmbeddingModel(model) + // } + // }, [userData]) const handleEmbeddingProviderChange = (provider: string) => { setSelectedEmbeddingProvider(provider) @@ -48,9 +48,9 @@ export const ConfigEmbeddings = ({ }) } - if (isUserDataLoading) { - return
Loading...
- } + // if (isUserDataLoading) { + // return
Loading...
+ // } return (
@@ -61,7 +61,6 @@ export const ConfigEmbeddings = ({ diff --git a/packages/client/windows/config/src/lib/embedding/embedding-model.tsx b/packages/client/windows/config/src/lib/embedding/embedding-model.tsx index 5b7c808962..843563c862 100644 --- a/packages/client/windows/config/src/lib/embedding/embedding-model.tsx +++ b/packages/client/windows/config/src/lib/embedding/embedding-model.tsx @@ -4,7 +4,6 @@ import { type FC } from 'react' interface EmbeddingModelDropdownProps { activeEmbeddingModels: string[] selectedEmbeddingModel?: string - userData?: any modelsWithKeys: string[] onChange: (model: string) => void } @@ -12,7 +11,6 @@ interface EmbeddingModelDropdownProps { export const EmbeddingModelDropdown: FC = ({ activeEmbeddingModels, selectedEmbeddingModel, - userData, modelsWithKeys, onChange, }) => {