Refine chatdoc and base code interface (#2)

Co-authored-by: Germey <[email protected]>

change/@acedatacloud-hub-5d9432a5-29cd-4a38-8d5e-f28e83e7ca73.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix chatdoc issues",
+  "packageName": "@acedatacloud/hub",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

src/components/chatdoc/UploadDocument.vue

@@ -88,6 +88,7 @@ export default defineComponent({
           ElMessage.success(this.$t('chatdoc.message.createDocumentSuccess'));
           this.dialogVisible = false;
           this.$store.dispatch('chatdoc/getDocuments', { repositoryId: this.$route.params.repositoryId });
+          this.$store.dispatch('chatdoc/getApplication');
         })
         .catch(() => {
           ElMessage.error(this.$t('chatdoc.message.createDocumentError'));

src/components/common/Price.vue

@@ -1,8 +1,7 @@
 <template>
   <div class="price-text">
     <span v-if="price > 0" class="unfree"
-      >￥{{ price }} {{ unit ? ` / ${unit}` : '' }}{{ start ? $t('common.message.startPrice') : ''
-      }}{{ $t('common.message.startPrice') }}
+      >${{ price }} {{ unit ? ` / ${unit}` : '' }}{{ start ? $t('common.message.startPrice') : '' }}
     </span>
     <span v-else class="free">
       {{ $t('common.message.free') }}
@@ -12,7 +11,6 @@
 
 <script>
 import { defineComponent } from 'vue';
-
 export default defineComponent({
   name: 'ApiPrice',
   props: {

src/constants/action.ts

@@ -3,4 +3,3 @@ export const ACTION_UPDATE = 'update';
 export const ACTION_DELETE = 'delete';
 export const ACTION_RETRIEVE = 'retrieve';
 export const ACTION_RETRIEVE_BATCH = 'retrieve_batch';
-export const ACTION_RETRIEVE_ALL = 'retrieve_all';

src/i18n/zh/index.ts

@@ -9,9 +9,11 @@ import order from './order';
 import distribution from './distribution';
 import user from './user';
 import chatdoc from './chatdoc';
+import service from './service';
 
 export default {
   chat,
+  service,
   chatdoc,
   user,
   order,

src/i18n/zh/service/button.ts

@@ -0,0 +1,7 @@
+export default {
+  learnMore: 'Learn More',
+  apply: 'Apply Now',
+  introduction: 'Service Introduction',
+  apis: 'API Description',
+  pricing: 'Pricing'
+};

src/i18n/zh/service/field.ts

@@ -0,0 +1,6 @@
+export default {
+  price: 'Price',
+  introduction: 'Introduction',
+  apis: 'API',
+  proxies: 'Proxy'
+};

src/i18n/zh/service/index.ts

@@ -0,0 +1,13 @@
+import message from './message';
+import unit from './unit';
+import button from './button';
+import field from './field';
+import title from './title';
+
+export default {
+  message,
+  unit,
+  button,
+  field,
+  title
+};

src/i18n/zh/service/message.ts

@@ -0,0 +1,12 @@
+export default {
+  free: 'Free',
+  around: 'Around',
+  welcomeCredits: 'Welcome Credits',
+  appliedCount: 'Number of Applications',
+  indexTitle: 'Your smart choice for digital services',
+  indexSubtitle: 'Empower your work and life with standardized excellence in services.',
+  fromPrice: 'From ',
+  packages: 'We offer a variety of packages for credits, the more packages you buy, the more discounts you get.',
+  offer: 'Offer',
+  partnersTitle: 'Trusted by leading partners'
+};

src/i18n/zh/service/title.ts

@@ -0,0 +1,5 @@
+export default {
+  apis: 'API',
+  proxies: 'Proxy',
+  packages: 'Packages'
+};

src/i18n/zh/service/unit.ts

@@ -0,0 +1,12 @@
+export default {
+  credit: 'Credit',
+  Credit: 'Credit',
+  credits: 'Credits',
+  Credits: 'Credits',
+  call: 'Call',
+  Call: 'Call',
+  calls: 'Calls',
+  Calls: 'Calls',
+  MB: 'MB',
+  GB: 'GB'
+};

src/models/chatdoc.ts

@@ -15,17 +15,40 @@ export interface IChatdocRepository {
   conversations?: IChatdocConversation[];
 }
 
+export interface IChatdocRepositoryRequest extends IChatdocRepository {
+  action: typeof ACTION_CREATE | typeof ACTION_UPDATE | typeof ACTION_DELETE;
+}
+
+export interface IChatdocRepositoryResponse extends IChatdocRepository {}
+export type IChatdocRepositoriesResponse = {
+  items: IChatdocRepository[];
+  count: number;
+};
+
 export interface IChatdocDocument {
   id: string;
   repository_id: string;
   file_url: string;
   file_name: string;
 }
 
+export interface IChatdocDocumentRequest extends IChatdocDocument {
+  action: typeof ACTION_CREATE | typeof ACTION_UPDATE | typeof ACTION_DELETE;
+  callback_url?: string;
+}
+
+export interface IChatdocDocumentResponse extends IChatdocDocument {}
+
+export type IChatdocDocumentsResponse = {
+  items: IChatdocDocument[];
+  count: number;
+};
+
 export interface IChatdocConversation {
   id: string;
   repository_id: string;
   messages: IChatdocMessage[];
+  question: string;
   editing?: boolean;
   deleting?: boolean;
 }
@@ -44,36 +67,21 @@ export enum IChatdocMessageState {
   FAILED = 'failed'
 }
 
-export interface IChatdocChatRequest {
+export interface IChatdocConversationRequest {
+  id: string;
   repository_id: string;
-  messages: IChatdocMessage[];
+  question: string;
   temperature?: number;
   knowledge_fallback?: boolean;
 }
 
-export interface IChatdocDocumentRequest extends IChatdocDocument {
-  action: typeof ACTION_CREATE | typeof ACTION_UPDATE | typeof ACTION_DELETE;
-  callback_url?: string;
-}
-
-export interface IChatdocDocumentResponse extends IChatdocDocument {}
-
-export type IChatdocConversationsResponse = IChatdocConversation[];
-
-export interface IChatdocRepositoryRequest extends IChatdocRepository {
-  action: typeof ACTION_CREATE | typeof ACTION_UPDATE | typeof ACTION_DELETE;
-}
-
-export interface IChatdocRepositoryResponse extends IChatdocRepository {}
-export type IChatdocRepositoriesResponse = {
-  items: IChatdocRepository[];
+export type IChatdocConversationsResponse = {
+  items: IChatdocConversation[];
   count: number;
 };
-export type IChatdocDocumentsResponse = IChatdocDocument[];
 
-export interface IChatdocChatResponse {
+export interface IChatdocConversationResponse {
+  id: string;
   answer: string;
-  delta_answer: string;
-  repository_id?: string;
-  conversation_id?: string;
+  delta_answer?: string;
 }

src/operators/auth.ts

@@ -5,7 +5,7 @@ import { getBaseUrlAuth } from '@/utils';
 
 class AuthOperator {
   async refreshToken(payload: IToken): Promise<AxiosResponse<ITokenResponse>> {
-    return httpClient.post('/token/refresh/', payload);
+    return httpClient.post('/auth/refresh/', payload);
   }
 }
 

src/operators/chatdoc.ts

@@ -8,7 +8,7 @@ import {
   IChatdocRepositoriesResponse,
   IChatdocRepositoryResponse
 } from '@/models';
-import { ACTION_RETRIEVE_ALL, ACTION_UPDATE, BASE_URL_API } from '@/constants';
+import { ACTION_UPDATE, BASE_URL_API } from '@/constants';
 import { ACTION_CREATE, ACTION_DELETE, ACTION_RETRIEVE, ACTION_RETRIEVE_BATCH } from '@/constants';
 
 class ChatdocOperator {
@@ -77,7 +77,7 @@ class ChatdocOperator {
     return await axios.post(
       `/chatdoc/repositories`,
       {
-        action: ACTION_RETRIEVE_ALL
+        action: ACTION_RETRIEVE_BATCH
       },
       {
         headers: {
@@ -97,7 +97,7 @@ class ChatdocOperator {
     return await axios.post(
       `/chatdoc/documents`,
       {
-        action: ACTION_RETRIEVE_ALL,
+        action: ACTION_RETRIEVE_BATCH,
         repository_id: repositoryId
       },
       {
@@ -111,15 +111,19 @@ class ChatdocOperator {
     );
   }
 
-  async getAllConversations(repositoryId: string): Promise<AxiosResponse<IChatdocConversationsResponse>> {
+  async getAllConversations(
+    repositoryId: string,
+    options: { token: string }
+  ): Promise<AxiosResponse<IChatdocConversationsResponse>> {
     return await axios.post(
       `/chatdoc/conversations`,
       {
-        action: ACTION_RETRIEVE_ALL,
+        action: ACTION_RETRIEVE_BATCH,
         repository_id: repositoryId
       },
       {
         headers: {
+          authorization: `Bearer ${options.token}`,
           accept: 'application/json',
           'content-type': 'application/json'
         },
@@ -273,16 +277,16 @@ class ChatdocOperator {
     );
   }
 
-  async chat(
-    payload: { repositoryId: string; question: string; conversationId?: string; knowledgeFallback?: boolean },
+  async chatConversation(
+    payload: { repositoryId: string; question: string; id?: string; knowledgeFallback?: boolean },
     options: { token: string; stream: (response: IChatdocChatResponse) => void }
   ): Promise<AxiosResponse<IChatdocChatResponse>> {
     return await axios.post(
-      `/chatdoc/chat`,
+      `/chatdoc/conversations`,
       {
         repository_id: payload.repositoryId,
         question: payload.question,
-        conversation_id: payload.conversationId,
+        id: payload.id,
         stateful: true
       },
       {

src/operators/user.ts

@@ -10,25 +10,25 @@ export interface IInviteesQuery {
 
 class UserOperator {
   async getMe(): Promise<AxiosResponse<IUserDetailResponse>> {
-    return httpClient.get('/me');
+    return httpClient.get('/users/me');
   }
 
   async getInvitees(query: IInviteesQuery): Promise<AxiosResponse<IUserListResponse>> {
-    return httpClient.get('/me/invitees', {
+    return httpClient.get('/users/me/invitees', {
       params: query
     });
   }
 
   async updateMe(data: IUser): Promise<AxiosResponse<IUserDetailResponse>> {
-    return httpClient.put('/me', data);
+    return httpClient.put('/users/me', data);
   }
 
   async getVerify(): Promise<AxiosResponse<IUserDetailResponse>> {
-    return httpClient.get('/verify');
+    return httpClient.get('/users/verify');
   }
 
   async updateVerify(data: IUser): Promise<AxiosResponse<IUserDetailResponse>> {
-    return httpClient.put('/verify', data);
+    return httpClient.put('/users/verify', data);
   }
 }
 

src/pages/chatdoc/Conversation.vue

@@ -55,12 +55,12 @@ import { log } from '@/utils';
 import { ROUTE_CHATDOC_CONVERSATION } from '@/router';
 import axios from 'axios';
 import { isJSONString } from '@/utils/is';
-import { Status } from '@/models';
+import { IService, Status } from '@/models';
 import ApplicationStatus from '@/components/application/Status.vue';
-import { IChatdocChatResponse, IChatdocConversation, IChatdocMessageState, IChatdocRepository } from '@/models';
+import { IChatdocConversationResponse, IChatdocConversation, IChatdocMessageState, IChatdocRepository } from '@/models';
 
 export default defineComponent({
-  name: 'ChatdocChat',
+  name: 'ChatdocConversation',
   components: {
     Layout,
     Conversations,
@@ -92,7 +92,7 @@ export default defineComponent({
     repository(): IChatdocRepository | undefined {
       return this.$store.state?.chatdoc?.repositories?.find((repository) => repository.id === this.repositoryId);
     },
-    conversations() {
+    conversations(): IChatdocConversation[] | undefined {
       return this.repository?.conversations;
     },
     conversationId(): string | undefined {
@@ -107,29 +107,23 @@ export default defineComponent({
     initializing() {
       return this.$store.state.chatdoc.status.getApplication === Status.Request;
     },
-    service() {
+    service(): IService | undefined {
       return this.$store.state.chatdoc.service;
     }
   },
   async mounted() {
     console.log('start get conversations');
     this.loading = true;
-    this.$store
-      .dispatch('chatdoc/getConversations', { repositoryId: this.repositoryId })
-      .then(() => {
-        this.loading = false;
-      })
-      .catch(() => {
-        this.loading = false;
-      });
+    this.$store.dispatch('chatdoc/getConversations', { repositoryId: this.repositoryId }).finally(() => {
+      this.loading = false;
+    });
   },
   methods: {
     async onSubmit() {
       this.messages.push({
         content: this.question,
         role: ROLE_USER
       });
-      console.debug('onSubmit', this.question);
       await this.onFetchAnswer();
     },
     async onScrollDown() {
@@ -169,21 +163,21 @@ export default defineComponent({
       // request server to get answer
       this.answering = true;
       chatdocOperator
-        .chat(
+        .chatConversation(
           {
             repositoryId: this.repositoryId,
             question,
-            conversationId: this.conversationId
+            id: this.conversationId
           },
           {
             token,
-            stream: (response: IChatdocChatResponse) => {
+            stream: (response: IChatdocConversationResponse) => {
               this.messages[this.messages.length - 1] = {
                 role: ROLE_ASSISTANT,
                 content: response.answer,
                 state: IChatdocMessageState.ANSWERING
               };
-              conversationId = response.conversation_id;
+              conversationId = response.id;
               this.onScrollDown();
             }
           }