client: add ARGBRender functionality and wrapped call (#121)

Author: RussTorres

integration_tests/test_client_integrated.py

@@ -5,6 +5,7 @@
 import logging
 import sys
 import json
+from PIL import Image
 import numpy as np
 from test_data import (render_host, render_port,
                        client_script_location, tilespec_file, tform_file,
@@ -358,3 +359,37 @@ def test_processpools_parallelfuncs(
         render, render_example_tilespec_and_transforms,
         "{}_jsonfiles".format(stackbase), False, poolsize=poolsize,
         mpPool=poolclass)
+
+
+@pytest.fixture(scope='module')
+def tile_tilespec():
+    tile_dims = (256, 256)
+    with tempfile.NamedTemporaryFile(suffix='.tif', mode='w') as imgf:
+        arr = np.random.randint(0, 256, size=tile_dims, dtype='uint8')
+        img = Image.fromarray(arr)
+        img.save(imgf.name)
+
+        ts = renderapi.tilespec.TileSpec(
+            tileId='myTestTile',
+            z=1.,
+            sectionId="z1.0",
+            width=tile_dims[0],
+            height=tile_dims[1],
+            minint=0,
+            maxint=255,
+            imageUrl="file://{}".format(imgf.name))
+        ts.minX = 0
+        ts.maxX = tile_dims[0]
+        ts.minY = 0
+        ts.maxY = tile_dims[1]
+
+        yield imgf.name, ts
+
+
+def test_ARGBrenderclient(render, tile_tilespec):
+    tile, tspec = tile_tilespec
+    arr = renderapi.client.render_tilespec(tspec, memGB='512M', render=render)
+    with Image.open(tile) as tileimg:
+        tilearr = np.array(tileimg)
+        assert arr.shape[:-1] == (tspec.width, tspec.height) == tilearr.shape
+        assert np.all(arr[:, :, 0] == tilearr)

renderapi/client/client.py

@@ -5,6 +5,10 @@
 import os
 from functools import partial
 import logging
+import tempfile
+
+import numpy
+from PIL import Image
 
 from renderapi.utils import NullHandler, renderdump_temp
 from renderapi.render import renderaccess
@@ -13,7 +17,7 @@
 from renderapi.external.processpools.stdlib_pool import WithMultiprocessingPool
 
 from .utils import renderclientaccess
-from .client_calls import importJsonClient, call_run_ws_client
+from .client_calls import importJsonClient, call_run_ws_client, renderClient
 
 # setup logger
 logger = logging.getLogger(__name__)
@@ -361,10 +365,43 @@ def world_to_local_array(stack, points, subprocess_mode=None,
     raise NotImplementedError('Whoops.')
 
 
+def _defaultval(v, default=None):
+    return default if v is None else v
+
+
+@renderclientaccess
+def materialize_tilespec_image(
+        tilespec, out_fn=None, height=None, width=None,
+        x=None, y=None, res=32,
+        subprocess_mode=None,
+        client_script=None, memGB=None,
+        render=None, **kwargs):
+    tspecfile = renderdump_temp([tilespec])
+
+    x = _defaultval(x, tilespec.minX)
+    y = _defaultval(y, tilespec.minY)
+    width = _defaultval(width, int(float((tilespec.maxX - tilespec.minX))))
+    height = _defaultval(height, int(float((tilespec.maxY - tilespec.minY))))
+    renderClient(tile_spec_url=tspecfile, out_fn=out_fn,
+                 height=height, width=width, x=x, y=y, res=res,
+                 subprocess_mode=subprocess_mode,
+                 client_script=client_script, memGB=memGB, **kwargs)
+
+    os.remove(tspecfile)
+
+
+def render_tilespec(*args, **kwargs):
+    with tempfile.NamedTemporaryFile(suffix='.tif') as f:
+        materialize_tilespec_image(*args, out_fn=f.name, **kwargs)
+        arr = numpy.array(Image.open(f.name))
+    return arr
+
+
 __all__ = [
     "import_single_json_file",
     "import_jsonfiles_and_transforms_parallel_by_z",
     "import_jsonfiles_parallel", "import_jsonfiles",
     "import_jsonfiles_validate_client", "import_tilespecs",
     "import_tilespecs_parallel", "local_to_world_array",
-    "world_to_local_array", "WithPool"]
+    "world_to_local_array", "WithPool",
+    "render_tilespec", "materialize_tilespec_image"]

renderapi/client/client_calls.py

@@ -11,7 +11,7 @@
 from renderapi.stack import make_stack_params, set_stack_state
 
 from .utils import renderclientaccess
-from .params import SiftPointMatchOptions
+from .params import ArgumentParameters, SiftPointMatchOptions
 
 
 # setup logger
@@ -82,7 +82,7 @@ def call_run_ws_client(className, add_args=[], renderclient=None,
         logger.warning('call_run_ws_client requires memory specification -- '
                        'defaulting to 1G')
         memGB = '1G'
-    args = map(str, [client_script, memGB, className] + add_args)
+    args = list(map(str, [client_script, memGB, className] + add_args))
     try:
         ret_val = run_subprocess_mode(args, **kwargs)
     except subprocess.CalledProcessError:
@@ -658,6 +658,30 @@ def pointMatchClient(stack, collection, tile_pairs,
                        **kwargs)
 
 
+@renderclientaccess
+def renderClient(tile_spec_url=None, height=None, width=None, in_fn=None,
+                 out_fn=None, x=None, y=None, res=None,
+                 subprocess_mode=None, client_script=None,
+                 memGB=None, render=None, **kwargs):
+    """call render
+    """
+    get_cmd_opt = ArgumentParameters.get_cmd_opt
+
+    argvs = (get_cmd_opt(tile_spec_url, '--tile_spec_url') +
+             get_cmd_opt(height, '--height') +
+             get_cmd_opt(width, '--width') +
+             get_cmd_opt(in_fn, '--in') +
+             get_cmd_opt(out_fn, '--out') +
+             get_cmd_opt(x, '--x') +
+             get_cmd_opt(y, '--y') +
+             get_cmd_opt(res, '--res'))
+
+    call_run_ws_client('org.janelia.alignment.Render',
+                       memGB=memGB, client_script=client_script,
+                       subprocess_mode=subprocess_mode, add_args=argvs,
+                       **kwargs)
+
+
 __all__ = [
     "call_run_ws_client", "run_subprocess_mode",
     "importJsonClient", "tilePairClient",