Feature/devfile updates nov

.dockerignore

@@ -0,0 +1,5 @@
+.venv
+.pytest_cache
+.coverage
+__pycache__
+.hypothesis

.github/workflows/deploy-openshift.yml

@@ -0,0 +1,78 @@
+name: Deploy to OpenShift
+
+on:
+  pull_request:
+    paths:
+      - "src/**"
+      - ".github/workflows/**"
+      - "Makefile"
+      - "pyproject.toml"
+      - "poetry.lock"
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    environment: test-non-prod
+    env:
+      IMAGE_NAME: deep-thought
+      REGISTRY_URI: quay.io
+      OPENSHIFT_PROJECT_NAME: deep-thought-github
+
+    steps:
+      # - name: Checkout repository
+      #   uses: actions/checkout@v2
+
+      # - name: Login to OpenShift
+      #   uses: redhat-actions/oc-login@v1
+      #   with:
+      #     openshift_server_url: ${{ secrets.OPENSHIFT_SERVER_URL }}
+      #     openshift_token: ${{ secrets.OPENSHIFT_API_TOKEN }}
+      #     insecure_skip_tls_verify: true
+      #     namespace: ${{ secrets.OPENSHIFT_PROJECT_NAME }}
+
+      # - name: Build container image
+      #   uses: redhat-actions/buildah-build@v2
+      #   with:
+      #     image: ${{ env.IMAGE_NAME }}
+      #     tags: latest ${{ github.sha }}
+      #     dockerfiles: |
+      #       ./Dockerfile
+
+      # - name: Push To Quay Registry
+      #   uses: redhat-actions/push-to-registry@v2
+      #   with:
+      #     image: ${{ env.IMAGE_NAME }}
+      #     tags: latest
+      #     registry: quay.io/${{ secrets.QUAY_REPOSITORY }}
+      #     username: ${{ secrets.QUAY_USERNAME }}
+      #     password: ${{ secrets.QUAY_PASSWORD }}
+
+      # - name: Deploy to OpenShift
+      #   run: |
+      #     oc new-app quay.io/${{ secrets.QUAY_REPOSITORY }}/${{ env.IMAGE_NAME }}:latest
+      #     oc expose svc/${{ env.IMAGE_NAME }}
+      #     oc rollout status deployment/${{ env.IMAGE_NAME }}
+
+      # - name: Verify Deployment
+      #   run: |
+      #     oc get pods -n ${{ secrets.OPENSHIFT_PROJECT_NAME }}
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Login to OpenShift
+        uses: redhat-actions/oc-login@v1
+        with:
+          openshift_server_url: ${{ secrets.OPENSHIFT_SERVER_URL }}
+          openshift_token: ${{ secrets.OPENSHIFT_API_TOKEN }}
+          insecure_skip_tls_verify: true
+          namespace: ${{ secrets.OPENSHIFT_PROJECT_NAME }}
+
+      - name: Trigger OpenShift Build
+        run: oc start-build <build-config-name> --follow --wait
+
+      - name: Verify Deployment
+        run: |
+          oc get pods -n ${{ secrets.OPENSHIFT_PROJECT_NAME }}

.gitignore

@@ -4,6 +4,9 @@ debug.log
 spend.log
 .env.config
 .env.secrets
+.env*
+deepthought-dev.json
+.venv*
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

Containerfile

@@ -0,0 +1,47 @@
+ARG POETRY_VERSION=1.7.1
+
+FROM registry.access.redhat.com/ubi8/python-311:1-35 as base
+
+ENV PYTHONFAULTHANDLER=1 \
+    PYTHONHASHSEED=random \
+    PYTHONUNBUFFERED=1
+
+FROM base as builder
+
+ARG POETRY_VERSION
+
+USER root
+WORKDIR /app
+
+ENV YOUR_ENV=${YOUR_ENV} \
+    PIP_NO_CACHE_DIR=off \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    PIP_DEFAULT_TIMEOUT=100
+
+RUN pip install --upgrade pip && \
+    pip install "poetry==$POETRY_VERSION"
+
+COPY pyproject.toml poetry.lock /app/
+
+RUN poetry config virtualenvs.create true && \
+    poetry config virtualenvs.path "/app/.venv" && \
+    poetry install --no-interaction --no-ansi --no-root --verbose
+
+COPY . /app
+
+USER 1001
+
+FROM base as final
+
+COPY --from=builder /app/.venv /app/.venv
+COPY src ./src
+COPY deployment/entrypoint.sh .
+
+CMD ["./entrypoint.sh"]
+
+
+# Local build command
+# podman build -t deep-thought:latest -f Dockerfile .
+
+# Local run command
+# podman run -it --rm -p 8000:8000 deep-thought:latest

Makefile

@@ -1,15 +1,16 @@
 API_VERSIONS = v1 v2
-SERVER_URL = http://127.0.0.1:8000
+SERVER_URL = http://0.0.0.0:8000
 SPEC_PATH = specs
 
 .PHONY: test run test-api test-all $(API_VERSIONS)
 
 run:
 	@echo "Current virtualenv: $(VIRTUAL_ENV)"
-	@uvicorn src.app:app --reload
+	@poetry run uvicorn src.app:app --reload --host 0.0.0.0 --port 8000
 
 install:
