Calculate additional codelist values for schema using anyOf

[odscjames]

Like OCDS record packages

#125 open-contracting/lib-cove-ocds#106

[odscjames]

@jpmckinney I wanted to simplify the tests, so we didn't also have to change the check for local or remote schemas. Does this still capture the change you are after?

[jpmckinney]

The integration.yml changes from #125 are relevant - otherwise these tests will forever fail.

The change to if schema_url.startswith("http") needs to be carried over. It's necessary to "fix(custom_jsonref_jsonloader): Read from filesystem if schema_url is a file path", because lib-cove has already messed around with the uri value by this point (IIRC), and checking schema_url directly is the only way to know if the URL is a file path or not.

Edit: Indeed - uri is parsed, and then uri is set to uri = urljoin(schema_url, ...). So, if schema_url is a file path, then "http" in uri_info.scheme will be True, even though the subsequent GET request will use a value of uri that's prefixed with a file path (i.e. no scheme). So, it's necessary to check schema_url instead of uri. This is more correct, even if this particular test doesn't need it.

As for the test, if it fails without the changes to common.py (and passes with the changes), then that's what matters.

[odscjames]

The integration.yml changes from #125 are relevant - otherwise these tests will forever fail.

It's on my todo list and I was going to look at separately

The change to if schema_url.startswith("http") ....

Noted in seperate issue to check out - thanks.

As for the test, if it fails without the changes to common.py (and passes with the changes), then that's what matters.

It does!

[odscjames]

@jpmckinney - @Bjwebb has pointed out the comments are anyOf but the code is oneOf - it should be doing this for both right? If so I can just add this and we should be done:

elif "anyOf" in value and isinstance(value["anyOf"], list):
            descendants = value["anyOf"]

[jpmckinney]

I probably meant oneOf everywhere (OCDS doesn't use anyOf), but supporting anyOf should be the same logic, so that change sounds good.

[odscjames]

Added.

I don't think we need a special test just for that elif - if I change schema_with_oneof_codelists.json locally I can see it working for anyOf too.

But over to @Bjwebb to review!