obsidian-plugin/logancyang_obsidian-copilot
1
0
Fork 0
mirror of https://github.com/logancyang/obsidian-copilot.git synced 2026-07-22 07:50:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[v2.4.7] Add gemini pro model (#225)

Browse source 
* Add gemino pro model and google api setting
This commit is contained in:
Logan Yang 2024-01-07 19:28:03 -08:00 committed by GitHub
parent b90a16533b
commit c74737bb95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 96 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifest.json
View file

@ -1,7 +1,7 @@
{
"id": "copilot",
"name": "Copilot",
"version": "2.4.6",
"version": "2.4.7",
"minAppVersion": "0.15.0",
"description": "A ChatGPT Copilot in Obsidian.",
"author": "Logan Yang",

31
package-lock.json generated
View file

@ -1,16 +1,17 @@
{
"name": "obsidian-copilot",
"version": "2.4.6",
"version": "2.4.7",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "obsidian-copilot",
"version": "2.4.6",
"version": "2.4.7",
"license": "AGPL-3.0",
"dependencies": {
"@huggingface/inference": "^1.8.0",
"@koa/cors": "^4.0.0",
"@langchain/google-genai": "^0.0.7",
"@tabler/icons-react": "^2.14.0",
"@types/pouchdb": "^6.4.0",
"axios": "^1.3.4",
@ -1197,6 +1198,14 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
"node_modules/@google/generative-ai": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/@google/generative-ai/-/generative-ai-0.1.3.tgz",
"integrity": "sha512-Cm4uJX1sKarpm1mje/MiOIinM7zdUUrQp/5/qGPAgznbdd/B9zup5ehT6c1qGqycFcSopTA1J1HpqHS5kJR8hQ==",
"engines": {
"node": ">=18.0.0"
}
},
"node_modules/@huggingface/inference": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/@huggingface/inference/-/inference-1.8.0.tgz",
@ -1805,9 +1814,9 @@
}
},
"node_modules/@langchain/core": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/@langchain/core/-/core-0.1.4.tgz",
"integrity": "sha512-Y3/mQLEiQ78ZbsTGYvPRj5bpvrhpTAcsbdyEtlYEvjMLbehEADfjQ41G9zc7U/emkrGtHRmxWO1ISmoeXeDmyQ==",
"version": "0.1.10",
"resolved": "https://registry.npmjs.org/@langchain/core/-/core-0.1.10.tgz",
"integrity": "sha512-vSFPtTkpQ9NT3qqvRh9FN4A16m89npj9KhzZgIh976bseMfI87jS+GK6Rih3qVcB8wsStqp80E5A36ce2egl8Q==",
"dependencies": {
"ansi-styles": "^5.0.0",
"camelcase": "6",
@ -1846,6 +1855,18 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/@langchain/google-genai": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/@langchain/google-genai/-/google-genai-0.0.7.tgz",
"integrity": "sha512-0VUrzVRS5PW/HhGVdTelDZd8DJVXdyLj2KqHpUNWdXNNMKaLVV6AY2nwqKLA3I4SV0VfOt1/XoZAgPIpQfn4Ow==",
"dependencies": {
"@google/generative-ai": "^0.1.0",
"@langchain/core": "~0.1.5"
},
"engines": {
"node": ">=18"
}
},
"node_modules/@langchain/openai": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.0.8.tgz",

3
package.json
View file

