diff --git a/.github/workflows/codeQL-analysis.yml b/.github/workflows/codeQL-analysis.yml new file mode 100644 index 000000000..94411c4d2 --- /dev/null +++ b/.github/workflows/codeQL-analysis.yml @@ -0,0 +1,102 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: + - main + paths: + - "electron/**" + - .github/workflows/jan-electron-linter-and-test.yml + - "web/**" + - "uikit/**" + - "package.json" + - "node_modules/**" + - "yarn.lock" + - "core/**" + - "extensions/**" + - "!README.md" + - "Makefile" + + pull_request: + branches: + - main + paths: + - "electron/**" + - .github/workflows/jan-electron-linter-and-test.yml + - "web/**" + - "uikit/**" + - "package.json" + - "node_modules/**" + - "yarn.lock" + - "Makefile" + +jobs: + analyze: + name: Analyze + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners + # Consider using larger runners for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: ["javascript-typescript"] + # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] + # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/docs/src/containers/Banner/index.js b/docs/src/containers/Banner/index.js index ea00cf8b1..482ff1041 100644 --- a/docs/src/containers/Banner/index.js +++ b/docs/src/containers/Banner/index.js @@ -71,6 +71,7 @@ export default function AnnoncementBanner() { key={i} href={social.href} target="_blank" + rel="noopener" > {social.icon} diff --git a/docs/src/containers/Footer/index.js b/docs/src/containers/Footer/index.js index 6c04faab6..39f6126ec 100644 --- a/docs/src/containers/Footer/index.js +++ b/docs/src/containers/Footer/index.js @@ -109,6 +109,7 @@ export default function Footer() { key={i} href={social.href} target="_blank" + rel="noopener" > {social.icon} diff --git a/extensions/inference-openai-extension/src/@types/global.d.ts b/extensions/inference-openai-extension/src/@types/global.d.ts index bb0c6e9bf..84f86c145 100644 --- a/extensions/inference-openai-extension/src/@types/global.d.ts +++ b/extensions/inference-openai-extension/src/@types/global.d.ts @@ -1,6 +1,5 @@ -import { Model } from "@janhq/core"; - declare const MODULE: string; +declare const OPENAI_DOMAIN: string; declare interface EngineSettings { full_url?: string; diff --git a/extensions/inference-openai-extension/src/helpers/sse.ts b/extensions/inference-openai-extension/src/helpers/sse.ts index 3a9401878..bbfc5e1fd 100644 --- a/extensions/inference-openai-extension/src/helpers/sse.ts +++ b/extensions/inference-openai-extension/src/helpers/sse.ts @@ -1,5 +1,4 @@ import { Observable } from "rxjs"; -import { EngineSettings, OpenAIModel } from "../@types/global"; /** * Sends a request to the inference server to generate a response based on the recent messages. @@ -16,7 +15,7 @@ export function requestInference( ): Observable { return new Observable((subscriber) => { let model_id: string = model.id; - if (engine.full_url.includes("openai.azure.com")) { + if (engine.full_url.includes(OPENAI_DOMAIN)) { model_id = engine.full_url.split("/")[5]; } const requestBody = JSON.stringify({ diff --git a/extensions/inference-openai-extension/src/index.ts b/extensions/inference-openai-extension/src/index.ts index 0f3a5064d..80d211d95 100644 --- a/extensions/inference-openai-extension/src/index.ts +++ b/extensions/inference-openai-extension/src/index.ts @@ -22,7 +22,6 @@ import { InferenceExtension } from "@janhq/core"; import { requestInference } from "./helpers/sse"; import { ulid } from "ulid"; import { join } from "path"; -import { EngineSettings, OpenAIModel } from "./@types/global"; /** * A class that implements the InferenceExtension interface from the @janhq/core package. @@ -108,6 +107,7 @@ export default class JanInferenceOpenAIExtension implements InferenceExtension { */ async inference(data: MessageRequest): Promise { const timestamp = Date.now(); + const message: ThreadMessage = { thread_id: data.threadId, created: timestamp, diff --git a/extensions/inference-openai-extension/webpack.config.js b/extensions/inference-openai-extension/webpack.config.js index 45be62271..72b7d90c1 100644 --- a/extensions/inference-openai-extension/webpack.config.js +++ b/extensions/inference-openai-extension/webpack.config.js @@ -18,10 +18,7 @@ module.exports = { plugins: [ new webpack.DefinePlugin({ MODULE: JSON.stringify(`${packageJson.name}/${packageJson.module}`), - INFERENCE_URL: JSON.stringify( - process.env.INFERENCE_URL || - "http://127.0.0.1:3928/inferences/llamacpp/chat_completion" - ), + OPENAI_DOMAIN: JSON.stringify("openai.azure.com"), }), ], output: {