Skip to content

Commit

Permalink
Fix retrieve tasks (#109)
Browse files Browse the repository at this point in the history
Co-authored-by: AceDataCloud <office@acedata.cloud>
  • Loading branch information
Germey and AceDataCloud committed Aug 16, 2024
1 parent 0831e3e commit acc9951
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix retrieve task issue",
"packageName": "@acedatacloud/nexior",
"email": "office@acedata.cloud",
"dependentChangeType": "patch"
}
2 changes: 1 addition & 1 deletion src/components/chat/Message.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ import MarkdownRenderer from '@/components/common/MarkdownRenderer.vue';
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
import { IApplication, IChatMessage, IChatMessageState } from '@/models';
import CopyToClipboard from '@/components/common/CopyToClipboard.vue';
import RestartToGenerate from '@/components/common/RestartToGenerate.vue';
import RestartToGenerate from './RestartToGenerate.vue';
import {
ERROR_CODE_API_ERROR,
ERROR_CODE_BAD_REQUEST,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ export default defineComponent({
</script>

<style lang="scss" scoped>
.icon-check,
.icon-copy {
.icon-sync {
margin-left: 5px;
cursor: pointer;
color: inherit;
Expand Down
4 changes: 3 additions & 1 deletion src/components/suno/task/Preview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
<p class="style">{{ audio?.style }}</p>
</div>
<div class="right">
<el-button size="small" round @click="onExtend($event, audio)">{{ $t('suno.button.extend') }}</el-button>
<el-button v-if="audio?.audio_url && audio?.video_url" size="small" round @click="onExtend($event, audio)">{{
$t('suno.button.extend')
}}</el-button>
<el-tooltip effect="dark" :content="$t('suno.button.download')" placement="top">
<font-awesome-icon
v-if="audio?.audio_url"
Expand Down
6 changes: 6 additions & 0 deletions src/operators/chat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class ChatOperator {
filter: {
ids?: string[];
applicationId?: string;
userId?: string;
},
options: IChatConversationOptions
): Promise<AxiosResponse<IChatConversationsResponse>> {
Expand All @@ -81,6 +82,11 @@ class ChatOperator {
? {
application_id: filter.applicationId
}
: {}),
...(filter.userId
? {
user_id: filter.userId
}
: {})
},
{
Expand Down
7 changes: 6 additions & 1 deletion src/operators/midjourney.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class MidjourneyOperator {
}

async tasks(
filter: { ids?: string[]; applicationId?: string; limit?: number; offset?: number },
filter: { ids?: string[]; applicationId?: string; userId?: string; limit?: number; offset?: number },
options: { token: string }
): Promise<AxiosResponse<IMidjourneyTasksResponse>> {
return await axios.post(
Expand All @@ -45,6 +45,11 @@ class MidjourneyOperator {
application_id: filter.applicationId
}
: {}),
...(filter.userId
? {
user_id: filter.userId
}
: {}),
...(filter.limit !== undefined
? {
limit: filter.limit
Expand Down
7 changes: 6 additions & 1 deletion src/operators/qrart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class QrartOperator {
}

async tasks(
filter: { ids?: string[]; applicationId?: string; limit?: number; offset?: number },
filter: { ids?: string[]; applicationId?: string; userId?: string; limit?: number; offset?: number },
options: { token: string }
): Promise<AxiosResponse<IQrartTasksResponse>> {
return await axios.post(
Expand All @@ -40,6 +40,11 @@ class QrartOperator {
application_id: filter.applicationId
}
: {}),
...(filter.userId
? {
user_id: filter.userId
}
: {}),
...(filter.limit !== undefined
? {
limit: filter.limit
Expand Down
7 changes: 6 additions & 1 deletion src/operators/suno.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SunoOperator {
}

async tasks(
filter: { ids?: string[]; applicationId?: string; limit?: number; offset?: number },
filter: { ids?: string[]; applicationId?: string; userId?: string; limit?: number; offset?: number },
options: { token: string }
): Promise<AxiosResponse<ISunoTasksResponse>> {
return await axios.post(
Expand All @@ -42,6 +42,11 @@ class SunoOperator {
ids: filter.ids
}
: {}),
...(filter.userId
? {
user_id: filter.userId
}
: {}),
...(filter.applicationId
? {
application_id: filter.applicationId
Expand Down
5 changes: 3 additions & 2 deletions src/store/chat/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ export const getApplications = async ({

export const getConversations = async ({
commit,
state
state,
rootState
}: ActionContext<IChatState, IRootState>): Promise<IChatConversation[]> => {
return new Promise((resolve, reject) => {
state.status.getConversations = Status.Request;
Expand All @@ -117,7 +118,7 @@ export const getConversations = async ({
chatOperator
.getConversations(
{
applicationId: state.application?.id
userId: rootState.user?.id
},
{
token
Expand Down
4 changes: 2 additions & 2 deletions src/store/midjourney/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export const getService = async ({ commit, state }: ActionContext<IMidjourneySta
};

export const getTasks = async (
{ commit, state }: ActionContext<IMidjourneyState, IRootState>,
{ commit, state, rootState }: ActionContext<IMidjourneyState, IRootState>,
{ offset, limit }: { offset?: number; limit?: number }
): Promise<IMidjourneyTasksResponse> => {
return new Promise((resolve, reject) => {
Expand All @@ -113,7 +113,7 @@ export const getTasks = async (
midjourneyOperator
.tasks(
{
applicationId: state.application?.id,
userId: rootState?.user?.id,
offset,
limit
},
Expand Down
4 changes: 2 additions & 2 deletions src/store/qrart/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export const getService = async ({ commit, state }: ActionContext<IQrartState, I
};

export const getTasks = async (
{ commit, state }: ActionContext<IQrartState, IRootState>,
{ commit, state, rootState }: ActionContext<IQrartState, IRootState>,
{ offset, limit }: { offset?: number; limit?: number }
): Promise<IQrartTask[]> => {
return new Promise((resolve, reject) => {
Expand All @@ -114,7 +114,7 @@ export const getTasks = async (
qrartOperator
.tasks(
{
applicationId: state.application?.id
userId: rootState?.user?.id
},
{
token
Expand Down
4 changes: 2 additions & 2 deletions src/store/suno/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const getService = async ({ commit, state }: ActionContext<ISunoState, IR
};

export const getTasks = async (
{ commit, state }: ActionContext<ISunoState, IRootState>,
{ commit, state, rootState }: ActionContext<ISunoState, IRootState>,
{ offset, limit }: { offset?: number; limit?: number }
): Promise<ISunoTask[]> => {
return new Promise((resolve, reject) => {
Expand All @@ -116,7 +116,7 @@ export const getTasks = async (
sunoOperator
.tasks(
{
applicationId: state.application?.id
userId: rootState?.user?.id
},
{
token
Expand Down

0 comments on commit acc9951

Please sign in to comment.