Seems complicated. Why don't you just inline the _generate_dict call?

I think you tried your best to keep the format so that nothing breaks in the webapp ;)

But, as explained in T782#18456, i was more inclined to either return:

1. directly the dict d (if possible at all, depending on our @db_transation* decorators)
2. a list of dict with key the content id and value the facts (licenses + tool that discovered it).

So, in the current state, instead of the proposed statement, a simpler adaptation to match solution 2. would be :

for _id, facts in d.items():
    yield {_id: facts}

That is still a list, so nothing should break down hill (webapp, except probably for the id which won't be converted in hex, not a breaking per say).

We need to also adjust the webapp endpoint (as mentioned in the link above and repeated here for convenience).

As explained in previous comment, i'd simply remove this.