fixed some matlab side error reporting

msurrogate/+msurrogate/collectargs.m

@@ -2,7 +2,7 @@
     %subtract two to also avoid the colon itself
     args = {};
     kwargs = struct();
-    idx_kw = numel(args_raw);
+    idx_kw = numel(args_raw) + 1;
     for i = 1:numel(args_raw)
       arg = args_raw{i};
       switch class(arg)
@@ -22,12 +22,30 @@
       end
     end
 
+    args
+    kwargs
+    idx_kw
+
     i = idx_kw;
-    while i < numel(args_raw)
-      field = args_raw{i};
-      val = args_raw{i + 1};
-      kwargs.(field) = val;
-      i = i + 2;
+    try
+      while i <= numel(args_raw)
+        field = args_raw{i};
+        val = args_raw{i + 1};
+        kwargs.(field) = val;
+        i = i + 2;
+      end
+    catch ME
+      switch ME.identifier
+      case 'MATLAB:badsubscript'
+        error('Unbalanced keyword arguments. It is also possible that string arguments are not inside a cell array. Calling convention for python objects is ({args...}, kwstruct, "key", value, "key", value...)')
+      case 'MATLAB:mustBeFieldName'
+        error('Keyword argument wrong type or unbalanced keyword arguments. It is also possible that arguments are not inside a cell array. Calling convention for python objects is ({args...}, kwstruct, "key", value, "key", value...)')
+      case 'MATLAB:AddField:InvalidFieldName'
+        rethrow(ME)
+      otherwise
+        disp(ME)
+        rethrow(ME)
+      end
     end
 end
 

msurrogate/+msurrogate/pyrowrap.m

@@ -227,7 +227,7 @@ function delete(self)
     function out = dir(self)
       call = py.getattr(self.internal(), 'pyrometa_dir');
       val = msurrogate.pyapply(call, {}, struct());
-      out = msurrogate.py2mat(py.dir(dir), self.handle);
+      out = msurrogate.py2mat(val, self.handle);
     end
 
     function c = repr(self)
@@ -253,7 +253,7 @@ function delete(self)
     end
 
     function out = properties(self)
-      out = dir(self)
+      out = dir(self);
     end
 
     function val = pyraw(self)

msurrogate/__init__.py

@@ -6,15 +6,14 @@
 
 
 def matlabpath():
-    return path.split(__file__)[0]
+    return path.abspath(path.split(__file__)[0])
 
 
 from .meta_app import (
     SurrogateApp,
     cookie_setup,
 )
 
-
 from .subproc_server import (
     SurrogateSubprocess,
 )

msurrogate/meta_proxy.py

@@ -95,6 +95,7 @@ def pyrometa_setitem(self, idx, val):
         return
 
     def pyrometa_call(self, name, *args, **kwargs):
+        print(name, args, kwargs)
         if name is None:
             val = self.obj
         else:

msurrogate/ping_test.py

@@ -1,7 +1,7 @@
 """
 """
 from __future__ import division, print_function, unicode_literals
-from msurrogate.meta_app import SurrogateApp
+from msurrogate import SurrogateApp
 
 
 def test_ping(text = ''):

msurrogate/subproc_server.py

@@ -46,8 +46,10 @@ def __init__(
         if module_name is None:
             raise RuntimeError("Must specify module_name")
 
+        #the -u is for unbuffered output (otherwise code must use flush everywhere)
+        #-S - and -c - are for the secret to be relayed via stdin and the cookie via stdout.
         self.proc = subprocess.Popen(
-            [python_call, '-m', module_name, '-S', '-', '-c', '-'] + args,
+            [python_call, '-u', '-m', module_name, '-S', '-', '-c', '-'] + args,
             stdout = subprocess.PIPE,
             stdin  = subprocess.PIPE,
             stderr = subprocess.PIPE,