Skip to content
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

fix(prompt-cell): adapt to the api of libro-server #47

Merged
merged 1 commit into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export class FormatterPromptMagicContribution

encode = (source: PromptDecodedFormatter) => {
const promptObj = {
model_name: source.modelType || 'CodeGPT',
model_name: source.modelType || 'chatgpt',
prompt: source.value,
};
const encodeValue = `%%prompt \n${JSON.stringify(promptObj)}`;
Expand Down
2 changes: 2 additions & 0 deletions packages/libro-prompt-cell/src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ import { PromptCellContribution } from './prompt-cell-contribution.js';
import { LibroPromptCellModel } from './prompt-cell-model.js';
import { LibroPromptOutputArea } from './prompt-cell-output-area.js';
import { LibroPromptCellModelFactory } from './prompt-cell-protocol.js';
import { PromptScript } from './prompt-cell-script.js';
import { LibroPromptCellView } from './prompt-cell-view.js';
import { LibroPromptOutputMimeTypeContribution } from './prompt-output-rendermime-contribution.js';

export const LibroPromptCellModule = ManaModule.create()
.register(
PromptCellContribution,
PromptScript,
LibroPromptCellView,
LibroPromptCellModel,
LibroPromptOutputArea,
Expand Down
9 changes: 6 additions & 3 deletions packages/libro-prompt-cell/src/prompt-cell-script.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
export namespace PromptScript {
export const get_models =
'import json\nfrom aistudio_notebook.prompt_flow import prompt_model_registry\nmodel_list = list(prompt_model_registry.promptModelRegistry.get_models().keys())\nmodel_data = json.dumps(model_list)\nprint(model_data)\n';
import { singleton } from '@difizen/mana-app';

@singleton()
export class PromptScript {
public readonly toList = `from libro_server import chat_provider
chat_provider.dump_list_json()`;
}
82 changes: 51 additions & 31 deletions packages/libro-prompt-cell/src/prompt-cell-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,40 @@ import {
watch,
} from '@difizen/mana-app';
import { Deferred } from '@difizen/mana-app';
import { Select } from 'antd';
import { Select, Tag } from 'antd';
import React, { useEffect, useState } from 'react';

import type { LibroPromptCellModel } from './prompt-cell-model.js';
import { PromptScript } from './prompt-cell-script.js';

export interface IModelSelectionItem {
value: string;
label: string;
}
export interface IModelItem {
value: string;
export interface IChatSelectionItem {
name: string;
type: string;
}

const SelectionItemLabel: React.FC<{ item: IChatSelectionItem }> = (props: {
item: IChatSelectionItem;
}) => {
const item = props.item;
const colorMap: Record<string, any> = {
VARIABLE: 'red',
LLM: 'blue',
API: 'green',
CUSTOM: undefined,
};

return (
<span className="libro-prompt-cell-selection-label">
<Tag
color={colorMap[item.type] || undefined}
className="libro-prompt-cell-header-selection-type"
>
{item.type}
</Tag>
<span className="libro-prompt-cell-header-selection-name">{item.name}</span>
</span>
);
};
const CellEditor: React.FC = () => {
const instance = useInject<LibroPromptCellView>(ViewInstance);
useEffect(() => {
Expand All @@ -66,15 +86,12 @@ const PropmtEditorViewComponent = React.forwardRef<HTMLDivElement>(
const [selectedModel, setSelectedModel] = useState<string>('暂无内置模型');
useEffect(() => {
instance
.fetch(
{ code: PromptScript.get_models, store_history: false },
instance.handleQueryResponse,
)
.updateChatList()
.then(() => {
const len = instance.modelSelection.length;
const len = instance.selection.length;
if (len > 0) {
instance.model.decodeObject = {
modelType: instance.modelSelection[len - 1].label,
modelType: instance.selection[len - 1].name,
...instance.model.decodeObject,
};
setSelectedModel(instance.model.decodeObject['modelType']);
Expand Down Expand Up @@ -111,13 +128,10 @@ const PropmtEditorViewComponent = React.forwardRef<HTMLDivElement>(
value={selectedModel}
style={{ width: 160 }}
onChange={handleChange}
options={instance.modelSelection}
options={instance.selection.map(instance.toSelectionOption)}
bordered={false}
onFocus={async () => {
await instance.fetch(
{ code: PromptScript.get_models, store_history: false },
instance.handleQueryResponse,
);
await instance.updateChatList();
}}
/>
</div>
Expand All @@ -136,11 +150,12 @@ export class LibroPromptCellView extends LibroExecutableCellView {
declare model: LibroPromptCellModel;

@prop()
modelSelection: IModelSelectionItem[] = [];
selection: IChatSelectionItem[] = [];

viewManager: ViewManager;

codeEditorManager: CodeEditorManager;
@inject(CodeEditorManager) codeEditorManager: CodeEditorManager;
@inject(PromptScript) promptScript: PromptScript;

outputs: IOutput[];

Expand All @@ -165,13 +180,11 @@ export class LibroPromptCellView extends LibroExecutableCellView {
@inject(CellService) cellService: CellService,
@inject(ViewManager) viewManager: ViewManager,
@inject(LibroViewTracker) libroViewTracker: LibroViewTracker,
@inject(CodeEditorManager) codeEditorManager: CodeEditorManager,
) {
super(options, cellService);
this.options = options;
this.viewManager = viewManager;
this.className = this.className + ' prompt';
this.codeEditorManager = codeEditorManager;

this.outputs = options.cell?.outputs as IOutput[];
this.libroViewTracker = libroViewTracker;
Expand Down Expand Up @@ -421,6 +434,20 @@ export class LibroPromptCellView extends LibroExecutableCellView {
return future.done as Promise<KernelMessage.IExecuteReplyMsg>;
};

updateChatList = async () => {
return this.fetch(
{ code: this.promptScript.toList, store_history: false },
this.handleQueryResponse,
);
};

toSelectionOption = (item: IChatSelectionItem) => {
return {
value: item.name,
label: <SelectionItemLabel item={item} />,
};
};

handleQueryResponse = (response: KernelMessage.IIOPubMessage) => {
const msgType = response.header.msg_type;
switch (msgType) {
Expand All @@ -432,10 +459,7 @@ export class LibroPromptCellView extends LibroExecutableCellView {
content = content.replace(/\\"/g, '"').replace(/\\'/g, "'");
}

const update = JSON.parse(content) as string[];
this.modelSelection = update.map((item) => {
return { value: item, label: item };
});
this.selection = JSON.parse(content) as IChatSelectionItem[];
break;
}
case 'stream': {
Expand All @@ -446,11 +470,7 @@ export class LibroPromptCellView extends LibroExecutableCellView {
contentStream = contentStream.replace(/\\"/g, '"').replace(/\\'/g, "'");
}

const updateStream = JSON.parse(contentStream) as string[];

this.modelSelection = updateStream.map((item) => {
return { value: item, label: item };
});
this.selection = JSON.parse(contentStream) as IChatSelectionItem[];
break;
}
default:
Expand Down