update

Author: denniszielke

.gitignore

@@ -3,6 +3,13 @@ __pycache__/
 *.py[cod]
 *$py.class
 
+components/output.yaml
+components/queue.yaml
+
+output/*
+
+src/objectdetection/flickr30k_dataset/
+src/objectdetection/Dataset/
 # C extensions
 *.so
 

.vscode/tasks.json

@@ -5,7 +5,7 @@
 			"appId": "optimizer",
 			"appPort": 6000,
 			"logLevel": "debug",
-			"componentsPath": "/Users/dennis/labs/serverless-container-ml/components",
+			"componentsPath": "./components-local",
 			"label": "daprd-debug",
 			"type": "daprd"
 		},

README.md

@@ -4,43 +4,35 @@ This sample is taken from https://techcommunity.microsoft.com/t5/apps-on-azure-b
 
 ![](/python.png)
 
-## create test data
 
-export AZURE_STORAGE_CONNECTION_STRING=""
-
-MESSAGE=$(echo -n "hello from azure cli" | base64)
+## Deploy Azure resources
 
-az storage message put --content $MESSAGE -q requests
+```
+PROJECT_NAME="dzopt5"
+LOCATION="westeurope"
 
-for i in {1..300}; do for i in {1..300}; az storage message put --content $MESSAGE -q requests; done
+bash ./deploy-infra.sh $PROJECT_NAME $LOCATION
 
+```
 
-## deployment guid
+## Deploy Apps into Container Apps
 
 ```
+PROJECT_NAME="dzopt5"
+GITHUB_REPO_OWNER="denniszielke"
+IMAGE_TAG="latest"
 
-DEPLOYMENT_NAME="dzmlserverless" # here the deployment
-RESOURCE_GROUP=$DEPLOYMENT_NAME # here enter the resources group
-LOCATION="northeurope" # azure region can only be canadacentral or northeurope
-AZURE_SUBSCRIPTION_ID=$(az account show --query id -o tsv) # here enter your subscription id
-GHUSER="denniszielke" # replace with your user name
-GHREPO="serverless-container-ml" # here the repo name
-AZURE_TENANT_ID=$(az account show --query tenantId -o tsv)
-GHREPO_BRANCH=":ref:refs/heads/main"
-az group create -n $RESOURCE_GROUP -l $LOCATION -o none
+bash ./deploy-apps.sh $PROJECT_NAME $GITHUB_REPO_OWNER $IMAGE_TAG
 
-AZURE_CLIENT_ID=$(az ad sp create-for-rbac --name "$DEPLOYMENT_NAME" --role contributor --scopes "/subscriptions/$AZURE_SUBSCRIPTION_ID/resourceGroups/$RESOURCE_GROUP" -o json | jq -r '.appId')
-
-AZURE_CLIENT_OBJECT_ID="$(az ad app show --id ${AZURE_CLIENT_ID} --query objectId -otsv)"
+```
 
-az rest --method POST --uri "https://graph.microsoft.com/beta/applications/$AZURE_CLIENT_OBJECT_ID/federatedIdentityCredentials" --body "{'name':'$DEPLOYMENT_NAME','issuer':'https://token.actions.githubusercontent.com','subject':'repo:$GHUSER/$GHREPO$GHREPO_BRANCH','description':'GitHub Actions for $DEPLOYMENT_NAME','audiences':['api://AzureADTokenExchange']}"
+## Create test data
 
-echo $AZURE_CLIENT_ID
+export AZURE_STORAGE_CONNECTION_STRING=""
 
-echo $AZURE_TENANT_ID
+MESSAGE=$(echo -n "hello from azure cli" | base64)
 
-echo $AZURE_SUBSCRIPTION_ID
+az storage message put --content $MESSAGE -q requests
 
-echo $RESOURCE_GROUP
+for i in {1..300}; do for i in {1..300}; az storage message put --content $MESSAGE -q requests; done
 
-```

components/blob.yaml renamed to component-templates/output-template.yaml

@@ -1,17 +1,17 @@
 apiVersion: dapr.io/v1alpha1
 kind: Component
 metadata:
-  name: bloboutput
+  name: output
 spec:
-  name: bloboutput
+  name: output
   type: bindings.azure.blobstorage
   version: v1
   metadata:
   - name: storageAccount
-    value: dserverless1
+    value: {.storageAccount}
   - name: storageAccessKey
-    value: ""
+    value: "{.storageAccessKey}"
   - name: container
-    value: items
+    value: output
   - name: decodeBase64
     value: "true"

components/queue.yaml renamed to component-templates/queue-template.yaml

@@ -7,9 +7,9 @@ spec:
   version: v1
   metadata:
   - name: storageAccount
-    value: dserverless1
+    value: "{.storageAccount}"
   - name: storageAccessKey
-    value: ""
+    value: "{.storageAccessKey}"
   - name: queue
     value: requests
   - name: ttlInSeconds

components-local/output-local.yaml

@@ -0,0 +1,10 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: output
+spec:
+  type: bindings.localstorage
+  version: v1
+  metadata:
+  - name: rootPath
+    value: output

components-local/queue-local.yaml

@@ -0,0 +1,14 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: requests
+spec:
+  type: pubsub.redis
+  version: v1
+  metadata:
+  - name: redisHost
+    value: localhost:6379
+  - name: redisPassword
+    value: ""
+  - name: consumerID
+    value: "requests"

create-config.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -e
+
+# infrastructure deployment properties
+
+DEPLOYMENT_NAME="$1" # here enter unique deployment name (ideally short and with letters for global uniqueness)
+
+if [ "$DEPLOYMENT_NAME" == "" ]; then
+echo "No project name provided - aborting"
+exit 0;
+fi
+
+if [[ $DEPLOYMENT_NAME =~ ^[a-z0-9]{5,9}$ ]]; then
+    echo "project name $DEPLOYMENT_NAME is valid"
+else
+    echo "project name $DEPLOYMENT_NAME is invalid - only numbers and lower case min 5 and max 8 characters allowed - aborting"
+    exit 0;
+fi
+
+RESOURCE_GROUP="$DEPLOYMENT_NAME"
+
+AZURE_CORE_ONLY_SHOW_ERRORS="True"
+
+if [ $(az group exists --name $RESOURCE_GROUP) = false ]; then
+    echo "resource group $RESOURCE_GROUP does not exist"
+    error=1
+else   
+    echo "resource group $RESOURCE_GROUP already exists"
+    LOCATION=$(az group show -n $RESOURCE_GROUP --query location -o tsv)
+fi
+
+STORAGE_KEY=$(az storage account keys list --account-name strg$DEPLOYMENT_NAME --resource-group $RESOURCE_GROUP --query "[0].value" -o tsv)
+STORAGE_NAME="strg$DEPLOYMENT_NAME"
+
+STORAGE_KEY_ESC=$(echo $STORAGE_KEY | sed 's/\//\\\//g')
+
+replaces="s/{.storageAccount}/$STORAGE_NAME/;";
+replaces="$replaces s/{.storageAccessKey}/$STORAGE_KEY_ESC/;";
+
+mkdir -p components
+
+cat ./component-templates/output-template.yaml | sed -e "$replaces" > ./components/output.yaml
+cat ./component-templates/queue-template.yaml | sed -e "$replaces" > ./components/queue.yaml
+
+echo "create component files in /components directory"

create-infra.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+# infrastructure deployment properties
+PROJECT_NAME="$1"
+REGISTRY_OWNER="$2"
+IMAGE_TAG="$3"
+
+if [ "$PROJECT_NAME" == "" ]; then
+echo "No project name provided - aborting"
+exit 0;
+fi
+
+if [[ $PROJECT_NAME =~ ^[a-z0-9]{5,8}$ ]]; then
+    echo "project name $PROJECT_NAME is valid"
+else
+    echo "project name $PROJECT_NAME is invalid - only numbers and lower case min 5 and max 8 characters allowed - aborting"
+    exit 0;
+fi
+
+RESOURCE_GROUP="$PROJECT_NAME"
+
+AZURE_CORE_ONLY_SHOW_ERRORS="True"
+
+if [ $(az group exists --name $RESOURCE_GROUP) = false ]; then
+    echo "resource group $RESOURCE_GROUP does not exist"
+    error=1
+else   
+    echo "resource group $RESOURCE_GROUP already exists"
+    LOCATION=$(az group show -n $RESOURCE_GROUP --query location -o tsv)
+fi
+
+az deployment group create -g $RESOURCE_GROUP -f ./infrastructure/apps.bicep \
+          -p projectName=$PROJECT_NAME -p imageTag=$IMAGE_TAG \
+          -p containerRegistryOwner=$REGISTRY_OWNER
+
+
+

deploy-apps.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -e
+
+# infrastructure deployment properties
+PROJECT_NAME="$1"
+LOCATION="$2"
+
+if [ "$PROJECT_NAME" == "" ]; then
+echo "No project name provided - aborting"
+exit 0;
+fi
+
+if [[ $PROJECT_NAME =~ ^[a-z0-9]{5,8}$ ]]; then
+    echo "project name $PROJECT_NAME is valid"
+else
+    echo "project name $PROJECT_NAME is invalid - only numbers and lower case min 5 and max 8 characters allowed - aborting"
+    exit 0;
+fi
+
+RESOURCE_GROUP="$PROJECT_NAME"
+
+AZURE_CORE_ONLY_SHOW_ERRORS="True"
+
+if [ $(az group exists --name $RESOURCE_GROUP) = false ]; then
+    echo "creating resource group $RESOURCE_GROUP..."
+    az group create -n $RESOURCE_GROUP -l $LOCATION -o none
+    echo "resource group $RESOURCE_GROUP created"
+else   
+    echo "resource group $RESOURCE_GROUP already exists"
+    LOCATION=$(az group show -n $RESOURCE_GROUP --query location -o tsv)
+fi
+
+az deployment group create -g $RESOURCE_GROUP -f ./infrastructure/main.bicep \
+          -p projectName=$PROJECT_NAME -p internalOnly=false
+
+
+