From 8a98650af643f4ac1980999eaad023c61fac94ff Mon Sep 17 00:00:00 2001 From: Sensational Code Date: Sat, 27 Jul 2024 23:46:12 -0700 Subject: [PATCH 1/8] Run eslint fix on user portal --- src/ui/UserPortal/components/ChatInput.vue | 157 +++++++++++++----- src/ui/UserPortal/components/ChatMessage.vue | 27 +-- src/ui/UserPortal/components/ChatSidebar.vue | 8 +- src/ui/UserPortal/components/ChatThread.vue | 14 +- .../UserPortal/components/CodeBlockHeader.vue | 125 +++++++------- src/ui/UserPortal/components/NavBar.vue | 7 +- src/ui/UserPortal/js/api.ts | 96 ++++++----- src/ui/UserPortal/js/eventBus.ts | 10 +- src/ui/UserPortal/js/types/index.ts | 2 +- src/ui/UserPortal/pages/auth/index.vue | 8 +- src/ui/UserPortal/stores/appConfigStore.ts | 26 +-- src/ui/UserPortal/stores/appStore.ts | 34 ++-- 12 files changed, 314 insertions(+), 200 deletions(-) diff --git a/src/ui/UserPortal/components/ChatInput.vue b/src/ui/UserPortal/components/ChatInput.vue index 85cb6ae57b..a9ffc9c8df 100644 --- a/src/ui/UserPortal/components/ChatInput.vue +++ b/src/ui/UserPortal/components/ChatInput.vue @@ -1,21 +1,33 @@ @@ -82,12 +143,12 @@
-

+

Drag and drop files here
or
- Browse for files + Browse for files

