chore: refactor core folder structure - module based

janhq · Mar 25, 2024 · 14a6746 · 14a6746
1 parent 77cbdc2
commit 14a6746
Show file tree

Hide file tree

Showing 28 changed files with 51 additions and 56 deletions.
diff --git a/core/src/core.ts → core/src/browser/core.ts b/core/src/core.ts → core/src/browser/core.ts
@@ -1,4 1,4 @@
-import { DownloadRequest, FileStat, NetworkConfig, SystemInformation } from './types'
 import { DownloadRequest, FileStat, NetworkConfig, SystemInformation } from '../types'
 
 /**
  * Execute a extension module function in main process

diff --git a/core/src/events.ts → core/src/browser/events.ts b/core/src/events.ts → core/src/browser/events.ts
diff --git a/core/src/extension.ts → core/src/browser/extension.ts b/core/src/extension.ts → core/src/browser/extension.ts
diff --git a/core/src/extensions/assistant.ts → core/src/browser/extensions/assistant.ts b/core/src/extensions/assistant.ts → core/src/browser/extensions/assistant.ts
@@ -1,4 1,4 @@
-import { Assistant, AssistantInterface } from '../index'
 import { Assistant, AssistantInterface } from '../../types'
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
 
 /**

diff --git a/core/src/extensions/conversational.ts → .../src/browser/extensions/conversational.ts b/core/src/extensions/conversational.ts → .../src/browser/extensions/conversational.ts
@@ -1,4 1,4 @@
-import { Thread, ThreadInterface, ThreadMessage, MessageInterface } from '../index'
 import { Thread, ThreadInterface, ThreadMessage, MessageInterface } from '../../types'
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
 
 /**

diff --git a/core/src/extensions/engines/AIEngine.ts → ...rc/browser/extensions/engines/AIEngine.ts b/core/src/extensions/engines/AIEngine.ts → ...rc/browser/extensions/engines/AIEngine.ts
@@ -2,7 2,7 @@ import { getJanDataFolderPath, joinPath } from '../../core'
 import { events } from '../../events'
 import { BaseExtension } from '../../extension'
 import { fs } from '../../fs'
-import { MessageRequest, Model, ModelEvent } from '../../types'
 import { MessageRequest, Model, ModelEvent } from '../../../types'
 import { EngineManager } from './EngineManager'
 
 /**

diff --git a/core/src/extensions/engines/EngineManager.ts → ...owser/extensions/engines/EngineManager.ts b/core/src/extensions/engines/EngineManager.ts → ...owser/extensions/engines/EngineManager.ts
@@ -1,4 1,3 @@
-import { log } from '../../core'
 import { AIEngine } from './AIEngine'
 
 /**
@@ -28,7 27,3 @@ export class EngineManager {
  return window.core?.engineManager as EngineManager
  }
 }
-
-/**
- * The singleton instance of the ExtensionManager.
- */
diff --git a/.../src/extensions/engines/LocalOAIEngine.ts → ...wser/extensions/engines/LocalOAIEngine.ts b/.../src/extensions/engines/LocalOAIEngine.ts → ...wser/extensions/engines/LocalOAIEngine.ts
@@ -1,6 1,6 @@
 import { executeOnMain, getJanDataFolderPath, joinPath, systemInformation } from '../../core'
 import { events } from '../../events'
-import { Model, ModelEvent } from '../../types'
 import { Model, ModelEvent } from '../../../types'
 import { OAIEngine } from './OAIEngine'
 
 /**

diff --git a/core/src/extensions/engines/OAIEngine.ts → ...c/browser/extensions/engines/OAIEngine.ts b/core/src/extensions/engines/OAIEngine.ts → ...c/browser/extensions/engines/OAIEngine.ts
@@ -13,7 13,7 @@ import {
  ModelInfo,
  ThreadContent,
  ThreadMessage,
-} from '../../types'
 } from '../../../types'
 import { events } from '../../events'
 
 /**

diff --git a/...src/extensions/engines/RemoteOAIEngine.ts → ...ser/extensions/engines/RemoteOAIEngine.ts b/...src/extensions/engines/RemoteOAIEngine.ts → ...ser/extensions/engines/RemoteOAIEngine.ts
diff --git a/core/src/extensions/engines/helpers/sse.ts → ...browser/extensions/engines/helpers/sse.ts b/core/src/extensions/engines/helpers/sse.ts → ...browser/extensions/engines/helpers/sse.ts
@@ -1,5 1,5 @@
 import { Observable } from 'rxjs'
-import { ModelRuntimeParams } from '../../../types'
 import { ModelRuntimeParams } from '../../../../types'
 /**
  * Sends a request to the inference server to generate a response based on the recent messages.
  * @param recentMessages - An array of recent messages to use as context for the inference.

diff --git a/core/src/extensions/engines/index.ts → core/src/browser/extensions/engines/index.ts b/core/src/extensions/engines/index.ts → core/src/browser/extensions/engines/index.ts
diff --git a/core/src/extensions/huggingface.ts → core/src/browser/extensions/huggingface.ts b/core/src/extensions/huggingface.ts → core/src/browser/extensions/huggingface.ts
@@ -1,6 1,6 @@
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
-import { HuggingFaceInterface, HuggingFaceRepoData, Quantization } from '../types/huggingface'
-import { Model } from '../types/model'
 import { HuggingFaceInterface, HuggingFaceRepoData, Quantization } from '../../types/huggingface'
 import { Model } from '../../types/model'
 
 /**
  * Hugging Face extension for converting HF models to GGUF.

diff --git a/core/src/extensions/index.ts → core/src/browser/extensions/index.ts b/core/src/extensions/index.ts → core/src/browser/extensions/index.ts
diff --git a/core/src/extensions/inference.ts → core/src/browser/extensions/inference.ts b/core/src/extensions/inference.ts → core/src/browser/extensions/inference.ts
@@ -1,4 1,4 @@
-import { InferenceInterface, MessageRequest, ThreadMessage } from '../index'
 import { InferenceInterface, MessageRequest, ThreadMessage } from '../../types'
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
 
 /**

diff --git a/core/src/extensions/model.ts → core/src/browser/extensions/model.ts b/core/src/extensions/model.ts → core/src/browser/extensions/model.ts
@@ -1,5 1,5 @@
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
-import { GpuSetting, ImportingModel, Model, ModelInterface, OptionType } from '../index'
 import { GpuSetting, ImportingModel, Model, ModelInterface, OptionType } from '../../types'
 
 /**
  * Model extension for managing models.

diff --git a/core/src/extensions/monitoring.ts → core/src/browser/extensions/monitoring.ts b/core/src/extensions/monitoring.ts → core/src/browser/extensions/monitoring.ts
@@ -1,5 1,5 @@
 import { BaseExtension, ExtensionTypeEnum } from '../extension'
-import { GpuSetting, MonitoringInterface, OperatingSystemInfo } from '../index'
 import { GpuSetting, MonitoringInterface, OperatingSystemInfo } from '../../types'
 
 /**
  * Monitoring extension for system monitoring.

diff --git a/core/src/fs.ts → core/src/browser/fs.ts b/core/src/fs.ts → core/src/browser/fs.ts
@@ -1,4 1,4 @@
-import { FileStat } from './types'
 import { FileStat } from '../types'
 
 /**
  * Writes data to a file at the specified path.

diff --git a/core/src/browser/index.ts b/core/src/browser/index.ts
@@ -0,0 1,29 @@
 /**
  * Export Core module
  * @module
  */
 export * from './core'
 
 /**
  * Export Event module.
  * @module
  */
 export * from './events'
 
 /**
  * Export Filesystem module.
  * @module
  */
 export * from './fs'
 
 /**
  * Export Extension module.
  * @module
  */
 export * from './extension'
 
 /**
  * Export all base extensions.
  * @module
  */
 export * from './extensions'