-	poetry install
+	poetry config installer.max-workers 10 && \
+	poetry install --no-interaction --only main --no-root -vvv
 
 upgrade-dependencies:
 	./src/scripts/upgrade-dependencies.sh

README.md

@@ -9,12 +9,12 @@ Deep Thought is a question-answering system that uses embeddings and a language
 
 ## API Details
 
-Information about the API can be found in the [API documentation](API.md).
+Information about the API can be found in the [API documentation](./docs/API.md).
 
 ## Deployment to OpenShift
 
 Information for deploying Deep Thought to OpenShift can be found in the [deployment documentation](deployment/README.md).
 
 ## Contributing
 
-See [CONTRIBUTING.md](CONTRIBUTING.md).
+See [CONTRIBUTING.md](./docs/CONTRIBUTING.md).

deployment/base/configMap.yaml

@@ -0,0 +1,29 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: deep-thought-config
+data:
+  PYTHONPATH: /
+  SPENDING_WARNING_PCT: '0.8'
+  OPENAI_MODEL_PRICE: '0.000003'
+  VERTEX_MODEL_VERSION: v1
+  GOOGLE_APPLICATION_CREDENTIALS: DEAFULT_PATH
+  MODEL_PROVIDER: AI_PROVIDER
+  EMBEDDING_MODEL_NAME: EMBEDDING_MODEL_NAME
+  LOG_LEVEL: DEBUG
+  COLLECTION_NAME: YOUR_COLLECTION_NAME
+  OPENAI_MODEL_NAME: OPENAI_MODEL_NAME
+  VERTEX_REGION: VERTEXT_REGION
+  VERTEX_ENDPOINT: VERTEX_ENDPOINT
+  DISABLE_SWAGGER: 'false'
+  SPEND_LOG_FILE: spend.log
+  TOKENIZERS_PARALLELISM: 'false'
+  APP_FILE: src/app.py
+  SPEND_LIMIT: '0.075'
+  CORS_ORIGINS: '*'
+  VERTEX_PROJECT_ID: VERTEX_PROJECT_ID
+  VERTEX_MODEL_NAME: VERTEX_MODEL_NAME
+  API_TITLE: API_TITLE_FOR_SWAGGER
+  API_VERSION: API_VERSION_FOR_SWAGGER
+  API_DESCRIPTION: API_DESCRIPTION_FOR_SWAGGER
+  SPEC_KEYS_TO_IGNORE: 'components,paths,info,'

deployment/base/google-application-credentials.yaml

@@ -0,0 +1,11 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: google-application-credentials
+data:
+  deepthought-dev.json: INSERT_JSON # insert deep thought json file. This current resides in /etc/innovation-office/deepthought/deepthought-local.json
+type: Opaque
+
+# oc apply -f google-application-credentials.yaml -n admin-devspaces
+# oc label secret google-application-credentials controller.devfile.io/mount-to-devworkspace=true controller.devfile.io/watch-secret=true
+# oc annotate secret google-application-credentials controller.devfile.io/mount-path="/etc/42"

deployment/base/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - configMap.yaml
+  - secrets.yaml
+  - google-application-credentials.yaml

deployment/base/secrets.yaml

@@ -0,0 +1,12 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: deep-thought-secrets
+data:
+  CONNECTION_STRING: postgresql://... # insert connection string to postgresql vector db
+  OPENAI_API_KEY: sk-... # insert openai api key
+type: Opaque
+
+# oc apply -f secrets.yaml -n admin-devspaces
+# oc label secret deep-thought-secrets controller.devfile.io/mount-to-devworkspace=true controller.devfile.io/watch-secret=true 
+# oc annotate secret deep-thought-secrets controller.devfile.io/mount-as=env

deployment/entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+VENV_PATH=$(find /app/.venv -name 'activate' | grep -m 1 'bin/activate')
+source $VENV_PATH
+
+export PYTHONPATH=$(pwd)
+
+uvicorn src.app:app --host 0.0.0.0 --port 8000

deployment_k8s/overlay/dev-spaces/configMap-patch.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: deep-thought-config
+  # annotations:
+  #   controller.devfile.io/mount-as: env
+  # labels:
+  #   controller.devfile.io/mount-to-devworkspace: 'true'
+  #   controller.devfile.io/watch-configmap: 'true'

deployment_k8s/overlay/dev-spaces/google-application-credentials-patch.yaml

@@ -0,0 +1,10 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: google-application-credentials
+  # annotations:
+  #   controller.devfile.io/mount-path: /etc/42
+  #   controller.devfile.io/mount-as: file
+  # labels:
+  #   controller.devfile.io/mount-to-devworkspace: 'true'
+  #   controller.devfile.io/watch-secret: 'true'

deployment_old/build.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Exit in case of error
+set -e
+
+APP_MODULE="src.app:app"
+
+# Check if Poetry is installed
+if ! command -v poetry &> /dev/null
+then
+    echo "Poetry could not be found, please install it first"
+    exit 1
+fi
+
+# Install dependencies
+echo "Installing dependencies..."
+#poetry install
+
+# Run application
+echo "Starting Deep Thought..."
+#uvicorn $APP_MODULE --host 0.0.0.0 --port 8000