javonet-ruby-sdk 2.1.9 → 2.1.11

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ArrayGetItemHandler.py

@@ -11,14 +11,15 @@ class ArrayGetItemHandler(AbstractCommandHandler):
                 raise Exception("ArrayGetItemHandler parameters mismatch!")
 
             array = command.payload[0]
-            indexes = command.payload[1:]
-            if len(indexes) == 1:
-                return array[indexes[0]]
+            if isinstance(command.payload[1], list):
+                indexes = command.payload[1]
             else:
-                array_copy = array.copy()
-                for i in indexes:
-                    array_copy = array_copy[i]
-                return array_copy
+                indexes = command.payload[1:]
+
+            array_copy = array.copy()
+            for i in indexes:
+                array_copy = array_copy[i]
+            return array_copy
 
         except Exception as e:
             exc_type, exc_value = type(e), e

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ArrayGetRankHandler.py

@@ -10,11 +10,14 @@ class ArrayGetRankHandler(AbstractCommandHandler):
         try:
             if len(command.payload) != self._required_parameters_count:
                 raise Exception("ArrayGetRankHandler parameters mismatch!")
-            raise Exception("ArrayGetRankHandler not implemented")
-            #array = command.payload[0]
 
-            #np_array = np.array(array)
-            #return np_array.ndim
+            array = command.payload[0]
+            rank = 0
+            while(isinstance(array, list)):
+                rank = rank + 1
+                array = array[0]
+
+            return rank
 
         except Exception as e:
             exc_type, exc_value = type(e), e

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ArrayGetSizeHandler.py

@@ -10,9 +10,13 @@ class ArrayGetSizeHandler(AbstractCommandHandler):
                 raise Exception("ArrayGetSizeHandler parameters mismatch!")
 
             array = command.payload[0]
-            return len(array)
-            #np_array = np.array(array)
-            #return np_array.size
+            size = 1
+            while(isinstance(array, list)):
+                size = size * len(array)
+                array = array[0]
+
+            return size
+
 
         except Exception as e:
             exc_type, exc_value = type(e), e

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/ArraySetItemHandler.py

@@ -12,10 +12,22 @@ class ArraySetItemHandler(AbstractCommandHandler):
 
             array = command.payload[0]
             value = command.payload[1]
-            indexes = command.payload[2:]
+            if isinstance(command.payload[2], list):
+                indexes = command.payload[2]
+            else:
+                indexes = command.payload[2:]
+
+            # one-dimensional array
             if len(indexes) == 1:
                 array[indexes[0]] = value
-                return 0
+            # multi-dimensional array
+            else:
+                for i in range((len(indexes)-1)):
+                    array = array[indexes[i]]
+
+                array[indexes[-1]] = value
+
+            return 0
 
         except Exception as e:
             exc_type, exc_value = type(e), e

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/GetEnumItemHandler.py

@@ -0,0 +1,22 @@
+from importlib import import_module
+
+from javonet.core.handler.CommandHandler.AbstractCommandHandler import AbstractCommandHandler
+
+
+class GetEnumItemHandler(AbstractCommandHandler):
+    def __init__(self):
+        self._required_parameters_count = 3
+
+    def process(self, command):
+        try:
+            if len(command.payload) < self._required_parameters_count:
+                raise Exception("CreateEnumHandler parameters mismatch!")
+            clazz = command.payload[0]
+            enum_name = command.payload[1]
+            enum_value = command.payload[2]
+            enum_type = getattr(clazz, enum_name)
+            return enum_type[enum_value]
+        except Exception as e:
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/GetEnumNameHandler.py

@@ -0,0 +1,22 @@
+from enum import Enum
+
+from javonet.core.handler.CommandHandler.AbstractCommandHandler import AbstractCommandHandler
+
+
+class GetEnumNameHandler(AbstractCommandHandler):
+    def __init__(self):
+        self._required_parameters_count = 1
+
+    def process(self, command):
+        try:
+            if len(command.payload) < self._required_parameters_count:
+                raise Exception("CreateEnumHandler parameters mismatch!")
+            enum_object = command.payload[0]
+            if isinstance(enum_object, Enum):
+                return enum_object.name
+            else:
+                raise Exception("Argument is not enumerable")
+        except Exception as e:
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/GetEnumValueHandler.py

