1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00

fix aquarius call and added logs

This commit is contained in:
Bogdan Fazakas 2022-03-21 11:10:09 +02:00
parent a1abc9cff0
commit 51b882f256
2 changed files with 33 additions and 8 deletions

View File

@ -74,15 +74,14 @@ async function getAssetMetadata(
const baseQueryparams = { const baseQueryparams = {
chainIds, chainIds,
filters: [ filters: [
getFilterTerm('datatokens', queryDtList), getFilterTerm('services.datatokenAddress', queryDtList),
getFilterTerm('service.type', 'compute'), getFilterTerm('services.type', 'compute'),
getFilterTerm('metadata.type', 'dataset') getFilterTerm('metadata.type', 'dataset')
], ],
ignorePurgatory: true ignorePurgatory: true
} as BaseQueryParams } as BaseQueryParams
const query = generateBaseQuery(baseQueryparams) const query = generateBaseQuery(baseQueryparams)
const result = await queryMetadata(query, cancelToken) const result = await queryMetadata(query, cancelToken)
return result?.results return result?.results
} }
@ -214,18 +213,25 @@ async function getJobs(
accountId: string, accountId: string,
assets: Asset[] assets: Asset[]
): Promise<ComputeJobMetaData[]> { ): Promise<ComputeJobMetaData[]> {
console.log('compute.ts getJobs providerUrls:', providerUrls)
const computeJobs: ComputeJobMetaData[] = [] const computeJobs: ComputeJobMetaData[] = []
console.log('compute.ts getJobs assets:', providerUrls)
providerUrls.forEach(async (providerUrl) => { providerUrls.forEach(async (providerUrl) => {
try { try {
const providerComputeJobs = (await ProviderInstance.computeStatus( const providerComputeJobs = (await ProviderInstance.computeStatus(
providerUrl, providerUrl,
null, null,
null, null,
null, assets[0].id,
accountId accountId
)) as ComputeJob[] )) as ComputeJob[]
if (!providerComputeJobs) { console.log(
'compute.ts getJobs providerComputeJobs:',
providerComputeJobs
)
if (providerComputeJobs) {
providerComputeJobs.sort((a, b) => { providerComputeJobs.sort((a, b) => {
if (a.dateCreated > b.dateCreated) { if (a.dateCreated > b.dateCreated) {
return -1 return -1
@ -235,10 +241,18 @@ async function getJobs(
} }
return 0 return 0
}) })
console.log(
'compute.ts getJobs providerComputeJobs sorted:',
providerComputeJobs
)
providerComputeJobs.forEach((job) => { providerComputeJobs.forEach((job) => {
const did = job.inputDID[0] const did = job.inputDID[0]
const asset = assets.filter((x) => x.id === did)[0] const asset = assets.filter((x) => x.id === did)[0]
console.log('compute.ts getJobs did:', providerComputeJobs)
console.log('compute.ts getJobs asset:', asset)
if (!asset) { if (!asset) {
const compJob: ComputeJobMetaData = { const compJob: ComputeJobMetaData = {
...job, ...job,
@ -251,6 +265,7 @@ async function getJobs(
}) })
} }
} catch (err) { } catch (err) {
console.log('compute.ts getJobs err:', err)
LoggerInstance.error(err.message) LoggerInstance.error(err.message)
} }
}) })
@ -277,21 +292,21 @@ export async function getComputeJobs(
user: accountId.toLowerCase() user: accountId.toLowerCase()
} }
console.log(' getComputeJobs variables ', variables) console.log('compute.ts getComputeJobs variables: ', variables)
const results = await fetchDataForMultipleChains( const results = await fetchDataForMultipleChains(
assetDTAddress ? getComputeOrdersByDatatokenAddress : getComputeOrders, assetDTAddress ? getComputeOrdersByDatatokenAddress : getComputeOrders,
variables, variables,
assetDTAddress ? [asset?.chainId] : chainIds assetDTAddress ? [asset?.chainId] : chainIds
) )
console.log(' getComputeJobs results getComputeOrders', results) console.log('compute.ts getComputeJobs results getComputeOrders:', results)
let tokenOrders: TokenOrder[] = [] let tokenOrders: TokenOrder[] = []
results.map((result) => { results.map((result) => {
result.orders.forEach((tokenOrder: TokenOrder) => result.orders.forEach((tokenOrder: TokenOrder) =>
tokenOrders.push(tokenOrder) tokenOrders.push(tokenOrder)
) )
}) })
console.log(' getComputeJobs tokenOrders ', tokenOrders) console.log('compute.ts getComputeJobs tokenOrders:', tokenOrders)
if (tokenOrders.length === 0) { if (tokenOrders.length === 0) {
return computeResult return computeResult
} }
@ -299,6 +314,8 @@ export async function getComputeJobs(
tokenOrders = tokenOrders.sort( tokenOrders = tokenOrders.sort(
(a, b) => b.createdTimestamp - a.createdTimestamp (a, b) => b.createdTimestamp - a.createdTimestamp
) )
console.log('compute.ts getComputeJobs tokenOrders sorted:', tokenOrders)
const datatokenAddressList = tokenOrders.map( const datatokenAddressList = tokenOrders.map(
(tokenOrder: TokenOrder) => tokenOrder.datatoken.address (tokenOrder: TokenOrder) => tokenOrder.datatoken.address
) )
@ -310,11 +327,18 @@ export async function getComputeJobs(
chainIds chainIds
) )
console.log('compute.ts assets:', assets)
const providerUrls: string[] = [] const providerUrls: string[] = []
assets.forEach((asset: Asset) => assets.forEach((asset: Asset) =>
providerUrls.push(asset.services[0].serviceEndpoint) providerUrls.push(asset.services[0].serviceEndpoint)
) )
console.log('compute.ts providerUrls:', providerUrls)
computeResult.computeJobs = await getJobs(providerUrls, accountId, assets) computeResult.computeJobs = await getJobs(providerUrls, accountId, assets)
console.log(
'compute.ts computeResult.computeJobs:',
computeResult.computeJobs
)
computeResult.isLoaded = true computeResult.isLoaded = true
return computeResult return computeResult

View File

@ -98,6 +98,7 @@ export default function ComputeJobs({
asset, asset,
newCancelToken() newCancelToken()
) )
console.log('computeJobs index jobs: ', jobs)
isMounted() && setJobs(jobs.computeJobs) isMounted() && setJobs(jobs.computeJobs)
setIsLoading(!jobs.isLoaded) setIsLoading(!jobs.isLoaded)
} catch (error) { } catch (error) {