refactor OHTTP library dependency (#31)

* redirection

* initial commit

* reference command line

* makefile extension

* set target path using enginetarget (#30)

* engine target

* workflow dispatch

* Changes to remove backtrace, add version, fix client http error message printing and other logging related changes

Remove reaming backtrace code

	modified:   .github/workflows/check.yml
	modified:   Makefile
	modified:   bhttp/Cargo.toml
	modified:   cgpuvm-attest/Cargo.toml
	modified:   docker/client/Dockerfile
	modified:   docker/server/run.sh
	modified:   ohttp-client/Cargo.toml
	modified:   ohttp-client/src/main.rs
	modified:   ohttp-server/Cargo.toml
	modified:   ohttp-server/src/main.rs
	modified:   ohttp/Cargo.toml
	modified:   verifier/Cargo.toml

* readme fixes

* readme fix

---------

Co-authored-by: agokarn <arthig@microsoft.com>

Author: kapilvgit

.github/workflows/check.yml

@@ -6,9 +6,10 @@ on:
   pull_request:
     branches: ["main"]
     paths-ignore: ["*.md", "LICENSE-*"]
+  workflow_dispatch:
+  
 env:
   CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: 1
 
 jobs:
   check:

Makefile

@@ -13,7 +13,7 @@ else ifeq ($(MODEL), whisper_aoai_local)
 	SCORING_ENDPOINT ?= 'http://localhost:9443/score'
 else ifeq ($(MODEL), whisper_aoai)
 	TARGET ?= http://127.0.0.1:5002
-	TARGET_PATH ?= '/v1/engines/whisper/audio/transcriptions'
+	TARGET_PATH ?= '/v1/engines/whisper/audio/translations'
 	DEPLOYMENT ?= 'arthig-deploy20'
 	SCORING_ENDPOINT ?= 'https://arthig-ep.eastus2.inference.ml.azure.com/score'
 else
@@ -94,40 +94,47 @@ verify-quote:
 # Local client deployments
 
 run-client:
-	RUST_BACKTRACE=1 RUST_LOG=info cargo run --bin ohttp-client -- $(SCORING_ENDPOINT)\
+	RUST_LOG=info cargo run --bin ohttp-client -- $(SCORING_ENDPOINT) \
   --target-path ${TARGET_PATH} -F "file=@${INPUT}" \
   --config `curl -s http://localhost:9443/discover` 
 
 run-client-kms: service-cert 
-	RUST_BACKTRACE=1 RUST_LOG=info cargo run --bin ohttp-client -- $(SCORING_ENDPOINT)\
+	RUST_LOG=info cargo run --bin ohttp-client -- $(SCORING_ENDPOINT) \
   --target-path ${TARGET_PATH} -F "file=@${INPUT}" \
-  --kms-cert ./service_cert.pem 
+  --kms-url ${KMS} --kms-cert ./service_cert.pem 
 
 run-client-kms-aoai: service-cert 
-	RUST_BACKTRACE=1 RUST_LOG=info cargo run --bin ohttp-client -- $(SCORING_ENDPOINT)\
+	RUST_LOG=info cargo run --bin ohttp-client -- $(SCORING_ENDPOINT) \
 	--target-path ${TARGET_PATH} -F "file=@${INPUT}" \
-	--kms-cert ./service_cert.pem \
+	--kms-url ${KMS} --kms-cert ./service_cert.pem \
 	-O 'openai-internal-enableasrsupport:true' -H 'openai-internal-enableasrsupport:true'
 
 run-client-kms-aoai-token: service-cert 
-	RUST_BACKTRACE=1 RUST_LOG=info cargo run --bin ohttp-client -- $(SCORING_ENDPOINT) \
+	RUST_LOG=info cargo run --bin ohttp-client -- $(SCORING_ENDPOINT) \
 	--target-path ${TARGET_PATH} -F "file=@${INPUT}" -F "response_format=json" -F "language=en" \
-	--kms-cert ./service_cert.pem \
+	--kms-url ${KMS} --kms-cert ./service_cert.pem \
 	-H 'openai-internal-enableasrsupport:true' -O 'openai-internal-enableasrsupport:true' \
 	-O 'azureml-model-deployment:$(DEPLOYMENT)' -O 'authorization: Bearer ${TOKEN}'
 
+run-client-kms-aoai-apim-token: service-cert
+	RUST_LOG=info cargo run --bin ohttp-client -- ${APIM_ENDPOINT} \
+	--target-path ${TARGET_PATH} -F "file=@${INPUT}" -F "response_format=json" \
+	--kms-url ${KMS} --kms-cert ./service_cert.pem -O 'api-key: ${API_KEY}'
+
 # Containerized client deployments
 
 run-client-container:
-	docker run --privileged --net=host --volume ${INPUT}:${MOUNTED_INPUT} ohttp-client \
-	$(SCORING_ENDPOINT) --target-path ${TARGET_PATH} -F "file=@${MOUNTED_INPUT}" \
-	--config `curl -s http://localhost:9443/discover`
+	docker run --net=host --volume ${INPUT}:${MOUNTED_INPUT} \
+	ohttp-client $(SCORING_ENDPOINT) -F "file=@${MOUNTED_INPUT}" --target-path ${TARGET_PATH}
 
-run-client-container-kms: service-cert
-	docker run --volume ${INPUT}:${MOUNTED_INPUT} \
-	--volume ./service_cert.pem:/tmp/service_cert.pem ohttp-client \
-	${SCORING_ENDPOINT} --target-path ${TARGET_PATH} -F "file=@${MOUNTED_INPUT}" \
-	--maa-url=${MAA} --kms-url=${KMS} --kms-cert /tmp/service_cert.pem 
+run-client-container-kms:
+	docker run --net=host --volume ${INPUT}:${MOUNTED_INPUT} -e KMS_URL=${KMS} \
+	ohttp-client ${SCORING_ENDPOINT} -F "file=@${MOUNTED_INPUT}" --target-path ${TARGET_PATH}
 
 run-client-container-it:
 	docker run -it --privileged --net=host -it --entrypoint=/bin/bash ohttp-client
+
+run-client-container-aoai:
+	docker run --volume ${INPUT}:${MOUNTED_INPUT} -e KMS_URL=${KMS} \
+	ohttp-client ${SCORING_ENDPOINT} -F "file=@${MOUNTED_INPUT}" --target-path ${TARGET_PATH} \
+	-O "api-key: ${API_KEY}" -F "response_format=json"

README.md

@@ -77,7 +77,7 @@ the server sees your IP address.
 
 The repo supports development using GitHub Codespaces and devcontainers. 
 
-[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=707634300&skip_quickstart=true&machine=premiumLinux&geo=EuropeWest)
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/kapilvgit/ohttp)
 
 ## Build and Test
 

bhttp/Cargo.toml

@@ -22,7 +22,6 @@ stream = []
 thiserror = "1"
 url = {version = "2", optional = true}
 tracing = "0.1"
-backtrace = "0.3"
 
 [dev-dependencies]
 hex = "0.4"

cgpuvm-attest/Cargo.toml

@@ -14,7 +14,6 @@ default = []
 libc = "0.2.0"
 tracing = "0.1"
 thiserror = "1"
-backtrace = "0.3"
 
 [dependencies.ohttp]
 path= "../ohttp"

docker/client/Dockerfile

@@ -13,6 +13,8 @@ RUN cargo install --path ohttp-client --debug
 FROM ubuntu:22.04
 RUN apt-get update && apt-get install -y ca-certificates openssl curl jq && rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/local/cargo/bin/ohttp-client /usr/local/bin/ohttp-client
-ENV RUST_BACKTRACE=1
+COPY ./examples/audio.mp3 ./examples/audio.mp3
+COPY ./examples/15m_gpt-has-entered-the-chat.mp3 ./examples/15m_gpt-has-entered-the-chat.mp3
+COPY --chmod=755 ./docker/client/run.sh .
 ENV RUST_LOG=info
-ENTRYPOINT [ "/usr/local/bin/ohttp-client" ]
+ENTRYPOINT [ "./run.sh" ]

docker/client/run.sh

@@ -13,35 +13,18 @@ is_valid_url() {
     fi
 }
 
-if [[ -z ${SCORING_ENDPOINT} ]]; then
-  echo "No SCORING_ENDPOINT defined"
-  exit 1
-fi
-
-if [[ -z ${TARGET_PATH} ]]; then
-  echo "No TARGET_PATH defined"
-  exit 1
-fi
-
-if [[ -z ${INPUT} ]]; then
-  echo "No INPUT defined"
-  exit 1
-fi
-
-CMD="RUST_BACKTRACE=1 RUST_LOG=info /usr/local/bin/ohttp-client ${SCORING_ENDPOINT} --target-path ${TARGET_PATH} -F \"file=@${INPUT}\""
-
 if [[ -n ${KMS_URL} ]]; then 
   if is_valid_url $KMS_URL; then 
     # Obtain KMS service certificate
     curl -s -k ${KMS_URL}/node/network | jq -r .service_certificate > /tmp/service_cert.pem
-    CMD="$CMD --kms-url ${KMS_URL} --kms-cert /tmp/service_cert.pem"
+    ARGS="$ARGS --kms-url ${KMS_URL} --kms-cert /tmp/service_cert.pem"
   else 
     echo "Invalid KMS URL"
     exit 1
   fi
 else 
-  CMD="$CMD --config `curl -s http://localhost:9443/discover`"
+  ARGS="$ARGS --config `curl -s http://localhost:9443/discover`"
 fi
 
-echo "Running $CMD..."
-eval $CMD
+echo "Running /usr/local/bin/ohttp-client" "$@" ${ARGS}
+RUST_LOG=info /usr/local/bin/ohttp-client "$@" ${ARGS}

docker/server/run.sh

@@ -18,9 +18,9 @@ if [[ -z ${TARGET} ]]; then
   exit 1
 fi
 
-CMD="RUST_BACKTRACE=1 RUST_LOG=info"
+CMD="RUST_LOG=info"
 if [[ -n ${TRACE} ]]; then
-  CMD="RUST_BACKTRACE=1 RUST_LOG=trace"
+  CMD="RUST_LOG=trace"
 fi
 
 if is_valid_url $TARGET; then 

ohttp-client/Cargo.toml

@@ -24,17 +24,18 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.18", features = ["default", "json", "env-filter"] }
-backtrace = "0.3"
 infer = "0.16.0"
 
 [dependencies.verifier]
 path= "../verifier"
 
 [dependencies.bhttp]
-path= "../bhttp"
+git = "https://github.com/kapilvgit/ohttp.git"
+branch = "kapilv/upstream"
 features = ["bhttp", "http"]
 
 [dependencies.ohttp]
-path= "../ohttp"
+git = "https://github.com/kapilvgit/ohttp.git"
+branch = "kapilv/upstream"
 features = ["client"]
 default-features = false

ohttp-client/README.md

@@ -0,0 +1,55 @@
+# Attested OHTTP Client
+This repository contains a reference implementation of an attested OHTTP client for 
+Azure AI confidential inferencing.
+
+## Prerequisites 
+
+1. An AzureML endpoint with a confidential whisper model. 
+2. Docker 
+
+## Using pre-built image
+You can use pre-built attested OHTTP container images to send an inferencing request. 
+
+Set the inferencing endpoint and access key as follows.
+```
+export TARGET_URI=<URL for your endpoint>
+export API_KEY=<key for accessing the endpoint>
+```
+
+Run inferencing using a pre-packaged audio file. 
+```
+export KMS_URL=https://accconfinferencedebug.confidential-ledger.azure.com
+docker run -e KMS_URL=${KMS_URL} mcr.microsoft.com/attested-ohttp-client:latest \
+  ${TARGET_URI} -F "file=@/examples/audio.mp3" -O "api-key: ${API_KEY}" -F "response_format=json"
+```
+
+Run inferencing using your own audio file by mounting the file into the container.
+```
+export KMS_URL=https://accconfinferencedebug.confidential-ledger.azure.com
+export INPUT_PATH=<path to your input file>
+export MOUNTED_PATH=/examples/audio.mp3
+docker run -e KMS_URL=${KMS_URL} --volume ${INPUT_PATH}:${MOUNTED_PATH} \
+  mcr.microsoft.com/attested-ohttp-client:latest \
+  ${TARGET_URI} -F "file=@${MOUNTED_INPUT}" -O "api-key ${API_KEY}" -F "response_format=json"
+```
+
+## Building your own container image
+
+### Development Environment
+
+The repo supports development using GitHub Codespaces and devcontainers. The repository includes a devcontainer configuration that installs all dependencies. 
+
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/kapilvgit/ohttp)
+
+Alternatively, you can setup your own environment by installing dependencies.
+```
+sudo apt update
+sudo apt install -y curl build-essential jq
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+```
+
+Next, you can build the client containers as follows. 
+
+```
+docker build -f docker/Dockerfile -t attested-ohttp-client .
+```