Reorganise files

taichimaeda · Apr 19, 2024 · bb6c590 · bb6c590
1 parent ba7b979
commit bb6c590
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 8 deletions.
diff --git a/src/api/clients/gemini.ts b/src/api/clients/gemini.ts
@@ -1,5 +1,5 @@
+import { APIClient } from '..';
 import { ChatMessage } from '../../types';
-import { APIClient } from '../client';
 
 // TODO:
 // Implement API client for Gemini.

diff --git a/src/api/clients/ollama.ts b/src/api/clients/ollama.ts
@@ -2,7 +2,7 @@ import { Notice } from 'obsidian';
 import OpenAI from 'openai';
 import Markpilot from 'src/main';
 import { validateURL } from 'src/utils';
-import { APIClient } from '../client';
+import { APIClient } from '..';
 import { CostsTracker } from '../costs';
 import { OpenAICompatibleAPIClient } from './openai-compatible';
 

diff --git a/src/api/clients/openai-compatible.ts b/src/api/clients/openai-compatible.ts
@@ -2,8 +2,8 @@ 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 } from '../client';
 import { CostsTracker } from '../costs';
 
 export abstract class OpenAICompatibleAPIClient implements APIClient {

diff --git a/src/api/clients/openai.ts b/src/api/clients/openai.ts
@@ -1,7 +1,7 @@
 import { Notice } from 'obsidian';
 import OpenAI from 'openai';
 import Markpilot from 'src/main';
-import { APIClient } from '../client';
+import { APIClient } from '..';
 import { CostsTracker } from '../costs';
 import { OpenAICompatibleAPIClient } from './openai-compatible';
 

diff --git a/src/api/clients/openrouter.ts b/src/api/clients/openrouter.ts
@@ -1,7 +1,7 @@
 import { Notice } from 'obsidian';
 import OpenAI from 'openai';
 import Markpilot from 'src/main';
-import { APIClient } from '../client';
+import { APIClient } from '..';
 import { CostsTracker } from '../costs';
 import { OpenAICompatibleAPIClient } from './openai-compatible';
 

diff --git a/src/api/client.ts → src/api/index.ts b/src/api/client.ts → src/api/index.ts
diff --git a/src/api/proxies/memory-cache.ts b/src/api/proxies/memory-cache.ts
@@ -1,7 +1,7 @@
 import { createHash } from 'crypto';
 import Markpilot from 'src/main';
+import { APIClient } from '..';
 import { ChatMessage } from '../../types';
-import { APIClient } from '../client';
 
 export class MemoryCacheProxy implements APIClient {
   private store: Map<string, string> = new Map();

diff --git a/src/api/proxies/usage-monitor.ts b/src/api/proxies/usage-monitor.ts
@@ -1,8 +1,8 @@
 import { Notice } from 'obsidian';
 import Markpilot from 'src/main';
 import { getThisMonthAsString } from 'src/utils';
+import { APIClient } from '..';
 import { ChatMessage } from '../../types';
-import { APIClient } from '../client';
 
 export class UsageMonitorProxy implements APIClient {
   constructor(

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -2,3 +2,13 @@ declare module '*.svg' {
   const content: string;
   export default content;
 }
+
+declare module '*.md' {
+  const content: string;
+  export default content;
+}
+
+declare module '*.txt' {
+  const content: string;
+  export default content;
+}
diff --git a/src/main.ts b/src/main.ts
@@ -8,7 +8,7 @@ import {
   setIcon,
   WorkspaceLeaf,
 } from 'obsidian';
-import { APIClient } from './api/client';
+import { APIClient } from './api';
 import { OllamaAPIClient } from './api/clients/ollama';
 import { OpenAIAPIClient } from './api/clients/openai';
 import { OpenRouterAPIClient } from './api/clients/openrouter';