@@ -0,0 +1,22 @@
+from enum import Enum
+
+from javonet.core.handler.CommandHandler.AbstractCommandHandler import AbstractCommandHandler
+
+
+class GetEnumValueHandler(AbstractCommandHandler):
+    def __init__(self):
+        self._required_parameters_count = 1
+
+    def process(self, command):
+        try:
+            if len(command.payload) < self._required_parameters_count:
+                raise Exception("CreateEnumHandler parameters mismatch!")
+            enum_object = command.payload[0]
+            if isinstance(enum_object, Enum):
+                return enum_object.value
+            else:
+                raise Exception("Argument is not enumerable")
+        except Exception as e:
+            exc_type, exc_value = type(e), e
+            new_exc = exc_type(exc_value).with_traceback(e.__traceback__)
+            raise new_exc from None

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/CommandHandler/GetTypeHandler.py

@@ -13,10 +13,12 @@ class GetTypeHandler(AbstractCommandHandler):
                 raise Exception("GetTypeHandler parameters mismatch!")
             if len(command.payload) == 1:
                 type_name = command.payload[0].split(".")
+
                 if len(type_name) == 1:
                     return import_module(type_name[0])
                 else:
-                    loaded_module = import_module(".".join(type_name[:-1]))
+                    for i in range(len(type_name) - 1):
+                        loaded_module = import_module(".".join(type_name[:i+1]))
                     return getattr(loaded_module, type_name[-1])
             else:
                 return import_module(".".join(command.payload[:]))

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/core/handler/Handler.py

@@ -1,5 +1,3 @@
-import traceback
-
 from javonet.core.handler.AbstractHandler import AbstractHandler
 from javonet.core.handler.CommandHandler.ValueHandler import ValueHandler
 from javonet.core.handler.CommandHandler.LoadLibraryHandler import LoadLibraryHandler
@@ -19,10 +17,13 @@ from javonet.core.handler.CommandHandler.ArrayGetSizeHandler import ArrayGetSize
 from javonet.core.handler.CommandHandler.ArrayGetRankHandler import ArrayGetRankHandler
 from javonet.core.handler.CommandHandler.ArraySetItemHandler import ArraySetItemHandler
 from javonet.core.handler.CommandHandler.ArrayHandler import ArrayHandler
+from javonet.core.handler.CommandHandler.GetEnumItemHandler import GetEnumItemHandler
+from javonet.core.handler.CommandHandler.GetEnumNameHandler import GetEnumNameHandler
+from javonet.core.handler.CommandHandler.GetEnumValueHandler import GetEnumValueHandler
 
 from javonet.core.handler.HandlerDictionary import handler_dict
 from javonet.core.handler.ReferencesCache import ReferencesCache
-from javonet.core.exception.ExceptionSerializer import ExceptionSerializer
+from javonet.utils.exception.ExceptionSerializer import ExceptionSerializer
 from javonet.utils.CommandType import CommandType
 from javonet.utils.Command import Command
 
@@ -30,43 +31,29 @@ from javonet.utils.Command import Command
 class Handler(AbstractHandler):
 
     def __init__(self):
-        value_handler = ValueHandler()
-        load_library_handler = LoadLibraryHandler()
-        invoke_static_method_handler = InvokeStaticMethodHandler()
-        set_static_field_handler = SetStaticFieldHandler()
-        create_class_instance_handler = CreateClassInstanceHandler()
-        get_static_field_handler = GetStaticFieldHandler()
-        resolve_instance_handler = ResolveInstanceHandler()
-        get_type_handler = GetTypeHandler()
-        invoke_instance_method_handler = InvokeInstanceMethodHandler()
-        casting_handler = CastingHandler()
-        get_instance_field_handler = GetInstanceFieldHandler()
-        set_instance_field_handler = SetInstanceFieldHandler()
-        destruct_reference_handler = DestructReferenceHandler()
-        array_get_item_handler = ArrayGetItemHandler()
-        array_get_size_handler = ArrayGetSizeHandler()
-        array_get_rank_handler = ArrayGetRankHandler()
-        array_set_item_handler = ArraySetItemHandler()
-        array_handler = ArrayHandler()
 
