Compare commits

...

1 Commits

Author SHA1 Message Date
pablodanswer
5a07f727c0 mystery solved 2024-11-21 12:51:30 -08:00
5 changed files with 26 additions and 7 deletions

View File

@@ -259,7 +259,7 @@ def get_personas(
) -> Sequence[Persona]:
stmt = select(Persona).distinct()
stmt = _add_user_filters(stmt=stmt, user=user, get_editable=get_editable)
print(stmt)
if not include_default:
stmt = stmt.where(Persona.builtin_persona.is_(False))
if not include_slack_bot_personas:
@@ -276,7 +276,10 @@ def get_personas(
joinedload(Persona.users),
)
return db_session.execute(stmt).unique().scalars().all()
result = db_session.execute(stmt).unique().scalars().all()
print("RESULT")
print(result)
return result
def mark_persona_as_deleted(

View File

@@ -114,7 +114,7 @@ def list_personas_admin(
include_deleted: bool = False,
get_editable: bool = Query(False, description="If true, return editable personas"),
) -> list[PersonaSnapshot]:
return [
personas = [
PersonaSnapshot.from_model(persona)
for persona in get_personas(
db_session=db_session,
@@ -124,6 +124,9 @@ def list_personas_admin(
joinedload_all=True,
)
]
print("PERSONAS")
print(personas)
return personas
@admin_router.patch("/{persona_id}/undelete")

View File

@@ -47,7 +47,7 @@ export const AssistantsProvider: React.FC<{
const [assistants, setAssistants] = useState<Persona[]>(
initialAssistants || []
);
const { user, isLoadingUser, isAdmin } = useUser();
const { user, isLoadingUser, isAdmin, isCurator } = useUser();
const [editablePersonas, setEditablePersonas] = useState<Persona[]>([]);
const [allAssistants, setAllAssistants] = useState<Persona[]>([]);
@@ -83,7 +83,7 @@ export const AssistantsProvider: React.FC<{
useEffect(() => {
const fetchPersonas = async () => {
if (!isAdmin) {
if (!isAdmin && !isCurator) {
return;
}
@@ -101,6 +101,8 @@ export const AssistantsProvider: React.FC<{
if (allResponse.ok) {
const allPersonas = await allResponse.json();
setAllAssistants(allPersonas);
} else {
console.error("Error fetching personas:", allResponse);
}
} catch (error) {
console.error("Error fetching personas:", error);
@@ -108,7 +110,7 @@ export const AssistantsProvider: React.FC<{
};
fetchPersonas();
}, [isAdmin]);
}, [isAdmin, isCurator]);
const refreshRecentAssistants = async (currentAssistant: number) => {
const response = await fetch("/api/user/recent-assistants", {

View File

@@ -67,7 +67,9 @@ export function UserProvider({
isLoadingUser,
refreshUser,
isAdmin: upToDateUser?.role === UserRole.ADMIN,
isCurator: upToDateUser?.role === UserRole.CURATOR,
isCurator:
upToDateUser?.role === UserRole.CURATOR ||
upToDateUser?.role === UserRole.GLOBAL_CURATOR,
isCloudSuperuser: upToDateUser?.is_cloud_superuser ?? false,
}}
>

View File

@@ -11,6 +11,7 @@ interface AssistantData {
hasImageCompatibleModel: boolean;
}
export async function fetchAssistantData(): Promise<AssistantData> {
console.log("FETCH ASSISTANT DATA");
// Default state if anything fails
const defaultState: AssistantData = {
assistants: [],
@@ -39,6 +40,8 @@ export async function fetchAssistantData(): Promise<AssistantData> {
}),
]);
console.log("ASSISTANTS");
console.log(assistants);
// Process visible assistants
let filteredAssistants = assistants.filter(
(assistant) => assistant.is_visible
@@ -75,6 +78,12 @@ export async function fetchAssistantData(): Promise<AssistantData> {
)
);
}
console.log("FILTERED ASSISTANTS");
console.log(filteredAssistants);
// console.log("HAS ANY CONNECTORS")
// console.log(hasAnyConnectors)
// console.log("HAS IMAGE COMPATIBLE MODEL")
// console.log(hasImageCompatibleModel)
return {
assistants: filteredAssistants,