@ -124,7 +124,6 @@ export class AiService {
broker , broker ,
rows , rows ,
accounts : user.accounts , accounts : user.accounts ,
subscription : user.subscription ,
userCurrency : user.settings.settings.baseCurrency , userCurrency : user.settings.settings.baseCurrency ,
userId : user.id userId : user.id
} ) ; } ) ;
@ -152,7 +151,6 @@ export class AiService {
accounts , accounts ,
broker , broker ,
rows , rows ,
subscription ,
userCurrency , userCurrency ,
userId userId
} : { } : {
@ -160,7 +158,6 @@ export class AiService {
accounts : AccountToMatch [ ] ; accounts : AccountToMatch [ ] ;
broker? : string ; broker? : string ;
rows : ActivityRow [ ] ; rows : ActivityRow [ ] ;
subscription? : UserWithSettings [ 'subscription' ] ;
userCurrency : string ; userCurrency : string ;
userId : string ; userId : string ;
} ) { } ) {
@ -211,7 +208,6 @@ export class AiService {
abortSignal , abortSignal ,
accountHints , accountHints ,
assets , assets ,
subscription ,
userId userId
} ) } )
: { accounts : [ ] , assets : [ ] } ; : { accounts : [ ] , assets : [ ] } ;
@ -524,15 +520,9 @@ export class AiService {
/ * * / * *
* Gives the holdings of the user with the tool get - portfolio of the server * Gives the holdings of the user with the tool get - portfolio of the server
* of the Model Context Protocol , without the holdings whose data source the * of the Model Context Protocol , without the holdings whose data source the
* import refuses for the user * import refuses
* / * /
private async getHoldingsToMatch ( { private async getHoldingsToMatch ( { userId } : { userId : string } ) {
subscription ,
userId
} : {
subscription? : UserWithSettings [ 'subscription' ] ;
userId : string ;
} ) {
const [ { content } , dataSources ] = await Promise . all ( [ const [ { content } , dataSources ] = await Promise . all ( [
this . mcpService . getPortfolio ( { userId , withValues : false } ) , this . mcpService . getPortfolio ( { userId , withValues : false } ) ,
this . dataProviderService . getDataSources ( ) this . dataProviderService . getDataSources ( )
@ -540,11 +530,7 @@ export class AiService {
return this . getHoldingsFromTable ( content [ 0 ] . text ) . filter ( return this . getHoldingsFromTable ( content [ 0 ] . text ) . filter (
( { dataSource } ) = > { ( { dataSource } ) = > {
return this . isValidDataSourceForImport ( { return this . isValidDataSourceForImport ( { dataSource , dataSources } ) ;
dataSource ,
dataSources ,
subscription
} ) ;
} }
) ; ) ;
} }
@ -608,8 +594,8 @@ export class AiService {
* symbol only . The holdings let the model select an asset profile which the * symbol only . The holdings let the model select an asset profile which the
* user already has , also if no search gives it , for example as no data * user already has , also if no search gives it , for example as no data
* provider finds its ISIN . A holding whose data source the import refuses * provider finds its ISIN . A holding whose data source the import refuses
* for the user is not given to the model , so that the model selects an * is not given to the model , so that the model selects an asset profile of
* asset profile of the search instead and the whole import does not fail . * the search instead and the whole import does not fail .
* If get - accounts fails , the model gets no accounts , so that only the * If get - accounts fails , the model gets no accounts , so that only the
* account hints have no match . If get - portfolio or the data sources fail , * account hints have no match . If get - portfolio or the data sources fail ,
* the model gets no holdings . The reasoning is disabled , as it can add * the model gets no holdings . The reasoning is disabled , as it can add
@ -625,13 +611,11 @@ export class AiService {
abortSignal , abortSignal ,
accountHints , accountHints ,
assets , assets ,
subscription ,
userId userId
} : { } : {
abortSignal? : AbortSignal ; abortSignal? : AbortSignal ;
accountHints : AccountHint [ ] ; accountHints : AccountHint [ ] ;
assets : AssetToMatch [ ] ; assets : AssetToMatch [ ] ;
subscription? : UserWithSettings [ 'subscription' ] ;
userId : string ; userId : string ;
} ) { } ) {
const startTime = performance . now ( ) ; const startTime = performance . now ( ) ;
@ -650,7 +634,7 @@ export class AiService {
} ) } )
: undefined , : undefined ,
assets . length > 0 assets . length > 0
? this . getHoldingsToMatch ( { subscription , userId } ) . catch ( ? this . getHoldingsToMatch ( { userId } ) . catch (
( error : Error ) : undefined = > { ( error : Error ) : undefined = > {
this . logger . warn ( ` Could not get the holdings: ${ error . message } ` ) ; this . logger . warn ( ` Could not get the holdings: ${ error . message } ` ) ;
@ -751,31 +735,24 @@ export class AiService {
/ * * / * *
* Checks without a request to a data provider if the import takes a data * Checks without a request to a data provider if the import takes a data
* source for the user : it is configured and does not require Ghostfolio * source of a holding : it is configured . The data source is first
* Premium , for example after the Premium subscription has expired . The data * transformed as POST api / v1 / import transforms it . A data source which
* source is first transformed as POST api / v1 / import transforms it . A symbol * requires Ghostfolio Premium is taken , as the import takes it for an asset
* which the data source cannot resolve , for example a delisted one , is not * profile which the user already has . A symbol which the data source cannot
* found , as this needs a request to the data provider . * resolve , for example a delisted one , is not found , as this needs a
* request to the data provider .
* / * /
private isValidDataSourceForImport ( { private isValidDataSourceForImport ( {
dataSource , dataSource ,
dataSources , dataSources
subscription
} : { } : {
dataSource : string ; dataSource : string ;
dataSources : DataSource [ ] ; dataSources : DataSource [ ] ;
subscription? : UserWithSettings [ 'subscription' ] ;
} ) { } ) {
const dataSourceOfImport = transformDataSourceInRequest ( { return dataSources . includes (
transformDataSourceInRequest ( {
dataSource , dataSource ,
configurationService : this.configurationService configurationService : this.configurationService
} ) ;
return (
dataSources . includes ( dataSourceOfImport ) &&
! this . dataProviderService . isPremiumRequired ( {
subscription ,
dataSource : dataSourceOfImport
} ) } )
) ; ) ;
} }
Thomas Kaul
4 days ago
GitHub