Skip to content

Commit

Permalink
HOTFIX: Turn off use of user service
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelsharpe
michaelsharpe committed Sep 27, 2024
1 parent 75a0d3f commit 3d2f49c
Show file tree
Hide file tree
Showing 9 changed files with 98 additions and 96 deletions.
7 changes: 6 additions & 1 deletion packages/client/editor/src/components/Newsidebar/AgentMenu.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
9 changes: 4 additions & 5 deletions packages/client/editor/src/components/Newsidebar/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
useCreateAgentMutation,
useCreateAgentReleaseMutation,
useGetAgentsQuery,
useGetUserQuery,
} from 'client/state'
import { useModal } from '../../contexts/ModalProvider'

Expand Down Expand Up @@ -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(() => {
Expand Down Expand Up @@ -201,7 +200,7 @@ export function NewSidebar(): React.JSX.Element {
<ContextMenu />
</div>

<MPBalanceBar userData={userData} isLoading={userLoading} />
{/* <MPBalanceBar userData={userData} isLoading={userLoading} /> */}
</div>
)
}
Expand Down
26 changes: 13 additions & 13 deletions packages/client/editor/src/components/PropertiesWindow/CompletionProviderOptions.tsx
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -125,7 +124,7 @@ export const CompletionProviderOptions: React.FC<
})
}

if (isLoading || isUserDataLoading || !userData) {
if (isLoading) {
return <div>Loading...</div>
}

Expand Down Expand Up @@ -170,11 +169,12 @@ export const CompletionProviderOptions: React.FC<
</SelectTrigger>
<SelectContent className="max-h-52 overflow-y-auto">
{activeModels.map(model => {
const isAvailable = isModelAvailableToUser({
userData,
model,
providersWithUserKeys,
})
// const isAvailable = isModelAvailableToUser({
// userData,
// model,
// providersWithUserKeys,
// })
const isAvailable = true
return (
<SelectItem
className="truncate"
Expand Down
33 changes: 16 additions & 17 deletions packages/client/editor/src/components/PropertiesWindow/EmbeddingProviderOptions.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ export const EmbeddingProviderOptions: 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,
// })

useEffect(() => {
const fetchData = async () => {
Expand All @@ -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) {
Expand All @@ -74,7 +72,7 @@ export const EmbeddingProviderOptions: React.FC<
}

fetchData()
}, [userData])
}, [])

useEffect(() => {
if (!providerData) return
Expand All @@ -91,7 +89,7 @@ export const EmbeddingProviderOptions: React.FC<
}
}, [selectedProvider])

if (isLoading || isUserDataLoading || !userData) {
if (isLoading) {
return <div>Loading...</div>
}

Expand Down Expand Up @@ -132,11 +130,12 @@ export const EmbeddingProviderOptions: React.FC<
</SelectTrigger>
<SelectContent>
{activeModels.map(model => {
const isAvailable = isModelAvailableToUser({
userData,
model,
providersWithUserKeys,
})
// const isAvailable = isModelAvailableToUser({
// userData,
// model,
// providersWithUserKeys,
// })
const isAvailable = true
return (
<SelectItem
key={model.model_name}
Expand Down
45 changes: 23 additions & 22 deletions packages/client/editor/src/hooks/useFeatureFlag.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,35 @@ const featureList: Record<Features, (PortalSubscriptions | Roles | boolean)[]> =
// [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
}
33 changes: 17 additions & 16 deletions packages/client/editor/src/screens/agents/AgentWindow/AgentCredentials.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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({
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions packages/client/editor/src/screens/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<any>) => {
return (props: IGridviewPanelProps<{ title: string }>) => {
Expand Down
29 changes: 14 additions & 15 deletions packages/client/windows/config/src/lib/embedding/config-embeddings.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -48,9 +48,9 @@ export const ConfigEmbeddings = ({
})
}

if (isUserDataLoading) {
return <div>Loading...</div>
}
// if (isUserDataLoading) {
// return <div>Loading...</div>
// }

return (
<div className="flex flex-col max-w-2xl w-full gap-y-4">
Expand All @@ -61,7 +61,6 @@ export const ConfigEmbeddings = ({
<EmbeddingModelDropdown
activeEmbeddingModels={['text-embedding-ada-002']}
selectedEmbeddingModel={selectedEmbeddingModel}
userData={userData}
modelsWithKeys={['text-embedding-ada-002']}
onChange={handleEmbeddingModelChange}
/>
Expand Down
2 changes: 0 additions & 2 deletions packages/client/windows/config/src/lib/embedding/embedding-model.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import { type FC } from 'react'
interface EmbeddingModelDropdownProps {
activeEmbeddingModels: string[]
selectedEmbeddingModel?: string
userData?: any
modelsWithKeys: string[]
onChange: (model: string) => void
}

export const EmbeddingModelDropdown: FC<EmbeddingModelDropdownProps> = ({
activeEmbeddingModels,
selectedEmbeddingModel,
userData,
modelsWithKeys,
onChange,
}) => {
Expand Down

0 comments on commit 3d2f49c

Please sign in to comment.