Skip to content

Commit

Permalink
Merge branch 'main' into pub-api
Browse files Browse the repository at this point in the history
  • Loading branch information
star-nox committed Mar 14, 2024
2 parents 91f84f5 + c249036 commit 3f60c38
Show file tree
Hide file tree
Showing 37 changed files with 4,079 additions and 4,541 deletions.
2 changes: 1 addition & 1 deletion .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SUPABASE_READ_ONLY=
SUPABASE_JWT_SECRET=

MATERIALS_SUPABASE_TABLE=uiuc_chatbot
NEW_NEW_NEWNEW_MATERIALS_SUPABASE_TABLE=documents
SUPABASE_DOCUMENTS_TABLE=documents

# QDRANT
QDRANT_COLLECTION_NAME=uiuc-chatbot
Expand Down
1 change: 1 addition & 0 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
plugins
user_trunk.yaml
user.yaml
tmp
24 changes: 15 additions & 9 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
version: 0.1
cli:
version: 1.18.0
version: 1.20.1
# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
plugins:
sources:
- id: trunk
ref: v1.3.0
ref: v1.4.3
uri: https://github.com/trunk-io/plugins
# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
runtimes:
Expand All @@ -18,20 +18,26 @@ runtimes:
# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
# - [email protected] # too sensitive, causing failures that make devs skip checks.
lint:
disabled:
- black
enabled:
# - [email protected]
# - [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected]
- [email protected].5
- checkov@3.1.9
- [email protected].7
- checkov@3.2.22
- git-diff-check
- markdownlint@0.37.0
- markdownlint@0.39.0
- [email protected]
- prettier@3.1.0
- ruff@0.1.7
- prettier@3.2.5
- ruff@0.2.2
- [email protected]
- [email protected]
- trivy@0.48.0
- yamllint@1.33.0
- trivy@0.49.1
- yamllint@1.35.1
ignore:
- linters: [ALL]
paths:
Expand Down
64 changes: 0 additions & 64 deletions ai_ta_backend/aws.py

This file was deleted.

7 changes: 7 additions & 0 deletions ai_ta_backend/beam/.beamignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.venv
venv
.idea
.vscode
.git
*.pyc
__pycache__
File renamed without changes.
Loading

0 comments on commit 3f60c38

Please sign in to comment.