@ -1,6 +1,6 @@
{
"name": "obsidian-copilot",
"version": "2.4.6",
"version": "2.4.7",
"description": "ChatGPT integration for Obsidian",
"main": "main.js",
"scripts": {
@ -38,6 +38,7 @@
"dependencies": {
"@huggingface/inference": "^1.8.0",
"@koa/cors": "^4.0.0",
"@langchain/google-genai": "^0.0.7",
"@tabler/icons-react": "^2.14.0",
"@types/pouchdb": "^6.4.0",
"axios": "^1.3.4",

24
src/aiState.ts
View file

@ -10,6 +10,8 @@ import {
COHEREAI,
ChatModelDisplayNames,
DEFAULT_SYSTEM_PROMPT,
GOOGLE,
GOOGLE_MODELS,
HUGGINGFACE,
LOCALAI,
OPENAI,
@ -19,6 +21,7 @@ import {
import { ChatMessage } from '@/sharedState';
import { getModelName, isSupportedChain } from '@/utils';
import VectorDBManager, { MemoryVector } from '@/vectorDBManager';
import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
import {
BaseChain,
ConversationChain,
@ -62,6 +65,8 @@ interface ModelConfig {
azureOpenAIApiInstanceName?: string,
azureOpenAIApiDeploymentName?: string,
azureOpenAIApiVersion?: string,
// Google API key https://api.js.langchain.com/classes/langchain_google_genai.ChatGoogleGenerativeAI.html
apiKey?: string,
openAIProxyBaseUrl?: string,
localAIModel?: string,
}
@ -76,6 +81,7 @@ export interface LangChainParams {
azureOpenAIApiDeploymentName: string,
azureOpenAIApiVersion: string,
azureOpenAIApiEmbeddingDeploymentName: string,
googleApiKey?: string,
model: string,
modelDisplayName: string,
temperature: number,
@ -135,6 +141,7 @@ class AIState {
private static chatOpenAI: ChatOpenAI;
private static chatAnthropic: ChatAnthropic;
private static azureChatOpenAI: ChatOpenAI;
private static chatGoogleGenerativeAI: ChatGoogleGenerativeAI;
private static chain: BaseChain;
private static retrievalChain: RetrievalQAChain;
private static conversationalRetrievalChain: ConversationalRetrievalQAChain;
@ -207,6 +214,7 @@ class AIState {
temperature,
maxTokens,
openAIProxyBaseUrl,
googleApiKey,
localAIModel,
} = this.langChainParams;
@ -245,6 +253,11 @@ class AIState {
azureOpenAIApiVersion: azureOpenAIApiVersion,
};
break;
case GOOGLE:
config = {
...config,
apiKey: googleApiKey,
};
}
return config;
@ -288,6 +301,14 @@ class AIState {
};
}
for (const modelDisplayNameKey of GOOGLE_MODELS) {
modelMap[modelDisplayNameKey] = {
hasApiKey: Boolean(this.langChainParams.googleApiKey),
AIConstructor: ChatGoogleGenerativeAI,
vendor: GOOGLE,
};
}
this.modelMap = modelMap;
}
@ -396,6 +417,9 @@ class AIState {
case AZURE_OPENAI:
AIState.azureChatOpenAI = newModelInstance as ChatOpenAI;
break;
case GOOGLE:
AIState.chatGoogleGenerativeAI = newModelInstance as ChatGoogleGenerativeAI;
break;
}
AIState.chatModel = newModelInstance;

1
src/components/ChatComponents/ChatIcons.tsx
View file

@ -116,6 +116,7 @@ const ChatIcons: React.FC<ChatIconsProps> = ({
<option value={ChatModelDisplayNames.AZURE_GPT_35_TURBO_16K}>{ChatModelDisplayNames.AZURE_GPT_35_TURBO_16K}</option>
<option value={ChatModelDisplayNames.AZURE_GPT_4}>{ChatModelDisplayNames.AZURE_GPT_4}</option>
<option value={ChatModelDisplayNames.AZURE_GPT_4_32K}>{ChatModelDisplayNames.AZURE_GPT_4_32K}</option>
<option value={ChatModelDisplayNames.GEMINI_PRO}>{ChatModelDisplayNames.GEMINI_PRO}</option>
<option value={ChatModelDisplayNames.LOCAL_AI}>{ChatModelDisplayNames.LOCAL_AI}</option>
</select>
<span className="tooltip-text">Model Selection</span>

10
src/constants.ts
View file

@ -17,6 +17,7 @@ export enum ChatModels {
CLAUDE_INSTANT_1_100K = 'claude-instant-1-100k',
AZURE_GPT_35_TURBO = 'gpt-35-turbo',
AZURE_GPT_35_TURBO_16K = 'gpt-35-turbo-16k',
GEMINI_PRO = 'gemini-pro',
}
export enum ChatModelDisplayNames {
@ -33,6 +34,7 @@ export enum ChatModelDisplayNames {
AZURE_GPT_35_TURBO_16K = 'AZURE GPT-3.5-16K',
AZURE_GPT_4 = 'AZURE GPT-4',
AZURE_GPT_4_32K = 'AZURE GPT-4 32K',
GEMINI_PRO = 'GEMINI PRO',
LOCAL_AI = 'LocalAI',
}
@ -59,6 +61,10 @@ export const CLAUDE_MODELS = new Set([
ChatModelDisplayNames.CLAUDE_INSTANT_1_100K,
]);
export const GOOGLE_MODELS = new Set([
ChatModelDisplayNames.GEMINI_PRO,
]);
export const DISPLAY_NAME_TO_MODEL: Record<string, string> = {
[ChatModelDisplayNames.GPT_35_TURBO]: ChatModels.GPT_35_TURBO,
[ChatModelDisplayNames.GPT_35_TURBO_16K]: ChatModels.GPT_35_TURBO_16K,
@ -73,6 +79,7 @@ export const DISPLAY_NAME_TO_MODEL: Record<string, string> = {
[ChatModelDisplayNames.AZURE_GPT_35_TURBO_16K]: ChatModels.AZURE_GPT_35_TURBO_16K,
[ChatModelDisplayNames.AZURE_GPT_4]: ChatModels.GPT_4,
[ChatModelDisplayNames.AZURE_GPT_4_32K]: ChatModels.GPT_4_32K,
[ChatModelDisplayNames.GEMINI_PRO]: ChatModels.GEMINI_PRO,
};
// Model Providers
@ -81,12 +88,14 @@ export const HUGGINGFACE = 'huggingface';
export const COHEREAI = 'cohereai';
export const AZURE_OPENAI = 'azure_openai';
export const ANTHROPIC = 'anthropic';
export const GOOGLE = 'google';
export const LOCALAI = 'localai';
export const VENDOR_MODELS: Record<string, Set<string>> = {
[OPENAI]: OPENAI_MODELS,
[AZURE_OPENAI]: AZURE_MODELS,
[ANTHROPIC]: CLAUDE_MODELS,
[GOOGLE]: GOOGLE_MODELS,
};
// Embedding Models
@ -106,6 +115,7 @@ export const DEFAULT_SETTINGS: CopilotSettings = {
azureOpenAIApiDeploymentName: '',
azureOpenAIApiVersion: '',
azureOpenAIApiEmbeddingDeploymentName: '',
googleApiKey: '',
defaultModel: ChatModels.GPT_4_TURBO,
defaultModelDisplayName: ChatModelDisplayNames.GPT_4_TURBO,
temperature: 0.7,

3
src/main.ts
View file

@ -27,6 +27,7 @@ export interface CopilotSettings {
azureOpenAIApiDeploymentName: string;
azureOpenAIApiVersion: string;
azureOpenAIApiEmbeddingDeploymentName: string;
googleApiKey: string;
defaultModel: string;
defaultModelDisplayName: string;
temperature: number;
@ -482,6 +483,7 @@ export default class CopilotPlugin extends Plugin {
azureOpenAIApiDeploymentName,
azureOpenAIApiVersion,
azureOpenAIApiEmbeddingDeploymentName,
googleApiKey,
temperature,
maxTokens,
contextTurns,
@ -498,6 +500,7 @@ export default class CopilotPlugin extends Plugin {
azureOpenAIApiDeploymentName,
azureOpenAIApiVersion,
azureOpenAIApiEmbeddingDeploymentName,
googleApiKey,
localAIModel,
model: this.settings.defaultModel,
modelDisplayName: this.settings.defaultModelDisplayName,

27
src/settings.ts
View file

@ -85,6 +85,7 @@ export class CopilotSettingTab extends PluginSettingTab {
ChatModelDisplayNames.AZURE_GPT_35_TURBO_16K,
ChatModelDisplayNames.AZURE_GPT_4,
ChatModelDisplayNames.AZURE_GPT_4_32K,
ChatModelDisplayNames.GEMINI_PRO,
ChatModelDisplayNames.LOCAL_AI,
];
@ -205,6 +206,32 @@ export class CopilotSettingTab extends PluginSettingTab {
// }
// );
containerEl.createEl('h6', { text: 'Google Gemini API' });
new Setting(containerEl)
.setName("Your Google API key")
.setDesc(
createFragment((frag) => {
frag.appendText("If you have Google Cloud, you can get Gemini API key ");
frag.createEl('a', {
text: "here",
href: "https://makersuite.google.com/app/apikey"
});
})
)
.addText((text) => {
text.inputEl.type = "password";
text.inputEl.style.width = "100%";
text
.setPlaceholder("Google API key")
.setValue(this.plugin.settings.googleApiKey)
.onChange(async (value) => {
this.plugin.settings.googleApiKey = value;
await this.plugin.saveSettings();
})
}
);
containerEl.createEl('h6', { text: 'Azure OpenAI API' });
new Setting(containerEl)

3
versions.json
View file

@ -27,5 +27,6 @@
"2.4.3": "0.15.0",
"2.4.4": "0.15.0",
"2.4.5": "0.15.0",
"2.4.6": "0.15.0"
"2.4.6": "0.15.0",
"2.4.7": "0.15.0"
}