diff --git a/core/src/index.ts b/core/src/index.ts
@@ -2,42 2,13 @@
  * Export all types.
  * @module
  */
-export * from './types/index'
 export * from './types'
 
 /**
- * Export all routes
- */
-export * from './api'
-
-/**
- * Export Core module
- * @module
- */
-export * from './core'
-
-/**
- * Export Event module.
- * @module
- */
-export * from './events'
-
-/**
- * Export Filesystem module.
- * @module
- */
-export * from './fs'
-
-/**
- * Export Extension module.
- * @module
- */
-export * from './extension'
-
-/**
- * Export all base extensions.
  * Export browser module
  * @module
  */
-export * from './extensions/index'
 export * from './browser'
 
 /**
  * Declare global object

diff --git a/core/src/node/api/common/adapter.ts b/core/src/node/api/common/adapter.ts
@@ -4,7 4,7 @@ import {
  ExtensionRoute,
  FileManagerRoute,
  FileSystemRoute,
-} from '../../../api'
 } from '../../../types/api'
 import { Downloader } from '../processors/download'
 import { FileSystem } from '../processors/fs'
 import { Extension } from '../processors/extension'

diff --git a/core/src/node/api/common/handler.ts b/core/src/node/api/common/handler.ts
@@ -1,4 1,4 @@
-import { CoreRoutes } from '../../../api'
 import { CoreRoutes } from '../../../types/api'
 import { RequestAdapter } from './adapter'
 
 export type Handler = (route: string, args: any) => any

diff --git a/core/src/node/api/processors/download.ts b/core/src/node/api/processors/download.ts
@@ -1,5 1,5 @@
 import { resolve, sep } from 'path'
-import { DownloadEvent } from '../../../api'
 import { DownloadEvent } from '../../../types/api'
 import { normalizeFilePath } from '../../helper/path'
 import { getJanDataFolderPath } from '../../helper'
 import { DownloadManager } from '../../helper/download'

diff --git a/core/src/node/api/restful/app/download.ts b/core/src/node/api/restful/app/download.ts
@@ -1,4 1,4 @@
-import { DownloadRoute } from '../../../../api'
 import { DownloadRoute } from '../../../../types/api'
 import { DownloadManager } from '../../../helper/download'
 import { HttpServer } from '../../HttpServer'
 

diff --git a/core/src/node/index.ts b/core/src/node/index.ts
@@ -5,4 5,4 @@ export * from './extension/store'
 export * from './api'
 export * from './helper'
 export * from './../types'
-export * from './../api'
 export * from '../types/api'
diff --git a/core/src/api/index.ts → core/src/types/api/index.ts b/core/src/api/index.ts → core/src/types/api/index.ts
diff --git a/core/src/types/index.ts b/core/src/types/index.ts
@@ -8,3 8,4 @@ export * from './file'
 export * from './config'
 export * from './huggingface'
 export * from './miscellaneous'
 export * from './api'
diff --git a/web/hooks/useActiveModel.ts b/web/hooks/useActiveModel.ts
@@ -7,7 7,6 @@ import { toaster } from '@/containers/Toast'
 
 import { LAST_USED_MODEL_ID } from './useRecommendedModel'
 
-import { extensionManager } from '@/extension'
 import { downloadedModelsAtom } from '@/helpers/atoms/Model.atom'
 import { activeThreadAtom } from '@/helpers/atoms/Thread.atom'