Just a notification on external changes

.dockerignore

@@ -0,0 +1,16 @@
+.git
+app.log
+workspace
+.pytest_cache
+tests
+*.egg-info
+dist
+.mypy_cache
+.ruff_cache
+.github
+.gitignore
+.ipynb_checkpoints
+.DS_Store
+.devcontainer
+.vscode
+scripts

.env.example

@@ -1,10 +1,23 @@
+AZURE_API_KEY=XXXX
+AZURE_API_BASE=https://your-resource-name.openai.azure.com
+AZURE_API_VERSION=2023-09-01-preview
+
 OPENAI_API_KEY=sk-XXXX
-OPENAI_API_TYPE=open_ai
-OPENAI_API_BASE=https://api.openai.com/v1
-OPENAI_API_VERSION=2023-03-15-preview
-# OPENAI_EXTRA_HEADERS={"key": "value"}
-OPENAI_MODELS=[{"displayName": "GPT-3.5", "name": "gpt-3.5-turbo"}, {"displayName": "GPT-4", "name": "gpt-4"}]
-# OPENAI_API_LOGLEVEL=debug
+
+BEDROCK_GATEWAY_API_KEY=YYYY
+BEDROCK_GATEWAY_API_BASE=https://your-gateway-url.com
+
+AVAILABLE_MODELS=[{"displayName": "GPT-3.5 16k", "name": "azure/gpt-35-turbo-16k"}, {"displayName": "GPT-3.5 0613", "name": "azure/gpt-35-turbo-0613"}, {"displayName": "Claude v1", "name": "bedrock_gateway/anthropic.claude-instant-v1"}, {"displayName": "Claude v2", "name": "bedrock_gateway/anthropic.claude-v2"}]
+
 API_PORT=5010
 WEB_PORT=8080
-SNAKEMQ_PORT=8765
+
+SESSION_ENCRYPTION_KEY="<SECRET_KEY>"
+
+DEBUG=1
+NO_INTERNET_AVAILABLE=0
+OPENAI_API_LOGLEVEL=debug
+FOUNDRY_DATA_FOLDER=/Global/Foundry Training and Resources/Example Data/Aviation Ontology
+
+KERNEL_MANAGER_WATCHDOG_INTERVAL_S=60
+KERNEL_MANAGER_TIMEOUT_S=3600

.github/CONTRIBUTING.md

@@ -34,7 +34,7 @@ To run the backend:
 gptcode
 ```
 
-To run the frontend in dev mode such that frontend code changes automatically update, set 
+To run the frontend in dev mode such that frontend code changes automatically update, set
 the following environment variable such that the frontend knows where to
 find the backend API server.
 
@@ -48,7 +48,7 @@ npm run dev
 
 The HMR/auto reloading version of the frontend can now be found at http://localhost:5173 (default Vite port)
 
-Note, the frontend served at `http://localhost:8080` is stale comes from the static bundled files that can 
+Note, the frontend served at `http://localhost:8080` is stale comes from the static bundled files that can
 be generated by running `make compile_frontend`.
 
 With this setup, code changes to the Flask backend still require restarting `gptcode` (backend).
@@ -78,7 +78,7 @@ We welcome ideas for improvements and new features. To suggest an enhancement, o
 
 ### Code Style
 
