andrewnguonly · andrewnguonly · Mar 19, 2024 · Mar 18, 2024
diff --git a/.eslintrc b/.eslintrc
@@ -5,7 +5,8 @@
     "@typescript-eslint",
     "react",
     "react-hooks",
-    "prettier"
+    "prettier",
+    "import"
   ],
   "extends": [
     "eslint:recommended",
@@ -16,7 +17,26 @@
   ],
   "ignorePatterns": [],
   "rules": {
-    "react/react-in-jsx-scope": "off"
+    "react/react-in-jsx-scope": "off",
+    "import/order": [
+      "error",
+      {
+        "groups": ["builtin", "external", "internal", "parent", "sibling", "index"],
+        "pathGroups": [
+          {
+            "pattern": "react",
+            "group": "external",
+            "position": "before"
+          }
+        ],
+        "pathGroupsExcludedImportTypes": ["builtin"],
+        "alphabetize": {
+          "order": "asc",
+          "caseInsensitive": true
+        },
+        "newlines-between": "always"
+      }
+    ]
   },
   "settings": {
     "react": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,6 +63,7 @@
     "css-loader": "^6.8.1",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",

diff --git a/src/components/ChatBar.tsx b/src/components/ChatBar.tsx
@@ -1,4 +1,15 @@
 import { ChangeEvent, useEffect, useRef, useState } from "react";
+
+import {
+  Avatar,
+  ChatContainer,
+  Message,
+  MessageList,
+  TypingIndicator,
+} from "@chatscope/chat-ui-kit-react";
+import HistoryIcon from "@mui/icons-material/History";
+import InfoIcon from "@mui/icons-material/Info";
+import SaveAltIcon from "@mui/icons-material/SaveAlt";
 import {
   Alert,
   Box,
@@ -13,18 +24,11 @@ import {
   Tooltip,
   Typography,
 } from "@mui/material";
-import HistoryIcon from "@mui/icons-material/History";
-import InfoIcon from "@mui/icons-material/Info";
-import SaveAltIcon from "@mui/icons-material/SaveAlt";
-import {
-  Avatar,
-  ChatContainer,
-  Message,
-  MessageList,
-  TypingIndicator,
-} from "@chatscope/chat-ui-kit-react";
 import Markdown from "markdown-to-jsx";
 import { v4 as uuidv4 } from "uuid";
+
+import { getContentConfig } from "../contentConfig";
+import { useThemeContext } from "../contexts/ThemeContext";
 import {
   CHAT_CONTAINER_HEIGHT_MAX,
   CHAT_CONTAINER_HEIGHT_MIN,
@@ -33,12 +37,11 @@ import {
   getLumosOptions,
 } from "../pages/Options";
 import { getHtmlContent } from "../scripts/content";
-import { getContentConfig } from "../contentConfig";
-import { CodeBlock, PreBlock } from "./CodeBlock";
+
 import ChatHistory from "./ChatHistory";
+import { CodeBlock, PreBlock } from "./CodeBlock";
 import "@chatscope/chat-ui-kit-styles/dist/default/styles.min.css";
 import "./ChatBar.css";
-import { useThemeContext } from "../contexts/ThemeContext";
 
 export class LumosMessage {
   constructor(

diff --git a/src/components/ChatHistory.tsx b/src/components/ChatHistory.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useState } from "react";
-import PropTypes from "prop-types";
+
+import DeleteIcon from "@mui/icons-material/Delete";
 import {
   Box,
   IconButton,
@@ -9,7 +10,7 @@ import {
   ListItemText,
   ListSubheader,
 } from "@mui/material";
-import DeleteIcon from "@mui/icons-material/Delete";
+import PropTypes from "prop-types";
 
 interface ChatHistoryProps {
   loadChat: (chatId: string) => void;

diff --git a/src/contexts/ThemeContext.tsx b/src/contexts/ThemeContext.tsx
@@ -1,5 +1,7 @@
 import React, { createContext, useContext, useState, useEffect } from "react";
+
 import { Theme, ThemeProvider as MUIThemeProvider } from "@mui/material";
+
 import getAppTheme from "../themes/AppTheme";
 
 interface ThemeContextValue {

diff --git a/src/index.tsx b/src/index.tsx
@@ -1,8 +1,10 @@
 import React from "react";
-import ReactDOM from "react-dom/client";
+
 import CssBaseline from "@mui/material/CssBaseline";
-import { ThemeProvider } from "./contexts/ThemeContext";
+import ReactDOM from "react-dom/client";
+
 import App from "./App";
+import { ThemeProvider } from "./contexts/ThemeContext";
 
 const root = document.createElement("div");
 root.className = "container";

diff --git a/src/options.tsx b/src/options.tsx
@@ -1,7 +1,9 @@
 import React from "react";
+
+import CssBaseline from "@mui/material/CssBaseline";
 import ReactDOM from "react-dom/client";
+
 import { ThemeProvider } from "./contexts/ThemeContext";
-import CssBaseline from "@mui/material/CssBaseline";
 import Options from "./pages/Options";
 
 const root = document.createElement("div");

diff --git a/src/pages/Options.tsx b/src/pages/Options.tsx
@@ -1,4 +1,5 @@
 import { ChangeEvent, useEffect, useState } from "react";
+
 import {
   Box,
   FormControl,
@@ -12,6 +13,7 @@ import {
   TextField,
   ThemeProvider,
 } from "@mui/material";
+
 import {
   ContentConfig,
   defaultContentConfig,

diff --git a/src/scripts/background.ts b/src/scripts/background.ts
@@ -1,3 +1,6 @@
+import { ChatOllama } from "@langchain/community/chat_models/ollama";
+import { OllamaEmbeddings } from "@langchain/community/embeddings/ollama";
+import { Ollama } from "@langchain/community/llms/ollama";
 import { Document } from "@langchain/core/documents";
 import {
   AIMessage,
@@ -15,22 +18,20 @@ import { ConsoleCallbackHandler } from "@langchain/core/tracers/console";
 import { IterableReadableStream } from "@langchain/core/utils/stream";
 import { RecursiveCharacterTextSplitter } from "langchain/text_splitter";
 import { formatDocumentsAsString } from "langchain/util/document";
-import { ChatOllama } from "@langchain/community/chat_models/ollama";
-import { OllamaEmbeddings } from "@langchain/community/embeddings/ollama";
-import { Ollama } from "@langchain/community/llms/ollama";
+
 import { LumosMessage } from "../components/ChatBar";
-import {
-  Calculator,
-  CLS_CALC_PROMPT,
-  CLS_CALC_TYPE,
-} from "../tools/calculator";
-import { EnhancedMemoryVectorStore } from "../vectorstores/enhanced_memory";
 import {
   DEFAULT_KEEP_ALIVE,
   getLumosOptions,
   isMultimodal,
   LumosOptions,
 } from "../pages/Options";
+import {
+  Calculator,
+  CLS_CALC_PROMPT,
+  CLS_CALC_TYPE,
+} from "../tools/calculator";
+import { EnhancedMemoryVectorStore } from "../vectorstores/enhanced_memory";
 
 interface VectorStoreMetadata {
   vectorStore: EnhancedMemoryVectorStore;

diff --git a/src/themes/AppTheme.tsx b/src/themes/AppTheme.tsx
@@ -1,5 +1,5 @@
-import { createTheme, Theme } from "@mui/material/styles";
 import { amber, lightGreen } from "@mui/material/colors";
+import { createTheme, Theme } from "@mui/material/styles";
 
 const getAppTheme = (darkMode: boolean): Theme => {
   return createTheme({

diff --git a/src/vectorstores/enhanced_memory.ts b/src/vectorstores/enhanced_memory.ts
@@ -7,8 +7,8 @@ import {
   BaseRetriever,
   type BaseRetrieverInput,
 } from "@langchain/core/retrievers";
-import { MemoryVectorStore } from "langchain/vectorstores/memory";
 import Fuse from "fuse.js";
+import { MemoryVectorStore } from "langchain/vectorstores/memory";
 
 export type EnhancedMemoryRetrieverInput<V extends EnhancedMemoryVectorStore> =
   BaseRetrieverInput &