@@ -170,9 +231,9 @@ export default { agentListOpen: false, showFileUploadDialog: false, primaryButtonBg: this.$appConfigStore.primaryButtonBg, - primaryButtonText: this.$appConfigStore.primaryButtonText, + primaryButtonText: this.$appConfigStore.primaryButtonText, secondaryButtonBg: this.$appConfigStore.secondaryButtonBg, - secondaryButtonText: this.$appConfigStore.secondaryButtonText, + secondaryButtonText: this.$appConfigStore.secondaryButtonText, }; }, @@ -232,15 +293,23 @@ export default { async handleUpload(event: any) { try { const formData = new FormData(); - formData.append("file", event.files[0]); + formData.append('file', event.files[0]); const objectId = await this.$appStore.uploadAttachment(formData); console.log(`File uploaded: ObjectId: ${objectId}`); - this.$toast.add({ severity: 'success', summary: 'Success', detail: 'File uploaded successfully.' }); + this.$toast.add({ + severity: 'success', + summary: 'Success', + detail: 'File uploaded successfully.', + }); this.showFileUploadDialog = false; } catch (error) { - this.$toast.add({ severity: 'error', summary: 'Error', detail: `File upload failed. ${error.message}` }); + this.$toast.add({ + severity: 'error', + summary: 'Error', + detail: `File upload failed. ${error.message}`, + }); } }, @@ -265,10 +334,10 @@ export default { rejectProps: { label: 'Cancel', severity: 'secondary', - outlined: true + outlined: true, }, acceptProps: { - label: 'Upload' + label: 'Upload', }, accept: () => { uploadCallback(); @@ -276,7 +345,7 @@ export default { }, reject: () => { this.showFileUploadDialog = false; - } + }, }); } else { uploadCallback(); @@ -285,19 +354,19 @@ export default { }, formatSize(bytes) { - const k = 1024; - const dm = 3; - const sizes = this.$primevue.config.locale.fileSizeTypes; + const k = 1024; + const dm = 3; + const sizes = this.$primevue.config.locale.fileSizeTypes; - if (bytes === 0) { - return `0 ${sizes[0]}`; - } + if (bytes === 0) { + return `0 ${sizes[0]}`; + } - const i = Math.floor(Math.log(bytes) / Math.log(k)); - const formattedSize = parseFloat((bytes / Math.pow(k, i)).toFixed(dm)); + const i = Math.floor(Math.log(bytes) / Math.log(k)); + const formattedSize = parseFloat((bytes / Math.pow(k, i)).toFixed(dm)); - return `${formattedSize} ${sizes[i]}`; - } + return `${formattedSize} ${sizes[i]}`; + }, }, }; @@ -327,7 +396,7 @@ export default { } .chat-input .input-wrapper { - display: flex; + display: flex; align-items: stretch; width: 100%; } @@ -403,10 +472,10 @@ export default { .attached-files { display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; - flex-wrap: nowrap; + flex-direction: row; + align-items: center; + justify-content: space-between; + flex-wrap: nowrap; } .file-remove { @@ -447,6 +516,6 @@ export default { width: 100%; text-align: center; font-size: 5rem; - color: #000; + color: #000; } diff --git a/src/ui/UserPortal/components/ChatMessage.vue b/src/ui/UserPortal/components/ChatMessage.vue index b812d3a916..4f32957f87 100644 --- a/src/ui/UserPortal/components/ChatMessage.vue +++ b/src/ui/UserPortal/components/ChatMessage.vue @@ -27,7 +27,9 @@ }, }" /> - {{ $filters.timeAgo(new Date(message.timeStamp)) }} + {{ + $filters.timeAgo(new Date(message.timeStamp)) + }} @@ -105,13 +107,14 @@

{{ prompt.prompt }}

@@ -166,7 +169,9 @@ function addCodeHeaderComponents(htmlString) { }); const html = doc.body.innerHTML; - const withVueCurlyBracesSanitized = html.replace(/{{/g, '{{').replace(/}}/g, '}}'); + const withVueCurlyBracesSanitized = html + .replace(/{{/g, '{{') + .replace(/}}/g, '}}'); return withVueCurlyBracesSanitized; } @@ -210,7 +215,7 @@ export default { components: { CodeBlockHeader, }, - }; + }; }, }, @@ -251,7 +256,7 @@ export default { hour: 'numeric', minute: 'numeric', second: 'numeric', - timeZoneName: 'short' + timeZoneName: 'short', }; return date.toLocaleString(undefined, options); }, diff --git a/src/ui/UserPortal/components/ChatSidebar.vue b/src/ui/UserPortal/components/ChatSidebar.vue index 5b04841d07..40eca75896 100644 --- a/src/ui/UserPortal/components/ChatSidebar.vue +++ b/src/ui/UserPortal/components/ChatSidebar.vue @@ -22,7 +22,13 @@ - + diff --git a/src/ui/UserPortal/stores/appConfigStore.ts b/src/ui/UserPortal/stores/appConfigStore.ts index f000ef9985..9bc8c9e2b9 100644 --- a/src/ui/UserPortal/stores/appConfigStore.ts +++ b/src/ui/UserPortal/stores/appConfigStore.ts @@ -42,14 +42,14 @@ export const useAppConfigStore = defineStore('appConfig', { actions: { async getConfigVariables() { const getConfigValueSafe = async (key: string, defaultValue: any = null) => { - try { - return await api.getConfigValue(key); - } catch (error) { - console.error(`Failed to get config value for key ${key}:`, error); - return defaultValue; - } - }; - + try { + return await api.getConfigValue(key); + } catch (error) { + console.error(`Failed to get config value for key ${key}:`, error); + return defaultValue; + } + }; + const [ apiUrl, isKioskMode, @@ -74,10 +74,10 @@ export const useAppConfigStore = defineStore('appConfig', { authInstance, authTenantId, authScopes, - authCallbackPath + authCallbackPath, ] = await Promise.all([ api.getConfigValue('FoundationaLLM:APIs:CoreAPI:APIUrl'), - + getConfigValueSafe('FoundationaLLM:Branding:KioskMode'), getConfigValueSafe('FoundationaLLM:Branding:PageTitle'), getConfigValueSafe('FoundationaLLM:Branding:FavIconUrl'), @@ -95,12 +95,12 @@ export const useAppConfigStore = defineStore('appConfig', { getConfigValueSafe('FoundationaLLM:Branding:SecondaryButtonBackgroundColor', '#70829a'), getConfigValueSafe('FoundationaLLM:Branding:SecondaryButtonTextColor', '#fff'), getConfigValueSafe('FoundationaLLM:Branding:FooterText'), - getConfigValueSafe('FoundationaLLM:Instance:Id','00000000-0000-0000-0000-000000000000'), + getConfigValueSafe('FoundationaLLM:Instance:Id', '00000000-0000-0000-0000-000000000000'), api.getConfigValue('FoundationaLLM:Chat:Entra:ClientId'), api.getConfigValue('FoundationaLLM:Chat:Entra:Instance'), api.getConfigValue('FoundationaLLM:Chat:Entra:TenantId'), api.getConfigValue('FoundationaLLM:Chat:Entra:Scopes'), - api.getConfigValue('FoundationaLLM:Chat:Entra:CallbackPath') + api.getConfigValue('FoundationaLLM:Chat:Entra:CallbackPath'), ]); this.apiUrl = apiUrl; @@ -123,7 +123,7 @@ export const useAppConfigStore = defineStore('appConfig', { this.secondaryButtonBg = secondaryButtonBg; this.secondaryButtonText = secondaryButtonText; this.footerText = footerText; - this.instanceId = instanceId + this.instanceId = instanceId; this.auth.clientId = authClientId; this.auth.instance = authInstance; diff --git a/src/ui/UserPortal/stores/appStore.ts b/src/ui/UserPortal/stores/appStore.ts index f6a32d2662..fdd0914368 100644 --- a/src/ui/UserPortal/stores/appStore.ts +++ b/src/ui/UserPortal/stores/appStore.ts @@ -15,7 +15,7 @@ export const useAppStore = defineStore('app', { selectedAgents: new Map(), lastSelectedAgent: null as ResourceProviderGetResult | null, attachments: [] as Attachment[], - longRunningOperations: new Map(), // sessionId -> operationId + longRunningOperations: new Map(), // sessionId -> operationId }), getters: {}, @@ -122,15 +122,17 @@ export const useAppStore = defineStore('app', { updateSessionAgentFromMessages(session: Session) { const lastAssistantMessage = this.currentMessages - .filter((message) => message.sender.toLowerCase() === 'assistant') - .pop(); + .filter((message) => message.sender.toLowerCase() === 'assistant') + .pop(); if (lastAssistantMessage) { - const agent = this.agents.find(agent => agent.resource.name === lastAssistantMessage.senderDisplayName); - if (agent) { - this.setSessionAgent(session, agent); - } + const agent = this.agents.find( + (agent) => agent.resource.name === lastAssistantMessage.senderDisplayName, + ); + if (agent) { + this.setSessionAgent(session, agent); + } } - }, + }, getSessionAgent(session: Session) { if (!session) return null; @@ -154,7 +156,7 @@ export const useAppStore = defineStore('app', { /** * Sends a message to the Core API. - * + * * @param text - The text of the message to send. * @returns A Promise that resolves when the message is sent. */ @@ -200,7 +202,7 @@ export const useAppStore = defineStore('app', { user_prompt: text, agent_name: agent.name, settings: null, - attachments: this.attachments.map(attachment => String(attachment.id)) + attachments: this.attachments.map((attachment) => String(attachment.id)), }); this.longRunningOperations.set(this.currentSession!.id, operationId); @@ -210,7 +212,7 @@ export const useAppStore = defineStore('app', { this.currentSession!.id, text, agent, - this.attachments.map(attachment => String(attachment.id)), + this.attachments.map((attachment) => String(attachment.id)), ); await this.getMessages(); } @@ -221,15 +223,15 @@ export const useAppStore = defineStore('app', { const { text: newSessionName } = await api.generateSessionName( this.currentSession!.id, sessionFullText, - ); + ); // the generate session name already renames the session in the backend this.currentSession!.name = newSessionName; } - }, + }, /** * Polls for the completion of a long-running operation. - * + * * @param sessionId - The session ID associated with the operation. * @param operationId - The ID of the operation to check for completion. */ @@ -242,7 +244,7 @@ export const useAppStore = defineStore('app', { await this.getMessages(); break; } - await new Promise(resolve => setTimeout(resolve, 2000)); // Poll every 2 seconds + await new Promise((resolve) => setTimeout(resolve, 2000)); // Poll every 2 seconds } }, @@ -293,7 +295,7 @@ export const useAppStore = defineStore('app', { const fileName = file.get('file')?.name; // this.attachments.push(id); // For now, we want to just replace the attachments with the new one. - this.attachments = [{ id, fileName}]; + this.attachments = [{ id, fileName }]; return id; } catch (error) { throw error; From 6b38d666272d04c71452e08cfccf4513ebdf4176 Mon Sep 17 00:00:00 2001 From: Sensational Code Date: Thu, 1 Aug 2024 00:21:58 -0700 Subject: [PATCH 2/8] Run eslint fix on user portal --- src/ui/UserPortal/components/ChatInput.vue | 116 ++++++++++++++++----- src/ui/UserPortal/stores/appConfigStore.ts | 26 ++--- src/ui/UserPortal/stores/appStore.ts | 45 ++++---- 3 files changed, 129 insertions(+), 58 deletions(-) diff --git a/src/ui/UserPortal/components/ChatInput.vue b/src/ui/UserPortal/components/ChatInput.vue index 906ac7291b..916c304116 100644 --- a/src/ui/UserPortal/components/ChatInput.vue +++ b/src/ui/UserPortal/components/ChatInput.vue @@ -1,21 +1,33 @@ @@ -82,12 +143,12 @@
-

+

Drag and drop files here
or
- Browse for files + Browse for files

@@ -178,7 +239,9 @@ export default { computed: { fileArrayFiltered() { - return this.$appStore.attachments.filter((attachment) => attachment.sessionId === this.$appStore.currentSession.sessionId); + return this.$appStore.attachments.filter( + (attachment) => attachment.sessionId === this.$appStore.currentSession.sessionId, + ); }, }, @@ -238,9 +301,12 @@ export default { async handleUpload(event: any) { try { const formData = new FormData(); - formData.append("file", event.files[0]); + formData.append('file', event.files[0]); - const objectId = await this.$appStore.uploadAttachment(formData, this.$appStore.currentSession.sessionId); + const objectId = await this.$appStore.uploadAttachment( + formData, + this.$appStore.currentSession.sessionId, + ); console.log(`File uploaded: ObjectId: ${objectId}`); this.$toast.add({ @@ -286,7 +352,7 @@ export default { acceptProps: { label: 'Cancel', severity: 'secondary', - outlined: true + outlined: true, }, accept: () => { this.showFileUploadDialog = false; @@ -294,7 +360,7 @@ export default { reject: () => { uploadCallback(); this.showFileUploadDialog = false; - } + }, }); } else { uploadCallback(); diff --git a/src/ui/UserPortal/stores/appConfigStore.ts b/src/ui/UserPortal/stores/appConfigStore.ts index 7399fb4cdf..d8b4615339 100644 --- a/src/ui/UserPortal/stores/appConfigStore.ts +++ b/src/ui/UserPortal/stores/appConfigStore.ts @@ -42,14 +42,14 @@ export const useAppConfigStore = defineStore('appConfig', { actions: { async getConfigVariables() { const getConfigValueSafe = async (key: string, defaultValue: any = null) => { - try { - return await api.getConfigValue(key); - } catch (error) { - console.error(`Failed to get config value for key ${key}:`, error); - return defaultValue; - } - }; - + try { + return await api.getConfigValue(key); + } catch (error) { + console.error(`Failed to get config value for key ${key}:`, error); + return defaultValue; + } + }; + const [ apiUrl, isKioskMode, @@ -74,10 +74,10 @@ export const useAppConfigStore = defineStore('appConfig', { authInstance, authTenantId, authScopes, - authCallbackPath + authCallbackPath, ] = await Promise.all([ api.getConfigValue('FoundationaLLM:APIEndpoints:CoreAPI:Essentials:APIUrl'), - + getConfigValueSafe('FoundationaLLM:Branding:KioskMode'), getConfigValueSafe('FoundationaLLM:Branding:PageTitle'), getConfigValueSafe('FoundationaLLM:Branding:FavIconUrl'), @@ -95,12 +95,12 @@ export const useAppConfigStore = defineStore('appConfig', { getConfigValueSafe('FoundationaLLM:Branding:SecondaryButtonBackgroundColor', '#70829a'), getConfigValueSafe('FoundationaLLM:Branding:SecondaryButtonTextColor', '#fff'), getConfigValueSafe('FoundationaLLM:Branding:FooterText'), - getConfigValueSafe('FoundationaLLM:Instance:Id','00000000-0000-0000-0000-000000000000'), + getConfigValueSafe('FoundationaLLM:Instance:Id', '00000000-0000-0000-0000-000000000000'), api.getConfigValue('FoundationaLLM:UserPortal:Authentication:Entra:ClientId'), api.getConfigValue('FoundationaLLM:UserPortal:Authentication:Entra:Instance'), api.getConfigValue('FoundationaLLM:UserPortal:Authentication:Entra:TenantId'), api.getConfigValue('FoundationaLLM:UserPortal:Authentication:Entra:Scopes'), - api.getConfigValue('FoundationaLLM:UserPortal:Authentication:Entra:CallbackPath') + api.getConfigValue('FoundationaLLM:UserPortal:Authentication:Entra:CallbackPath'), ]); this.apiUrl = apiUrl; @@ -123,7 +123,7 @@ export const useAppConfigStore = defineStore('appConfig', { this.secondaryButtonBg = secondaryButtonBg; this.secondaryButtonText = secondaryButtonText; this.footerText = footerText; - this.instanceId = instanceId + this.instanceId = instanceId; this.auth.clientId = authClientId; this.auth.instance = authInstance; diff --git a/src/ui/UserPortal/stores/appStore.ts b/src/ui/UserPortal/stores/appStore.ts index 7cc7ee71f7..698be10070 100644 --- a/src/ui/UserPortal/stores/appStore.ts +++ b/src/ui/UserPortal/stores/appStore.ts @@ -15,7 +15,7 @@ export const useAppStore = defineStore('app', { selectedAgents: new Map(), lastSelectedAgent: null as ResourceProviderGetResult | null, attachments: [] as Attachment[], - longRunningOperations: new Map(), // sessionId -> operationId + longRunningOperations: new Map(), // sessionId -> operationId }), getters: {}, @@ -122,15 +122,17 @@ export const useAppStore = defineStore('app', { updateSessionAgentFromMessages(session: Session) { const lastAssistantMessage = this.currentMessages - .filter((message) => message.sender.toLowerCase() === 'assistant') - .pop(); + .filter((message) => message.sender.toLowerCase() === 'assistant') + .pop(); if (lastAssistantMessage) { - const agent = this.agents.find(agent => agent.resource.name === lastAssistantMessage.senderDisplayName); - if (agent) { - this.setSessionAgent(session, agent); - } + const agent = this.agents.find( + (agent) => agent.resource.name === lastAssistantMessage.senderDisplayName, + ); + if (agent) { + this.setSessionAgent(session, agent); + } } - }, + }, getSessionAgent(session: Session) { if (!session) return null; @@ -154,7 +156,7 @@ export const useAppStore = defineStore('app', { /** * Sends a message to the Core API. - * + * * @param text - The text of the message to send. * @returns A Promise that resolves when the message is sent. */ @@ -162,8 +164,9 @@ export const useAppStore = defineStore('app', { if (!text) return; let sessionId = this.currentSession!.id; - let relevantAttachments = this.attachments.filter(attachment => attachment.sessionId === sessionId); - + let relevantAttachments = this.attachments.filter( + (attachment) => attachment.sessionId === sessionId, + ); const authStore = useAuthStore(); const tempUserMessage: Message = { @@ -204,7 +207,7 @@ export const useAppStore = defineStore('app', { user_prompt: text, agent_name: agent.name, settings: null, - attachments: relevantAttachments.map(attachment => String(attachment.id)) + attachments: relevantAttachments.map((attachment) => String(attachment.id)), }); this.longRunningOperations.set(this.currentSession!.id, operationId); @@ -214,7 +217,7 @@ export const useAppStore = defineStore('app', { this.currentSession!.id, text, agent, - relevantAttachments.map(attachment => String(attachment.id)), + relevantAttachments.map((attachment) => String(attachment.id)), ); await this.getMessages(); } @@ -225,15 +228,15 @@ export const useAppStore = defineStore('app', { const { text: newSessionName } = await api.generateSessionName( this.currentSession!.id, sessionFullText, - ); + ); // the generate session name already renames the session in the backend this.currentSession!.name = newSessionName; } - }, + }, /** * Polls for the completion of a long-running operation. - * + * * @param sessionId - The session ID associated with the operation. * @param operationId - The ID of the operation to check for completion. */ @@ -246,7 +249,7 @@ export const useAppStore = defineStore('app', { await this.getMessages(); break; } - await new Promise(resolve => setTimeout(resolve, 2000)); // Poll every 2 seconds + await new Promise((resolve) => setTimeout(resolve, 2000)); // Poll every 2 seconds } }, @@ -297,14 +300,16 @@ export const useAppStore = defineStore('app', { const fileName = file.get('file')?.name; const newAttachment = { id, fileName, sessionId }; - const existingIndex = this.attachments.findIndex(attachment => attachment.sessionId === sessionId); - + const existingIndex = this.attachments.findIndex( + (attachment) => attachment.sessionId === sessionId, + ); + if (existingIndex !== -1) { this.attachments.splice(existingIndex, 1, newAttachment); } else { this.attachments.push(newAttachment); } - + return id; } catch (error) { throw error; From 5e7a1a87cfa70f6bcbde6096ca985f15c6863cdc Mon Sep 17 00:00:00 2001 From: Sensational Code Date: Thu, 1 Aug 2024 00:22:27 -0700 Subject: [PATCH 3/8] Run eslint fix on management portal --- .../components/AccessControl.vue | 201 ++- .../components/ApiStatusCard.vue | 286 ++-- .../components/NavigationBox.vue | 161 +- .../components/RoleAssignmentsTable.vue | 590 +++---- .../ManagementPortal/components/Sidebar.vue | 4 +- .../directives/createChipOnBlur.ts | 66 +- src/ui/ManagementPortal/js/api.test.ts | 150 +- src/ui/ManagementPortal/js/api.ts | 1468 +++++++++-------- src/ui/ManagementPortal/js/mock.ts | 496 +++--- src/ui/ManagementPortal/js/types.ts | 36 +- src/ui/ManagementPortal/layouts/default.vue | 2 +- .../ManagementPortal/pages/agents/create.vue | 174 +- .../ManagementPortal/pages/agents/private.vue | 13 +- .../ManagementPortal/pages/agents/public.vue | 13 +- .../pages/data-sources/create.vue | 45 +- .../pages/data-sources/index.vue | 10 +- src/ui/ManagementPortal/pages/index/index.vue | 6 +- src/ui/ManagementPortal/pages/info.vue | 311 ++-- .../security/role-assignments/create.vue | 1284 +++++++------- .../edit/[roleAssignmentName].vue | 26 +- .../pages/security/role-assignments/index.vue | 66 +- src/ui/ManagementPortal/plugins/directives.ts | 12 +- .../ManagementPortal/server/api/api-status.ts | 52 +- .../ManagementPortal/stores/appConfigStore.ts | 4 +- src/ui/ManagementPortal/vitest.config.ts | 10 +- 25 files changed, 2823 insertions(+), 2663 deletions(-) diff --git a/src/ui/ManagementPortal/components/AccessControl.vue b/src/ui/ManagementPortal/components/AccessControl.vue index 4451957778..eef7276b4e 100644 --- a/src/ui/ManagementPortal/components/AccessControl.vue +++ b/src/ui/ManagementPortal/components/AccessControl.vue @@ -1,101 +1,100 @@ - - - \ No newline at end of file + + + diff --git a/src/ui/ManagementPortal/components/ApiStatusCard.vue b/src/ui/ManagementPortal/components/ApiStatusCard.vue index a6192efa25..101038deed 100644 --- a/src/ui/ManagementPortal/components/ApiStatusCard.vue +++ b/src/ui/ManagementPortal/components/ApiStatusCard.vue @@ -1,143 +1,143 @@ - - - - - + + + + + diff --git a/src/ui/ManagementPortal/components/NavigationBox.vue b/src/ui/ManagementPortal/components/NavigationBox.vue index 844b2649e8..c80a4ef9b7 100644 --- a/src/ui/ManagementPortal/components/NavigationBox.vue +++ b/src/ui/ManagementPortal/components/NavigationBox.vue @@ -1,80 +1,81 @@ - - - - - - \ No newline at end of file + + + + + diff --git a/src/ui/ManagementPortal/components/RoleAssignmentsTable.vue b/src/ui/ManagementPortal/components/RoleAssignmentsTable.vue index 4450bbc7b0..d07a49c93b 100644 --- a/src/ui/ManagementPortal/components/RoleAssignmentsTable.vue +++ b/src/ui/ManagementPortal/components/RoleAssignmentsTable.vue @@ -1,292 +1,298 @@ - - - - - + + + + + diff --git a/src/ui/ManagementPortal/components/Sidebar.vue b/src/ui/ManagementPortal/components/Sidebar.vue index b5e8f2a09c..7000add8ac 100644 --- a/src/ui/ManagementPortal/components/Sidebar.vue +++ b/src/ui/ManagementPortal/components/Sidebar.vue @@ -58,7 +58,9 @@ Security - Instance Access Control + Instance Access Control
diff --git a/src/ui/ManagementPortal/directives/createChipOnBlur.ts b/src/ui/ManagementPortal/directives/createChipOnBlur.ts index f88c9e504c..8381c01f26 100644 --- a/src/ui/ManagementPortal/directives/createChipOnBlur.ts +++ b/src/ui/ManagementPortal/directives/createChipOnBlur.ts @@ -1,33 +1,33 @@ -import { nextTick } from 'vue'; - -const createChipOnBlur = { - mounted(el, binding) { - nextTick(() => { - const input = el.querySelector('input'); - if (input) { - input.addEventListener('blur', () => { - const value = input.value.trim(); - - if (value) { - const propertyName = binding.arg; // Use the argument passed to the directive - if (propertyName) { - const targetArray = binding.instance[propertyName]; - if (Array.isArray(targetArray)) { - targetArray.push(value); - input.value = ''; - } else { - console.warn(`The property "${propertyName}" is not an array or is undefined`); - } - } else { - console.warn('No argument provided for the directive'); - } - } - }); - } else { - console.warn('Input element not found within Chips component'); - } - }); - } -}; - -export default createChipOnBlur; +import { nextTick } from 'vue'; + +const createChipOnBlur = { + mounted(el, binding) { + nextTick(() => { + const input = el.querySelector('input'); + if (input) { + input.addEventListener('blur', () => { + const value = input.value.trim(); + + if (value) { + const propertyName = binding.arg; // Use the argument passed to the directive + if (propertyName) { + const targetArray = binding.instance[propertyName]; + if (Array.isArray(targetArray)) { + targetArray.push(value); + input.value = ''; + } else { + console.warn(`The property "${propertyName}" is not an array or is undefined`); + } + } else { + console.warn('No argument provided for the directive'); + } + } + }); + } else { + console.warn('Input element not found within Chips component'); + } + }); + }, +}; + +export default createChipOnBlur; diff --git a/src/ui/ManagementPortal/js/api.test.ts b/src/ui/ManagementPortal/js/api.test.ts index fb1ab335b6..bef3ec1ee8 100644 --- a/src/ui/ManagementPortal/js/api.test.ts +++ b/src/ui/ManagementPortal/js/api.test.ts @@ -1,75 +1,75 @@ -import { describe, test, expect } from 'vitest'; -import api from './api'; -require('dotenv').config(); - -describe('API Account Tests', async () => { - api.setApiUrl(process.env.VITEST_API_URL); - api.setInstanceId(process.env.VITEST_API_INSTANCE_ID); - api.bearerToken = process.env.VITEST_API_AUTH_TOKEN; - - test.concurrent('should fetch role assignments', async () => { - const roleAssignments = await api.getRoleAssignments(); - expect(roleAssignments).toBeInstanceOf(Array); - - const roleAssignment = roleAssignments[0]; - expect(roleAssignment).toBeDefined(); - }); - - test.concurrent('should fetch role assignment details', async () => { - const roleAssignments = await api.getRoleAssignments(); - expect(roleAssignments).toBeInstanceOf(Array); - const roleAssignment = roleAssignments[0]; - expect(roleAssignment).toBeDefined(); - - const roleAssignmentDetails = await api.getRoleAssignment(roleAssignment.id); - expect(roleAssignmentDetails).toBeDefined(); - expect(roleAssignmentDetails).toBeInstanceOf(Object); - expect(roleAssignmentDetails).not.toBeInstanceOf(Array); - }); - - test.concurrent('should fetch users', async () => { - const users = await api.getUsers(); - const user = users.items[0]; - expect(user).toBeDefined(); - }); - - test.concurrent('should fetch user details', async () => { - const users = await api.getUsers(); - const user = users.items[0]; - expect(user).toBeDefined(); - - const userDetails = await api.getUser(user.id); - expect(userDetails).toBeDefined(); - }); - - test.concurrent('should fetch groups', async () => { - const groups = await api.getGroups(); - const group = groups.items[0]; - expect(group).toBeDefined(); - }); - - test.concurrent('should fetch group details', async () => { - const groups = await api.getGroups(); - const group = groups.items[0]; - expect(group).toBeDefined(); - - const groupDetails = await api.getGroup(group.id); - expect(groupDetails).toBeDefined(); - }); - - test.concurrent('should fetch objects for user and group', async () => { - const users = await api.getUsers(); - const user = users.items[0]; - expect(user).toBeDefined(); - - const groups = await api.getGroups(); - const group = groups.items[0]; - expect(group).toBeDefined(); - - const objects = await api.getObjects({ - ids: [user.id, group.id], - }); - expect(objects).toBeDefined(); - expect(objects).toBeInstanceOf(Array); - }); -}); +import { describe, test, expect } from 'vitest'; +import api from './api'; +require('dotenv').config(); + +describe('API Account Tests', async () => { + api.setApiUrl(process.env.VITEST_API_URL); + api.setInstanceId(process.env.VITEST_API_INSTANCE_ID); + api.bearerToken = process.env.VITEST_API_AUTH_TOKEN; + + test.concurrent('should fetch role assignments', async () => { + const roleAssignments = await api.getRoleAssignments(); + expect(roleAssignments).toBeInstanceOf(Array); + + const roleAssignment = roleAssignments[0]; + expect(roleAssignment).toBeDefined(); + }); + + test.concurrent('should fetch role assignment details', async () => { + const roleAssignments = await api.getRoleAssignments(); + expect(roleAssignments).toBeInstanceOf(Array); + const roleAssignment = roleAssignments[0]; + expect(roleAssignment).toBeDefined(); + + const roleAssignmentDetails = await api.getRoleAssignment(roleAssignment.id); + expect(roleAssignmentDetails).toBeDefined(); + expect(roleAssignmentDetails).toBeInstanceOf(Object); + expect(roleAssignmentDetails).not.toBeInstanceOf(Array); + }); + + test.concurrent('should fetch users', async () => { + const users = await api.getUsers(); + const user = users.items[0]; + expect(user).toBeDefined(); + }); + + test.concurrent('should fetch user details', async () => { + const users = await api.getUsers(); + const user = users.items[0]; + expect(user).toBeDefined(); + + const userDetails = await api.getUser(user.id); + expect(userDetails).toBeDefined(); + }); + + test.concurrent('should fetch groups', async () => { + const groups = await api.getGroups(); + const group = groups.items[0]; + expect(group).toBeDefined(); + }); + + test.concurrent('should fetch group details', async () => { + const groups = await api.getGroups(); + const group = groups.items[0]; + expect(group).toBeDefined(); + + const groupDetails = await api.getGroup(group.id); + expect(groupDetails).toBeDefined(); + }); + + test.concurrent('should fetch objects for user and group', async () => { + const users = await api.getUsers(); + const user = users.items[0]; + expect(user).toBeDefined(); + + const groups = await api.getGroups(); + const group = groups.items[0]; + expect(group).toBeDefined(); + + const objects = await api.getObjects({ + ids: [user.id, group.id], + }); + expect(objects).toBeDefined(); + expect(objects).toBeInstanceOf(Array); + }); +}); diff --git a/src/ui/ManagementPortal/js/api.ts b/src/ui/ManagementPortal/js/api.ts index d19b8f60b6..4fe265b596 100644 --- a/src/ui/ManagementPortal/js/api.ts +++ b/src/ui/ManagementPortal/js/api.ts @@ -1,704 +1,764 @@ -import type { - ResourceProviderGetResult, - Agent, - DataSource, - AppConfigUnion, - AgentIndex, - AgentGatekeeper, - AIModel, - FilterRequest, - CreateAgentRequest, - CheckNameResponse, - Prompt, - TextPartitioningProfile, - TextEmbeddingProfile, - CreatePromptRequest, - CreateTextPartitioningProfileRequest, - ExternalOrchestrationService, - Role, - RoleAssignment, -} from './types'; -import { convertToDataSource, convertToAppConfigKeyVault, convertToAppConfig } from '@/js/types'; -import { $fetch } from 'ofetch'; - -async function wait(milliseconds: number = 1000): Promise { - return await new Promise((resolve) => setTimeout(() => resolve(), milliseconds)); -} - -export default { - apiVersion: '2024-02-16', - apiUrl: null as string | null, - setApiUrl(apiUrl: string) { - this.apiUrl = apiUrl; - }, - - instanceId: null as string | null, - setInstanceId(instanceId: string) { - this.instanceId = instanceId; - }, - - bearerToken: null, - async getBearerToken() { - if (this.bearerToken) return this.bearerToken; - - const token = await useNuxtApp().$authStore.getToken(); - this.bearerToken = token.accessToken; - return this.bearerToken; - }, - - async fetch(url: string, opts: any = {}) { - const options = opts; - options.headers = opts.headers || {}; - - // if (options?.query) { - // url += '?' + (new URLSearchParams(options.query)).toString(); - // } - - const bearerToken = await this.getBearerToken(); - options.headers.Authorization = `Bearer ${bearerToken}`; - - return await $fetch(`${this.apiUrl}${url}`, options); - }, - - async getConfigValue(key: string) { - return await $fetch(`/api/config/`, { - params: { - key, - }, - }); - }, - - /* - Data Sources - */ - async checkDataSourceName(name: string, type: string): Promise { - const payload = { - name, - type, - }; - - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/checkname?api-version=${this.apiVersion}`, - { - method: 'POST', - body: payload, - }, - ); - }, - - async getDefaultDataSource(): Promise { - const payload: FilterRequest = { - default: true, - }; - - const data = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/filter?api-version=${this.apiVersion}`, - { - method: 'POST', - body: payload, - }, - ); - - if (data && data.length > 0) { - return data[0] as DataSource; - } else { - return null; - } - }, - - async getAgentDataSources(addDefaultOption: boolean = false): Promise[]> { - const data = (await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources?api-version=${this.apiVersion}`, - )) as ResourceProviderGetResult[]; - if (addDefaultOption) { - const defaultDataSource: DataSource = { - name: 'Select default data source', - type: 'DEFAULT', - object_id: '', - resolved_configuration_references: {}, - configuration_references: {}, - }; - const defaultDataSourceResult: ResourceProviderGetResult = { - resource: defaultDataSource, - actions: [], - roles: [], - }; - data.unshift(defaultDataSourceResult); - } - return data; - }, - - async getDataSource(dataSourceId: string): Promise> { - const [data] = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/${dataSourceId}?api-version=${this.apiVersion}`, - ) as ResourceProviderGetResult[]; - let dataSource = data.resource as DataSource; - dataSource.resolved_configuration_references = {}; - // Retrieve all the app config values for the data source. - const appConfigFilter = `FoundationaLLM:DataSources:${dataSource.name}:*`; - const appConfigResults = await this.getAppConfigs(appConfigFilter); - - // If set the resolved_configuration_references property on the data source with the app config values. - if (appConfigResults) { - for (const appConfigResult of appConfigResults) { - const appConfig = appConfigResult.resource; - const propertyName = appConfig.name.split(':').pop(); - dataSource.resolved_configuration_references[propertyName as string] = String( - appConfig.value, - ); - } - } else { - for (const [configName /* configValue */] of Object.entries( - dataSource.configuration_references, - )) { - const resolvedValue = await this.getAppConfig( - dataSource.configuration_references[ - configName as keyof typeof dataSource.configuration_references - ], - ); - if (resolvedValue) { - dataSource.resolved_configuration_references[configName] = String(resolvedValue.value); - } else { - dataSource.resolved_configuration_references[configName] = ''; - } - } - } - dataSource = convertToDataSource(dataSource); - data.resource = dataSource; - return data; - }, - - async upsertDataSource(request): Promise { - const dataSource = convertToDataSource(request); - for (const [propertyName, propertyValue] of Object.entries( - dataSource.resolved_configuration_references || {}, - )) { - if (!propertyValue) { - continue; - } - - const appConfigKey = `FoundationaLLM:DataSources:${dataSource.name}:${propertyName}`; - const keyVaultSecretName = - `foundationallm-datasources-${dataSource.name}-${propertyName}`.toLowerCase(); - const metadata = dataSource.configuration_reference_metadata?.[propertyName]; - - const appConfigResult = await this.getAppConfig('FoundationaLLM:Configuration:KeyVaultURI'); - const keyVaultUri = appConfigResult.resource; - - let appConfig: AppConfigUnion = { - name: appConfigKey, - display_name: appConfigKey, - description: '', - key: appConfigKey, - value: propertyValue, - }; - - if (metadata && metadata.isKeyVaultBacked) { - appConfig = convertToAppConfigKeyVault({ - ...appConfig, - key_vault_uri: keyVaultUri.value, - key_vault_secret_name: keyVaultSecretName, - }); - } else { - appConfig = convertToAppConfig(appConfig); - } - - await this.upsertAppConfig(appConfig); - - dataSource.configuration_references[propertyName] = appConfigKey; - } - - // Remove any any configuration_references whose values are null or empty strings. - for (const [propertyName, propertyValue] of Object.entries( - dataSource.configuration_references, - )) { - if (!propertyValue) { - delete dataSource.configuration_references[propertyName]; - } - } - - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/${dataSource.name}?api-version=${this.apiVersion}`, - { - method: 'POST', - body: JSON.stringify(dataSource), - headers: { - 'Content-Type': 'application/json', - }, - }, - ); - }, - - async deleteDataSource(dataSourceId: string): Promise { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/${dataSourceId}?api-version=${this.apiVersion}`, - { - method: 'DELETE', - }, - ); - }, - - /* - App Configuration - */ - async getAppConfig(key: string): Promise> { - const data = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Configuration/appConfigurations/${key}?api-version=${this.apiVersion}`, - ); - return data[0] as ResourceProviderGetResult; - }, - - async getAppConfigs(filter?: string): Promise[]> { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Configuration/appConfigurations/${filter}?api-version=${this.apiVersion}`, - ) as ResourceProviderGetResult[]; - }, - - async upsertAppConfig(request): Promise { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Configuration/appConfigurations/${request.key}?api-version=${this.apiVersion}`, - { - method: 'POST', - body: request, - }, - ); - }, - - /* - Indexes - */ - async getAgentIndexes(addDefaultOption: boolean = false): Promise[]> { - const data = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Vectorization/indexingProfiles?api-version=${this.apiVersion}`, - ) as ResourceProviderGetResult[]; - // If data is empty, return an empty array. - if (!data) { - return []; - } - // Retrieve all the app config values for the vectorization resources. - const appConfigFilter = `FoundationaLLM:Vectorization:*`; - const appConfigResults = await this.getAppConfigs(appConfigFilter); - if (appConfigResults) { - // Store all of the app config values (resource property of each result) in a map for easy access. - const appConfigValues = new Map(); - for (const appConfigResult of appConfigResults) { - appConfigValues.set(appConfigResult.resource.name, appConfigResult.resource); - } - - // Loop through the text embedding profiles and replace the app config keys with the real values. - for (const indexingProfile of data) { - if (indexingProfile.resource.configuration_references === undefined) { - continue; - } - indexingProfile.resource.resolved_configuration_references = { ...indexingProfile.resource.configuration_references }; - if (appConfigValues.has(indexingProfile.resource.configuration_references?.APIKey)) { - indexingProfile.resource.resolved_configuration_references.APIKey = appConfigValues.get(indexingProfile.resource.configuration_references.APIKey)?.value || ''; - } - if (appConfigValues.has(indexingProfile.resource.configuration_references?.AuthenticationType)) { - indexingProfile.resource.resolved_configuration_references.AuthenticationType = appConfigValues.get(indexingProfile.resource.configuration_references.AuthenticationType)?.value || ''; - } - if (appConfigValues.has(indexingProfile.resource.configuration_references?.Endpoint)) { - indexingProfile.resource.resolved_configuration_references.Endpoint = appConfigValues.get(indexingProfile.resource.configuration_references.Endpoint)?.value || ''; - } - } - } - - if (addDefaultOption) { - const defaultAgentIndex: AgentIndex = { - name: 'Select default index source', - object_id: '', - settings: {}, - configuration_references: {}, - }; - const defaultAgentIndexResult: ResourceProviderGetResult = { - resource: defaultAgentIndex, - actions: [], - roles: [], - }; - data.unshift(defaultAgentIndexResult); - } - return data; - }, - - async getDefaultAgentIndex(): Promise { - const payload: FilterRequest = { - default: true, - }; - - const data = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Vectorization/indexingProfiles/filter?api-version=${this.apiVersion}`, - { - method: 'POST', - body: payload, - }, - ); - - if (data && data.length > 0) { - return data[0] as AgentIndex; - } else { - return null; - } - }, - - /* - Text Embedding Profiles - */ - async getTextEmbeddingProfiles(): Promise[]> { - const data = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Vectorization/textEmbeddingProfiles?api-version=${this.apiVersion}`, - ) as ResourceProviderGetResult[]; - // If data is empty, return an empty array. - if (!data) { - return []; - } - // Retrieve all the app config values for the vectorization resources. - const appConfigFilter = `FoundationaLLM:Vectorization:*`; - const appConfigResults = await this.getAppConfigs(appConfigFilter); - if (appConfigResults) { - // Store all of the app config values (resource property of each result) in a map for easy access. - const appConfigValues = new Map(); - for (const appConfigResult of appConfigResults) { - appConfigValues.set(appConfigResult.resource.name, appConfigResult.resource); - } - - // Loop through the text embedding profiles and replace the app config keys with the real values. - for (const textEmbeddingProfile of data) { - if (textEmbeddingProfile.resource.configuration_references === undefined) { - continue; - } - textEmbeddingProfile.resource.resolved_configuration_references = { ...textEmbeddingProfile.resource.configuration_references }; - if (appConfigValues.has(textEmbeddingProfile.resource.configuration_references?.APIKey)) { - textEmbeddingProfile.resource.resolved_configuration_references.APIKey = appConfigValues.get(textEmbeddingProfile.resource.configuration_references.APIKey)?.value || ''; - } - if (appConfigValues.has(textEmbeddingProfile.resource.configuration_references?.APIVersion)) { - textEmbeddingProfile.resource.resolved_configuration_references.APIVersion = appConfigValues.get(textEmbeddingProfile.resource.configuration_references.APIVersion)?.value || ''; - } - if (appConfigValues.has(textEmbeddingProfile.resource.configuration_references?.AuthenticationType)) { - textEmbeddingProfile.resource.resolved_configuration_references.AuthenticationType = appConfigValues.get(textEmbeddingProfile.resource.configuration_references.AuthenticationType)?.value || ''; - } - if (appConfigValues.has(textEmbeddingProfile.resource.configuration_references?.DeploymentName)) { - textEmbeddingProfile.resource.resolved_configuration_references.DeploymentName = appConfigValues.get(textEmbeddingProfile.resource.configuration_references.DeploymentName)?.value || ''; - } - if (appConfigValues.has(textEmbeddingProfile.resource.configuration_references?.Endpoint)) { - textEmbeddingProfile.resource.resolved_configuration_references.Endpoint = appConfigValues.get(textEmbeddingProfile.resource.configuration_references.Endpoint)?.value || ''; - } - } - } - return data; - }, - - /* - Agents - */ - async checkAgentName(name: string, agentType: string): Promise { - const payload = { - name, - type: agentType, - }; - - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/checkname?api-version=${this.apiVersion}`, - { - method: 'POST', - body: payload, - }, - ) as CheckNameResponse; - }, - - async getAgents(): Promise[]> { - const agents = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents?api-version=${this.apiVersion}`, - ) as ResourceProviderGetResult[]; - // Sort the agents by name. - agents.sort((a, b) => a.resource.name.localeCompare(b.resource.name)); - return agents; - }, - - async getAgent(agentId: string): Promise> { - const [agentGetResult]: ResourceProviderGetResult[] = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/${agentId}?api-version=${this.apiVersion}`, - ); - - const agent = agentGetResult.resource as Agent; - - const orchestratorTypeToKeyMap: { [key: string]: string } = { - LangChain: 'AzureOpenAI', - AzureOpenAIDirect: 'AzureOpenAI', - AzureAIDirect: 'AzureAI', - }; - - const orchestratorTypeKey = orchestratorTypeToKeyMap[agent.orchestration_settings?.orchestrator]; - - // Retrieve all the app config values for the agent - const appConfigFilter = `FoundationaLLM:${orchestratorTypeKey}:${agent.name}:API:*`; - const appConfigResults = await this.getAppConfigs(appConfigFilter); - - // Replace the orchestrator endpoint config keys with the real values - if (appConfigResults) { - for (const appConfigResult of appConfigResults) { - const appConfig = appConfigResult.resource; - const propertyName = appConfig.name.split(':').pop(); - agent.orchestration_settings.endpoint_configuration[propertyName as string] = String( - appConfig.value, - ); - } - } else { - for (const [configName /* configValue */] of Object.entries(agent.orchestration_settings)) { - const resolvedValue = await this.getAppConfig( - agent.orchestration_settings.endpoint_configuration[ - configName as keyof typeof agent.orchestration_settings.endpoint_configuration - ], - ); - if (resolvedValue && resolvedValue.resource) { - agent.orchestration_settings.endpoint_configuration[configName] = String( - resolvedValue.resource.value, - ); - } else { - agent.orchestration_settings.endpoint_configuration[configName] = ''; - } - } - } - - agentGetResult.resource = agent; - - return agentGetResult; - }, - - async upsertAgent(agentId: string, agentData: CreateAgentRequest): Promise { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/${agentId}?api-version=${this.apiVersion}`, - { - method: 'POST', - body: agentData, - }, - ); - }, - - async createAgent(request: CreateAgentRequest): Promise { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/${request.name}?api-version=${this.apiVersion}`, - { - method: 'POST', - body: request, - }, - ); - }, - - async deleteAgent(agentId: string): Promise { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/${agentId}?api-version=${this.apiVersion}`, - { - method: 'DELETE', - }, - ); - }, - - /* - Prompts - */ - async getPrompt(promptId: string): Promise | null> { - // Attempt to retrieve the prompt. If it doesn't exist, return an empty object. - try { - const data = await this.fetch(`${promptId}?api-version=${this.apiVersion}`); - return data[0]; - } catch (error) { - return null; - } - }, - - async createOrUpdatePrompt(agentId: string, request: CreatePromptRequest): Promise { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Prompt/prompts/${agentId}?api-version=${this.apiVersion}`, - { - method: 'POST', - body: request, - }, - ); - }, - - async getTextPartitioningProfile(profileId: string): Promise> { - const data = await this.fetch(`${profileId}?api-version=${this.apiVersion}`); - return data[0]; - }, - - async createOrUpdateTextPartitioningProfile( - agentId: string, - request: CreateTextPartitioningProfileRequest, - ): Promise { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Vectorization/textPartitioningProfiles/${agentId}?api-version=${this.apiVersion}`, - { - method: 'POST', - body: request, - }, - ); - }, - - async getExternalOrchestrationServices(resolveApiKey: boolean = false): Promise[]> { - const data = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Configuration/apiEndpointConfigurations?api-version=${this.apiVersion}`, - ) as ResourceProviderGetResult[]; - - // Retrieve all the app config values for the external orchestration services.. - const appConfigFilter = `FoundationaLLM:ExternalAPIs:*`; - const appConfigResults = await this.getAppConfigs(appConfigFilter); - - // Loop through the external orchestration services and replace the app config keys with the real values. - for (const externalOrchestrationService of data) { - externalOrchestrationService.resource.resolved_api_key = ''; - - if (resolveApiKey) { - // Find a matching app config for the API Key. The app config name should be in the format FoundationaLLM:ExternalAPIs::APIKey - const apiKeyAppConfig = appConfigResults.find(appConfig => appConfig.resource.name === `FoundationaLLM:ExternalAPIs:${externalOrchestrationService.resource.name}:APIKey`); - if (apiKeyAppConfig) { - externalOrchestrationService.resource.resolved_api_key = apiKeyAppConfig.resource.value; - } - } - } - - // Return the updated external orchestration services. - return data; - }, - - async getAIModels(): Promise[]> { - const data = await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.AIModel/aiModels?api-version=${this.apiVersion}`, - ) as ResourceProviderGetResult[]; - - return data; - }, - - /* - Role Assignments - */ - async getRoleAssignments(scope): RoleAssignment[] { - const assignments = (await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleAssignments/filter?api-version=${this.apiVersion}`, - { - method: 'POST', - body: JSON.stringify({ - scope: `/instances/${this.instanceId}${scope ? `/${scope}` : ''}`, - }), - }, - )) as RoleAssignment[]; - - assignments.map(assignment => { - if (assignment.resource.scope === `/instances/${this.instanceId}`) { - assignment.resource.scope_name = scope ? 'Instance (Inherited)' : 'Instance'; - } else if (assignment.resource.scope === `/instances/${this.instanceId}/${scope}`) { - assignment.resource.scope_name = 'This resource'; - } - }); - - return assignments; - }, - - async getRoleAssignment(roleAssignmentId): RoleAssignment[] { - return (await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleAssignments/${roleAssignmentId}?api-version=${this.apiVersion}`, - { - method: 'POST', - body: JSON.stringify({ - scope: `/instances/${this.instanceId}`, - }), - }, - )) as RoleAssignment[]; - }, - - async createRoleAssignment(request: Object): Promise { - if (!request.scope) { - request.scope = `/instances/${this.instanceId}`; - } - - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleAssignments/${request.name}?api-version=${this.apiVersion}`, - { - method: 'POST', - body: JSON.stringify(request), - }, - ); - }, - - /* - Role Definitions - */ - async getRoleDefinitions(): RoleAssignment[] { - return (await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleDefinitions?api-version=${this.apiVersion}`, - )) as Object[]; - }, - - async getRoleDefinition(roleAssignmentId): RoleAssignment { - return (await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleDefinitions/${roleAssignmentId}?api-version=${this.apiVersion}`, - )) as RoleAssignment[]; - }, - - async deleteRoleAssignment(roleAssignmentId): void { - return await this.fetch( - `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleDefinitions/${roleAssignmentId}?api-version=${this.apiVersion}`, - { - method: 'DELETE', - }, - ); - }, - - /* - Users - */ - async getUsers(params) { - const defaults = { - name: '', - ids: [], - page_number: 1, - page_size: null, - }; - - return await this.fetch(`/instances/${this.instanceId}/identity/users/retrieve?api-version=${this.apiVersion}`, { - method: 'POST', - body: JSON.stringify({ - ...defaults, - ...params, - }), - }); - }, - - async getUser(userId) { - return await this.fetch(`/instances/${this.instanceId}/identity/users/${userId}?api-version=${this.apiVersion}`); - }, - - /* - Groups - */ - async getGroups(params) { - const defaults = { - name: '', - ids: [], - page_number: 1, - page_size: null, - }; - - return await this.fetch(`/instances/${this.instanceId}/identity/groups/retrieve?api-version=${this.apiVersion}`, { - method: 'POST', - body: JSON.stringify({ - ...defaults, - ...params, - }), - }); - }, - - async getGroup(groupId) { - return await this.fetch(`/instances/${this.instanceId}/identity/groups/${groupId}?api-version=${this.apiVersion}`); - }, - - /* - Combined User+Groups - */ - async getObjects(params = { ids: [] }) { - return await this.fetch(`/instances/${this.instanceId}/identity/objects/retrievebyids?api-version=${this.apiVersion}`, { - method: 'POST', - body: JSON.stringify(params), - }); - }, -}; - +import type { + ResourceProviderGetResult, + Agent, + DataSource, + AppConfigUnion, + AgentIndex, + AgentGatekeeper, + AIModel, + FilterRequest, + CreateAgentRequest, + CheckNameResponse, + Prompt, + TextPartitioningProfile, + TextEmbeddingProfile, + CreatePromptRequest, + CreateTextPartitioningProfileRequest, + ExternalOrchestrationService, + Role, + RoleAssignment, +} from './types'; +import { convertToDataSource, convertToAppConfigKeyVault, convertToAppConfig } from '@/js/types'; +import { $fetch } from 'ofetch'; + +async function wait(milliseconds: number = 1000): Promise { + return await new Promise((resolve) => setTimeout(() => resolve(), milliseconds)); +} + +export default { + apiVersion: '2024-02-16', + apiUrl: null as string | null, + setApiUrl(apiUrl: string) { + this.apiUrl = apiUrl; + }, + + instanceId: null as string | null, + setInstanceId(instanceId: string) { + this.instanceId = instanceId; + }, + + bearerToken: null, + async getBearerToken() { + if (this.bearerToken) return this.bearerToken; + + const token = await useNuxtApp().$authStore.getToken(); + this.bearerToken = token.accessToken; + return this.bearerToken; + }, + + async fetch(url: string, opts: any = {}) { + const options = opts; + options.headers = opts.headers || {}; + + // if (options?.query) { + // url += '?' + (new URLSearchParams(options.query)).toString(); + // } + + const bearerToken = await this.getBearerToken(); + options.headers.Authorization = `Bearer ${bearerToken}`; + + return await $fetch(`${this.apiUrl}${url}`, options); + }, + + async getConfigValue(key: string) { + return await $fetch(`/api/config/`, { + params: { + key, + }, + }); + }, + + /* + Data Sources + */ + async checkDataSourceName(name: string, type: string): Promise { + const payload = { + name, + type, + }; + + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/checkname?api-version=${this.apiVersion}`, + { + method: 'POST', + body: payload, + }, + ); + }, + + async getDefaultDataSource(): Promise { + const payload: FilterRequest = { + default: true, + }; + + const data = await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/filter?api-version=${this.apiVersion}`, + { + method: 'POST', + body: payload, + }, + ); + + if (data && data.length > 0) { + return data[0] as DataSource; + } else { + return null; + } + }, + + async getAgentDataSources( + addDefaultOption: boolean = false, + ): Promise[]> { + const data = (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources?api-version=${this.apiVersion}`, + )) as ResourceProviderGetResult[]; + if (addDefaultOption) { + const defaultDataSource: DataSource = { + name: 'Select default data source', + type: 'DEFAULT', + object_id: '', + resolved_configuration_references: {}, + configuration_references: {}, + }; + const defaultDataSourceResult: ResourceProviderGetResult = { + resource: defaultDataSource, + actions: [], + roles: [], + }; + data.unshift(defaultDataSourceResult); + } + return data; + }, + + async getDataSource(dataSourceId: string): Promise> { + const [data] = (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/${dataSourceId}?api-version=${this.apiVersion}`, + )) as ResourceProviderGetResult[]; + let dataSource = data.resource as DataSource; + dataSource.resolved_configuration_references = {}; + // Retrieve all the app config values for the data source. + const appConfigFilter = `FoundationaLLM:DataSources:${dataSource.name}:*`; + const appConfigResults = await this.getAppConfigs(appConfigFilter); + + // If set the resolved_configuration_references property on the data source with the app config values. + if (appConfigResults) { + for (const appConfigResult of appConfigResults) { + const appConfig = appConfigResult.resource; + const propertyName = appConfig.name.split(':').pop(); + dataSource.resolved_configuration_references[propertyName as string] = String( + appConfig.value, + ); + } + } else { + for (const [configName /* configValue */] of Object.entries( + dataSource.configuration_references, + )) { + const resolvedValue = await this.getAppConfig( + dataSource.configuration_references[ + configName as keyof typeof dataSource.configuration_references + ], + ); + if (resolvedValue) { + dataSource.resolved_configuration_references[configName] = String(resolvedValue.value); + } else { + dataSource.resolved_configuration_references[configName] = ''; + } + } + } + dataSource = convertToDataSource(dataSource); + data.resource = dataSource; + return data; + }, + + async upsertDataSource(request): Promise { + const dataSource = convertToDataSource(request); + for (const [propertyName, propertyValue] of Object.entries( + dataSource.resolved_configuration_references || {}, + )) { + if (!propertyValue) { + continue; + } + + const appConfigKey = `FoundationaLLM:DataSources:${dataSource.name}:${propertyName}`; + const keyVaultSecretName = + `foundationallm-datasources-${dataSource.name}-${propertyName}`.toLowerCase(); + const metadata = dataSource.configuration_reference_metadata?.[propertyName]; + + const appConfigResult = await this.getAppConfig('FoundationaLLM:Configuration:KeyVaultURI'); + const keyVaultUri = appConfigResult.resource; + + let appConfig: AppConfigUnion = { + name: appConfigKey, + display_name: appConfigKey, + description: '', + key: appConfigKey, + value: propertyValue, + }; + + if (metadata && metadata.isKeyVaultBacked) { + appConfig = convertToAppConfigKeyVault({ + ...appConfig, + key_vault_uri: keyVaultUri.value, + key_vault_secret_name: keyVaultSecretName, + }); + } else { + appConfig = convertToAppConfig(appConfig); + } + + await this.upsertAppConfig(appConfig); + + dataSource.configuration_references[propertyName] = appConfigKey; + } + + // Remove any any configuration_references whose values are null or empty strings. + for (const [propertyName, propertyValue] of Object.entries( + dataSource.configuration_references, + )) { + if (!propertyValue) { + delete dataSource.configuration_references[propertyName]; + } + } + + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/${dataSource.name}?api-version=${this.apiVersion}`, + { + method: 'POST', + body: JSON.stringify(dataSource), + headers: { + 'Content-Type': 'application/json', + }, + }, + ); + }, + + async deleteDataSource(dataSourceId: string): Promise { + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.DataSource/dataSources/${dataSourceId}?api-version=${this.apiVersion}`, + { + method: 'DELETE', + }, + ); + }, + + /* + App Configuration + */ + async getAppConfig(key: string): Promise> { + const data = await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Configuration/appConfigurations/${key}?api-version=${this.apiVersion}`, + ); + return data[0] as ResourceProviderGetResult; + }, + + async getAppConfigs(filter?: string): Promise[]> { + return (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Configuration/appConfigurations/${filter}?api-version=${this.apiVersion}`, + )) as ResourceProviderGetResult[]; + }, + + async upsertAppConfig(request): Promise { + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Configuration/appConfigurations/${request.key}?api-version=${this.apiVersion}`, + { + method: 'POST', + body: request, + }, + ); + }, + + /* + Indexes + */ + async getAgentIndexes( + addDefaultOption: boolean = false, + ): Promise[]> { + const data = (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Vectorization/indexingProfiles?api-version=${this.apiVersion}`, + )) as ResourceProviderGetResult[]; + // If data is empty, return an empty array. + if (!data) { + return []; + } + // Retrieve all the app config values for the vectorization resources. + const appConfigFilter = `FoundationaLLM:Vectorization:*`; + const appConfigResults = await this.getAppConfigs(appConfigFilter); + if (appConfigResults) { + // Store all of the app config values (resource property of each result) in a map for easy access. + const appConfigValues = new Map(); + for (const appConfigResult of appConfigResults) { + appConfigValues.set(appConfigResult.resource.name, appConfigResult.resource); + } + + // Loop through the text embedding profiles and replace the app config keys with the real values. + for (const indexingProfile of data) { + if (indexingProfile.resource.configuration_references === undefined) { + continue; + } + indexingProfile.resource.resolved_configuration_references = { + ...indexingProfile.resource.configuration_references, + }; + if (appConfigValues.has(indexingProfile.resource.configuration_references?.APIKey)) { + indexingProfile.resource.resolved_configuration_references.APIKey = + appConfigValues.get(indexingProfile.resource.configuration_references.APIKey)?.value || + ''; + } + if ( + appConfigValues.has(indexingProfile.resource.configuration_references?.AuthenticationType) + ) { + indexingProfile.resource.resolved_configuration_references.AuthenticationType = + appConfigValues.get( + indexingProfile.resource.configuration_references.AuthenticationType, + )?.value || ''; + } + if (appConfigValues.has(indexingProfile.resource.configuration_references?.Endpoint)) { + indexingProfile.resource.resolved_configuration_references.Endpoint = + appConfigValues.get(indexingProfile.resource.configuration_references.Endpoint) + ?.value || ''; + } + } + } + + if (addDefaultOption) { + const defaultAgentIndex: AgentIndex = { + name: 'Select default index source', + object_id: '', + settings: {}, + configuration_references: {}, + }; + const defaultAgentIndexResult: ResourceProviderGetResult = { + resource: defaultAgentIndex, + actions: [], + roles: [], + }; + data.unshift(defaultAgentIndexResult); + } + return data; + }, + + async getDefaultAgentIndex(): Promise { + const payload: FilterRequest = { + default: true, + }; + + const data = await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Vectorization/indexingProfiles/filter?api-version=${this.apiVersion}`, + { + method: 'POST', + body: payload, + }, + ); + + if (data && data.length > 0) { + return data[0] as AgentIndex; + } else { + return null; + } + }, + + /* + Text Embedding Profiles + */ + async getTextEmbeddingProfiles(): Promise[]> { + const data = (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Vectorization/textEmbeddingProfiles?api-version=${this.apiVersion}`, + )) as ResourceProviderGetResult[]; + // If data is empty, return an empty array. + if (!data) { + return []; + } + // Retrieve all the app config values for the vectorization resources. + const appConfigFilter = `FoundationaLLM:Vectorization:*`; + const appConfigResults = await this.getAppConfigs(appConfigFilter); + if (appConfigResults) { + // Store all of the app config values (resource property of each result) in a map for easy access. + const appConfigValues = new Map(); + for (const appConfigResult of appConfigResults) { + appConfigValues.set(appConfigResult.resource.name, appConfigResult.resource); + } + + // Loop through the text embedding profiles and replace the app config keys with the real values. + for (const textEmbeddingProfile of data) { + if (textEmbeddingProfile.resource.configuration_references === undefined) { + continue; + } + textEmbeddingProfile.resource.resolved_configuration_references = { + ...textEmbeddingProfile.resource.configuration_references, + }; + if (appConfigValues.has(textEmbeddingProfile.resource.configuration_references?.APIKey)) { + textEmbeddingProfile.resource.resolved_configuration_references.APIKey = + appConfigValues.get(textEmbeddingProfile.resource.configuration_references.APIKey) + ?.value || ''; + } + if ( + appConfigValues.has(textEmbeddingProfile.resource.configuration_references?.APIVersion) + ) { + textEmbeddingProfile.resource.resolved_configuration_references.APIVersion = + appConfigValues.get(textEmbeddingProfile.resource.configuration_references.APIVersion) + ?.value || ''; + } + if ( + appConfigValues.has( + textEmbeddingProfile.resource.configuration_references?.AuthenticationType, + ) + ) { + textEmbeddingProfile.resource.resolved_configuration_references.AuthenticationType = + appConfigValues.get( + textEmbeddingProfile.resource.configuration_references.AuthenticationType, + )?.value || ''; + } + if ( + appConfigValues.has( + textEmbeddingProfile.resource.configuration_references?.DeploymentName, + ) + ) { + textEmbeddingProfile.resource.resolved_configuration_references.DeploymentName = + appConfigValues.get( + textEmbeddingProfile.resource.configuration_references.DeploymentName, + )?.value || ''; + } + if (appConfigValues.has(textEmbeddingProfile.resource.configuration_references?.Endpoint)) { + textEmbeddingProfile.resource.resolved_configuration_references.Endpoint = + appConfigValues.get(textEmbeddingProfile.resource.configuration_references.Endpoint) + ?.value || ''; + } + } + } + return data; + }, + + /* + Agents + */ + async checkAgentName(name: string, agentType: string): Promise { + const payload = { + name, + type: agentType, + }; + + return (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/checkname?api-version=${this.apiVersion}`, + { + method: 'POST', + body: payload, + }, + )) as CheckNameResponse; + }, + + async getAgents(): Promise[]> { + const agents = (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents?api-version=${this.apiVersion}`, + )) as ResourceProviderGetResult[]; + // Sort the agents by name. + agents.sort((a, b) => a.resource.name.localeCompare(b.resource.name)); + return agents; + }, + + async getAgent(agentId: string): Promise> { + const [agentGetResult]: ResourceProviderGetResult[] = await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/${agentId}?api-version=${this.apiVersion}`, + ); + + const agent = agentGetResult.resource as Agent; + + const orchestratorTypeToKeyMap: { [key: string]: string } = { + LangChain: 'AzureOpenAI', + AzureOpenAIDirect: 'AzureOpenAI', + AzureAIDirect: 'AzureAI', + }; + + const orchestratorTypeKey = + orchestratorTypeToKeyMap[agent.orchestration_settings?.orchestrator]; + + // Retrieve all the app config values for the agent + const appConfigFilter = `FoundationaLLM:${orchestratorTypeKey}:${agent.name}:API:*`; + const appConfigResults = await this.getAppConfigs(appConfigFilter); + + // Replace the orchestrator endpoint config keys with the real values + if (appConfigResults) { + for (const appConfigResult of appConfigResults) { + const appConfig = appConfigResult.resource; + const propertyName = appConfig.name.split(':').pop(); + agent.orchestration_settings.endpoint_configuration[propertyName as string] = String( + appConfig.value, + ); + } + } else { + for (const [configName /* configValue */] of Object.entries(agent.orchestration_settings)) { + const resolvedValue = await this.getAppConfig( + agent.orchestration_settings.endpoint_configuration[ + configName as keyof typeof agent.orchestration_settings.endpoint_configuration + ], + ); + if (resolvedValue && resolvedValue.resource) { + agent.orchestration_settings.endpoint_configuration[configName] = String( + resolvedValue.resource.value, + ); + } else { + agent.orchestration_settings.endpoint_configuration[configName] = ''; + } + } + } + + agentGetResult.resource = agent; + + return agentGetResult; + }, + + async upsertAgent(agentId: string, agentData: CreateAgentRequest): Promise { + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/${agentId}?api-version=${this.apiVersion}`, + { + method: 'POST', + body: agentData, + }, + ); + }, + + async createAgent(request: CreateAgentRequest): Promise { + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/${request.name}?api-version=${this.apiVersion}`, + { + method: 'POST', + body: request, + }, + ); + }, + + async deleteAgent(agentId: string): Promise { + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Agent/agents/${agentId}?api-version=${this.apiVersion}`, + { + method: 'DELETE', + }, + ); + }, + + /* + Prompts + */ + async getPrompt(promptId: string): Promise | null> { + // Attempt to retrieve the prompt. If it doesn't exist, return an empty object. + try { + const data = await this.fetch(`${promptId}?api-version=${this.apiVersion}`); + return data[0]; + } catch (error) { + return null; + } + }, + + async createOrUpdatePrompt(agentId: string, request: CreatePromptRequest): Promise { + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Prompt/prompts/${agentId}?api-version=${this.apiVersion}`, + { + method: 'POST', + body: request, + }, + ); + }, + + async getTextPartitioningProfile( + profileId: string, + ): Promise> { + const data = await this.fetch(`${profileId}?api-version=${this.apiVersion}`); + return data[0]; + }, + + async createOrUpdateTextPartitioningProfile( + agentId: string, + request: CreateTextPartitioningProfileRequest, + ): Promise { + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Vectorization/textPartitioningProfiles/${agentId}?api-version=${this.apiVersion}`, + { + method: 'POST', + body: request, + }, + ); + }, + + async getExternalOrchestrationServices( + resolveApiKey: boolean = false, + ): Promise[]> { + const data = (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Configuration/apiEndpointConfigurations?api-version=${this.apiVersion}`, + )) as ResourceProviderGetResult[]; + + // Retrieve all the app config values for the external orchestration services.. + const appConfigFilter = `FoundationaLLM:ExternalAPIs:*`; + const appConfigResults = await this.getAppConfigs(appConfigFilter); + + // Loop through the external orchestration services and replace the app config keys with the real values. + for (const externalOrchestrationService of data) { + externalOrchestrationService.resource.resolved_api_key = ''; + + if (resolveApiKey) { + // Find a matching app config for the API Key. The app config name should be in the format FoundationaLLM:ExternalAPIs::APIKey + const apiKeyAppConfig = appConfigResults.find( + (appConfig) => + appConfig.resource.name === + `FoundationaLLM:ExternalAPIs:${externalOrchestrationService.resource.name}:APIKey`, + ); + if (apiKeyAppConfig) { + externalOrchestrationService.resource.resolved_api_key = apiKeyAppConfig.resource.value; + } + } + } + + // Return the updated external orchestration services. + return data; + }, + + async getAIModels(): Promise[]> { + const data = (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.AIModel/aiModels?api-version=${this.apiVersion}`, + )) as ResourceProviderGetResult[]; + + return data; + }, + + /* + Role Assignments + */ + async getRoleAssignments(scope): RoleAssignment[] { + const assignments = (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleAssignments/filter?api-version=${this.apiVersion}`, + { + method: 'POST', + body: JSON.stringify({ + scope: `/instances/${this.instanceId}${scope ? `/${scope}` : ''}`, + }), + }, + )) as RoleAssignment[]; + + assignments.map((assignment) => { + if (assignment.resource.scope === `/instances/${this.instanceId}`) { + assignment.resource.scope_name = scope ? 'Instance (Inherited)' : 'Instance'; + } else if (assignment.resource.scope === `/instances/${this.instanceId}/${scope}`) { + assignment.resource.scope_name = 'This resource'; + } + }); + + return assignments; + }, + + async getRoleAssignment(roleAssignmentId): RoleAssignment[] { + return (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleAssignments/${roleAssignmentId}?api-version=${this.apiVersion}`, + { + method: 'POST', + body: JSON.stringify({ + scope: `/instances/${this.instanceId}`, + }), + }, + )) as RoleAssignment[]; + }, + + async createRoleAssignment(request: Object): Promise { + if (!request.scope) { + request.scope = `/instances/${this.instanceId}`; + } + + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleAssignments/${request.name}?api-version=${this.apiVersion}`, + { + method: 'POST', + body: JSON.stringify(request), + }, + ); + }, + + /* + Role Definitions + */ + async getRoleDefinitions(): RoleAssignment[] { + return (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleDefinitions?api-version=${this.apiVersion}`, + )) as Object[]; + }, + + async getRoleDefinition(roleAssignmentId): RoleAssignment { + return (await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleDefinitions/${roleAssignmentId}?api-version=${this.apiVersion}`, + )) as RoleAssignment[]; + }, + + async deleteRoleAssignment(roleAssignmentId): void { + return await this.fetch( + `/instances/${this.instanceId}/providers/FoundationaLLM.Authorization/roleDefinitions/${roleAssignmentId}?api-version=${this.apiVersion}`, + { + method: 'DELETE', + }, + ); + }, + + /* + Users + */ + async getUsers(params) { + const defaults = { + name: '', + ids: [], + page_number: 1, + page_size: null, + }; + + return await this.fetch( + `/instances/${this.instanceId}/identity/users/retrieve?api-version=${this.apiVersion}`, + { + method: 'POST', + body: JSON.stringify({ + ...defaults, + ...params, + }), + }, + ); + }, + + async getUser(userId) { + return await this.fetch( + `/instances/${this.instanceId}/identity/users/${userId}?api-version=${this.apiVersion}`, + ); + }, + + /* + Groups + */ + async getGroups(params) { + const defaults = { + name: '', + ids: [], + page_number: 1, + page_size: null, + }; + + return await this.fetch( + `/instances/${this.instanceId}/identity/groups/retrieve?api-version=${this.apiVersion}`, + { + method: 'POST', + body: JSON.stringify({ + ...defaults, + ...params, + }), + }, + ); + }, + + async getGroup(groupId) { + return await this.fetch( + `/instances/${this.instanceId}/identity/groups/${groupId}?api-version=${this.apiVersion}`, + ); + }, + + /* + Combined User+Groups + */ + async getObjects(params = { ids: [] }) { + return await this.fetch( + `/instances/${this.instanceId}/identity/objects/retrievebyids?api-version=${this.apiVersion}`, + { + method: 'POST', + body: JSON.stringify(params), + }, + ); + }, +}; diff --git a/src/ui/ManagementPortal/js/mock.ts b/src/ui/ManagementPortal/js/mock.ts index a92ecbb606..626f0d16fd 100644 --- a/src/ui/ManagementPortal/js/mock.ts +++ b/src/ui/ManagementPortal/js/mock.ts @@ -121,288 +121,296 @@ export const mockAzureDataLakeDataSource2: AzureDataLakeDataSource = { export const mockRoles = [ { - "type": "FoundationaLLM.Authorization/roleDefinitions", - "name": "17ca4b59-3aee-497d-b43b-95dd7d916f99", - "object_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/17ca4b59-3aee-497d-b43b-95dd7d916f99", - "display_name": "Role Based Access Control Administrator", - "description": "Manage access to FoundationaLLM resources by assigning roles using FoundationaLLM RBAC.", - "assignable_scopes": [ - "/" - ], - "permissions": [ + type: 'FoundationaLLM.Authorization/roleDefinitions', + name: '17ca4b59-3aee-497d-b43b-95dd7d916f99', + object_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/17ca4b59-3aee-497d-b43b-95dd7d916f99', + display_name: 'Role Based Access Control Administrator', + description: + 'Manage access to FoundationaLLM resources by assigning roles using FoundationaLLM RBAC.', + assignable_scopes: ['/'], + permissions: [ { - "actions": [ - "FoundationaLLM.Authorization/roleAssignments/read", - "FoundationaLLM.Authorization/roleAssignments/write", - "FoundationaLLM.Authorization/roleAssignments/delete" + actions: [ + 'FoundationaLLM.Authorization/roleAssignments/read', + 'FoundationaLLM.Authorization/roleAssignments/write', + 'FoundationaLLM.Authorization/roleAssignments/delete', ], - "not_actions": [], - "data_actions": [], - "not_data_actions": [] - } + not_actions: [], + data_actions: [], + not_data_actions: [], + }, ], - "created_on": "2024-03-07T00:00:00.0000000Z", - "updated_on": "2024-03-07T00:00:00.0000000Z", - "created_by": null, - "updated_by": null + created_on: '2024-03-07T00:00:00.0000000Z', + updated_on: '2024-03-07T00:00:00.0000000Z', + created_by: null, + updated_by: null, }, { - "type": "FoundationaLLM.Authorization/roleDefinitions", - "name": "00a53e72-f66e-4c03-8f81-7e885fd2eb35", - "object_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35", - "display_name": "Reader", - "description": "View all resources without the possiblity of making any changes.", - "assignable_scopes": [ - "/" - ], - "permissions": [ + type: 'FoundationaLLM.Authorization/roleDefinitions', + name: '00a53e72-f66e-4c03-8f81-7e885fd2eb35', + object_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35', + display_name: 'Reader', + description: 'View all resources without the possiblity of making any changes.', + assignable_scopes: ['/'], + permissions: [ { - "actions": [ - "*/read" - ], - "not_actions": [], - "data_actions": [], - "not_data_actions": [] - } + actions: ['*/read'], + not_actions: [], + data_actions: [], + not_data_actions: [], + }, ], - "created_on": "2024-03-07T00:00:00.0000000Z", - "updated_on": "2024-03-07T00:00:00.0000000Z", - "created_by": null, - "updated_by": null + created_on: '2024-03-07T00:00:00.0000000Z', + updated_on: '2024-03-07T00:00:00.0000000Z', + created_by: null, + updated_by: null, }, { - "type": "FoundationaLLM.Authorization/roleDefinitions", - "name": "a9f0020f-6e3a-49bf-8d1d-35fd53058edf", - "object_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/a9f0020f-6e3a-49bf-8d1d-35fd53058edf", - "display_name": "Contributor", - "description": "Full access to manage all resources without the possiblity of assigning roles in FoundationaLLM RBAC.", - "assignable_scopes": [ - "/" - ], - "permissions": [ + type: 'FoundationaLLM.Authorization/roleDefinitions', + name: 'a9f0020f-6e3a-49bf-8d1d-35fd53058edf', + object_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/a9f0020f-6e3a-49bf-8d1d-35fd53058edf', + display_name: 'Contributor', + description: + 'Full access to manage all resources without the possiblity of assigning roles in FoundationaLLM RBAC.', + assignable_scopes: ['/'], + permissions: [ { - "actions": [ - "*" - ], - "not_actions": [ - "FoundationaLLM.Authorization/*/write", - "FoundationaLLM.Authorization/*/delete" + actions: ['*'], + not_actions: [ + 'FoundationaLLM.Authorization/*/write', + 'FoundationaLLM.Authorization/*/delete', ], - "data_actions": [], - "not_data_actions": [] - } + data_actions: [], + not_data_actions: [], + }, ], - "created_on": "2024-03-07T00:00:00.0000000Z", - "updated_on": "2024-03-07T00:00:00.0000000Z", - "created_by": null, - "updated_by": null + created_on: '2024-03-07T00:00:00.0000000Z', + updated_on: '2024-03-07T00:00:00.0000000Z', + created_by: null, + updated_by: null, }, { - "type": "FoundationaLLM.Authorization/roleDefinitions", - "name": "fb8e0fd0-f7e2-4957-89d6-19f44f7d6618", - "object_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/fb8e0fd0-f7e2-4957-89d6-19f44f7d6618", - "display_name": "User Access Administrator", - "description": "Manage access to FoundationaLLM resources.", - "assignable_scopes": [ - "/" - ], - "permissions": [ + type: 'FoundationaLLM.Authorization/roleDefinitions', + name: 'fb8e0fd0-f7e2-4957-89d6-19f44f7d6618', + object_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/fb8e0fd0-f7e2-4957-89d6-19f44f7d6618', + display_name: 'User Access Administrator', + description: 'Manage access to FoundationaLLM resources.', + assignable_scopes: ['/'], + permissions: [ { - "actions": [ - "*/read", - "FoundationaLLM.Authorization/*" - ], - "not_actions": [], - "data_actions": [], - "not_data_actions": [] - } + actions: ['*/read', 'FoundationaLLM.Authorization/*'], + not_actions: [], + data_actions: [], + not_data_actions: [], + }, ], - "created_on": "2024-03-07T00:00:00.0000000Z", - "updated_on": "2024-03-07T00:00:00.0000000Z", - "created_by": null, - "updated_by": null + created_on: '2024-03-07T00:00:00.0000000Z', + updated_on: '2024-03-07T00:00:00.0000000Z', + created_by: null, + updated_by: null, }, { - "type": "FoundationaLLM.Authorization/roleDefinitions", - "name": "1301f8d4-3bea-4880-945f-315dbd2ddb46", - "object_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/1301f8d4-3bea-4880-945f-315dbd2ddb46", - "display_name": "Owner", - "description": "Full access to manage all resources, including the ability to assign roles in FoundationaLLM RBAC.", - "assignable_scopes": [ - "/" - ], - "permissions": [ + type: 'FoundationaLLM.Authorization/roleDefinitions', + name: '1301f8d4-3bea-4880-945f-315dbd2ddb46', + object_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/1301f8d4-3bea-4880-945f-315dbd2ddb46', + display_name: 'Owner', + description: + 'Full access to manage all resources, including the ability to assign roles in FoundationaLLM RBAC.', + assignable_scopes: ['/'], + permissions: [ { - "actions": [ - "*" - ], - "not_actions": [], - "data_actions": [], - "not_data_actions": [] - } + actions: ['*'], + not_actions: [], + data_actions: [], + not_data_actions: [], + }, ], - "created_on": "2024-03-07T00:00:00.0000000Z", - "updated_on": "2024-03-07T00:00:00.0000000Z", - "created_by": null, - "updated_by": null - } + created_on: '2024-03-07T00:00:00.0000000Z', + updated_on: '2024-03-07T00:00:00.0000000Z', + created_by: null, + updated_by: null, + }, ]; export const mockRoleAssignmentsResponse = { - "instance_id": "6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "role_assignments": [ + instance_id: '6fa496ce-d5c0-4e02-9223-06a98c9c0176', + role_assignments: [ { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "9c04b0-c2a9-4c55-ac8f-09ba13351ab9", - "object_id": "/providers/FoundationaLLM.Authorization/roleAssignments/9c0453b0-c2a9-4c55-ac8f-09ba13351ab9", - "display_name": 'Example 1', - "description": "Contributor role on the FoundationaLLM instance.", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/a9f0020f-6e3a-49bf-8d1d-35fd53058edf", - "principal_id": "example-fe23ef05-5c5b-4a75-b59d-bba70129ece8", - "principal_type": "Group", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "cost_center": null, - "created_on": "2024-05-23T14:27:29.5114963+00:00", - "updated_on": "2024-05-23T14:27:29.5114963+00:00", - "created_by": "SYSTEM", - "updated_by": "SYSTEM", - "deleted": false + type: 'FoundationaLLM.Authorization/roleAssignments', + name: '9c04b0-c2a9-4c55-ac8f-09ba13351ab9', + object_id: + '/providers/FoundationaLLM.Authorization/roleAssignments/9c0453b0-c2a9-4c55-ac8f-09ba13351ab9', + display_name: 'Example 1', + description: 'Contributor role on the FoundationaLLM instance.', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/a9f0020f-6e3a-49bf-8d1d-35fd53058edf', + principal_id: 'example-fe23ef05-5c5b-4a75-b59d-bba70129ece8', + principal_type: 'Group', + scope: '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176', + cost_center: null, + created_on: '2024-05-23T14:27:29.5114963+00:00', + updated_on: '2024-05-23T14:27:29.5114963+00:00', + created_by: 'SYSTEM', + updated_by: 'SYSTEM', + deleted: false, }, { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "f11b77-6b2a-4b81-9e75-8b737a6ad81e", - "object_id": "/providers/FoundationaLLM.Authorization/roleAssignments/f11bab77-6b2a-4b81-9e75-8b737a6ad81e", - "display_name": 'Example 2', - "description": "User Access Administrator role on the FoundationaLLM instance.", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/fb8e0fd0-f7e2-4957-89d6-19f44f7d6618", - "principal_id": "example-23413e7f-825a-4abf-a7db-3a0b6bdd166e", - "principal_type": "Group", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "cost_center": null, - "created_on": "2024-05-23T14:27:29.5114963+00:00", - "updated_on": "2024-05-23T14:27:29.5114963+00:00", - "created_by": "SYSTEM", - "updated_by": "SYSTEM", - "deleted": false + type: 'FoundationaLLM.Authorization/roleAssignments', + name: 'f11b77-6b2a-4b81-9e75-8b737a6ad81e', + object_id: + '/providers/FoundationaLLM.Authorization/roleAssignments/f11bab77-6b2a-4b81-9e75-8b737a6ad81e', + display_name: 'Example 2', + description: 'User Access Administrator role on the FoundationaLLM instance.', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/fb8e0fd0-f7e2-4957-89d6-19f44f7d6618', + principal_id: 'example-23413e7f-825a-4abf-a7db-3a0b6bdd166e', + principal_type: 'Group', + scope: '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176', + cost_center: null, + created_on: '2024-05-23T14:27:29.5114963+00:00', + updated_on: '2024-05-23T14:27:29.5114963+00:00', + created_by: 'SYSTEM', + updated_by: 'SYSTEM', + deleted: false, }, { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "4521b9-1b0e-4ad9-a8cd-75727282cbe7", - "object_id": "/providers/FoundationaLLM.Authorization/roleAssignments/4521bdb9-1b0e-4ad9-a8cd-75727282cbe7", - "display_name": null, - "description": "Role assignment reader for the Management API managed identity.", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35", - "principal_id": "example-f8e51522-4291-4471-b029-2649b7311d01", - "principal_type": "User", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "cost_center": null, - "created_on": "2024-05-23T14:27:29.5114963+00:00", - "updated_on": "2024-05-23T14:27:29.5114963+00:00", - "created_by": "SYSTEM", - "updated_by": "SYSTEM", - "deleted": false + type: 'FoundationaLLM.Authorization/roleAssignments', + name: '4521b9-1b0e-4ad9-a8cd-75727282cbe7', + object_id: + '/providers/FoundationaLLM.Authorization/roleAssignments/4521bdb9-1b0e-4ad9-a8cd-75727282cbe7', + display_name: null, + description: 'Role assignment reader for the Management API managed identity.', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35', + principal_id: 'example-f8e51522-4291-4471-b029-2649b7311d01', + principal_type: 'User', + scope: '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176', + cost_center: null, + created_on: '2024-05-23T14:27:29.5114963+00:00', + updated_on: '2024-05-23T14:27:29.5114963+00:00', + created_by: 'SYSTEM', + updated_by: 'SYSTEM', + deleted: false, }, { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "597646-7e39-46a0-aced-9c9be832b437", - "object_id": "/providers/FoundationaLLM.Authorization/roleAssignments/59766546-7e39-46a0-aced-9c9be832b437", - "display_name":'Example 4', - "description": "Role assignment reader for the Core API managed identity.", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35", - "principal_id": "example-d59f73e7-ff08-41bb-881c-fc3c63bdcf30", - "principal_type": "User", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "cost_center": null, - "created_on": "2024-05-23T14:27:29.5114963+00:00", - "updated_on": "2024-05-23T14:27:29.5114963+00:00", - "created_by": "SYSTEM", - "updated_by": "SYSTEM", - "deleted": false + type: 'FoundationaLLM.Authorization/roleAssignments', + name: '597646-7e39-46a0-aced-9c9be832b437', + object_id: + '/providers/FoundationaLLM.Authorization/roleAssignments/59766546-7e39-46a0-aced-9c9be832b437', + display_name: 'Example 4', + description: 'Role assignment reader for the Core API managed identity.', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35', + principal_id: 'example-d59f73e7-ff08-41bb-881c-fc3c63bdcf30', + principal_type: 'User', + scope: '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176', + cost_center: null, + created_on: '2024-05-23T14:27:29.5114963+00:00', + updated_on: '2024-05-23T14:27:29.5114963+00:00', + created_by: 'SYSTEM', + updated_by: 'SYSTEM', + deleted: false, }, { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "afc3b8-7f91-4968-b6ac-e260a3a7157b", - "object_id": "/providers/FoundationaLLM.Authorization/roleAssignments/afc304b8-7f91-4968-b6ac-e260a3a7157b", - "display_name": 'Example 5', - "description": "Role assignment reader for the Vectorization API managed identity.", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35", - "principal_id": "example-bc7db642-9f96-49c1-b4ee-103d0178f432", - "principal_type": "User", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "cost_center": null, - "created_on": "2024-05-23T14:27:29.5114963+00:00", - "updated_on": "2024-05-23T14:27:29.5114963+00:00", - "created_by": "SYSTEM", - "updated_by": "SYSTEM", - "deleted": false + type: 'FoundationaLLM.Authorization/roleAssignments', + name: 'afc3b8-7f91-4968-b6ac-e260a3a7157b', + object_id: + '/providers/FoundationaLLM.Authorization/roleAssignments/afc304b8-7f91-4968-b6ac-e260a3a7157b', + display_name: 'Example 5', + description: 'Role assignment reader for the Vectorization API managed identity.', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35', + principal_id: 'example-bc7db642-9f96-49c1-b4ee-103d0178f432', + principal_type: 'User', + scope: '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176', + cost_center: null, + created_on: '2024-05-23T14:27:29.5114963+00:00', + updated_on: '2024-05-23T14:27:29.5114963+00:00', + created_by: 'SYSTEM', + updated_by: 'SYSTEM', + deleted: false, }, { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "765716-3624-4feb-bc77-58676e096faf", - "object_id": "/providers/FoundationaLLM.Authorization/roleAssignments/76578e16-3624-4feb-bc77-58676e096faf", - "display_name": 'Example 6', - "description": "Role assignment reader for the Orchestration API managed identity.", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35", - "principal_id": "example-f7955eef-283e-438e-840f-5d5b2aa845b8", - "principal_type": "User", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "cost_center": null, - "created_on": "2024-05-23T14:27:29.5114963+00:00", - "updated_on": "2024-05-23T14:27:29.5114963+00:00", - "created_by": "SYSTEM", - "updated_by": "SYSTEM", - "deleted": false + type: 'FoundationaLLM.Authorization/roleAssignments', + name: '765716-3624-4feb-bc77-58676e096faf', + object_id: + '/providers/FoundationaLLM.Authorization/roleAssignments/76578e16-3624-4feb-bc77-58676e096faf', + display_name: 'Example 6', + description: 'Role assignment reader for the Orchestration API managed identity.', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/00a53e72-f66e-4c03-8f81-7e885fd2eb35', + principal_id: 'example-f7955eef-283e-438e-840f-5d5b2aa845b8', + principal_type: 'User', + scope: '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176', + cost_center: null, + created_on: '2024-05-23T14:27:29.5114963+00:00', + updated_on: '2024-05-23T14:27:29.5114963+00:00', + created_by: 'SYSTEM', + updated_by: 'SYSTEM', + deleted: false, }, { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "4ff47b-1cd3-49d3-94cd-311ee68e3ac9", - "object_id": "/providers/FoundationaLLM.Authorization/roleAssignments/4ff9547b-1cd3-49d3-94cd-311ee68e3ac9", - "display_name": 'Example 7', - "description": "Contributor role for Andrei local debug.", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/a9f0020f-6e3a-49bf-8d1d-35fd53058edf", - "principal_id": "example-e66c544b-a150-4135-8198-a80eaa312386", - "principal_type": "User", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "cost_center": null, - "created_on": "2024-03-22T15:33:08.2807765+00:00", - "updated_on": "2024-03-22T15:33:08.2807765+00:00", - "created_by": "SYSTEM", - "updated_by": "SYSTEM", - "deleted": false + type: 'FoundationaLLM.Authorization/roleAssignments', + name: '4ff47b-1cd3-49d3-94cd-311ee68e3ac9', + object_id: + '/providers/FoundationaLLM.Authorization/roleAssignments/4ff9547b-1cd3-49d3-94cd-311ee68e3ac9', + display_name: 'Example 7', + description: 'Contributor role for Andrei local debug.', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/a9f0020f-6e3a-49bf-8d1d-35fd53058edf', + principal_id: 'example-e66c544b-a150-4135-8198-a80eaa312386', + principal_type: 'User', + scope: '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176', + cost_center: null, + created_on: '2024-03-22T15:33:08.2807765+00:00', + updated_on: '2024-03-22T15:33:08.2807765+00:00', + created_by: 'SYSTEM', + updated_by: 'SYSTEM', + deleted: false, }, { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "ca46b0-f3e9-4d25-bca8-e36d226b80fd", - "object_id": "/providers/FoundationaLLM.Authorization/roleAssignments/ca467bb0-f3e9-4d25-bca8-e36d226b80fd", - "display_name": 'Example 8', - "description": "Brian Local Dev - Contributor role on the FoundationaLLM instance.", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/a9f0020f-6e3a-49bf-8d1d-35fd53058edf", - "principal_id": "example-2930c230-b255-435a-8ef1-7788d99c2a36", - "principal_type": "User", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176", - "cost_center": null, - "created_on": "2024-05-23T14:27:29.5114963+00:00", - "updated_on": "2024-05-23T14:27:29.5114963+00:00", - "created_by": "SYSTEM", - "updated_by": "SYSTEM", - "deleted": false + type: 'FoundationaLLM.Authorization/roleAssignments', + name: 'ca46b0-f3e9-4d25-bca8-e36d226b80fd', + object_id: + '/providers/FoundationaLLM.Authorization/roleAssignments/ca467bb0-f3e9-4d25-bca8-e36d226b80fd', + display_name: 'Example 8', + description: 'Brian Local Dev - Contributor role on the FoundationaLLM instance.', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/a9f0020f-6e3a-49bf-8d1d-35fd53058edf', + principal_id: 'example-2930c230-b255-435a-8ef1-7788d99c2a36', + principal_type: 'User', + scope: '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176', + cost_center: null, + created_on: '2024-05-23T14:27:29.5114963+00:00', + updated_on: '2024-05-23T14:27:29.5114963+00:00', + created_by: 'SYSTEM', + updated_by: 'SYSTEM', + deleted: false, }, { - "type": "FoundationaLLM.Authorization/roleAssignments", - "name": "13bd64-d201-4846-9a49-4f8866dd6141", - "object_id": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176/providers/FoundationaLLM.Authorization/roleAssignments/1336bd64-d201-4846-9a49-4f8866dd6141", - "display_name": 'Example 9', - "description": "Owner role for Joel Hulen", - "role_definition_id": "/providers/FoundationaLLM.Authorization/roleDefinitions/1301f8d4-3bea-4880-945f-315dbd2ddb46", - "principal_id": "example-dc1f7302-f63e-4f75-a7e8-8984f75a522d", - "principal_type": "User", - "scope": "/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176/providers/FoundationaLLM.Agent/agents/JoelTest", - "cost_center": null, - "created_on": "0001-01-01T00:00:00+00:00", - "updated_on": "0001-01-01T00:00:00+00:00", - "created_by": null, - "updated_by": null, - "deleted": false - } - ] + type: 'FoundationaLLM.Authorization/roleAssignments', + name: '13bd64-d201-4846-9a49-4f8866dd6141', + object_id: + '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176/providers/FoundationaLLM.Authorization/roleAssignments/1336bd64-d201-4846-9a49-4f8866dd6141', + display_name: 'Example 9', + description: 'Owner role for Joel Hulen', + role_definition_id: + '/providers/FoundationaLLM.Authorization/roleDefinitions/1301f8d4-3bea-4880-945f-315dbd2ddb46', + principal_id: 'example-dc1f7302-f63e-4f75-a7e8-8984f75a522d', + principal_type: 'User', + scope: + '/instances/6fa496ce-d5c0-4e02-9223-06a98c9c0176/providers/FoundationaLLM.Agent/agents/JoelTest', + cost_center: null, + created_on: '0001-01-01T00:00:00+00:00', + updated_on: '0001-01-01T00:00:00+00:00', + created_by: null, + updated_by: null, + deleted: false, + }, + ], }; diff --git a/src/ui/ManagementPortal/js/types.ts b/src/ui/ManagementPortal/js/types.ts index e37e86e008..aa553c2240 100644 --- a/src/ui/ManagementPortal/js/types.ts +++ b/src/ui/ManagementPortal/js/types.ts @@ -6,7 +6,7 @@ interface ResourceBase { description: string; cost_center: string; expiration_date: string; -}; +} export type ResourceProviderGetResult = { /** @@ -98,13 +98,13 @@ export type AIModel = ResourceBase & { name: string; type: string; // The object id of the APIEndpointConfiguration object providing the configuration for the API endpoint used to interact with the model. - endpoint_object_id: string; - // The version of the AI model. - version?: string | null; - // The name of the deployment corresponding to the AI model. - deployment_name?: string | null; - // Dictionary with default values for the model parameters. - model_parameters: { [key: string]: any }; + endpoint_object_id: string; + // The version of the AI model. + version?: string | null; + // The name of the deployment corresponding to the AI model. + deployment_name?: string | null; + // Dictionary with default values for the model parameters. + model_parameters: { [key: string]: any }; }; export interface ConfigurationReferenceMetadata { @@ -244,7 +244,7 @@ export type TextEmbeddingProfile = ResourceBase & { }; settings: { model_name: string; - } + }; // The resolved configuration references are used to store the resolved values for displaying in the UI and updating the configuration. resolved_configuration_references: { APIKey: string; @@ -252,10 +252,10 @@ export type TextEmbeddingProfile = ResourceBase & { AuthenticationType: string; DeploymentName: string; Endpoint: string; - }; - resolved_settings: { + }; + resolved_settings: { model_name: string; - } + }; }; export type CheckNameResponse = { @@ -359,13 +359,9 @@ export type CreateTextPartitioningProfileRequest = ResourceBase & { }; }; -export type Role = { - -}; +export type Role = {}; -export type RoleAssignment = { - -}; +export type RoleAssignment = {}; // Type guards export function isAzureDataLakeDataSource( @@ -374,9 +370,7 @@ export function isAzureDataLakeDataSource( return dataSource.type === 'azure-data-lake'; } -export function isOneLakeDataSource( - dataSource: DataSource, -): dataSource is OneLakeDataSource { +export function isOneLakeDataSource(dataSource: DataSource): dataSource is OneLakeDataSource { return dataSource.type === 'onelake'; } diff --git a/src/ui/ManagementPortal/layouts/default.vue b/src/ui/ManagementPortal/layouts/default.vue index cfe9a44703..9298be52fb 100644 --- a/src/ui/ManagementPortal/layouts/default.vue +++ b/src/ui/ManagementPortal/layouts/default.vue @@ -52,7 +52,7 @@ export default { footer { text-align: right; font-size: 0.85rem; - margin-top: 24px; + margin-top: 24px; padding-right: 24px; } diff --git a/src/ui/ManagementPortal/pages/agents/create.vue b/src/ui/ManagementPortal/pages/agents/create.vue index 6bd8383171..84834393dc 100644 --- a/src/ui/ManagementPortal/pages/agents/create.vue +++ b/src/ui/ManagementPortal/pages/agents/create.vue @@ -20,7 +20,6 @@ />
-