-        handler_dict[CommandType.Value] = value_handler
-        handler_dict[CommandType.LoadLibrary] = load_library_handler
-        handler_dict[CommandType.InvokeStaticMethod] = invoke_static_method_handler
-        handler_dict[CommandType.SetStaticField] = set_static_field_handler
-        handler_dict[CommandType.CreateClassInstance] = create_class_instance_handler
-        handler_dict[CommandType.GetStaticField] = get_static_field_handler
-        handler_dict[CommandType.Reference] = resolve_instance_handler
-        handler_dict[CommandType.GetType] = get_type_handler
-        handler_dict[CommandType.InvokeInstanceMethod] = invoke_instance_method_handler
-        handler_dict[CommandType.Cast] = casting_handler
-        handler_dict[CommandType.GetInstanceField] = get_instance_field_handler
-        handler_dict[CommandType.SetInstanceField] = set_instance_field_handler
-        handler_dict[CommandType.DestructReference] = destruct_reference_handler
-        handler_dict[CommandType.ArrayGetItem] = array_get_item_handler
-        handler_dict[CommandType.ArrayGetSize] = array_get_size_handler
-        handler_dict[CommandType.ArrayGetRank] = array_get_rank_handler
-        handler_dict[CommandType.ArraySetItem] = array_set_item_handler
-        handler_dict[CommandType.Array] = array_handler
+        handler_dict[CommandType.Value] = ValueHandler()
+        handler_dict[CommandType.LoadLibrary] = LoadLibraryHandler()
+        handler_dict[CommandType.InvokeStaticMethod] = InvokeStaticMethodHandler()
+        handler_dict[CommandType.SetStaticField] = SetStaticFieldHandler()
+        handler_dict[CommandType.CreateClassInstance] = CreateClassInstanceHandler()
+        handler_dict[CommandType.GetStaticField] = GetStaticFieldHandler()
+        handler_dict[CommandType.Reference] = ResolveInstanceHandler()
+        handler_dict[CommandType.GetType] = GetTypeHandler()
+        handler_dict[CommandType.InvokeInstanceMethod] = InvokeInstanceMethodHandler()
+        handler_dict[CommandType.Cast] = CastingHandler()
+        handler_dict[CommandType.GetInstanceField] = GetInstanceFieldHandler()
+        handler_dict[CommandType.SetInstanceField] = SetInstanceFieldHandler()
+        handler_dict[CommandType.DestructReference] = DestructReferenceHandler()
+        handler_dict[CommandType.ArrayGetItem] = ArrayGetItemHandler()
+        handler_dict[CommandType.ArrayGetSize] = ArrayGetSizeHandler()
+        handler_dict[CommandType.ArrayGetRank] = ArrayGetRankHandler()
+        handler_dict[CommandType.ArraySetItem] = ArraySetItemHandler()
+        handler_dict[CommandType.Array] = ArrayHandler()
+        handler_dict[CommandType.GetEnumItem] = GetEnumItemHandler()
+        handler_dict[CommandType.GetEnumName] = GetEnumNameHandler()
+        handler_dict[CommandType.GetEnumValue] = GetEnumValueHandler()
+
 
     def handle_command(self, command):
         try:

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/utils/CommandType.py

@@ -30,3 +30,7 @@ class CommandType(Enum):
     SetInstanceField = 25
     InvokeGenericStaticMethod = 26
     InvokeGenericMethod = 27
+    CreateGenericClassInstance = 28
+    GetEnumItem = 29
+    GetEnumName = 30
+    GetEnumValue = 31

