Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test merge #1

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e8105f9
Add Back button to re-direct to Atlas. Updating with the latest stabi…
DFoxArdent Mar 25, 2024
8b9913e
Update README.md
DFoxArdent Mar 25, 2024
fc5781c
Update README_azd.md
DFoxArdent Mar 25, 2024
6366827
Add or update the Azure App Service build and deployment workflow config
DFoxArdent Mar 25, 2024
1e0c125
Improve Styling detail and spacing between messages
DFoxArdent Mar 25, 2024
027cdbc
Merge branch 'main' of https://github.com/DFoxArdent/Sampleapp
DFoxArdent Mar 25, 2024
a2f9aef
Updated Spacing between user message and response
DFoxArdent Mar 25, 2024
bb844b5
Add or update the Azure App Service build and deployment workflow config
DFoxArdent Mar 25, 2024
897b9c9
Add or update the Azure App Service build and deployment workflow config
DFoxArdent Mar 25, 2024
75de5a8
Add or update the Azure App Service build and deployment workflow config
DFoxArdent Mar 25, 2024
8e0eb46
Update messages and feedback repsonse options
DFoxArdent Mar 26, 2024
9693af4
Merge branch 'main' of https://github.com/DFoxArdent/Sampleapp
DFoxArdent Mar 26, 2024
5f3fe85
Update Build
DFoxArdent Mar 26, 2024
d91b4f3
Update docker-image.yml
DFoxArdent Mar 26, 2024
47f6452
Adding Hyperlink to the Atlas AI Logo to return to Atlas as well as h…
DFoxArdent Mar 26, 2024
bfa28d2
Merge branch 'main' of https://github.com/DFoxArdent/Sampleapp
DFoxArdent Mar 26, 2024
116db76
Delete .github/workflows/docker-image.yml
DFoxArdent Mar 26, 2024
75baae1
Add support for promptflow endpoint
DFoxArdent Apr 2, 2024
56a6b9e
Add Support for promptflow endpoint
DFoxArdent Apr 2, 2024
8781fca
Add support for promptflow endpoint
DFoxArdent Apr 2, 2024
9fd3e39
Fix Citation Styles in Mobile
DFoxArdent Apr 2, 2024
b0bf15e
Fix Citation Styles in Mobile
DFoxArdent Apr 2, 2024
91e4daf
Fix Citation Styling Mobile
DFoxArdent Apr 2, 2024
2dd83a9
Fix Error Messages and remove rogue console log
DFoxArdent Apr 2, 2024
07d4397
Add or update the Azure App Service build and deployment workflow config
DFoxArdent Apr 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,11 @@ AZURE_MLINDEX_FILENAME_COLUMN=
AZURE_MLINDEX_TITLE_COLUMN=
AZURE_MLINDEX_URL_COLUMN=
AZURE_MLINDEX_VECTOR_COLUMNS=
AZURE_MLINDEX_QUERY_TYPE=
AZURE_MLINDEX_QUERY_TYPE=
# Chat with data: Prompt flow API
USE_PROMPTFLOW=False
PROMPTFLOW_ENDPOINT=
PROMPTFLOW_API_KEY=
PROMPTFLOW_RESPONSE_TIMEOUT=120
PROMPTFLOW_REQUEST_FIELD_NAME=question
PROMPTFLOW_RESPONSE_FIELD_NAME=answer
32 changes: 0 additions & 32 deletions .github/workflows/docker-image.yml

This file was deleted.

69 changes: 69 additions & 0 deletions .github/workflows/main_atlas-ai.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
# More GitHub Actions for Azure: https://github.com/Azure/actions
# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions

name: Build and deploy Python app to Azure Web App - Atlas-AI

on:
push:
branches:
- main
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Set up Python version
uses: actions/setup-python@v1
with:
python-version: '3.11'

- name: Create and start virtual environment
run: |
python -m venv venv
source venv/bin/activate

- name: Install dependencies
run: pip install -r requirements.txt

# Optional: Add step to run tests here (PyTest, Django test suites, etc.)

- name: Zip artifact for deployment
run: zip release.zip ./* -r

- name: Upload artifact for deployment jobs
uses: actions/upload-artifact@v3
with:
name: python-app
path: |
release.zip
!venv/

deploy:
runs-on: ubuntu-latest
needs: build
environment:
name: 'Production'
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}

steps:
- name: Download artifact from build job
uses: actions/download-artifact@v3
with:
name: python-app

- name: Unzip artifact for deployment
run: unzip release.zip


- name: 'Deploy to Azure Web App'
uses: azure/webapps-deploy@v2
id: deploy-to-webapp
with:
app-name: 'Atlas-AI'
slot-name: 'Production'
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_A367B12DBE2F4BC5B10880341EA36C68 }}
69 changes: 69 additions & 0 deletions .github/workflows/testmerge_atlasaiuat.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
# More GitHub Actions for Azure: https://github.com/Azure/actions
# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions

name: Build and deploy Python app to Azure Web App - AtlasAIuat

on:
push:
branches:
- TestMerge
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Set up Python version
uses: actions/setup-python@v1
with:
python-version: '3.11'

- name: Create and start virtual environment
run: |
python -m venv venv
source venv/bin/activate

- name: Install dependencies
run: pip install -r requirements.txt

# Optional: Add step to run tests here (PyTest, Django test suites, etc.)

- name: Zip artifact for deployment
run: zip release.zip ./* -r

- name: Upload artifact for deployment jobs
uses: actions/upload-artifact@v3
with:
name: python-app
path: |
release.zip
!venv/

deploy:
runs-on: ubuntu-latest
needs: build
environment:
name: 'Production'
url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}

steps:
- name: Download artifact from build job
uses: actions/download-artifact@v3
with:
name: python-app

- name: Unzip artifact for deployment
run: unzip release.zip


- name: 'Deploy to Azure Web App'
uses: azure/webapps-deploy@v2
id: deploy-to-webapp
with:
app-name: 'AtlasAIuat'
slot-name: 'Production'
publish-profile: ${{ secrets.AZUREAPPSERVICE_PUBLISHPROFILE_B9B223E934434C6D925E76DD501B80D9 }}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Loading
Loading