Skip to content

Commit 8476044

Browse files
arkid15rarkid15r
committed
Merge branch 'main' into pr/Dhirajsharma2060/2047
2 parents 4d95c48 + 6009980 commit 8476044

File tree

108 files changed

+10262
-2787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+10262
-2787
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ __pycache__
44
.cache
55
.dockerignore
66
.env
7+
.env.*
78
.envs
89
.git
910
.gitignore

‎.github/workflows/run-ci-cd.yaml‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ jobs:
446446
touch .env.frontend
447447
echo "NEXT_SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> .env.frontend
448448
echo "NEXT_SERVER_CSRF_URL=${{ secrets.NEXT_SERVER_CSRF_URL }}" >> .env.frontend
449-
echo "NEXT_SERVER_GITHUB_CLIENT_ID=${{ secrets.GITHUB_CLIENT_ID }}" >> .env.frontend
450-
echo "NEXT_SERVER_GITHUB_CLIENT_SECRET=${{ secrets.GITHUB_CLIENT_SECRET }}" >> .env.frontend
449+
echo "NEXT_SERVER_GITHUB_CLIENT_ID=${{ secrets.NEST_GITHUB_CLIENT_ID }}" >> .env.frontend
450+
echo "NEXT_SERVER_GITHUB_CLIENT_SECRET=${{ secrets.NEST_GITHUB_CLIENT_SECRET }}" >> .env.frontend
451451
echo "NEXT_SERVER_GRAPHQL_URL=${{ secrets.NEXT_SERVER_GRAPHQL_URL }}" >> .env.frontend
452452
echo "NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }}" >> .env.frontend
453453
echo "NEXTAUTH_URL=${{ secrets.VITE_API_URL }}" >> .env.frontend
@@ -492,15 +492,26 @@ jobs:
492492
- name: Check out repository
493493
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
494494

495+
- name: Install pnpm
496+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda
497+
with:
498+
run_install: true
499+
version: 10
500+
495501
- name: Set up Node
496502
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
497503
with:
504+
cache-dependency-path: frontend/pnpm-lock.yaml
505+
cache: 'pnpm'
498506
node-version: 22
499507

500-
- name: Run Lighthouse CI
501-
working-directory: frontend
508+
- name: Run lighthouse-ci
509+
env:
510+
LHCI_BASE_URL: 'https://nest.owasp.dev'
502511
run: |
503-
npx -y @lhci/cli@0.15.1 autorun
512+
pnpm run lighthouse-ci
513+
timeout-minutes: 15
514+
working-directory: frontend
504515

505516
build-production-images:
506517
name: Build Production Images
@@ -701,8 +712,8 @@ jobs:
701712
touch .env.frontend
702713
echo "NEXT_SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> .env.frontend
703714
echo "NEXT_SERVER_CSRF_URL=${{ secrets.NEXT_SERVER_CSRF_URL }}" >> .env.frontend
704-
echo "NEXT_SERVER_GITHUB_CLIENT_ID=${{ secrets.GITHUB_CLIENT_ID }}" >> .env.frontend
705-
echo "NEXT_SERVER_GITHUB_CLIENT_SECRET=${{ secrets.GITHUB_CLIENT_SECRET }}" >> .env.frontend
715+
echo "NEXT_SERVER_GITHUB_CLIENT_ID=${{ secrets.NEST_GITHUB_CLIENT_ID }}" >> .env.frontend
716+
echo "NEXT_SERVER_GITHUB_CLIENT_SECRET=${{ secrets.NEST_GITHUB_CLIENT_SECRET }}" >> .env.frontend
706717
echo "NEXT_SERVER_GRAPHQL_URL=${{ secrets.NEXT_SERVER_GRAPHQL_URL }}" >> .env.frontend
707718
echo "NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }}" >> .env.frontend
708719
echo "NEXTAUTH_URL=${{ secrets.VITE_API_URL }}" >> .env.frontend

‎.github/workflows/run-code-ql.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
3030

3131
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c
32+
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498
3333
with:
3434
languages: ${{ matrix.language }}
3535

@@ -53,6 +53,6 @@ jobs:
5353
run: pnpm install --frozen-lockfile
5454

