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

wip compute jobs

This commit is contained in:
Bogdan Fazakas 2022-03-08 01:13:36 +02:00
parent f1f1c17535
commit 95a65e784d
2 changed files with 59 additions and 68 deletions

View File

@ -8,7 +8,8 @@ import {
DDO, DDO,
Service, Service,
ProviderInstance, ProviderInstance,
ComputeEnvironment ComputeEnvironment,
ComputeJob
} from '@oceanprotocol/lib' } from '@oceanprotocol/lib'
import { CancelToken } from 'axios' import { CancelToken } from 'axios'
import { gql } from 'urql' import { gql } from 'urql'
@ -24,6 +25,7 @@ import { getOceanConfig } from './ocean'
import { SortTermOptions } from 'src/@types/aquarius/SearchQuery' import { SortTermOptions } from 'src/@types/aquarius/SearchQuery'
import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection' import { AssetSelectionAsset } from '@shared/FormFields/AssetSelection'
import { transformAssetToAssetSelection } from './assetConvertor' import { transformAssetToAssetSelection } from './assetConvertor'
import { AssetExtended } from 'src/@types/AssetExtended'
const getComputeOrders = gql` const getComputeOrders = gql`
query ComputeOrders($user: String!) { query ComputeOrders($user: String!) {
@ -321,75 +323,64 @@ function getServiceEndpoints(data: TokenOrder[], assets: Asset[]): string[] {
// return computeJobs // return computeJobs
// } // }
// function getDtList(data: TokenOrder[]): string[] { export async function getComputeJobs(
// const dtList = [] chainIds: number[],
accountId: string,
asset?: AssetExtended,
token?: CancelToken
): Promise<ComputeResults> {
if (!accountId) return
const assetDTAddress = asset.datatokens[0].address
const computeResult: ComputeResults = {
computeJobs: [],
isLoaded: false
}
let isLoading = true
const variables = assetDTAddress
? {
user: accountId.toLowerCase(),
datatokenAddress: assetDTAddress.toLowerCase()
}
: {
user: accountId.toLowerCase()
}
// for (let i = 0; i < data.length; i++) { const results = await fetchDataForMultipleChains(
// dtList.push(data[i].datatokenId.address) assetDTAddress ? getComputeOrdersByDatatokenAddress : getComputeOrders,
// } variables,
assetDTAddress ? [asset?.chainId] : chainIds
)
// return dtList let data: TokenOrder[] = results.map((result) =>
// } result.tokenOrders.forEach((tokenOrder: TokenOrder) => {
return tokenOrder
})
)
// export async function getComputeJobs( if (data.length === 0) {
// chainIds: number[], return computeResult
// account: Account, }
// ddo?: Asset,
// token?: CancelToken
// ): Promise<ComputeResults> {
// const assetDTAddress = ddo?.dataTokenInfo?.address
// let computeResult: ComputeResults = {
// computeJobs: [],
// isLoaded: false
// }
// let isLoading = true
// const variables = assetDTAddress
// ? {
// user: account?.getId().toLowerCase(),
// datatokenAddress: assetDTAddress.toLowerCase()
// }
// : {
// user: account?.getId().toLowerCase()
// }
// const result = await fetchDataForMultipleChains( data = data.sort((a, b) => b.timestamp - a.timestamp)
// assetDTAddress ? getComputeOrdersByDatatokenAddress : getComputeOrders, const queryDtList = data.map((tokenOrder) => tokenOrder.datatokenId.address)
// variables, if (!queryDtList) return
// assetDTAddress ? [ddo?.chainId] : chainIds
// )
// let data: TokenOrder[] = []
// for (let i = 0; i < result.length; i++) {
// if (!result[i]?.tokenOrders || result[i].tokenOrders.length === 0) continue
// result[i]?.tokenOrders.forEach((tokenOrder: TokenOrder) => {
// data.push(tokenOrder)
// })
// }
// if (!ocean || !account || !data) return
// if (data.length === 0) { const assets = await getAssetMetadata(queryDtList, token, chainIds)
// return computeResult const serviceEndpoints = getServiceEndpoints(data, assets)
// } // const providers: Provider[] = await getProviders(
// serviceEndpoints,
// config,
// ocean
// )
// const computeJobs = await getJobs(providers, account, assets)
isLoading = false
// computeResult = {
// computeJobs: computeJobs,
// isLoaded: isLoading
// }
// data = data.sort((a, b) => b.timestamp - a.timestamp) return computeResult
// const queryDtList = getDtList(data) }
// if (!queryDtList) return
// const assets = await getAssetMetadata(queryDtList, token, chainIds)
// const serviceEndpoints = getServiceEndpoints(data, assets)
// const providers: Provider[] = await getProviders(
// serviceEndpoints,
// config,
// ocean
// )
// const computeJobs = await getJobs(providers, account, assets)
// isLoading = false
// computeResult = {
// computeJobs: computeJobs,
// isLoaded: isLoading
// }
// return computeResult
// }
export async function createTrustedAlgorithmList( export async function createTrustedAlgorithmList(
selectedAlgorithms: string[], // list of DIDs, selectedAlgorithms: string[], // list of DIDs,

View File

@ -10,7 +10,7 @@ import Details from './Details'
import Refresh from '@images/refresh.svg' import Refresh from '@images/refresh.svg'
import { useUserPreferences } from '@context/UserPreferences' import { useUserPreferences } from '@context/UserPreferences'
import NetworkName from '@shared/NetworkName' import NetworkName from '@shared/NetworkName'
// import { getComputeJobs } from '@utils/compute' import { getComputeJobs } from '@utils/compute'
import styles from './index.module.css' import styles from './index.module.css'
import { useAsset } from '@context/Asset' import { useAsset } from '@context/Asset'
import { useIsMounted } from '@hooks/useIsMounted' import { useIsMounted } from '@hooks/useIsMounted'
@ -90,9 +90,9 @@ export default function ComputeJobs({
} }
try { try {
setIsLoading(true) setIsLoading(true)
// const jobs = await getComputeJobs(chainIds, accountId, ddo) const jobs = await getComputeJobs(chainIds, accountId, asset)
// isMounted() && setJobs(jobs.computeJobs) isMounted() && setJobs(jobs.computeJobs)
// setIsLoading(jobs.isLoaded) setIsLoading(jobs.isLoaded)
} catch (error) { } catch (error) {
LoggerInstance.error(error.message) LoggerInstance.error(error.message)
} }