Merge branch 'main' into feat-Oauth2-google-support

Author: ZHallen122

.github/workflows/autofix.yml

@@ -2,7 +2,6 @@ name: autofix.ci
 
 on:
   pull_request:
-  push:
     branches: [ "main" ]
 
 permissions:

.github/workflows/backend-ci.yml

@@ -1,10 +1,5 @@
-name: Backend CI
+name: backend 
 on:
-  push:
-    branches: [ main ]
-    paths:
-      - 'backend/**'
-      - 'codefox-common/**'
   pull_request:
     branches: [ main ]
     paths:
@@ -13,7 +8,7 @@ on:
   workflow_dispatch:
 jobs:
   build:
-    name: Install and Build Backend
+    name: build
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/frontend-ci.yml

@@ -1,10 +1,5 @@
-name: Frontend CI
+name: frontend
 on:
-  push:
-    branches: [ main ]
-    paths:
-      - 'frontend/**'
-      - 'codefox-common/**'
   pull_request:
     branches: [ main ]
     paths:
@@ -13,7 +8,7 @@ on:
   workflow_dispatch:
 jobs:
   build:
-    name: Install and Build Frontend
+    name: build
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/llm-server.yml

@@ -1,10 +1,5 @@
-name: LLM Server CI
+name: llm
 on:
-  push:
-    branches: [ main ]
-    paths:
-      - 'llm-server/**'
-      - 'codefox-common/**'
   pull_request:
     branches: [ main ]
     paths:
@@ -13,7 +8,7 @@ on:
   workflow_dispatch:
 jobs:
   build:
-    name: Install and Build LLM Server
+    name: build
     runs-on: ubuntu-latest
 
     steps:

backend/.env.example

@@ -32,6 +32,24 @@ MAIL_FROM=noreply@example.com
 MAIL_PORT=587
 MAIL_DOMAIN=your_net
 
+# github app
+GITHUB_ENABLED=true     # set false to disable GitHub
+GITHUB_APP_ID="GITHUB_APP_ID"
+GITHUB_PRIVATE_KEY_PATH="YOUR_PATH"
+GITHUB_CLIENT_ID="GITHUB_CLIENT_ID"
+GITHUB_CLIENT_SECRET="GITHUB_CLIENT_SECRET"
+GITHUB_WEBHOOK_SECRET="GITHUB_WEBHOOK_SECRET"
+CALLBACK="CALLBACK"
+
+# Database Configuration
+USE_REMOTE_DB=false 
+DB_TYPE=
+DB_HOST=
+DB_PORT=0
+DB_USERNAME=
+DB_NAME=
+DB_REGION=us-east-2  
+
 ## Google OAuth
 GOOGLE_CLIENT_ID=YOUR_CLIENT_ID
 GOOGLE_SECRET=Your_SECRET

backend/package.json

@@ -33,7 +33,7 @@
     "@huggingface/transformers": "latest",
     "@nestjs-modules/mailer": "^2.0.2",
     "@nestjs/apollo": "^12.2.0",
-    "@nestjs/axios": "^3.0.3",
+    "@nestjs/axios": "^3.1.3",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.2.3",
     "@nestjs/core": "^10.0.0",
@@ -42,11 +42,15 @@
     "@nestjs/passport": "^11.0.5",
     "@nestjs/platform-express": "^10.0.0",
     "@nestjs/typeorm": "^10.0.2",
+    "@octokit/auth-app": "^7.1.5",
+    "@octokit/webhooks": "^13.7.5",
     "@types/bcrypt": "^5.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/normalize-path": "^3.0.2",
     "@types/toposort": "^2.0.7",
-    "axios": "^1.7.7",
+    "archiver": "^7.0.1",
+    "axios": "^1.8.3",
+    "aws-sdk": "^2.1692.0",
     "bcrypt": "^5.1.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
@@ -59,16 +63,20 @@
     "graphql-subscriptions": "^2.0.0",
     "graphql-upload-minimal": "^1.6.1",
     "graphql-ws": "^5.16.0",
+    "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
     "markdown-to-txt": "^2.0.1",
     "nodemailer": "^6.10.0",
     "normalize-path": "^3.0.0",
+    "octokit": "^4.1.2",
     "openai": "^4.77.0",
     "p-queue-es5": "^6.0.2",
     "passport": "^0.7.0",
     "passport-google-oauth20": "^2.0.0",
