Python: Adapt SampleSearchClient mods