From bf6e33c161705f86b03919b217f01223c5a4b5f4 Mon Sep 17 00:00:00 2001 From: "Vishal Shinde (Persistent Systems Inc)" Date: Wed, 16 Apr 2025 14:17:59 +0530 Subject: [PATCH 1/3] added new paths --- docs/AIFoundryDeployment.md | 60 ++++++++++---------- docs/FabricDeployment.md | 14 ++--- docs/PromptFlowEvaluation.md | 20 +++---- docs/PromptFlowSafetyEvaluation.md | 4 +- infra/bicep/deploy_aihub_scripts.bicep | 2 +- infra/bicep/deploy_fabric_scripts.bicep | 2 +- infra/bicep/deploy_index_scripts.bicep | 2 +- infra/bicep/deploy_upload_files_script.bicep | 2 +- infra/bicep/main.json | 6 +- infra/scripts/copy_kb_files.sh | 6 +- infra/scripts/run_create_aihub_scripts.sh | 6 +- infra/scripts/run_create_index_scripts.sh | 8 +-- infra/scripts/run_fabric_items_scripts.sh | 10 ++-- 13 files changed, 71 insertions(+), 71 deletions(-) diff --git a/docs/AIFoundryDeployment.md b/docs/AIFoundryDeployment.md index 0473cb67..158ce773 100644 --- a/docs/AIFoundryDeployment.md +++ b/docs/AIFoundryDeployment.md @@ -4,7 +4,7 @@ Please follow the steps below to configure the Prompt flow endpoint in App servi ## Step 1: OpenAI Foundry Project 1. Launch the [AI Foundry](https://ai.azure.com/) and select `project` under Jump into a project in Azure AI Foundry, If not found click on View all projects from the top menu. - ![Home](/ResearchAssistant/Deployment/images/aiStudio/Home.png) + ![Home](/docs/images/aiStudio/Home.png) 2. Click on the project with name `ai_project_{your deployment prefix}`. @@ -12,52 +12,52 @@ Please follow the steps below to configure the Prompt flow endpoint in App servi 1. Click on `PromptFlow` button from left menu under `Build and customize`. - ![Prompt Flow](/ResearchAssistant/Deployment/images/aiStudio/PromptFlow.png) + ![Prompt Flow](/docs/images/aiStudio/PromptFlow.png) 2. Click on `Create` button. Then click on `Upload` button from `Upload From Local` option from the last row. - ![Upload](/ResearchAssistant/Deployment/images/aiStudio/UploadFromLocal.png) + ![Upload](/docs/images/aiStudio/UploadFromLocal.png) -3. Click on `Zip File` radio button. Then click on `Browse` to select the file `DraftFlow.zip` from the cloned/downloaded GitHub repository folder. The file will be located at `/ResearchAssistant/Deployment/scripts/ai_hub_scripts/flows/`. +3. Click on `Zip File` radio button. Then click on `Browse` to select the file `DraftFlow.zip` from the cloned/downloaded GitHub repository folder. The file will be located at `/infra/scripts/aihub_scripts/flows/`. - ![Select Local File](/ResearchAssistant/Deployment/images/aiStudio/SelectLocalFile.png) + ![Select Local File](/docs/images/aiStudio/SelectLocalFile.png) 4. Once the DraftFlow.zip file is uploaded, change folder name to `DraftFlow` and Select Flow type as `Chat Flow` and click on `Upload` button. - ![Upload Local File](/ResearchAssistant/Deployment/images/aiStudio/UploadLocalFile.png) + ![Upload Local File](/docs/images/aiStudio/UploadLocalFile.png) 5. Click on `Start compute session` and click on `Start compute session` from the drop-down list. It can take few minutes for the runtime to start. - ![Select Runtime](/ResearchAssistant/Deployment/images/aiStudio/SelectRunTime.png) + ![Select Runtime](/docs/images/aiStudio/SelectRunTime.png) 6. Click on `Deploy` button once it is enabled. Enter a unique name for Endpoint Name field. >IMPORTANT: This name has to be unique across all endpoints in your Azure subscription. You can leave the Deployment name, Virtual machine type, and Instace count as populated and click on `Review + Create`. Optionally you can choose a different VM type/size and increase/decrease the Instance count as needed. Then review details and click on `Create` in the next screen. - ![Deploy Draft Flow](/ResearchAssistant/Deployment/images/aiStudio/DeployDraftFlow.png) + ![Deploy Draft Flow](/docs/images/aiStudio/DeployDraftFlow.png) 7. It will take few minutes for the flow to be validated and deployed. Click on `Models + endpoints` from left menu. You might only see the Default_AzureOpenAI deployments in the page until the deployment is completed. Please wait and click on `Refresh` after few minutes. - ![Deployments Page](/ResearchAssistant/Deployment/images/aiStudio/BlankDeploymentsPage.png) + ![Deployments Page](/docs/images/aiStudio/BlankDeploymentsPage.png) 8. Click on the deployed endpoint with name `ai-project-bycra-jzxzb-1`. - ![Drafts Endpoint](/ResearchAssistant/Deployment/images/aiStudio/DraftsEndpoint.png) + ![Drafts Endpoint](/docs/images/aiStudio/DraftsEndpoint.png) 9. Click on `Consume` from the top menu. Copy below details to use later in step 3.6. - Deployment - REST endpoint - Primary key - ![Drafts Endpoint Consume](/ResearchAssistant/Deployment/images/aiStudio/DraftsEndpointConsume.png) + ![Drafts Endpoint Consume](/docs/images/aiStudio/DraftsEndpointConsume.png) ## Step 3: Update the deployment keys in Azure App Service configuration 1. Launch the Azure Portal [Azure Portal](https://portal.azure.com/). 2. Enter `Resource Groups` in the top search bar. - ![Search Resource Groups](/ResearchAssistant/Deployment/images/aiStudio/AzurePortalResourceGroups.png) + ![Search Resource Groups](/docs/images/aiStudio/AzurePortalResourceGroups.png) 3. Locate your Resource Group you selected/created during one-click deployment and click on it. @@ -65,7 +65,7 @@ Please follow the steps below to configure the Prompt flow endpoint in App servi 5. Click on `Environment Variables` from left menu under `Settings`. - ![Application Environment Variables](/ResearchAssistant/Deployment/images/aiStudio/AppEnvironmentVariables.png) + ![Application Environment Variables](/docs/images/aiStudio/AppEnvironmentVariables.png) 6. Modify the below variables with values collected in step 2.9 above. - AI_STUDIO_DRAFT_FLOW_ENDPOINT @@ -74,64 +74,64 @@ Please follow the steps below to configure the Prompt flow endpoint in App servi 7. Click on `Apply` button at the bottom of the screen. Then click on `Confirm` in the pop-up. - ![Application Environment Variables Confirm](/ResearchAssistant/Deployment/images/aiStudio/AppEnvironmentVariablesConfirm.png) + ![Application Environment Variables Confirm](/docs/images/aiStudio/AppEnvironmentVariablesConfirm.png) 8. Click on `Overview` from the left menu. Then click on `Restart` button in the top menu. Then click on `Yes` in the pop-up message. - ![Application Restart](/ResearchAssistant/Deployment/images/aiStudio/AppServiceRestart.png) + ![Application Restart](/docs/images/aiStudio/AppServiceRestart.png) ## Step 4: Add Authentication in Azure App Service configuration 1. Click on `Authentication` from left menu. - ![Authentication](/ResearchAssistant/Deployment/images/aiStudio/AppAuthentication.png) + ![Authentication](/docs/images/aiStudio/AppAuthentication.png) 2. Click on `+ Add Provider` to see a list of identity providers. - ![Authentication Identity](/ResearchAssistant/Deployment/images/aiStudio/AppAuthenticationIdentity.png) + ![Authentication Identity](/docs/images/aiStudio/AppAuthenticationIdentity.png) 3. Click on `+ Add Provider` to see a list of identity providers. - ![Add Provider](/ResearchAssistant/Deployment/images/aiStudio/AppAuthIdentityProvider.png) + ![Add Provider](/docs/images/aiStudio/AppAuthIdentityProvider.png) -4. Select the first option `Microsoft Entra Id` from the drop-down list. If `Create new app registration` is disabled, go to [Step 4a](https://github.com/microsoft/Build-your-own-AI-Assistant-Solution-Accelerator/blob/PSL-Authenticate-Doc/ResearchAssistant/Deployment/AIStudioDeployment.md#step-4a-creating-a-new-app-registration) +4. Select the first option `Microsoft Entra Id` from the drop-down list. If `Create new app registration` is disabled, go to [Step 4a](https://github.com/microsoft/Build-your-own-AI-Assistant-Solution-Accelerator/blob/PSL-Authenticate-Doc/docs/AIStudioDeployment.md#step-4a-creating-a-new-app-registration) - ![Add Provider](/ResearchAssistant/Deployment/images/aiStudio/AppAuthIdentityProviderAdd.png) + ![Add Provider](/docs/images/aiStudio/AppAuthIdentityProviderAdd.png) 5. Accept the default values and click on `Add` button to go back to the previous page with the identify provider added. - ![Add Provider](/ResearchAssistant/Deployment/images/aiStudio/AppAuthIdentityProviderAdded.png) + ![Add Provider](/docs/images/aiStudio/AppAuthIdentityProviderAdded.png) ### Step 4a: Creating a new App Registration 1. Click on `Home` and select `Microsoft Entra ID`. -![Microsoft Entra ID](/ResearchAssistant/Deployment/images/aiStudio/MicrosoftEntraID.png) +![Microsoft Entra ID](/docs/images/aiStudio/MicrosoftEntraID.png) 2. Click on `App registrations`. -![App registrations](/ResearchAssistant/Deployment/images/aiStudio/Appregistrations.png) +![App registrations](/docs/images/aiStudio/Appregistrations.png) 3. Click on `+ New registration`. -![New Registrations](/ResearchAssistant/Deployment/images/aiStudio/NewRegistration.png) +![New Registrations](/docs/images/aiStudio/NewProject.png) 4. Provide the `Name`, select supported account types as `Accounts in this organizational directory only(Contoso only - Single tenant)`, select platform as `Web`, enter/select the `URL` and register. -![Add Details](/ResearchAssistant/Deployment/images/aiStudio/AddDetails.png) +![Add Details](/docs/images/aiStudio/AddDetails.png) 5. After application is created sucessfully, then click on `Add a Redirect URL`. -![Redirect URL](/ResearchAssistant/Deployment/images/aiStudio/AddRedirectURL.png) +![Redirect URL](/docs/images/aiStudio/AddRedirectURL.png) 6. Click on `+ Add a platform`. -![+ Add platform](/ResearchAssistant/Deployment/images/aiStudio/AddPlatform.png) +![+ Add platform](/docs/images/aiStudio/AddPlatform.png) 7. Click on `Web`. -![Web](/ResearchAssistant/Deployment/images/aiStudio/Web.png) +![Web](/docs/images/aiStudio/Web.png) -8. Enter the `web app URL` (Provide the app service name in place of XXXX) and Save. Then go back to [Step 4](https://github.com/microsoft/Build-your-own-AI-Assistant-Solution-Accelerator/blob/PSL-Authenticate-Doc/ResearchAssistant/Deployment/AIStudioDeployment.md#step-4-add-authentication-in-azure-app-service-configuration) and follow from _Point 4_ choose `Pick an existing app registration in this directory` from the Add an Identity Provider page and provide the newly registered App Name. +8. Enter the `web app URL` (Provide the app service name in place of XXXX) and Save. Then go back to [Step 4](https://github.com/microsoft/Build-your-own-AI-Assistant-Solution-Accelerator/blob/PSL-Authenticate-Doc/docs/AIStudioDeployment.md#step-4-add-authentication-in-azure-app-service-configuration) and follow from _Point 4_ choose `Pick an existing app registration in this directory` from the Add an Identity Provider page and provide the newly registered App Name. -![Add Details](/ResearchAssistant/Deployment/images/aiStudio/WebAppURL.png) +![Add Details](/docs/images/aiStudio/WebAppURL.png) diff --git a/docs/FabricDeployment.md b/docs/FabricDeployment.md index 12a997a6..653132c8 100644 --- a/docs/FabricDeployment.md +++ b/docs/FabricDeployment.md @@ -3,22 +3,22 @@ Please follow the steps below to set up the Fabric Workspace and collect the id 1. Launch Microsoft Fabric Data Engineering experience [Data Engineering](https://app.fabric.microsoft.com/home?experience=data-engineering). 2. Click on `Workspaces` from the left menu and click on `New Workspace` at the bottom of the menu. - ![Create Workspace](/ResearchAssistant/Deployment/images/fabric/workspaces.png) + ![Create Workspace](/docs/images/fabric/workspaces.png) 3. Enter a Workspace Name and click on `Apply`. - ![New Workspace](/ResearchAssistant/Deployment/images/fabric/CreateWorkspace.png) + ![New Workspace](/docs/images/fabric/CreateWorkspace.png) 4. On the next page, click on `Import`. - ![Create Workspace](/ResearchAssistant/Deployment/images/fabric/WorkspaceGuid.png) + ![Create Workspace](/docs/images/fabric/WorkspaceGuid.png) 5. Click on `Notebook`. - ![Create Workspace](/ResearchAssistant/Deployment/images/fabric/ImportNotebooks.png) + ![Create Workspace](/docs/images/fabric/ImportNotebooks.png) -5. Navigate to the local folder where you cloned/downloaded this repository and select notebooks shown in screenshot from path `/ResearchAssistant/Deployment/scripts/fabric_scripts/`. - ![Create Workspace](/ResearchAssistant/Deployment/images/fabric/SelectNotebooks.png) +5. Navigate to the local folder where you cloned/downloaded this repository and select notebooks shown in screenshot from path `/infra/scripts/fabric_scripts/`. + ![Create Workspace](/docs/images/fabric/SelectNotebooks.png) 6. Downloaded Notebooks appear in the workspace. - ![Create Workspace](/ResearchAssistant/Deployment/images/fabric/Notebooks.png) + ![Create Workspace](/blob/byoc-researcher/docs/images/fabric/Notebooks.png) 7. You can Click on each notebook to see the code. These notebooks can be scheduled to run periodically if you plan to upload new documents to the storage account. diff --git a/docs/PromptFlowEvaluation.md b/docs/PromptFlowEvaluation.md index 35386b8c..d6feb4cd 100644 --- a/docs/PromptFlowEvaluation.md +++ b/docs/PromptFlowEvaluation.md @@ -17,34 +17,34 @@ In prompt flow, you can customize or create your own evaluation flow and metrics 2. Locate your AI project under recent projects. - ![image1](/ResearchAssistant/Deployment/images/evaluation/image1.png) + ![image1](/docs/images/evaluation/image1.png) 3. Once inside your project, select Evaluation from the left dropdown menu. - ![image2](/ResearchAssistant/Deployment/images/evaluation/image2.png) + ![image2](/docs/images/evaluation/image2.png) 4. From your Evaluation view, select New evaluation in the middle of the page. - ![imag3](/ResearchAssistant/Deployment/images/evaluation/image3.png) + ![imag3](/docs/images/evaluation/image3.png) 5. From here you can create, name a new evaluation and select your scenario. - ![image4](/ResearchAssistant/Deployment/images/evaluation/image4.png) + ![image4](/docs/images/evaluation/image4.png) 6. Select the flow you want to evaluate. (To evaluate the DraftFlow select DraftFlow here) - ![image5](/ResearchAssistant/Deployment/images/evaluation/image5.png) + ![image5](/docs/images/evaluation/image5.png) 7. Select metrics you would like to use. Also, be sure to select an active Connection and active Deployment name/Model. - ![image6](/ResearchAssistant/Deployment/images/evaluation/image6.png) + ![image6](/docs/images/evaluation/image6.png) 8. Use an existing dataset or upload a dataset to use in evaluation. (Upload the provided dataset found in \Deployment\data\EvaluationDataset.csv) - ![image7](/ResearchAssistant/Deployment/images/evaluation/image7.png) + ![image7](/docs/images/evaluation/image7.png) 9. Lastly, map the inputs from your dataset and click submit. - ![image8](/ResearchAssistant/Deployment/images/evaluation/image8.png) + ![image8](/docs/images/evaluation/image8.png) ### Results Once the flow has been ran successfully, the metrics will be displayed showing a 1-5 score of each respective metric. From here, you can click into the evaluation flow to get a better understanding of the scores. - ![image9](/ResearchAssistant/Deployment/images/evaluation/image9.png) - ![image10](/ResearchAssistant/Deployment/images/evaluation/image10.png) + ![image9](/docs/images/evaluation/image9.png) + ![image10](/docs/images/evaluation/image10.png) diff --git a/docs/PromptFlowSafetyEvaluation.md b/docs/PromptFlowSafetyEvaluation.md index 1fa7d7cb..1c18ba09 100644 --- a/docs/PromptFlowSafetyEvaluation.md +++ b/docs/PromptFlowSafetyEvaluation.md @@ -1,7 +1,7 @@ # Safety Evaluation Flow Guide Please follow the steps below to generate Adversarial data and set up the evaluation flow. -1. Open the notebook `simulate_and_evaluate_flow.ipynb` in path `/ResearchAssistant/Deployment/scripts/evaluation_scripts/` in Visual Studio Code or your choice of notebook editor. +1. Open the notebook `simulate_and_evaluate_flow.ipynb` in path `//infra/scripts/evaluation_scripts/` in Visual Studio Code or your choice of notebook editor. 2. Update the parameters like Key Vault Name, AI Studio Project Name and AI Studio Deployment URL, Key and Name parameters and run all the cells in the notebook. @@ -11,7 +11,7 @@ Please follow the steps below to generate Adversarial data and set up the evalua 5. Click on the flow created from the notebook to see the results. - ![Evaluation Results](/ResearchAssistant/Deployment/images/evaluation/safety_evaluation.png) + ![Evaluation Results](/docs/images/evaluation/safety_evaluation.png) diff --git a/infra/bicep/deploy_aihub_scripts.bicep b/infra/bicep/deploy_aihub_scripts.bicep index 12164fb3..5832242b 100644 --- a/infra/bicep/deploy_aihub_scripts.bicep +++ b/infra/bicep/deploy_aihub_scripts.bicep @@ -20,7 +20,7 @@ resource create_index 'Microsoft.Resources/deploymentScripts@2020-10-01' = { } properties: { azCliVersion: '2.52.0' - primaryScriptUri: '${baseUrl}ResearchAssistant/Deployment/scripts/run_create_aihub_scripts.sh' + primaryScriptUri: '${baseUrl}infra/scripts/run_create_aihub_scripts.sh' arguments: '${baseUrl} ${keyVaultName} ${solutionName} ${resourceGroupName} ${subscriptionId} ${solutionLocation}' // Specify any arguments for the script timeout: 'PT1H' // Specify the desired timeout duration retentionInterval: 'PT1H' // Specify the desired retention interval diff --git a/infra/bicep/deploy_fabric_scripts.bicep b/infra/bicep/deploy_fabric_scripts.bicep index a62e8998..1ec88447 100644 --- a/infra/bicep/deploy_fabric_scripts.bicep +++ b/infra/bicep/deploy_fabric_scripts.bicep @@ -18,7 +18,7 @@ resource create_index 'Microsoft.Resources/deploymentScripts@2020-10-01' = { } properties: { azCliVersion: '2.52.0' - primaryScriptUri: '${baseUrl}ResearchAssistant/Deployment/scripts/run_fabric_items_scripts.sh' + primaryScriptUri: '${baseUrl}infra/scripts/run_fabric_items_scripts.sh' arguments: '${baseUrl} ${keyVaultName} ${fabricWorkspaceId}' // Specify any arguments for the script timeout: 'PT1H' // Specify the desired timeout duration retentionInterval: 'PT1H' // Specify the desired retention interval diff --git a/infra/bicep/deploy_index_scripts.bicep b/infra/bicep/deploy_index_scripts.bicep index fc680bb1..d1fea18b 100644 --- a/infra/bicep/deploy_index_scripts.bicep +++ b/infra/bicep/deploy_index_scripts.bicep @@ -17,7 +17,7 @@ resource create_index 'Microsoft.Resources/deploymentScripts@2020-10-01' = { } properties: { azCliVersion: '2.52.0' - primaryScriptUri: '${baseUrl}ResearchAssistant/Deployment/scripts/run_create_index_scripts.sh' + primaryScriptUri: '${baseUrl}infra/scripts/run_create_index_scripts.sh' arguments: '${baseUrl} ${keyVaultName}' // Specify any arguments for the script timeout: 'PT1H' // Specify the desired timeout duration retentionInterval: 'PT1H' // Specify the desired retention interval diff --git a/infra/bicep/deploy_upload_files_script.bicep b/infra/bicep/deploy_upload_files_script.bicep index 9a61ef26..39ad4f25 100644 --- a/infra/bicep/deploy_upload_files_script.bicep +++ b/infra/bicep/deploy_upload_files_script.bicep @@ -19,7 +19,7 @@ resource copy_demo_Data 'Microsoft.Resources/deploymentScripts@2020-10-01' = { } properties: { azCliVersion: '2.50.0' - primaryScriptUri: '${baseUrl}ResearchAssistant/Deployment/scripts/copy_kb_files.sh' // deploy-azure-synapse-pipelines.sh + primaryScriptUri: '${baseUrl}infra/scripts/copy_kb_files.sh' // deploy-azure-synapse-pipelines.sh arguments: '${storageAccountName} ${containerName} ${baseUrl}' // Specify any arguments for the script timeout: 'PT1H' // Specify the desired timeout duration retentionInterval: 'PT1H' // Specify the desired retention interval diff --git a/infra/bicep/main.json b/infra/bicep/main.json index dd5f167e..f1c18647 100644 --- a/infra/bicep/main.json +++ b/infra/bicep/main.json @@ -634,7 +634,7 @@ }, "properties": { "azCliVersion": "2.50.0", - "primaryScriptUri": "[format('{0}ResearchAssistant/Deployment/scripts/copy_kb_files.sh', parameters('baseUrl'))]", + "primaryScriptUri": "[format('{0}infra/scripts/copy_kb_files.sh', parameters('baseUrl'))]", "arguments": "[format('{0} {1} {2}', parameters('storageAccountName'), parameters('containerName'), parameters('baseUrl'))]", "timeout": "PT1H", "retentionInterval": "PT1H", @@ -1223,7 +1223,7 @@ }, "properties": { "azCliVersion": "2.52.0", - "primaryScriptUri": "[format('{0}ResearchAssistant/Deployment/scripts/run_create_index_scripts.sh', parameters('baseUrl'))]", + "primaryScriptUri": "[format('{0}infra/scripts/run_create_index_scripts.sh', parameters('baseUrl'))]", "arguments": "[format('{0} {1}', parameters('baseUrl'), parameters('keyVaultName'))]", "timeout": "PT1H", "retentionInterval": "PT1H", @@ -1321,7 +1321,7 @@ }, "properties": { "azCliVersion": "2.52.0", - "primaryScriptUri": "[format('{0}ResearchAssistant/Deployment/scripts/run_create_aihub_scripts.sh', parameters('baseUrl'))]", + "primaryScriptUri": "[format('{0}infra/scripts/run_create_aihub_scripts.sh', parameters('baseUrl'))]", "arguments": "[format('{0} {1} {2} {3} {4} {5}', parameters('baseUrl'), parameters('keyVaultName'), parameters('solutionName'), parameters('resourceGroupName'), parameters('subscriptionId'), parameters('solutionLocation'))]", "timeout": "PT1H", "retentionInterval": "PT1H", diff --git a/infra/scripts/copy_kb_files.sh b/infra/scripts/copy_kb_files.sh index b687f92e..f7c23c26 100644 --- a/infra/scripts/copy_kb_files.sh +++ b/infra/scripts/copy_kb_files.sh @@ -7,15 +7,15 @@ baseUrl="$3" zipFileName1="demodata1.zip" extractedFolder1="demodata" -zipUrl1=${baseUrl}"ResearchAssistant/Deployment/data/demodata1.zip" +zipUrl1=${baseUrl}"infra/data/demodata1.zip" zipFileName2="demodata2.zip" extractedFolder2="demodata2" -zipUrl2=${baseUrl}"ResearchAssistant/Deployment/data/demodata2.zip" +zipUrl2=${baseUrl}"infra/data/demodata2.zip" zipFileName3="demodata3.zip" extractedFolder3="demodata3" -zipUrl3=${baseUrl}"ResearchAssistant/Deployment/data/demodata3.zip" +zipUrl3=${baseUrl}"infra/data/demodata3.zip" # Download the zip file diff --git a/infra/scripts/run_create_aihub_scripts.sh b/infra/scripts/run_create_aihub_scripts.sh index 8032ec85..93983741 100644 --- a/infra/scripts/run_create_aihub_scripts.sh +++ b/infra/scripts/run_create_aihub_scripts.sh @@ -11,16 +11,16 @@ solutionLocation="$6" requirementFile="requirements.txt" -requirementFileUrl=${baseUrl}"ResearchAssistant/Deployment/scripts/aihub_scripts/requirements.txt" +requirementFileUrl=${baseUrl}"infra/scripts/aihub_scripts/requirements.txt" flowFile=DraftFlow.zip extractedFlowFolder="DraftFlow" -flowFileUrl=${baseUrl}"ResearchAssistant/Deployment/scripts/aihub_scripts/flows/DraftFlow.zip" +flowFileUrl=${baseUrl}"infra/scripts/aihub_scripts/flows/DraftFlow.zip" echo "Download Started" # Download the create_index python files -curl --output "create_ai_hub.py" ${baseUrl}"ResearchAssistant/Deployment/scripts/aihub_scripts/create_ai_hub.py" +curl --output "create_ai_hub.py" ${baseUrl}"infra/scripts/aihub_scripts/create_ai_hub.py" # Download the requirement file curl --output "$requirementFile" "$requirementFileUrl" diff --git a/infra/scripts/run_create_index_scripts.sh b/infra/scripts/run_create_index_scripts.sh index 73c2b628..33dc40e8 100644 --- a/infra/scripts/run_create_index_scripts.sh +++ b/infra/scripts/run_create_index_scripts.sh @@ -5,14 +5,14 @@ echo "started the script" baseUrl="$1" keyvaultName="$2" requirementFile="requirements.txt" -requirementFileUrl=${baseUrl}"ResearchAssistant/Deployment/scripts/index_scripts/requirements.txt" +requirementFileUrl=${baseUrl}"infra/scripts/index_scripts/requirements.txt" echo "Download Started" # Download the create_index python files -curl --output "create_articles_index.py" ${baseUrl}"ResearchAssistant/Deployment/scripts/index_scripts/create_articles_index.py" -curl --output "create_grants_index.py" ${baseUrl}"ResearchAssistant/Deployment/scripts/index_scripts/create_grants_index.py" -curl --output "create_drafts_index.py" ${baseUrl}"ResearchAssistant/Deployment/scripts/index_scripts/create_drafts_index.py" +curl --output "create_articles_index.py" ${baseUrl}"infra/scripts/index_scripts/create_articles_index.py" +curl --output "create_grants_index.py" ${baseUrl}"infra/scripts/index_scripts/create_grants_index.py" +curl --output "create_drafts_index.py" ${baseUrl}"infra/scripts/index_scripts/create_drafts_index.py" # Download the requirement file curl --output "$requirementFile" "$requirementFileUrl" diff --git a/infra/scripts/run_fabric_items_scripts.sh b/infra/scripts/run_fabric_items_scripts.sh index 2258108f..d631745c 100644 --- a/infra/scripts/run_fabric_items_scripts.sh +++ b/infra/scripts/run_fabric_items_scripts.sh @@ -6,16 +6,16 @@ baseUrl="$1" keyvaultName="$2" fabricWorkspaceId="$3" requirementFile="requirements.txt" -requirementFileUrl=${baseUrl}"ResearchAssistant/Deployment/scripts/fabric_scripts/requirements.txt" +requirementFileUrl=${baseUrl}"infra/scripts/fabric_scripts/requirements.txt" echo "Download Started" # Download the create_fabric python files -curl --output "create_fabric_items.py" ${baseUrl}"ResearchAssistant/Deployment/scripts/fabric_scripts/create_fabric_items.py" +curl --output "create_fabric_items.py" ${baseUrl}"infra/scripts/fabric_scripts/create_fabric_items.py" -curl --output "create_articles_index.ipynb" ${baseUrl}"ResearchAssistant/Deployment/scripts/fabric_scripts/create_articles_index.ipynb" -curl --output "create_grants_index.ipynb" ${baseUrl}"ResearchAssistant/Deployment/scripts/fabric_scripts/create_grants_index.ipynb" -curl --output "create_drafts_index.ipynb" ${baseUrl}"ResearchAssistant/Deployment/scripts/fabric_scripts/create_drafts_index.ipynb" +curl --output "create_articles_index.ipynb" ${baseUrl}"infra/scripts/fabric_scripts/create_articles_index.ipynb" +curl --output "create_grants_index.ipynb" ${baseUrl}"infra/scripts/fabric_scripts/create_grants_index.ipynb" +curl --output "create_drafts_index.ipynb" ${baseUrl}"infra/scripts/fabric_scripts/create_drafts_index.ipynb" # Download the requirement file curl --output "$requirementFile" "$requirementFileUrl" From f02013ef2596079bfda7d1959424c5809fc07aef Mon Sep 17 00:00:00 2001 From: "Vishal Shinde (Persistent Systems Inc)" Date: Wed, 16 Apr 2025 14:39:15 +0530 Subject: [PATCH 2/3] docker file changes --- src/WebApp.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/WebApp.Dockerfile b/src/WebApp.Dockerfile index 210e3e3d..f1856d9c 100644 --- a/src/WebApp.Dockerfile +++ b/src/WebApp.Dockerfile @@ -2,10 +2,10 @@ FROM node:20-alpine AS frontend RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app WORKDIR /home/node/app -COPY ./ResearchAssistant/App/frontend/package*.json ./ +COPY ./src/frontend/package*.json ./ USER node RUN npm ci -COPY --chown=node:node ./ResearchAssistant/App/frontend/ ./frontend +COPY --chown=node:node ./src/frontend/ ./frontend # COPY --chown=node:node ./static/ ./static WORKDIR /home/node/app/frontend RUN npm run build @@ -19,13 +19,13 @@ RUN apk add --no-cache --virtual .build-deps \ && apk add --no-cache \ libpq -COPY ./ResearchAssistant/App/requirements.txt /usr/src/app/ +COPY ./src/requirements.txt /usr/src/app/ RUN pip install --upgrade pip setuptools wheel \ && pip install --no-cache-dir -r /usr/src/app/requirements.txt \ && pip install --no-cache-dir uwsgi \ && rm -rf /root/.cache -COPY ./ResearchAssistant/App/ /usr/src/app/ +COPY ./src/ /usr/src/app/ COPY --from=frontend /home/node/app/static /usr/src/app/static/ WORKDIR /usr/src/app EXPOSE 80 From 0449a1338615e7969fb830bb57d6710fc9d3a8b7 Mon Sep 17 00:00:00 2001 From: "Vishal Shinde (Persistent Systems Inc)" Date: Tue, 22 Apr 2025 16:42:28 +0530 Subject: [PATCH 3/3] fixed:this azure-ai-ml SDK and CLI installation broken --- infra/scripts/aihub_scripts/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/scripts/aihub_scripts/requirements.txt b/infra/scripts/aihub_scripts/requirements.txt index 98acb23a..3b6a4ec1 100644 --- a/infra/scripts/aihub_scripts/requirements.txt +++ b/infra/scripts/aihub_scripts/requirements.txt @@ -1,7 +1,7 @@ azure-identity azure-keyvault-secrets azure-ai-resources -azure-ai-ml==1.26.1 +azure-ai-ml==1.26.3 msal[broker]==1.24.0b1 azure-mgmt-resource==23.1.0b2 azure-mgmt-cognitiveservices