New processor API

src/ocrd/__init__.py

@@ -14,7 +14,7 @@
 
 """
 
-from ocrd.processor.base import run_processor, run_cli, Processor
+from ocrd.processor.base import run_processor, run_cli, Processor, ResourceNotFoundError
 from ocrd_models import OcrdMets, OcrdExif, OcrdFile, OcrdAgent
 from ocrd.resolver import Resolver
 from ocrd_validators import *

src/ocrd/cli/bashlib.py

@@ -108,11 +108,17 @@ def bashlib_input_files(**kwargs):
         raise FileNotFoundError(msg)
     resolver = Resolver()
     workspace = resolver.workspace_from_url(mets, working_dir)
-    processor = Processor(workspace,
-                          ocrd_tool=None,
-                          page_id=kwargs['page_id'],
-                          input_file_grp=kwargs['input_file_grp'],
-                          output_file_grp=kwargs['output_file_grp'])
+    class BashlibProcessor(Processor):
+        @property
+        def ocrd_tool(self):
+            return {}
+        @property
+        def executable(self):
+            return ''
+    processor = BashlibProcessor(workspace,
+                                 page_id=kwargs['page_id'],
+                                 input_file_grp=kwargs['input_file_grp'],
+                                 output_file_grp=kwargs['output_file_grp'])
     for input_files in processor.zip_input_files(mimetype=None, on_error='abort'):
         # ensure all input files exist locally (without persisting them in the METS)
         # - this mimics the default behaviour of all Pythonic processors

src/ocrd/cli/ocrd_tool.py

@@ -100,46 +100,66 @@ def ocrd_tool_tool_description(ctx):
 def ocrd_tool_tool_list_resources(ctx):
     class BashProcessor(Processor):
         @property
+        def metadata(self):
+            return ctx.json
+        @property
+        def executable(self):
+            return ctx.tool_name
+        @property
         def moduledir(self):
             return os.path.dirname(ctx.filename)
-    BashProcessor(None, ocrd_tool=ctx.json['tools'][ctx.tool_name],
-                  list_resources=True)
+    BashProcessor(None, list_resources=True)
 
 @ocrd_tool_tool.command('resolve-resource', help="Get a tool's file resource full path name")
 @click.argument('res_name')
 @pass_ocrd_tool
 def ocrd_tool_tool_resolve_resource(ctx, res_name):
     class BashProcessor(Processor):
         @property
+        def metadata(self):
+            return ctx.json
+        @property
+        def executable(self):
+            return ctx.tool_name
+        @property
         def moduledir(self):
             return os.path.dirname(ctx.filename)
-    BashProcessor(None, ocrd_tool=ctx.json['tools'][ctx.tool_name],
-                  resolve_resource=res_name)
+    BashProcessor(None, resolve_resource=res_name)
 
 @ocrd_tool_tool.command('show-resource', help="Dump a tool's file resource")
 @click.argument('res_name')
 @pass_ocrd_tool
 def ocrd_tool_tool_show_resource(ctx, res_name):
     class BashProcessor(Processor):
         @property
+        def metadata(self):
+            return ctx.json
+        @property
+        def executable(self):
+            return ctx.tool_name
+        @property
         def moduledir(self):
             return os.path.dirname(ctx.filename)
-    BashProcessor(None, ocrd_tool=ctx.json['tools'][ctx.tool_name],
-                  show_resource=res_name)
+    BashProcessor(None, show_resource=res_name)
 
 @ocrd_tool_tool.command('help', help="Generate help for processors")
 @click.argument('subcommand', required=False)
 @pass_ocrd_tool
 def ocrd_tool_tool_params_help(ctx, subcommand):
     class BashProcessor(Processor):
+        @property
+        def metadata(self):
+            return ctx.json
+        @property
+        def executable(self):
+            return ctx.tool_name
         # set docstrings to empty
         __doc__ = None
         # HACK: override the module-level docstring, too
         getmodule(OcrdToolCtx).__doc__ = None
         def process(self):
             return super()
-    BashProcessor(None, ocrd_tool=ctx.json['tools'][ctx.tool_name],
-                  show_help=True, subcommand=subcommand)
+    BashProcessor(None, show_help=True, subcommand=subcommand)
 
 # ----------------------------------------------------------------------
 # ocrd ocrd-tool tool categories

src/ocrd/decorators/__init__.py

@@ -48,11 +48,11 @@ def ocrd_cli_wrap_processor(
     **kwargs
 ):
     if not sys.argv[1:]:
-        processorClass(workspace=None, show_help=True)
+        processorClass(None, show_help=True)
         sys.exit(1)
     if dump_json or dump_module_dir or help or version or show_resource or list_resources:
         processorClass(
-            workspace=None,
+            None,
             dump_json=dump_json,
             dump_module_dir=dump_module_dir,
             show_help=help,
@@ -71,6 +71,8 @@ def ocrd_cli_wrap_processor(
     initLogging()
 
     LOG = getLogger('ocrd.cli_wrap_processor')
+    assert kwargs['input_file_grp'] is not None
+    assert kwargs['output_file_grp'] is not None
     # LOG.info('kwargs=%s' % kwargs)
     if 'parameter' in kwargs:
         # Disambiguate parameter file/literal, and resolve file

src/ocrd/decorators/ocrd_cli_options.py

@@ -29,11 +29,8 @@ def cli(mets_url):
         option('-m', '--mets', help="METS to process", default=DEFAULT_METS_BASENAME),
         option('-w', '--working-dir', help="Working Directory"),
         option('-U', '--mets-server-url', help="METS server URL. Starts with http:// then TCP, otherwise unix socket path"),
-        # TODO OCR-D/core#274
-        # option('-I', '--input-file-grp', required=True),
-        # option('-O', '--output-file-grp', required=True),
-        option('-I', '--input-file-grp', default='INPUT'),
-        option('-O', '--output-file-grp', default='OUTPUT'),
+        option('-I', '--input-file-grp', default=None),
+        option('-O', '--output-file-grp', default=None),
         option('-g', '--page-id'),
         option('--overwrite', is_flag=True, default=False),
         option('--profile', is_flag=True, default=False),