5555
- name: Perform CodeQL analysis
56-
uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c
56+
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498
5757
with:
5858
category: /language:${{ matrix.language }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
exclude: (.github|pnpm-lock.yaml)
1111

1212
- repo: https://github.com/astral-sh/ruff-pre-commit
13-
rev: v0.12.9
13+
rev: v0.12.10
1414
hooks:
1515
- id: ruff
1616
args:

‎backend/apps/ai/Makefile‎

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,43 @@
1-
ai-create-chapter-chunks:
2-
@echo "Creating chapter chunks"
3-
@CMD="python manage.py ai_create_chapter_chunks" $(MAKE) exec-backend-command
1+
ai-run-rag-tool:
2+
@echo "Running RAG tool"
3+
@CMD="python manage.py ai_run_rag_tool" $(MAKE) exec-backend-command
44

5-
ai-create-committee-chunks:
6-
@echo "Creating committee chunks"
7-
@CMD="python manage.py ai_create_committee_chunks" $(MAKE) exec-backend-command
5+
ai-update-chapter-chunks:
6+
@echo "Updating chapter chunks"
7+
@CMD="python manage.py ai_update_chapter_chunks" $(MAKE) exec-backend-command
88

9-
ai-create-event-chunks:
10-
@echo "Creating event chunks"
11-
@CMD="python manage.py ai_create_event_chunks" $(MAKE) exec-backend-command
9+
ai-update-chapter-context:
10+
@echo "Updating chapter context"
11+
@CMD="python manage.py ai_update_chapter_context" $(MAKE) exec-backend-command
1212

13-
ai-create-project-chunks:
14-
@echo "Creating project chunks"
15-
@CMD="python manage.py ai_create_project_chunks" $(MAKE) exec-backend-command
13+
ai-update-committee-chunks:
14+
@echo "Updating committee chunks"
15+
@CMD="python manage.py ai_update_committee_chunks" $(MAKE) exec-backend-command
1616

17-
ai-create-slack-message-chunks:
18-
@echo "Creating Slack message chunks"
19-
@CMD="python manage.py ai_create_slack_message_chunks" $(MAKE) exec-backend-command
17+
ai-update-committee-context:
18+
@echo "Updating committee context"
19+
@CMD="python manage.py ai_update_committee_context" $(MAKE) exec-backend-command
2020

21-
ai-run-rag-tool:
22-
@echo "Running RAG tool"
23-
@CMD="python manage.py ai_run_rag_tool" $(MAKE) exec-backend-command
21+
ai-update-event-chunks:
22+
@echo "Updating event chunks"
23+
@CMD="python manage.py ai_update_event_chunks" $(MAKE) exec-backend-command
24+
25+
ai-update-event-context:
26+
@echo "Updating event context"
27+
@CMD="python manage.py ai_update_event_context" $(MAKE) exec-backend-command
28+
29+
ai-update-project-chunks:
30+
@echo "Updating project chunks"
31+
@CMD="python manage.py ai_update_project_chunks" $(MAKE) exec-backend-command
32+
33+
ai-update-project-context:
34+
@echo "Updating project context"
35+
@CMD="python manage.py ai_update_project_context" $(MAKE) exec-backend-command
36+
37+
ai-update-slack-message-chunks:
38+
@echo "Updating Slack message chunks"
39+
@CMD="python manage.py ai_update_slack_message_chunks" $(MAKE) exec-backend-command
40+
41+
ai-update-slack-message-context:
42+
@echo "Updating Slack message context"
43+
@CMD="python manage.py ai_update_slack_message_context" $(MAKE) exec-backend-command

‎backend/apps/ai/admin.py‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from django.contrib import admin
44

55
from apps.ai.models.chunk import Chunk
6+
from apps.ai.models.context import Context
67

78

89
class ChunkAdmin(admin.ModelAdmin):
@@ -11,9 +12,25 @@ class ChunkAdmin(admin.ModelAdmin):
1112
list_display = (
1213
"id",
1314
"text",
14-
"content_type",
15+
"context",
1516
)
16-
search_fields = ("text", "object_id")
17+
list_filter = ("context__entity_type",)
18+
search_fields = ("text",)
19+
20+
21+
class ContextAdmin(admin.ModelAdmin):
22+
"""Admin for Context model."""
23+
24+
list_display = (
25+
"id",
26+
"content",
27+
"entity_type",
28+
"entity_id",
29+
"source",
30+
)
31+
list_filter = ("entity_type", "source")
32+
search_fields = ("content", "source")
1733

1834

1935
admin.site.register(Chunk, ChunkAdmin)
36+
admin.site.register(Context, ContextAdmin)

‎backend/apps/ai/agent/tools/rag/rag_tool.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,8 @@ def __init__(
2828
ValueError: If the OpenAI API key is not set.
2929
3030
"""
31-
try:
32-
self.retriever = Retriever(embedding_model=embedding_model)
33-
self.generator = Generator(chat_model=chat_model)
34-
except Exception:
35-
logger.exception("Failed to initialize RAG tool")
36-
raise
31+
self.retriever = Retriever(embedding_model=embedding_model)
32+
self.generator = Generator(chat_model=chat_model)
3733

3834
def query(
3935
self,

0 commit comments

Comments
 (0)