Fix ocrd_network client run argument order

[bertsky]

No description provided.

[bertsky]

@kba should I make a v2 backport of 0d277ac?

I should probably create an issue for this, but perhaps someone can get me on track here: Shouldn't we also allow the user to pass the ocrd_utils.config options to the server, somehow? (In v3, you'll remember, we introduced fine-grained controls like OCRD_MISSING_INPUT, OCRD_MISSING_OUTPUT, OCRD_EXISTING_OUTPUT, that should in principle be configurable on a case-by-case basis. Without any such delegation, one would have to live with the defaults set on the server side, so there's not much use for them in the network scenario...)

[bertsky]

I should probably create an issue for this, but perhaps someone can get me on track here: Shouldn't we also allow the user to pass the ocrd_utils.config options to the server, somehow? (In v3, you'll remember, we introduced fine-grained controls like OCRD_MISSING_INPUT, OCRD_MISSING_OUTPUT, OCRD_EXISTING_OUTPUT, that should in principle be configurable on a case-by-case basis. Without any such delegation, one would have to live with the defaults set on the server side, so there's not much use for them in the network scenario...)

Another problem is with how parameter resources get resolved now. In the CLI setting, we allowed an ambiguity between JSON literals and file names, so the latter would have to be resolved to absolute paths (for the various resource locations), which in turn obviously dependend on the processor class (because of the custom module location):

core/src/ocrd/decorators/__init__.py

Lines 95 to 103 in 4d33491

	if 'parameter' in kwargs:
	# Disambiguate parameter file/literal, and resolve file
	def resolve(name):
	try:
	return processor.resolve_resource(name)
	except ResourceNotFoundError:
	return None
	kwargs['parameter'] = parse_json_string_or_file(*kwargs['parameter'],
	resolve_preset_file=resolve)

But in the network setting, where parameters can be added to the processing or workflow request, no such resolution (from resource name to resource path) takes place –

• On the server side, there is only a parameter validation step
  

  core/src/ocrd_network/server_utils.py

  Line 220 in 4d33491

  report = ParameterValidator(ocrd_tool).validate(dict(job_input.parameters))

• On the client side, there is only the JSON string vs file disambiguation, but no prior resolution.
  

  core/src/ocrd_network/cli/client.py

  Line 142 in 4d33491

  req_params["parameters"] = set_json_key_value_overrides(parse_json_string_or_file(*parameter), *parameter_override)

Did we abandon the entire mechanism, or am I missing something?

[kba]

@kba should I make a v2 backport of 0d277ac?

It depends - does the previous behavior trigger a bug? AFAICT we're only calling the method with kwargs or am I missing something?