Reorgniase files

src/api/clients/gemini.ts

@@ -1,5 +1,4 @@
-import { APIClient } from '..';
-import { ChatMessage } from '../../types';
+import { APIClient, ChatMessage } from '..';
 
 // TODO:
 // Implement API client for Gemini.

src/api/clients/openai-compatible.ts

@@ -2,8 +2,7 @@ import { getEncoding } from 'js-tiktoken';
 import { Notice } from 'obsidian';
 import OpenAI from 'openai';
 import Markpilot from 'src/main';
-import { APIClient } from '..';
-import { ChatMessage } from '../../types';
+import { APIClient, ChatMessage } from '..';
 import { CostsTracker } from '../costs';
 import { PromptGenerator } from '../prompts/generator';
 

src/api/index.ts

@@ -1,6 +1,16 @@
-import { ChatMessage } from '../types';
-
 export interface APIClient {
   fetchChat(messages: ChatMessage[]): AsyncGenerator<string | undefined>;
   fetchCompletions(prefix: string, suffix: string): Promise<string | undefined>;
 }
+
+export type ChatRole = 'system' | 'assistant' | 'user';
+
+export interface ChatMessage {
+  role: ChatRole;
+  content: string;
+}
+
+export interface ChatHistory {
+  messages: ChatMessage[];
+  response: string;
+}

src/api/prompts/generator.ts

@@ -1,6 +1,6 @@
 import Markpilot from 'src/main';
-import { ChatMessage } from 'src/types';
 import { FewShotPrompt } from '.';
+import { ChatMessage } from '..';
 import { BlockQuotePrompt } from './block-quote';
 import { CodeBlockPrompt } from './code-block';
 import { Context, getContext, getLanguage } from './context';

src/api/proxies/memory-cache.ts

@@ -1,7 +1,6 @@
 import { createHash } from 'crypto';
 import Markpilot from 'src/main';
-import { APIClient } from '..';
-import { ChatMessage } from '../../types';
+import { APIClient, ChatMessage } from '..';
 
 export class MemoryCacheProxy implements APIClient {
   private store: Map<string, string> = new Map();

src/api/proxies/usage-monitor.ts

@@ -1,8 +1,7 @@
 import { Notice } from 'obsidian';
 import Markpilot from 'src/main';
 import { getThisMonthAsString } from 'src/utils';
-import { APIClient } from '..';
-import { ChatMessage } from '../../types';
+import { APIClient, ChatMessage } from '..';
 
 export class UsageMonitorProxy implements APIClient {
   constructor(

src/chat/App.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
+import { ChatHistory, ChatRole } from 'src/api';
 import Markpilot from 'src/main';
-import { ChatHistory, ChatRole } from 'src/types';
 import { ChatInput } from './components/ChatBox';
 import { ChatItem } from './components/ChatItem';
 import { ChatView } from './view';

src/chat/components/ChatItem.tsx

@@ -2,7 +2,7 @@ import { Bot, Copy, User } from 'lucide-react';
 import ReactMarkdown from 'react-markdown';
 import rehypeKatex from 'rehype-katex';
 import remarkMath from 'remark-math';
-import { ChatMessage } from 'src/types';
+import { ChatMessage } from 'src/api';
 
 export function ChatItem({ message }: { message: ChatMessage }) {
   return (