Skip to content

Commit

Permalink
Merge pull request #414 from SujalXplores/fix/eslint-issues
Browse files Browse the repository at this point in the history
fix: silent eslint issues
  • Loading branch information
wonderwhy-er authored Nov 25, 2024
2 parents 66ef47c + 12dcb8d commit 574f0a0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
3 changes: 0 additions & 3 deletions app/components/chat/BaseChat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ import { ExportChatButton } from '~/components/chat/chatExportAndImport/ExportCh
import { ImportButton } from '~/components/chat/chatExportAndImport/ImportButton';
import { ExamplePrompts } from '~/components/chat/ExamplePrompts';

// eslint-disable-next-line @typescript-eslint/no-unused-vars
const providerList = PROVIDER_LIST;

// @ts-ignore TODO: Introduce proper types
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const ModelSelector = ({ model, setModel, provider, setProvider, modelList, providerList, apiKeys }) => {
Expand Down
5 changes: 2 additions & 3 deletions app/lib/runtime/action-runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,13 @@ export class ActionRunner {

this.#updateAction(actionId, { ...action, ...data.action, executed: !isStreaming });

// eslint-disable-next-line consistent-return
return (this.#currentExecutionPromise = this.#currentExecutionPromise
this.#currentExecutionPromise = this.#currentExecutionPromise
.then(() => {
this.#executeAction(actionId, isStreaming);
})
.catch((error) => {
console.error('Action failed:', error);
}));
});
}

async #executeAction(actionId: string, isStreaming: boolean = false) {
Expand Down
14 changes: 11 additions & 3 deletions app/utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,10 @@ const getOllamaBaseUrl = () => {
};

async function getOllamaModels(): Promise<ModelInfo[]> {
if (typeof window === 'undefined') {
return [];
}

try {
const baseUrl = getOllamaBaseUrl();
const response = await fetch(`${baseUrl}/api/tags`);
Expand All @@ -294,8 +298,8 @@ async function getOllamaModels(): Promise<ModelInfo[]> {
provider: 'Ollama',
maxTokenAllowed: 8000,
}));
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (e) {
console.error('Error getting Ollama models:', e);
return [];
}
}
Expand All @@ -321,8 +325,8 @@ async function getOpenAILikeModels(): Promise<ModelInfo[]> {
label: model.id,
provider: 'OpenAILike',
}));
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (e) {
console.error('Error getting OpenAILike models:', e);
return [];
}
}
Expand Down Expand Up @@ -361,6 +365,10 @@ async function getOpenRouterModels(): Promise<ModelInfo[]> {
}

async function getLMStudioModels(): Promise<ModelInfo[]> {
if (typeof window === 'undefined') {
return [];
}

try {
const baseUrl = import.meta.env.LMSTUDIO_API_BASE_URL || 'http://localhost:1234';
const response = await fetch(`${baseUrl}/v1/models`);
Expand All @@ -371,8 +379,8 @@ async function getLMStudioModels(): Promise<ModelInfo[]> {
label: model.id,
provider: 'LMStudio',
}));
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (e) {
console.error('Error getting LMStudio models:', e);
return [];
}
}
Expand Down

0 comments on commit 574f0a0

Please sign in to comment.