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 named OpenAI import problem for Demos #28544

Merged
merged 1 commit into from
Dec 12, 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 @@ -13,7 +13,7 @@ import {
import { Observable } from 'rxjs';
import { AppService } from './app.service';
import { loadMessages } from 'devextreme/localization';
import { DataSource } from 'devextreme/common/data';
import DataSource from 'devextreme/data/data_source';

if (!/localhost/.test(document.location.host)) {
enableProdMode();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import {
Alert,
MessageEnteredEvent
} from 'devextreme/ui/chat';
import { DataSource, CustomStore } from 'devextreme/common/data';
import DataSource from 'devextreme/data/data_source';
import CustomStore from 'devextreme/data/custom_store';

@Injectable({
providedIn: 'root',
Expand All @@ -26,7 +27,7 @@ export class AppService {
endpoint: 'https://public-api.devexpress.com/demo-openai',
apiKey: 'DEMO',
}

REGENERATION_TEXT = 'Regeneration...';
ALERT_TIMEOUT = 1000 * 60;

Expand Down Expand Up @@ -95,7 +96,7 @@ export class AppService {
});
},
});

this.dataSource = new DataSource({
store: this.customStore,
paginate: false,
Expand All @@ -109,17 +110,17 @@ export class AppService {
max_tokens: 1000,
temperature: 0.7,
};

const response = await this.chatService.chat.completions.create(params);
const data = { choices: response.choices };

return data.choices[0].message?.content;
}

async processMessageSending(message, event) {
this.messages.push({ role: 'user', content: message.text });
this.typingUsersSubject.next([this.assistant]);

try {
const aiResponse = await this.getAIResponse(this.messages);

Expand All @@ -138,7 +139,7 @@ export class AppService {
updateLastMessage(text = this.REGENERATION_TEXT) {
const items = this.dataSource.items();
const lastMessage = items.at(-1);

this.dataSource.store().push([{
type: 'update',
key: lastMessage.id,
Expand All @@ -161,7 +162,7 @@ export class AppService {
this.setAlerts([{
message: 'Request limit reached, try again in a minute.'
}]);

setTimeout(() => {
this.setAlerts([]);
}, this.ALERT_TIMEOUT);
Expand Down Expand Up @@ -194,7 +195,7 @@ export class AppService {

return result;
}

async onMessageEntered({ message, event }: MessageEnteredEvent) {
this.dataSource.store().push([{ type: 'insert', data: { id: Date.now(), ...message } }]);

Expand Down
8 changes: 4 additions & 4 deletions apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@message-entered="onMessageEntered($event)"
>
<template #message="{ data }">
<span
<span
v-if="data.message.text === REGENERATION_TEXT"
>
{{ REGENERATION_TEXT }}
Expand Down Expand Up @@ -53,7 +53,7 @@ import { ref, onBeforeMount } from 'vue';
import DxChat from 'devextreme-vue/chat';
import DxButton from 'devextreme-vue/button';
import { loadMessages } from 'devextreme/localization';
import openai from 'openai';
import { AzureOpenAI } from 'openai';
import {
dictionary,
messages,
Expand All @@ -66,7 +66,7 @@ import {
ALERT_TIMEOUT,
} from './data.ts';

const chatService = new openai.AzureOpenAI(AzureOpenAIConfig);
const chatService = new AzureOpenAI(AzureOpenAIConfig);

const typingUsers = ref([]);
const alerts = ref([]);
Expand Down Expand Up @@ -150,7 +150,7 @@ function alertLimitReached() {
alerts.value = [{
message: 'Request limit reached, try again in a minute.'
}];

setTimeout(() => {
alerts.value = [];
}, ALERT_TIMEOUT);
Expand Down
3 changes: 3 additions & 0 deletions apps/demos/configs/Angular/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ window.config = {
'@angular/forms': {
'esModule': true,
},
'openai': {
'esModule': true,
},
},
paths: {
'npm:': '../../../../node_modules/',
Expand Down
3 changes: 3 additions & 0 deletions apps/demos/configs/React/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ window.config = {
'esModule': true,
},
/**/
'openai': {
'esModule': true,
},
},
paths: {
'npm:': '../../../../node_modules/',
Expand Down
3 changes: 3 additions & 0 deletions apps/demos/configs/ReactJs/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ window.config = {
'esModule': true,
},
/**/
'openai': {
'esModule': true,
},
},
paths: {
'npm:': '../../../node_modules/',
Expand Down
3 changes: 3 additions & 0 deletions apps/demos/configs/Vue/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ window.config = {
'esModule': true,
},
/**/
'openai': {
'esModule': true,
},
},
paths: {
'project:': '../../../../',
Expand Down
Loading