+    "pg": "^8.14.1",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
+    "simple-git": "^3.27.0",
     "sqlite3": "^5.1.7",
     "subscriptions-transport-ws": "^0.11.0",
     "toposort": "^2.0.2",

backend/src/app.module.ts

@@ -1,6 +1,7 @@
 import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
 import { Module } from '@nestjs/common';
-import { ConfigModule } from '@nestjs/config';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import { EnvironmentVariables } from './config/env.validation';
 import { GraphQLModule } from '@nestjs/graphql';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { join } from 'path';
@@ -16,14 +17,18 @@ import { APP_INTERCEPTOR } from '@nestjs/core';
 import { LoggingInterceptor } from 'src/interceptor/LoggingInterceptor';
 import { PromptToolModule } from './prompt-tool/prompt-tool.module';
 import { MailModule } from './mail/mail.module';
+import { GitHubModule } from './github/github.module';
+import { AppConfigService } from './config/config.service';
+import { getDatabaseConfig } from './database.config';
 
-// TODO(Sma1lboy): move to a separate file
-function isProduction(): boolean {
-  return process.env.NODE_ENV === 'production';
-}
 @Module({
   imports: [
-    ConfigModule.forRoot({ isGlobal: true }),
+    ConfigModule.forRoot({
+      isGlobal: true,
+      validate: (config: Record<string, unknown>) => {
+        return Object.assign(new EnvironmentVariables(), config);
+      },
+    }),
     GraphQLModule.forRoot<ApolloDriverConfig>({
       driver: ApolloDriver,
       autoSchemaFile: join(process.cwd(), '../frontend/src/graphql/schema.gql'),
@@ -35,11 +40,11 @@ function isProduction(): boolean {
       },
       context: ({ req, res }) => ({ req, res }),
     }),
-    TypeOrmModule.forRoot({
-      type: 'sqlite',
-      database: join(process.cwd(), './database.db'),
-      synchronize: !isProduction(),
-      entities: [__dirname + '/**/*.model{.ts,.js}'],
+    TypeOrmModule.forRootAsync({
+      imports: [ConfigModule],
+      useFactory: (config: ConfigService<EnvironmentVariables>) =>
+        getDatabaseConfig(new AppConfigService(config)),
+      inject: [ConfigService],
     }),
     InitModule,
     UserModule,
@@ -50,13 +55,16 @@ function isProduction(): boolean {
     PromptToolModule,
     MailModule,
     TypeOrmModule.forFeature([User]),
+    GitHubModule,
   ],
   providers: [
     AppResolver,
+    AppConfigService,
     {
       provide: APP_INTERCEPTOR,
       useClass: LoggingInterceptor,
     },
   ],
+  exports: [AppConfigService],
 })
 export class AppModule {}

backend/src/auth/auth.module.ts

@@ -3,27 +3,28 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { Menu } from './menu/menu.model';
 import { JwtModule } from '@nestjs/jwt';
 import { Role } from './role/role.model';
-import { ConfigModule, ConfigService } from '@nestjs/config';
 import { AuthService } from './auth.service';
 import { User } from 'src/user/user.model';
+import { AppConfigService } from 'src/config/config.service';
 import { AuthResolver } from './auth.resolver';
 import { RefreshToken } from './refresh-token/refresh-token.model';
 import { JwtCacheModule } from 'src/jwt-cache/jwt-cache.module';
 import { MailModule } from 'src/mail/mail.module';
 import { GoogleStrategy } from './oauth/GoogleStrategy';
 import { GoogleController } from './google.controller';
+import { AppConfigModule } from 'src/config/config.module';
 
 @Module({
   imports: [
-    ConfigModule,
+    AppConfigModule,
     TypeOrmModule.forFeature([Role, Menu, User, RefreshToken]),
     JwtModule.registerAsync({
-      imports: [ConfigModule],
-      useFactory: async (configService: ConfigService) => ({
-        secret: configService.get<string>('JWT_SECRET'),
+      imports: [AppConfigModule],
+      useFactory: async (config: AppConfigService) => ({
+        secret: config.jwtSecret,
         signOptions: { expiresIn: '24h' },
       }),
-      inject: [ConfigService],
+      inject: [AppConfigService],
     }),
     JwtCacheModule,
     MailModule,

backend/src/auth/auth.service.ts

@@ -5,7 +5,7 @@ import {
   NotFoundException,
   UnauthorizedException,
 } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
+import { AppConfigService } from 'src/config/config.service';
 import { JwtService } from '@nestjs/jwt';
 import { InjectRepository } from '@nestjs/typeorm';
 import { LoginUserInput } from 'src/user/dto/login-user.input';
@@ -34,7 +34,7 @@ export class AuthService {
     private userRepository: Repository<User>,
     private jwtService: JwtService,
     private jwtCacheService: JwtCacheService,
-    private configService: ConfigService,
+    private configService: AppConfigService,
     private mailService: MailService,
     @InjectRepository(Menu)
     private menuRepository: Repository<Menu>,
@@ -43,10 +43,7 @@ export class AuthService {
     @InjectRepository(RefreshToken)
     private refreshTokenRepository: Repository<RefreshToken>,
   ) {
-    // Read the MAIL_ENABLED environment variable, default to 'true'
-    this.isMailEnabled =
-      this.configService.get<string>('MAIL_ENABLED', 'false').toLowerCase() ===
-      'true';
+    this.isMailEnabled = this.configService.isMailEnabled;
   }
 
   async confirmEmail(token: string): Promise<EmailConfirmationResponse> {
@@ -220,7 +217,7 @@ export class AuthService {
     );
 
     const refreshTokenEntity = await this.createRefreshToken(user);
-    this.jwtCacheService.storeAccessToken(refreshTokenEntity.token);
+    this.jwtCacheService.storeAccessToken(accessToken);
 
     return {
       accessToken,

backend/src/chat/chat.controller.ts

@@ -22,13 +22,6 @@ export class ChatController {
     @GetAuthToken() userId: string,
   ) {
     try {
-      // Save user's message first
-      await this.chatService.saveMessage(
-        chatDto.chatId,
-        chatDto.message,
-        MessageRole.User,
-      );
-
       if (chatDto.stream) {
         // Streaming response
         res.setHeader('Content-Type', 'text/event-stream');
@@ -39,6 +32,7 @@ export class ChatController {
           chatId: chatDto.chatId,
           message: chatDto.message,
           model: chatDto.model,
+          role: MessageRole.User,
         });
 
         let fullResponse = '';
@@ -51,13 +45,6 @@ export class ChatController {
           }
         }
 
-        // Save the complete message
-        await this.chatService.saveMessage(
-          chatDto.chatId,
-          fullResponse,
-          MessageRole.Assistant,
-        );
-
         res.write('data: [DONE]\n\n');
         res.end();
       } else {
@@ -66,15 +53,8 @@ export class ChatController {
           chatId: chatDto.chatId,
           message: chatDto.message,
           model: chatDto.model,
+          role: MessageRole.User,
         });
-
-        // Save the complete message
-        await this.chatService.saveMessage(
-          chatDto.chatId,
-          response,
-          MessageRole.Assistant,
-        );
-
         res.json({ content: response });
       }
     } catch (error) {

backend/src/chat/chat.model.ts

@@ -75,11 +75,11 @@ class ChatCompletionDelta {
 
 @ObjectType('ChatCompletionChoiceType')
 class ChatCompletionChoice {
-  @Field()
-  index: number;
+  @Field({ nullable: true })
+  index: number | null;
 
-  @Field(() => ChatCompletionDelta)
-  delta: ChatCompletionDelta;
+  @Field(() => ChatCompletionDelta, { nullable: true })
+  delta: ChatCompletionDelta | null;
 
   @Field({ nullable: true })
   finishReason: string | null;
@@ -90,14 +90,14 @@ export class ChatCompletionChunk {
   @Field()
   id: string;
 
-  @Field()
-  object: string;
+  @Field({ nullable: true })
+  object: string | null;
 
-  @Field()
-  created: number;
+  @Field({ nullable: true })
+  created: number | null;
 
-  @Field()
-  model: string;
+  @Field({ nullable: true })
+  model: string | null;
 
   @Field({ nullable: true })
   systemFingerprint: string | null;

backend/src/chat/chat.module.ts

@@ -11,13 +11,15 @@ import { UserService } from 'src/user/user.service';
 import { PubSub } from 'graphql-subscriptions';
 import { JwtCacheModule } from 'src/jwt-cache/jwt-cache.module';
 import { UploadModule } from 'src/upload/upload.module';
+import { GitHubModule } from 'src/github/github.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([Chat, User]),
     AuthModule,
     JwtCacheModule,
     UploadModule,
+    GitHubModule,
   ],
   controllers: [ChatController],
   providers: [