data/lib/javonet-ruby-sdk/Binaries/Python/{MacOs/X64/javonet/core → Windows/X64/javonet/utils}/exception/ExceptionThrower.py

@@ -1,48 +1,63 @@
-import re
-
-from javonet.core.exception.JavonetException import JavonetException
-from javonet.utils.Command import Command
-from javonet.utils.ExceptionType import ExceptionType
-
-
-class ExceptionThrower:
-
-    @staticmethod
-    def throw_exception(command_exception: Command):
-        original_exception = ExceptionType.to_exception(command_exception.get_payload()[0])
-        javonet_stack_command = command_exception.get_payload()[1]
-        exception_name = command_exception.get_payload()[2]
-        exception_message = command_exception.get_payload()[3]
-
-        stack_classes, stack_methods, stack_lines, stack_files = ExceptionThrower.get_local_stack_trace(
-            command_exception.get_payload()[4],
-            command_exception.get_payload()[5],
-            command_exception.get_payload()[6],
-            command_exception.get_payload()[7])
-        traceback_str = ""
-
-        for i in range(len(stack_classes)):
-            if i < len(stack_files) and stack_files[i]:
-                traceback_str += "File \"{}\"".format(stack_files[i])
-            if i < len(stack_lines) and stack_lines[i]:
-                traceback_str += ", line {}".format(stack_lines[i])
-            if i < len(stack_methods) and stack_methods[i]:
-                traceback_str += ", in {}".format(stack_methods[i])
-            traceback_str += "\n"
-            if i < len(stack_classes) and stack_classes[i]:
-                traceback_str += "    {}\n".format(stack_classes[i])
-
-        return ExceptionThrower.raise_exception(original_exception, exception_message, traceback_str)
-
-    @staticmethod
-    def raise_exception(original_exception, exception_message, traceback_str):
-        return JavonetException(str(original_exception), exception_message, traceback_str)
-
-    @staticmethod
-    def get_local_stack_trace(stack_trace_classes, stack_trace_methods, stack_trace_lines, stack_trace_files):
-        stack_classes = re.split("\\|", stack_trace_classes)
-        stack_methods = re.split("\\|", stack_trace_methods)
-        stack_lines = re.split("\\|", stack_trace_lines)
-        stack_files = re.split("\\|", stack_trace_files)
-
-        return [stack_classes, stack_methods, stack_lines, stack_files]
+import re
+
+from javonet.utils.exception.JavonetException import JavonetException
+from javonet.utils.Command import Command
+from javonet.utils.ExceptionType import ExceptionType
+
+
+class ExceptionThrower:
+
+    @staticmethod
+    def throw_exception(command_exception: Command):
+        stack_classes, stack_methods, stack_lines, stack_files = "", "", "", ""
+        exception_message = "Python Exception with empty message"
+        exception_name = "Python exception"
+        javonet_stack_command = ""
+        traceback_str = ""
+
+        exception_payload_len = len(command_exception.payload)
+        if exception_payload_len >=8:
+            stack_classes, stack_methods, stack_lines, stack_files = ExceptionThrower.get_local_stack_trace(
+                command_exception.get_payload()[4],
+                command_exception.get_payload()[5],
+                command_exception.get_payload()[6],
+                command_exception.get_payload()[7])
+
+        if exception_payload_len >= 4:
+            exception_message = command_exception.get_payload()[3]
+
+        if exception_payload_len >= 3:
+            exception_name = command_exception.get_payload()[2]
+
+        if exception_payload_len >= 2:
+            javonet_stack_command = command_exception.get_payload()[1]
+
+        if exception_payload_len >= 1:
+            original_exception = ExceptionType.to_exception(command_exception.get_payload()[0])
+
+
+        for i in range(len(stack_classes)):
+            if i < len(stack_files) and stack_files[i]:
+                traceback_str += "File \"{}\"".format(stack_files[i])
+            if i < len(stack_lines) and stack_lines[i]:
+                traceback_str += ", line {}".format(stack_lines[i])
+            if i < len(stack_methods) and stack_methods[i]:
+                traceback_str += ", in {}".format(stack_methods[i])
+            traceback_str += "\n"
+            if i < len(stack_classes) and stack_classes[i]:
+                traceback_str += "    {}\n".format(stack_classes[i])
+
+        return ExceptionThrower.raise_exception(original_exception, exception_message, traceback_str)
+
+    @staticmethod
+    def raise_exception(original_exception, exception_message, traceback_str):
+        return JavonetException(str(original_exception), exception_message, traceback_str)
+
+    @staticmethod
+    def get_local_stack_trace(stack_trace_classes, stack_trace_methods, stack_trace_lines, stack_trace_files):
+        stack_classes = re.split("\\|", stack_trace_classes)
+        stack_methods = re.split("\\|", stack_trace_methods)
+        stack_lines = re.split("\\|", stack_trace_lines)
+        stack_files = re.split("\\|", stack_trace_files)
+
+        return [stack_classes, stack_methods, stack_lines, stack_files]

