Build/Refactor: lint pre-commit hook and reformat repo to spec (danny…

…-avila#314) * build/refactor: move lint/prettier packages to project root, install husky, add pre-commit hook * refactor: reformat files * build: put full eslintrc back with all rules
fuegovic · May 18, 2023 · 7fdc862 · 7fdc862
1 parent 8d75b25
commit 7fdc862
Show file tree

Hide file tree

Showing 157 changed files with 4,879 additions and 2,446 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,113 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+    node: true,
+    commonjs: true,
+    es6: true
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
+    'prettier'
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true
+    }
+  },
+  plugins: ['react', 'react-hooks', '@typescript-eslint'],
+  rules: {
+    '@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': 'allow-with-description' }],
+    indent: ['error', 2, { SwitchCase: 1 }],
+    'max-len': [
+      'error',
+      {
+        code: 150,
+        ignoreStrings: true,
+        ignoreTemplateLiterals: true,
+        ignoreComments: true
+      }
+    ],
+    'linebreak-style': 0,
+    // "arrow-parens": [2, "as-needed", { requireForBlockBody: true }],
+    // 'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],
+    'no-console': 'off',
+    'import/extensions': 'off',
+    'no-use-before-define': [
+      'error',
+      {
+        functions: false
+      }
+    ],
+    'no-promise-executor-return': 'off',
+    'no-param-reassign': 'off',
+    'no-continue': 'off',
+    'no-restricted-syntax': 'off',
+    'react/prop-types': ['off'],
+    'react/display-name': ['off']
+  },
+  overrides: [
+    {
+      files: ['**/*.ts', '**/*.tsx'],
+      rules: {
+        'no-unused-vars': 'off', // off because it conflicts with '@typescript-eslint/no-unused-vars'
+        'react/display-name': 'off',
+        '@typescript-eslint/no-unused-vars': 'warn'
+      }
+    },
+    {
+      files: ['rollup.config.js', '.eslintrc.js', 'jest.config.js'],
+      env: {
+        node: true
+      }
+    },
+    {
+      files: [
+        '**/*.test.js',
+        '**/*.test.jsx',
+        '**/*.test.ts',
+        '**/*.test.tsx',
+        '**/*.spec.js',
+        '**/*.spec.jsx',
+        '**/*.spec.ts',
+        '**/*.spec.tsx',
+        'setupTests.js'
+      ],
+      env: {
+        jest: true,
+        node: true
+      },
+      rules: {
+        'react/display-name': 'off',
+        'react/prop-types': 'off',
+        'react/no-unescaped-entities': 'off'
+      }
+    },
+    {
+      files: '**/*.+(ts)',
+      parser: '@typescript-eslint/parser',
+      parserOptions: {
+        project: './client/tsconfig.json'
+      },
+      plugins: ['@typescript-eslint/eslint-plugin'],
+      extends: [
+        'plugin:@typescript-eslint/eslint-recommended',
+        'plugin:@typescript-eslint/recommended'
+      ]
+    }
+  ],
+  settings: {
+    react: {
+      createClass: 'createReactClass', // Regex for Component Factory to use,
+      // default to "createReactClass"
+      pragma: 'React', // Pragma to use, default to "React"
+      fragment: 'Fragment', // Fragment to use (may be a property of <pragma>), default to "Fragment"
+      version: 'detect' // React version. "detect" automatically picks the version you have installed.
+    }
+  }
+};
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged
+
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,19 @@
+module.exports = {
+  printWidth: 100,
+  useTabs: false,
+  tabWidth: 2,
+  semi: true,
+  singleQuote: true,
+  // bracketSpacing: false,
+  trailingComma: 'none',
+  arrowParens: 'always',
+  embeddedLanguageFormatting: 'auto',
+  insertPragma: false,
+  proseWrap: 'preserve',
+  quoteProps: 'as-needed',
+  requirePragma: false,
+  rangeStart: 0,
+  endOfLine: 'auto',
+  jsxBracketSameLine: false,
+  jsxSingleQuote: false,
+};
diff --git a/api/.eslintrc.js b/api/.eslintrc.js
diff --git a/api/.prettierrc b/api/.prettierrc
diff --git a/api/app/clients/bingai.js b/api/app/clients/bingai.js
@@ -23,7 +23,8 @@ const askBing = async ({
 
   const bingAIClient = new BingAIClient({
     // "_U" cookie from bing.com
-    userToken: process.env.BINGAI_TOKEN == 'user_provided' ? token : process.env.BINGAI_TOKEN ?? null,
+    userToken:
+      process.env.BINGAI_TOKEN == 'user_provided' ? token : process.env.BINGAI_TOKEN ?? null,
     // If the above doesn't work, provide all your cookies as a string instead
     // cookies: '',
     debug: false,

diff --git a/api/app/clients/chatgpt-browser.js b/api/app/clients/chatgpt-browser.js
@@ -18,9 +18,11 @@ const browserClient = async ({
 
   const clientOptions = {
     // Warning: This will expose your access token to a third party. Consider the risks before using this.
-    reverseProxyUrl: process.env.CHATGPT_REVERSE_PROXY || 'https://ai.fakeopen.com/api/conversation',
+    reverseProxyUrl:
+      process.env.CHATGPT_REVERSE_PROXY || 'https://ai.fakeopen.com/api/conversation',
     // Access token from https://chat.openai.com/api/auth/session
-    accessToken: process.env.CHATGPT_TOKEN == 'user_provided' ? token : process.env.CHATGPT_TOKEN ?? null,
+    accessToken:
+      process.env.CHATGPT_TOKEN == 'user_provided' ? token : process.env.CHATGPT_TOKEN ?? null,
     model: model,
     debug: false,
     proxy: process.env.PROXY || null,

diff --git a/api/app/clients/chatgpt-client.js b/api/app/clients/chatgpt-client.js
@@ -1,7 +1,7 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
 const { genAzureEndpoint } = require('../../utils/genAzureEndpoints');
-const tiktoken = require("@dqbd/tiktoken");
+const tiktoken = require('@dqbd/tiktoken');
 const encoding_for_model = tiktoken.encoding_for_model;
 
 const askClient = async ({
@@ -27,7 +27,7 @@ const askClient = async ({
 
   const azure = process.env.AZURE_OPENAI_API_KEY ? true : false;
   if (promptPrefix == null) {
-    promptText = "You are ChatGPT, a large language model trained by OpenAI.";
+    promptText = 'You are ChatGPT, a large language model trained by OpenAI.';
   } else {
     promptText = promptPrefix;
   }
@@ -45,7 +45,7 @@ const askClient = async ({
     },
     chatGptLabel,
     promptPrefix,
-    proxy: process.env.PROXY || null,
+    proxy: process.env.PROXY || null
     // debug: true
   };
 
@@ -77,16 +77,16 @@ const askClient = async ({
   const res = await client.sendMessage(text, { ...options, userId });
   // return res;
   // create a new response object that includes the token counts
-const newRes = {
-  ...res, 
-  usage: {
-    prompt_tokens: prompt_tokens.length,
-    completion_tokens: text_tokens.length,
-    total_tokens: prompt_tokens.length + text_tokens.length
-  }
-};
+  const newRes = {
+    ...res,
+    usage: {
+      prompt_tokens: prompt_tokens.length,
+      completion_tokens: text_tokens.length,
+      total_tokens: prompt_tokens.length + text_tokens.length
+    }
+  };
 
-return newRes;
+  return newRes;
 };
 
 module.exports = { askClient };
diff --git a/api/app/google/GoogleClient.js b/api/app/google/GoogleClient.js
@@ -3,7 +3,10 @@ const TextStream = require('../stream');
 const { google } = require('googleapis');
 const { Agent, ProxyAgent } = require('undici');
 const { getMessages, saveMessage, saveConvo } = require('../../models');
-const { encoding_for_model: encodingForModel, get_encoding: getEncoding } = require('@dqbd/tiktoken');
+const {
+  encoding_for_model: encodingForModel,
+  get_encoding: getEncoding
+} = require('@dqbd/tiktoken');
 
 const tokenizersCache = {};
 
@@ -65,7 +68,8 @@ class GoogleAgent {
     // The max prompt tokens is determined by the max context tokens minus the max response tokens.
     // Earlier messages will be dropped until the prompt is within the limit.
     this.maxResponseTokens = this.modelOptions.maxOutputTokens || 1024;
-    this.maxPromptTokens = this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;
+    this.maxPromptTokens =
+      this.options.maxPromptTokens || this.maxContextTokens - this.maxResponseTokens;
 
     if (this.maxPromptTokens + this.maxResponseTokens > this.maxContextTokens) {
       throw new Error(
@@ -291,7 +295,10 @@ class GoogleAgent {
     try {
       const result = await this.getCompletion(message, messages, opts.abortController);
       blocked = result?.predictions?.[0]?.safetyAttributes?.blocked;
-      reply = result?.predictions?.[0]?.candidates?.[0]?.content || result?.predictions?.[0]?.content || '';
+      reply =
+        result?.predictions?.[0]?.candidates?.[0]?.content ||
+        result?.predictions?.[0]?.content ||
+        '';
       if (blocked === true) {
         reply = `Google blocked a proper response to your message:\n${JSON.stringify(
           result.predictions[0].safetyAttributes

diff --git a/api/app/stream.js b/api/app/stream.js
@@ -16,10 +16,7 @@ class TextStream extends Readable {
     if (this.currentIndex < this.text.length) {
       setTimeout(() => {
         const remainingChars = this.text.length - this.currentIndex;
-        const chunkSize = Math.min(
-          this.randomInt(minChunkSize, maxChunkSize + 1),
-          remainingChars
-        );
+        const chunkSize = Math.min(this.randomInt(minChunkSize, maxChunkSize + 1), remainingChars);
 
         const chunk = this.text.slice(this.currentIndex, this.currentIndex + chunkSize);
         this.push(chunk);

diff --git a/api/lib/parse/getCitations.js b/api/lib/parse/getCitations.js
@@ -7,8 +7,8 @@ const getCitations = (res) => {
   if (!textBlocks) return '';
   let links = textBlocks[textBlocks.length - 1]?.text.match(regex);
   if (links?.length === 0 || !links) return '';
-  links = links.map((link) => link.trim());
+  links = links.map(link => link.trim());
   return links.join('\n');
 };
 
-module.exports = getCitations;
+module.exports = getCitations;
diff --git a/api/lib/utils/mergeSort.js b/api/lib/utils/mergeSort.js
@@ -2,28 +2,28 @@ function mergeSort(arr, compareFn) {
   if (arr.length <= 1) {
     return arr;
   }
-  
+
   const mid = Math.floor(arr.length / 2);
   const leftArr = arr.slice(0, mid);
   const rightArr = arr.slice(mid);
-  
+
   return merge(mergeSort(leftArr, compareFn), mergeSort(rightArr, compareFn), compareFn);
 }
 
 function merge(leftArr, rightArr, compareFn) {
   const result = [];
   let leftIndex = 0;
   let rightIndex = 0;
-  
+
   while (leftIndex < leftArr.length && rightIndex < rightArr.length) {
     if (compareFn(leftArr[leftIndex], rightArr[rightIndex]) < 0) {
       result.push(leftArr[leftIndex++]);
     } else {
       result.push(rightArr[rightIndex++]);
     }
   }
-  
+
   return result.concat(leftArr.slice(leftIndex)).concat(rightArr.slice(rightIndex));
 }
 
-module.exports = mergeSort;
+module.exports = mergeSort;
diff --git a/api/middleware/requireLocalAuth.js b/api/middleware/requireLocalAuth.js
@@ -19,7 +19,7 @@ const requireLocalAuth = (req, res, next) => {
     }
     if (!user) {
       log({
-        title: '(requireLocalAuth) Error: No user',
+        title: '(requireLocalAuth) Error: No user'
       });
       return res.status(422).send(info);
     }