Fixes

Author: aamini7

scenarios/AksOpenAiTerraform/scripts/app/Dockerfile

@@ -1,94 +1,12 @@
-# app/Dockerfile
-
-# # Stage 1 - Install build dependencies
-
-# A Dockerfile must start with a FROM instruction which sets the base image for the container.
-# The Python images come in many flavors, each designed for a specific use case.
-# The python:3.11-slim image is a good base image for most applications.
-# It is a minimal image built on top of Debian Linux and includes only the necessary packages to run Python.
-# The slim image is a good choice because it is small and contains only the packages needed to run Python.
-# For more information, see: 
-# * https://hub.docker.com/_/python 
-# * https://docs.streamlit.io/knowledge-base/tutorials/deploy/docker
 FROM python:3.11-slim AS builder
-
-# The WORKDIR instruction sets the working directory for any RUN, CMD, ENTRYPOINT, COPY and ADD instructions that follow it in the Dockerfile.
-# If the WORKDIR doesn’t exist, it will be created even if it’s not used in any subsequent Dockerfile instruction.
-# For more information, see: https://docs.docker.com/engine/reference/builder/#workdir
-WORKDIR /app
-
-# Set environment variables. 
-# The ENV instruction sets the environment variable <key> to the value <value>.
-# This value will be in the environment of all “descendant” Dockerfile commands and can be replaced inline in many as well.
-# For more information, see: https://docs.docker.com/engine/reference/builder/#env
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-
-# Install git so that we can clone the app code from a remote repo using the RUN instruction.
-# The RUN comand has 2 forms:
-# * RUN <command> (shell form, the command is run in a shell, which by default is /bin/sh -c on Linux or cmd /S /C on Windows)
-# * RUN ["executable", "param1", "param2"] (exec form)
-# The RUN instruction will execute any commands in a new layer on top of the current image and commit the results. 
-# The resulting committed image will be used for the next step in the Dockerfile.
-# For more information, see: https://docs.docker.com/engine/reference/builder/#run
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    curl \
-    software-properties-common \
-    git \
-    && rm -rf /var/lib/apt/lists/*
-
-# Create a virtualenv to keep dependencies together
-RUN python -m venv /opt/venv
-ENV PATH="/opt/venv/bin:$PATH"
-
-# Clone the requirements.txt which contains dependencies to WORKDIR
-# COPY has two forms:
-# * COPY <src> <dest> (this copies the files from the local machine to the container's own filesystem)
-# * COPY ["<src>",... "<dest>"] (this form is required for paths containing whitespace)
-# For more information, see: https://docs.docker.com/engine/reference/builder/#copy
-COPY requirements.txt .
-
-# Install the Python dependencies
-RUN pip install --no-cache-dir --no-deps -r requirements.txt
-
-# Stage 2 - Copy only necessary files to the runner stage
-
-# The FROM instruction initializes a new build stage for the application
-FROM python:3.11-slim
-
-# Sets the working directory to /app
 WORKDIR /app
 
-# Copy the virtual environment from the builder stage
-COPY --from=builder /opt/venv /opt/venv
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
 
-# Set environment variables
-ENV PATH="/opt/venv/bin:$PATH"
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
 
-# Clone the app.py containing the application code
-COPY app.py .
-
-# Copy the images folder to WORKDIR
-# The ADD instruction copies new files, directories or remote file URLs from <src> and adds them to the filesystem of the image at the path <dest>.
-# For more information, see: https://docs.docker.com/engine/reference/builder/#add
-ADD images ./images
-
-# The EXPOSE instruction informs Docker that the container listens on the specified network ports at runtime.
-# For more information, see: https://docs.docker.com/engine/reference/builder/#expose
+COPY . .
 EXPOSE 8501
-
-# The HEALTHCHECK instruction has two forms:
-# * HEALTHCHECK [OPTIONS] CMD command (check container health by running a command inside the container)
-# * HEALTHCHECK NONE (disable any healthcheck inherited from the base image)
-# The HEALTHCHECK instruction tells Docker how to test a container to check that it is still working. 
-# This can detect cases such as a web server that is stuck in an infinite loop and unable to handle new connections, 
-# even though the server process is still running. For more information, see: https://docs.docker.com/engine/reference/builder/#healthcheck
-HEALTHCHECK CMD curl --fail http://localhost:8501/_stcore/health
-
-# The ENTRYPOINT instruction has two forms:
-# * ENTRYPOINT ["executable", "param1", "param2"] (exec form, preferred)
-# * ENTRYPOINT command param1 param2 (shell form)
-# The ENTRYPOINT instruction allows you to configure a container that will run as an executable.
-# For more information, see: https://docs.docker.com/engine/reference/builder/#entrypoint
 ENTRYPOINT ["streamlit", "run", "app.py", "--server.port=8501", "--server.address=0.0.0.0"]

scenarios/AksOpenAiTerraform/scripts/app/app.py

@@ -1,47 +1,13 @@
-"""
-MIT License
-
-Copyright (c) 2023 Paolo Salvatori
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-# This sample is based on the following article:
-#
 # - https://levelup.gitconnected.com/its-time-to-create-a-private-chatgpt-for-yourself-today-6503649e7bb6
 #
-# Use pip to install the following packages:
-#
-# - streamlit
-# - openai
-# - streamlit-chat
-# - azure.identity
-# - dotenv
-#
 # Make sure to provide a value for the following environment variables:
 #
-# - AZURE_OPENAI_BASE: the URL of your Azure OpenAI resource, for example https://eastus.api.cognitive.microsoft.com/
-# - AZURE_OPENAI_KEY: the key of your Azure OpenAI resource
-# - AZURE_OPENAI_DEPLOYMENT: the name of the ChatGPT deployment used by your Azure OpenAI resource
-# - AZURE_OPENAI_MODEL: the name of the ChatGPT model used by your Azure OpenAI resource, for example gpt-35-turbo
-# - TITLE: the title of the Streamlit app
-# - TEMPERATURE: the temperature used by the OpenAI API to generate the response
+# - AZURE_OPENAI_BASE (ex: https://eastus.api.cognitive.microsoft.com/)
+# - AZURE_OPENAI_KEY
+# - AZURE_OPENAI_DEPLOYMENT
+# - AZURE_OPENAI_MODEL
+# - TITLE
+# - TEMPERATURE
 # - SYSTEM: give the model instructions about how it should behave and any context it should reference when generating a response. 
 #   Used to describe the assistant's personality.
 #
@@ -64,7 +30,6 @@
 # 
 # - streamlit run app.py
 
-# Import packages
 import os
 import sys
 import time

scenarios/AksOpenAiTerraform/scripts/app/requirements.txt

@@ -1,145 +1,5 @@
-aiohttp==3.8.4
-aiosignal==1.3.1
-altair==4.2.2
-anyio==3.6.2
-async-timeout==4.0.2
-attrs==23.1.0
-autopep8==1.6.0
-azure-core==1.26.4
-azure-identity==1.13.0
-backoff==2.2.1
-blinker==1.6.2
-cachetools==5.3.0
-certifi==2021.10.8
-cffi==1.15.1
-charset-normalizer==2.0.7
-chromadb==0.3.22
-click==8.0.3
-clickhouse-connect==0.5.24
-cmake==3.26.3
-cryptography==40.0.2
-dataclasses-json==0.5.7
-debugpy==1.6.7
-decorator==5.1.1
-duckdb==0.7.1
-entrypoints==0.4
-et-xmlfile==1.1.0
-fastapi==0.95.1
-filelock==3.12.0
-Flask==2.0.2
-frozenlist==1.3.3
-fsspec==2023.5.0
-gitdb==4.0.10
-GitPython==3.1.31
-greenlet==2.0.2
-h11==0.14.0
-hnswlib==0.7.0
-httptools==0.5.0
-huggingface-hub==0.14.1
-idna==3.3
-importlib-metadata==6.6.0
-itsdangerous==2.0.1
-jc==1.23.1
-Jinja2==3.0.2
-joblib==1.2.0
-jsonschema==4.17.3
-langchain==0.0.169
-lit==16.0.3
-llama-index==0.6.8
-lz4==4.3.2
-markdown-it-py==2.2.0
-MarkupSafe==2.0.1
-marshmallow==3.19.0
-marshmallow-enum==1.5.1
-mdurl==0.1.2
-monotonic==1.6
-mpmath==1.3.0
-msal==1.22.0
-msal-extensions==1.0.0
-multidict==6.0.4
-mypy-extensions==1.0.0
-networkx==3.1
-nltk==3.8.1
-numexpr==2.8.4
-numpy==1.24.3
-nvidia-cublas-cu11==11.10.3.66
-nvidia-cuda-cupti-cu11==11.7.101
-nvidia-cuda-nvrtc-cu11==11.7.99
-nvidia-cuda-runtime-cu11==11.7.99
-nvidia-cudnn-cu11==8.5.0.96
-nvidia-cufft-cu11==10.9.0.58
-nvidia-curand-cu11==10.2.10.91
-nvidia-cusolver-cu11==11.4.0.1
-nvidia-cusparse-cu11==11.7.4.91
-nvidia-nccl-cu11==2.14.3
-nvidia-nvtx-cu11==11.7.91
-openai==0.27.7
-openapi-schema-pydantic==1.2.4
-openpyxl==3.0.9
-packaging==23.1
-pandas==2.0.1
-pandas-stubs==1.2.0.35
-Pillow==9.5.0
-pipdeptree==2.7.1
-portalocker==2.7.0
-posthog==3.0.1
-protobuf==3.20.3
-pyarrow==12.0.0
-pycodestyle==2.8.0
-pycparser==2.21
-pydantic==1.10.7
-pydeck==0.8.1b0
-Pygments==2.15.1
-PyJWT==2.7.0
-Pympler==1.0.1
-PyPDF2==3.0.1
-pyrsistent==0.19.3
-python-dateutil==2.8.2
 python-dotenv==0.19.2
-pytz==2021.3
-PyYAML==6.0
-regex==2023.5.5
-requests==2.29.0
-rich==13.3.5
-ruamel.yaml==0.17.21
-ruamel.yaml.clib==0.2.7
-scikit-learn==1.2.2
-scipy==1.10.1
-sentence-transformers==2.2.2
-sentencepiece==0.1.99
-six==1.16.0
-smmap==5.0.0
-sniffio==1.3.0
-SQLAlchemy==2.0.13
-starlette==0.26.1
 streamlit==1.22.0
 streamlit-chat==0.0.2.2
-sympy==1.12
-tenacity==8.2.2
-threadpoolctl==3.1.0
-tiktoken==0.4.0
-tokenizers==0.13.3
-toml==0.10.2
-toolz==0.12.0
-torch==2.0.1
-torchvision==0.15.2
-tornado==6.3.2
-tqdm==4.62.3
-transformers==4.29.1
-triton==2.0.0
-typing-inspect==0.8.0
-typing_extensions==4.5.0
-tzdata==2023.3
-tzlocal==5.0.1
-urllib3==1.26.7
-uvicorn==0.22.0
-uvloop==0.17.0
-validators==0.20.0
-watchdog==3.0.0
-watchfiles==0.19.0
-websockets==11.0.3
-Werkzeug==2.0.2
-xmltodict==0.13.0
-yarl==1.9.2
-zipp==3.15.0
-zstandard==0.21.0
+azure-identity==1.13.0
+openai==0.27.7

scenarios/AksOpenAiTerraform/scripts/deploy.sh

@@ -1,28 +1,23 @@
-# Variables
+#!/bin/bash
+
 SUBSCRIPTION_ID=$(az account show --query id --output tsv)
 TENANT_ID=$(az account show --query tenantId --output tsv)
 RESOURCE_GROUP=$(terraform output resource_group_name)
 LOCATION="westus3"
 
-# Build/Push App's Docker image
-ACR_NAME=$(terraform output resource_group_name)
+# Build Image
+ACR_NAME=$(terraform output acr_name)
 az acr login --name $ACR_NAME
 ACR_URL=$(az acr show --name $ACR_NAME --query loginServer --output tsv)
-docker build -t $ACR_URL/$ACR_NAME.azurecr.io/magic8ball:v1 ./app --push
+docker build -t $ACR_URL/magic8ball:v1 ./app --push
 
-# Get AKS credentials
 az aks get-credentials \
   --admin \
   --name $clusterName \
   --resource-group $resourceGroupName \
   --subscription $subscriptionId \
   --only-show-errors
 
-# Install Helm
-curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 -o get_helm.sh -s
-chmod 700 get_helm.sh
-./get_helm.sh &>/dev/null
-
 # Install NGINX ingress controller
 helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
 helm install nginx-ingress ingress-nginx/ingress-nginx \

scenarios/AksOpenAiTerraform/terraform/.terraform.lock.hcl

@@ -62,7 +62,7 @@ module "openai" {
   log_analytics_workspace_id = module.log_analytics_workspace.id
 }
 
-module "aks_cluster" {
+module "aks" {
   source              = "./modules/aks"
   name                = "AksCluster"
   location            = var.location
@@ -252,7 +252,7 @@ resource "azurerm_federated_identity_credential" "this" {
   resource_group_name = azurerm_resource_group.main.name
 
   audience  = ["api://AzureADTokenExchange"]
-  issuer    = module.aks_cluster.oidc_issuer_url
+  issuer    = module.aks.oidc_issuer_url
   parent_id = azurerm_user_assigned_identity.aks_workload.id
   subject   = "system:serviceaccount:${local.namespace}:${local.service_account_name}"
 }
@@ -266,11 +266,11 @@ resource "azurerm_role_assignment" "cognitive_services_user_assignment" {
 resource "azurerm_role_assignment" "network_contributor_assignment" {
   role_definition_name = "Network Contributor"
   scope                = azurerm_resource_group.main.id
-  principal_id         = module.aks_cluster.aks_identity_principal_id
+  principal_id         = module.aks.aks_identity_principal_id
 }
 
 resource "azurerm_role_assignment" "acr_pull_assignment" {
   role_definition_name = "AcrPull"
   scope                = module.container_registry.id
-  principal_id         = module.aks_cluster.kubelet_identity_object_id
+  principal_id         = module.aks.kubelet_identity_object_id
 }