-
Notifications
You must be signed in to change notification settings - Fork 41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
refactor: move getLocalModels to ModelsManager #112
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import { type MockInstance, beforeEach, expect, test, vi } from 'vitest'; | ||
| import os from 'os'; | ||
| import fs from 'node:fs'; | ||
| import path from 'node:path'; | ||
| import { ModelsManager } from './modelsManager'; | ||
|
|
||
| beforeEach(() => { | ||
| vi.resetAllMocks(); | ||
| }); | ||
|
|
||
| test('getLocalModels should return models in local directory', () => { | ||
| vi.spyOn(os, 'homedir').mockReturnValue('/home/user'); | ||
| const readdirSyncMock = vi.spyOn(fs, 'readdirSync') as unknown as MockInstance< | ||
| [path: string], | ||
| string[] | fs.Dirent[] | ||
| >; | ||
| readdirSyncMock.mockImplementation((dir: string) => { | ||
| if (dir.endsWith('model-id-1') || dir.endsWith('model-id-2')) { | ||
| const base = path.basename(dir); | ||
| return [base + '-model']; | ||
| } else { | ||
| return [ | ||
| { | ||
| isDirectory: () => true, | ||
| path: '/home/user/appstudio-dir', | ||
| name: 'model-id-1', | ||
| }, | ||
| { | ||
| isDirectory: () => true, | ||
| path: '/home/user/appstudio-dir', | ||
| name: 'model-id-2', | ||
| }, | ||
| { | ||
| isDirectory: () => false, | ||
| path: '/home/user/appstudio-dir', | ||
| name: 'other-file-should-be-ignored.txt', | ||
| }, | ||
| ] as fs.Dirent[]; | ||
| } | ||
| }); | ||
| const manager = new ModelsManager('/home/user/aistudio'); | ||
| const models = manager.getLocalModels(); | ||
| expect(models).toEqual([ | ||
| { | ||
| id: 'model-id-1', | ||
| file: 'model-id-1-model', | ||
| }, | ||
| { | ||
| id: 'model-id-2', | ||
| file: 'model-id-2-model', | ||
| }, | ||
| ]); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import type { LocalModelInfo } from '@shared/src/models/ILocalModelInfo'; | ||
| import fs from 'fs'; | ||
| import * as path from 'node:path'; | ||
|
|
||
| export class ModelsManager { | ||
| constructor(private appUserDirectory: string) {} | ||
|
|
||
| getLocalModels(): LocalModelInfo[] { | ||
| const result: LocalModelInfo[] = []; | ||
| const modelsDir = path.join(this.appUserDirectory, 'models'); | ||
| const entries = fs.readdirSync(modelsDir, { withFileTypes: true }); | ||
| const dirs = entries.filter(dir => dir.isDirectory()); | ||
| for (const d of dirs) { | ||
| const modelEntries = fs.readdirSync(path.resolve(d.path, d.name)); | ||
| if (modelEntries.length !== 1) { | ||
| // we support models with one file only for now | ||
| continue; | ||
| } | ||
| result.push({ | ||
| id: d.name, | ||
| file: modelEntries[0], | ||
| }); | ||
| } | ||
| return result; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just a question.
It seems it's a lazy initialization and without cache, do we need to read the files each time we're called or you're planning to read it eagerly or have a cache
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could watch the folder for changes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point, I created #116