Merge branch 'main' into fix/start-new-chat-icon

dustinwloring1988 · web-flow · commit 4980a9a33c83 · 2024-12-13T13:57:02.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,6 @@ modelfiles
 
 # docs ignore
 site
+
+# commit file ignore
+app/commit.json
diff --git a/app/commit.json b/app/commit.json
@@ -1 +1 @@
-{ "commit": "1764145ba4cd8a4cf10f4dc89ac9abf6fd1a00fd" }
+{ "commit": "1d64a15ed0110fc62091b1dca90139de9fb9fdb4" }
diff --git a/app/utils/constants.ts b/app/utils/constants.ts
@@ -462,9 +462,6 @@ async function getOpenRouterModels(): Promise<ModelInfo[]> {
 }
 
 async function getLMStudioModels(_apiKeys?: Record<string, string>, settings?: IProviderSetting): Promise<ModelInfo[]> {
-  if (typeof window === 'undefined') {
-    return [];
-  }
 
   try {
     const baseUrl = settings?.baseUrl || import.meta.env.LMSTUDIO_API_BASE_URL || 'http://localhost:1234';

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "commit": "1764145ba4cd8a4cf10f4dc89ac9abf6fd1a00fd" }`
	`1`	`+{ "commit": "1d64a15ed0110fc62091b1dca90139de9fb9fdb4" }`
Original file line number	Diff line number	Diff line change
`@@ -462,9 +462,6 @@ async function getOpenRouterModels(): Promise<ModelInfo[]> {`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`async function getLMStudioModels(_apiKeys?: Record<string, string>, settings?: IProviderSetting): Promise<ModelInfo[]> {`
`465`		`- if (typeof window === 'undefined') {`
`466`		`- return [];`
`467`		`- }`
`468`	`465`
`469`	`466`	`try {`
`470`	`467`	`const baseUrl = settings?.baseUrl \|\| import.meta.env.LMSTUDIO_API_BASE_URL \|\| 'http://localhost:1234';`