-gpt-code-ui uses [Black](https://black.readthedocs.io/en/stable/the_black_code_style/index.html) as its code style guide. Please ensure that your code follows these guidelines. 
+gpt-code-ui uses [Black](https://black.readthedocs.io/en/stable/the_black_code_style/index.html) as its code style guide. Please ensure that your code follows these guidelines.
 
 ### Commit Messages
 
@@ -91,4 +91,3 @@ Write clear and concise commit messages that briefly describe the changes made i
 - [Black](https://black.readthedocs.io/en/stable/the_black_code_style/index.html)
 
 Thank you once again for your interest in contributing to gpt-code-ui. We look forward to collaborating with you and creating an even better project together!
-

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -52,14 +52,14 @@ body:
         4. Observe the error.
     validations:
       required: true
-      
+
   - type: textarea
     id: possible-solution
     attributes:
       label: Possible solution
       description: |
-        Not obligatory, but please suggest a fix or reason for the bug, if you have an idea.  
-      
+        Not obligatory, but please suggest a fix or reason for the bug, if you have an idea.
+
 
   - type: checkboxes
     id: operating-systems
@@ -81,7 +81,7 @@ body:
       placeholder: Typescript vX.Y / Python v3.xx
     validations:
       required: true
-      
+
   - type: input
     id: gpt-code-ui-version
     attributes:
@@ -105,4 +105,3 @@ body:
           required: true
         - label: 'I have provided enough information for the maintainers to reproduce and diagnose the issue.'
           required: true
-

.github/ISSUE_TEMPLATE/config.yml

@@ -2,4 +2,4 @@ blank_issues_enabled: false
 contact_links:
   - name: Ask a question
     url: https://github.com/ricklamers/gpt-code-ui/discussions/categories/q-a
-    about: Ask questions and discuss with other community members
+    about: Ask questions and discuss with other community members

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -48,7 +48,7 @@ body:
       label: "📝 Additional Context"
       description: "Add any other context or screenshots about the feature request here."
       placeholder: "..."
-      
+
   - type: checkboxes
     id: acknowledgements
     attributes:
@@ -60,4 +60,4 @@ body:
         - label: 'I have searched the existing issues to make sure this feature has not been requested yet.'
           required: true
         - label: 'I have provided enough information for the maintainers to understand and evaluate this request.'
-          required: true
+          required: true

.github/PULL_REQUEST_TEMPLATE/pull_request_template_simple.md

@@ -19,4 +19,4 @@
 
 ## Types of changes
 
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

.github/workflows/docker-image.yml

@@ -0,0 +1,18 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag code-impact:$(date +%s)

.gitignore

@@ -4,6 +4,7 @@
 
 # Program related
 process_pids/
+kernel.*
 kernel_connection_file.json
 
 # Python stuff
@@ -19,4 +20,7 @@ __pycache__/
 *.log
 
 dist/
-build/
+build/
+.app_service_config.json
+.DS_Store
+.ipynb_checkpoints

.pre-commit-config.yaml

@@ -0,0 +1,45 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-merge-conflict
+      - id: debug-statements
+      - id: mixed-line-ending
+      - id: check-case-conflict
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-executables-have-shebangs
+      - id: check-shebang-scripts-are-executable
+      # - id: check-yaml
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.1.11
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args:
+          - --fix
+          - --exit-non-zero-on-fix
+      # Run the formatter.
+      - id: ruff-format
+  - repo: https://github.com/compilerla/conventional-pre-commit
+    rev: v3.1.0
+    hooks:
+      - id: conventional-pre-commit
+        stages: [commit-msg]
+        args: []
+  # TODO enable after fixing existing issues
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: "v1.8.0"
+    hooks:
+      - id: mypy
+        additional_dependencies: [types-requests==2.31.0.20240106]
+        args: [--implicit-optional]
+  - repo: local
+    hooks:
+    - id: eslint
+      name: eslint_frontend
+      entry: ./frontend/node_modules/.bin/eslint --fix
+      files: ^frontend/.*\.[jt]sx?$  # *.js, *.jsx, *.ts and *.tsx
+      types: [file]
+      language: system

Dockerfile

@@ -0,0 +1,75 @@
+FROM node:16.16.0-alpine AS uibuild
+RUN apk add --no-cache make rsync
+RUN mkdir frontendbuild
+WORKDIR /frontendbuild
+COPY Makefile ./
+COPY frontend/ ./frontend
+COPY pyproject.toml ./
+COPY gpt_code_ui/webapp/static ./gpt_code_ui/webapp/static
+RUN ls -al .
+RUN make compile_frontend
+
+
+FROM python:3.10-slim as backendbuild
+# runtime binary dependencies
+RUN set -eux; \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        libxrender1 \
+        libxext6 \
+        curl \
+    ; \
+    rm -rf /var/lib/apt/lists/*
+
+ENV PYTHONFAULTHANDLER=1 \
+    PYTHONUNBUFFERED=1 \
+    PYTHONHASHSEED=random \
+    PIP_NO_CACHE_DIR=off \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    PIP_DEFAULT_TIMEOUT=100 \
+    POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_CREATE=0 \
+    POETRY_CACHE_DIR='/var/cache/pypoetry' \
+    POETRY_HOME='/usr/local' \
+    POETRY_VERSION=1.7.1
+
+RUN curl -sSL https://install.python-poetry.org | python3 -
+
+RUN mkdir backendbuild
+WORKDIR /backendbuild
+
+# first install only dependencies
+COPY poetry.lock pyproject.toml ./
+RUN touch README.md
+RUN poetry install --without dev --without devtools --no-root --no-ansi && rm -rf $POETRY_CACHE_DIR
+
+
+# install actual project
+COPY run_with_app_service_config.py ./
+COPY gpt_code_ui/ ./gpt_code_ui
+RUN poetry install --without dev --without devtools --no-ansi && rm -rf $POETRY_CACHE_DIR
+
+# Inject frontend into backend resources to be served from there
+COPY --from=uibuild /frontendbuild/frontend/dist/ ./gpt_code_ui/webapp/static
+
+RUN mkdir workspace
+RUN chmod 0777 workspace
+RUN touch app.log
+RUN chmod 0777 app.log
+
+RUN ls -al .
+RUN ls -al ./gpt_code_ui
+RUN which python
+
+EXPOSE 8080
+
+# restrict access to /proc to make it more difficult to access other proccesses, see https://superuser.com/a/704035
+RUN cat /etc/fstab
+RUN ls -al /etc/fstab
+RUN echo "proc /proc proc nosuid,nodev,noexec,hidepid=2 0 0" >> /etc/fstab
+RUN cat /etc/fstab
+
+RUN adduser --no-create-home gpt_code_ui
+USER gpt_code_ui
+
+CMD ["python", "./run_with_app_service_config.py", "./gpt_code_ui/main.py"]

LICENSE

@@ -18,4 +18,4 @@ 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.
+SOFTWARE.

Makefile

@@ -1,18 +1,18 @@
-.PHONY: all compile_frontend bundle_pypi upload_pypi increment_version release check_env_var
+.PHONY: all container_image container_run compile_frontend bundle_pypi upload_pypi increment_version release check_env_var
 
 all: check_env_var build upload_pypi
 
 build: check_env_var compile_frontend bundle_pypi
 
 increment_version:
-	@VERSION=$$(grep -e "^\s*version='[^']*'" setup.py | cut -d "'" -f 2) && \
+	@VERSION=$$(grep -e '^\s*version\s*=\s*"[^"]*"' pyproject.toml | cut -d '"' -f 2) && \
 	MAJOR=$$(echo $$VERSION | cut -d. -f1) && \
 	MINOR=$$(echo $$VERSION | cut -d. -f2) && \
 	PATCH=$$(echo $$VERSION | cut -d. -f3) && \
 	NEW_PATCH=$$((PATCH + 1)) && \
 	NEW_VERSION="$$MAJOR.$$MINOR.$$NEW_PATCH" && \
-	sed -i.bak "s/version='[^']*'/version='$$NEW_VERSION'/" setup.py && \
-	rm setup.py.bak && \
+	sed -i.bak "s/$$VERSION/$$NEW_VERSION/" pyproject.toml && \
+	rm -f pyproject.toml.bak && \
 	echo "Updated version to $$NEW_VERSION"
 
 
@@ -22,16 +22,28 @@ release:
 compile_frontend:
 	cd frontend && \
 	npm install && \
-	VITE_APP_VERSION=$$(grep -e "^\s*version='[^']*'" ../setup.py | cut -d "'" -f 2) npm run build && \
+	VITE_APP_VERSION=$$(grep -e '^\s*version\s*=\s*"[^"]*"' ../pyproject.toml | cut -d '"' -f 2) npm run build && \
 	find ../gpt_code_ui/webapp/static -mindepth 1 ! -name '.gitignore' -delete && \
 	rsync -av dist/ ../gpt_code_ui/webapp/static
 
+container_image:
+	podman build . --tag=gpt_code_ui
+
+container_run:
+	podman run \
+		--env 'APP_SERVICE_CONFIG=$(shell cat .app_service_config.json)' \
+		--env "FOUNDRY_DEV_TOOLS_FOUNDRY_URL=$(shell grep -e 'foundry_url' $$HOME/.foundry-dev-tools/config | cut -d '=' -f 2 | awk '{$$1=$$1;print}')" \
+		--env "FOUNDRY_DEV_TOOLS_JWT=$(shell grep -e 'jwt' $$HOME/.foundry-dev-tools/config | cut -d '=' -f 2 | awk '{$$1=$$1;print}')" \
+		-p=8080:8080/tcp \
+		--name="GPT-Code-UI" \
+		localhost/gpt_code_ui:latest
+
 bundle_pypi:
 	rm -rf dist build && \
-	python3 setup.py sdist bdist_wheel
+	poetry build
 
-upload_pypi:
-	twine upload dist/*
+upload_pypi: bundle_pypi
+	poetry publish
 
 check_env_var:
 ifeq ($(VITE_WEB_ADDRESS),)