data/lib/javonet-ruby-sdk/Binaries/Python/Windows/X64/javonet/{core → utils}/exception/JavonetException.py

@@ -1,5 +1,3 @@
-
-
 class JavonetException(Exception):
     def __init__(self, name, message, traceback_str):
         self.name = name

data/lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/handler/command_handler/array_get_item_handler.rb

@@ -10,11 +10,38 @@ class ArrayGetItemHandler < AbstractCommandHandler
       if command.payload.length < @required_parameters_count
         raise ArgumentError.new "Array get item parameters mismatch"
       end
-      array = command.payload[0]
-      index = command.payload[1,]
-      return array[index]
+
+      if command.payload[0].is_a? Array
+        return get_item_array(command)
+      elsif command.payload[0].is_a? Hash
+        return get_item_hash(command)
+      else
+        raise ArgumentError.new "Cannot get element from %s" % [command.payload[0]]
+      end
     rescue Exception => e
-      return e
+      e
+    end
+  end
+
+  def get_item_array(command)
+    array = command.payload[0]
+    indexes = if command.payload[1].is_a? Array
+                command.payload[1]
+              else
+                command.payload[1..]
+              end
+
+    if array.is_a? Array
+      indexes.each { |i|
+        array = array[i]
+      }
+      array
     end
   end
+
+  def get_item_hash(command)
+    hash = command.payload[0]
+    key = command.payload[1]
+    hash[key]
+  end
 end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/handler/command_handler/array_get_rank_handler.rb

@@ -1,9 +1,21 @@
 require_relative 'abstract_command_handler'
 
 class ArrayGetRankHandler < AbstractCommandHandler
+  def initialize
+    @required_parameters_count = 1
+  end
   def process(command)
     begin
-      raise ArgumentError.new "ArrayGetRankHandler not implemented"
+      if command.payload.length < @required_parameters_count
+        raise ArgumentError.new "Array get rank parameters mismatch"
+      end
+      array = command.payload[0]
+      rank = 0
+      while array.is_a? Array
+        rank = rank + 1
+        array = array[0]
+      end
+      return rank
     rescue Exception => e
       return e
     end

data/lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/handler/command_handler/array_get_size_handler.rb

@@ -4,15 +4,34 @@ class ArrayGetSizeHandler < AbstractCommandHandler
   def initialize
     @required_parameters_count = 1
   end
+
   def process(command)
     begin
       if command.payload.length < @required_parameters_count
         raise ArgumentError.new "Array get size parameters mismatch"
       end
-      array = command.payload[0]
-      return array.length()
+
+      if command.payload[0].is_a? Array
+        return get_size_array(command)
+      else
+        return get_size(command)
+      end
     rescue Exception => e
       return e
     end
   end
+
+  def get_size_array(command)
+    array = command.payload[0]
+    size = 1
+    while array.is_a? Array
+      size = size * array.length
+      array = array[0]
+    end
+    size
+  end
+
+  def get_size(command)
+    command.payload[0].length
+  end
 end