feat: read catalog synchronously during init #3094
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Philippe Martin <[email protected]>
axel7083
reviewed
May 28, 2025
| this.#jsonWatcher.init(); | ||
|
|
||
| await this.readCatalogs(); | ||
| } |
There was a problem hiding this comment.
async init(): Promise<void> {
return new Promise<void>((resolve) => {
// Creating a json watcher
this.#jsonWatcher = new JsonWatcher(this.getUserCatalogPath(), {
version: CatalogFormat.CURRENT,
recipes: [],
models: [],
categories: [],
});
this.#jsonWatcher.onContentUpdated(content => {
resolve();
this.onUserCatalogUpdate(content);
});
this.#jsonWatcher.init();
});
}can't we just wrap the JSON watcher instead of reading manually the file??
There was a problem hiding this comment.
yes, great idea. Just moving resolve() after onSuerCatalogUpdate()
Signed-off-by: Philippe Martin <[email protected]>
axel7083
approved these changes
May 28, 2025
axel7083
reviewed
May 28, 2025
packages/backend/src/studio.spec.ts
Outdated
| import { afterEach, beforeEach, expect, test, vi, describe, type MockInstance } from 'vitest'; | ||
| import { Studio } from './studio'; | ||
| import { type ExtensionContext, EventEmitter, version } from '@podman-desktop/api'; | ||
| import * as catalogManager from './managers/catalogManager'; |
There was a problem hiding this comment.
why importing everything using *?
Suggested change
| import * as catalogManager from './managers/catalogManager'; | |
| import { CatalogManager } from './managers/catalogManager'; | |
| [...] | |
| vi.mocked(CatalogManager).mockReturnValue(...) |
There was a problem hiding this comment.
right, a residue of a another try, reverting...
Signed-off-by: Philippe Martin <[email protected]>
feloy
force-pushed
the
fix-2937/model-not-found-init
branch
from
6d83534 to
dcbb838
Compare
axel7083
approved these changes
May 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Philippe Martin [email protected]
What does this PR do?
Reads the catalogs during the call to
catalogManager.init(), so the models are available for modelsManager at init timeScreenshot / video of UI
What issues does this PR fix or reference?
Fixes #2937
How to test this PR?
The problem in #2937 is reproducible only when a valid user catalog file exists. Download models, then create a user catalog file, and start Podman Desktop with AI Lab. The warnings of model not found should have disappeared