codeql python query for call hierarchy of a site-package function from repository source code

[noamilshtein]

Hi all,
I'm trying to get the call hierarchy of prepare_data function called by send function of websockets site-package
where websockets.send() is called from my repository source code (in my_client.py).
the query below returns calls to prepare_data from send and broadcast functions (defined in websockets site-package) but i would like to get only the calls tracing back to my_client.py, meaning i don't wish to get a result for broadcast function.

import python

predicate calls(CallNode call, Value val, Scope scope) {
  val.getACall() = call and
  (
    scope = val.(CallableValue).getScope()
    or
    scope = val.(ClassValue).getScope()
  ) 
  or
  exists(CallNode otherCall, Value otherVal, Scope otherScope |
    calls(otherCall, otherVal, otherScope) and
    otherCall.getFunction() = call.getFunction() and
    otherVal = val and
    otherScope = scope
  )
}

from CallNode call, Value val, Scope scope
where      
   calls(call, val, scope)
  and val.getName().matches("%prepare_data%")
select call, val, scope, val.getName(), call.getScope()

[aibaars]

Have you tried restricting the "starting point" of the call graph to CallNodes in my_client.py? Something like:

from CallNode call, Value val, Scope scope
where      
  callNode.getFile().getBaseName() = "my_client.py"
  and calls(call, val, scope)
  and val.getName().matches("%prepare_data%")
select call, val, scope, val.getName(), call.getScope()

[noamilshtein]

thanks, i tried but unfortunately it worked only for direct calls
i also tried adding usage of exists:

from CallNode call, Value val, Scope scope
where 

calls(call, val, scope)
and val.getName().matches("prepare_data")

and exists(CallNode origin |
      calls(origin, _, call.getScope()) and
      call.getScope().getEnclosingScope().getLocation().getFile().toString().matches("%my_client.py%"))

select call, val, scope, val.getName(), call.getScope()

but i still don't get results