pycall 0.1.0.alpha.20170224b → 0.1.0.alpha.20170226

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a6e3735f767731679b29028417f1c65fd29a34
-  data.tar.gz: 479fa94df217c1db443950c73e5457fd910a0568
+  metadata.gz: ab504049d683e34fa1e325340601d6577a40cd5e
+  data.tar.gz: c477cf5937dd0499e50512a4829ad3688d8e34e5
 SHA512:
-  metadata.gz: e14d7ebbd21f597a9d9b439532b30a5466d46df36af207ad07151e839ecb5e768eca30dac5c85a717b612facea30a6ad89094bfc168501cd70117e3af443162d
-  data.tar.gz: 616be33cc87bfae9291dd6ebccb875a41c0c33b97e2a1255d14a9250b3a50540449b37e3e132136171aaa8ad586893367f812dccf43c2a8b73808cbf2fbff718
+  metadata.gz: 041fda79cb71ccb7653e442c1831f97b489058adb48159cef581d49174182350047e736192eb5568c6d2c4b61d6e2691e917ccb28f578c2dd5b340d90dca41d3
+  data.tar.gz: eb6af8382a0531729aa8ac151d0880e1c7c613441550490fad77e924b26012723833b5ea1aaab75e6ef9a9f1d9d4e99e416ac4c244c155f7c5a2f7b42c4c5d3c

data/examples/classifier_comparison.rb

@@ -2,8 +2,6 @@ require 'pycall/import'
 include PyCall::Import
 
 pyimport 'numpy', as: :np
-pyimport 'matplotlib.pyplot', as: :plt
-pyimport 'matplotlib.colors', as: :mplc
 pyfrom 'sklearn.cross_validation', import: :train_test_split
 pyfrom 'sklearn.preprocessing', import: :StandardScaler
 pyfrom 'sklearn.datasets', import: %i(make_moons make_circles make_classification)
@@ -14,6 +12,13 @@ pyfrom 'sklearn.ensemble', import: %i(RandomForestClassifier AdaBoostClassifier)
 pyfrom 'sklearn.naive_bayes', import: :GaussianNB
 pyfrom 'sklearn.discriminant_analysis', import: %i(LinearDiscriminantAnalysis QuadraticDiscriminantAnalysis)
 
+# FIXME: MacOSX backend is not usable through pycall.  I want to fix this issue but the reason is unclear.
+pyimport 'matplotlib', as: :mp
+mp.rcParams[:backend] = 'TkAgg' if mp.rcParams[:backend] == 'MacOSX'
+
+pyimport 'matplotlib.pyplot', as: :plt
+pyimport 'matplotlib.colors', as: :mplc
+
 h = 0.02  # step size in the mesh
 
 names = [

data/examples/hist.rb

@@ -2,6 +2,11 @@ require 'pycall/import'
 include PyCall::Import
 
 pyimport 'numpy', as: 'np'
+
+# FIXME: MacOSX backend is not usable through pycall.  I want to fix this issue but the reason is unclear.
+pyimport 'matplotlib', as: :mp
+mp.rcParams[:backend] = 'TkAgg' if mp.rcParams[:backend] == 'MacOSX'
+
 pyimport 'matplotlib.mlab', as: 'mlab'
 pyimport 'matplotlib.pyplot', as: 'plt'
 

data/examples/plot_forest_importances_faces.rb

@@ -3,6 +3,11 @@ require 'pycall/import'
 include PyCall::Import
 
 pyimport 'numpy', as: 'np'
+
+# FIXME: MacOSX backend is not usable through pycall.  I want to fix this issue but the reason is unclear.
+pyimport 'matplotlib', as: :mp
+mp.rcParams[:backend] = 'TkAgg' if mp.rcParams[:backend] == 'MacOSX'
+
 pyimport 'matplotlib.pyplot', as: 'plt'
 
 pyfrom 'sklearn.datasets', import: 'fetch_olivetti_faces'

data/examples/sum_benchmarking.rb

@@ -3,6 +3,11 @@ include PyCall::Import
 
 require 'benchmark'
 pyimport :pandas, as: :pd
+
+# FIXME: MacOSX backend is not usable through pycall.  I want to fix this issue but the reason is unclear.
+pyimport 'matplotlib', as: :mp
+mp.rcParams[:backend] = 'TkAgg' if mp.rcParams[:backend] == 'MacOSX'
+
 pyimport :seaborn, as: :sns
 pyimport 'matplotlib.pyplot', as: :plt
 

data/lib/pycall/conversion.rb

@@ -1,5 +1,41 @@
 module PyCall
   module Conversions
+    @python_type_map = []
+
+    class TypePair < Struct.new(:pytype, :rbtype)
+      def to_a
+        [pytype, rbtype]
+      end
+    end
+
+    def self.python_type_mapping(pytype, rbtype)
+      @python_type_map.each_with_index do |type_pair, index|
+        next unless pytype == type_pair.pytype
+        type_pair.rbtype = rbtype
+        return
+      end
+      @python_type_map << TypePair.new(pytype, rbtype)
+    end
+
+    def self.to_ruby(pyobj)
+      unless pyobj.kind_of? PyObject
+        raise
+      end
+      @python_type_map.each do |tp|
+        pytype, rbtype = tp.to_a
+        next unless pyobj.kind_of?(pytype)
+        case
+        when rbtype.kind_of?(Proc)
+          return rbtype.(pyobj)
+        when rbtype.respond_to?(:from_python)
+          return rbtype.from_python(pyobj)
+        else
+          return rbtype.new(pyobj)
+        end
+      end
+      pyobj
+    end
+
     def self.from_ruby(obj)
       case obj
       when PyObject
@@ -102,7 +138,7 @@ module PyCall
         return Conversions.convert_to_string(py_str_ptr).force_encoding(Encoding::UTF_8)
 
       when LibPython.PyList_Type
-        return Conversions.convert_to_array(self)
+        return PyCall::List.new(self)
 
       when LibPython.PyTuple_Type
         return Conversions.convert_to_tuple(self)
@@ -114,7 +150,7 @@ module PyCall
         return PyCall::Set.new(self)
       end
 
-      self
+      Conversions.to_ruby(self)
     end
   end
 end

data/lib/pycall/dict.rb

@@ -68,7 +68,10 @@ module PyCall
     end
 
     def has_key?(key)
-      1 == LibPython.PyDict_Contains(__pyobj__, key).to_ruby
+      key = Conversions.from_ruby(key)
+      value = LibPython.PyDict_Contains(__pyobj__, key)
+      raise PyError.fetch if value == -1
+      1 == value
     end
 
     def default=(val)

data/lib/pycall/eval.rb

@@ -7,6 +7,7 @@ module PyCall
       locals_ptr = maindict_ptr
       defer_sigint do
         py_code_ptr = LibPython.Py_CompileString(str, filename, Py_eval_input)
+        raise PyError.fetch if py_code_ptr.null?
         LibPython.PyEval_EvalCode(py_code_ptr, globals_ptr, locals_ptr)
       end
     end
@@ -14,8 +15,12 @@ module PyCall
     class << self
       private
 
+      def main_module
+        @main_module ||= PyCall.import_module("__main__")
+      end
+
       def maindict_ptr
-        LibPython.PyModule_GetDict(PyCall.import_module("__main__"))
+        @maindict_ptr ||= LibPython.PyModule_GetDict(main_module)
       end
 
       def defer_sigint

data/lib/pycall/iruby_helper.rb

@@ -0,0 +1,40 @@
+require 'pycall'
+require 'iruby'
+
+module PyCall
+  module IRubyHelper
+    private
+
+    def check_pyobject_respond_to_format_method(obj, method_name)
+      return false unless obj.kind_of? PyObject
+      return false unless PyCall.hasattr?(obj, method_name)
+      PyCall.getattr(obj, method_name).kind_of? PyCall::LibPython.PyMethod_Type
+    end
+
+    def register_pyobject_formatter(format_name, mime, priority_value=0)
+      method_name = :"_repr_#{format_name}_"
+      match do |obj|
+        check_pyobject_respond_to_format_method(obj, method_name)
+      end
+      priority priority_value
+      format mime do |obj|
+        PyCall.getattr(obj, method_name).()
+      end
+    end
+  end
+end
+
+::IRuby::Display::Registry.module_eval do
+  extend PyCall::IRubyHelper
+
+  register_pyobject_formatter :html, 'text/html'
+  register_pyobject_formatter :markdown, 'text/markdown'
+  register_pyobject_formatter :svg, 'image/svg+xml'
+  register_pyobject_formatter :png, 'image/png'
+  register_pyobject_formatter :jpeg, 'image/jpeg'
+  register_pyobject_formatter :latex, 'text/latex'
+  register_pyobject_formatter :json, 'application/json'
+  register_pyobject_formatter :javascript, 'application/javascript'
+  register_pyobject_formatter :pdf, 'application/pdf'
+  register_pyobject_formatter :pretty, 'text/plain', -1000
+end

data/lib/pycall/libpython.rb

@@ -129,6 +129,7 @@ module PyCall
     attach_variable :PySet_Type, PyTypeObject
 
     attach_variable :PyFunction_Type, PyTypeObject
+    attach_variable :PyMethod_Type, PyTypeObject
 
     # --- functions ---
 
@@ -146,8 +147,11 @@ module PyCall
     attach_function :PyObject_SetItem, [PyObject.by_ref, PyObject.by_ref, PyObject.by_ref], :int
     attach_function :PyObject_DelItem, [PyObject.by_ref, PyObject.by_ref], :int
     attach_function :PyObject_Call, [PyObject.by_ref, PyObject.by_ref, PyObject.by_ref], PyObject.by_ref
-    attach_function :PyObject_IsInstance, [PyObject.by_ref, PyTypeObject.by_ref], :int
+    attach_function :PyObject_IsInstance, [PyObject.by_ref, PyObject.by_ref], :int
     attach_function :PyObject_Dir, [PyObject.by_ref], PyObject.by_ref
+    attach_function :PyObject_Repr, [PyObject.by_ref], PyObject.by_ref
+    attach_function :PyObject_Str, [PyObject.by_ref], PyObject.by_ref
+    attach_function :PyObject_Type, [PyObject.by_ref], PyTypeObject.by_ref
 
     # Bool
 
@@ -237,6 +241,7 @@ module PyCall
 
     attach_function :PySequence_Size, [PyObject.by_ref], :ssize_t
     attach_function :PySequence_GetItem, [PyObject.by_ref, :ssize_t], PyObject.by_ref
+    attach_function :PySequence_Contains, [PyObject.by_ref, PyObject.by_ref], :int
 
     # Dict
 
@@ -282,6 +287,7 @@ module PyCall
 
     # Error
 
+    attach_function :PyErr_Clear, [], :void
     attach_function :PyErr_Print, [], :void
     attach_function :PyErr_Occurred, [], PyObject.by_ref
     attach_function :PyErr_Fetch, [:pointer, :pointer, :pointer], :void

data/lib/pycall/list.rb

@@ -1,6 +1,7 @@
 module PyCall
   class List
     include PyObjectWrapper
+    include Enumerable
 
     def self.new(init=nil)
       case init
@@ -47,7 +48,28 @@ module PyCall
 
     def include?(value)
       value = Conversions.from_ruby(value)
-      LibPython.PyList_Contains(__pyobj__, value).to_ruby
+      value = LibPython.PySequence_Contains(__pyobj__, value)
+      raise PyError.fetch if value == -1
+      1 == value
+    end
+
+    def ==(other)
+      case other
+      when Array
+        self.to_a == other
+      else
+        super
+      end
+    end
+
+    def each
+      return enum_for unless block_given?
+      i, n = 0, size
+      while i < n
+        yield self[i]
+        i += 1
+      end
+      self
     end
 
     def to_a

data/lib/pycall/pyerror.rb

@@ -17,9 +17,19 @@ module PyCall
       @type = type
       @value = value
       @traceback = traceback
-      super("#{@type.inspect}: #{PyCall.eval('str').(@value)}")
+      super("Error occurred in Python")
     end
 
     attr_reader :type, :value, :traceback
+
+    def message
+      "#{PyObject.new(type.to_ptr)}: #{value}".tap do |msg|
+        unless traceback.null?
+          if (o = PyCall.format_traceback(traceback))
+            msg.concat("\n", *o)
+          end
+        end
+      end
+    end
   end
 end

data/lib/pycall/pyobject.rb

@@ -39,7 +39,7 @@ module PyCall
 
     def kind_of?(klass)
       case klass
-      when PyTypeObject
+      when PyObject, PyTypeObject
         Types.pyisinstance(self, klass)
       else
         super
@@ -122,7 +122,16 @@ module PyCall
     end
 
     def to_s
-      PyCall.str(self)
+      s = LibPython.PyObject_Repr(self)
+      if s.null?
+        LibPython.PyErr_Clear()
+        s = LibPython.PyObject_Str(self)
+        if s.null?
+          LibPython.PyErr_Clear()
+          return super
+        end
+      end
+      s.to_ruby
     end
 
     alias inspect to_s

data/lib/pycall/pyobject_wrapper.rb

@@ -1,7 +1,8 @@
 module PyCall
   module PyObjectWrapper
-    def initialize(pyobj, pytype)
+    def initialize(pyobj, pytype=nil)
       check_type pyobj, pytype
+      pytype ||= LibPython.PyObject_Type(pyobj)
       @__pyobj__ = pyobj
     end
 
@@ -41,7 +42,8 @@ module PyCall
     private
 
     def check_type(pyobj, pytype)
-      return if pyobj.kind_of?(PyObject) && pyobj.kind_of?(pytype)
+      return if pyobj.kind_of?(PyObject)
+      return if pytype.nil? || pyobj.kind_of?(pytype)
       raise TypeError, "the argument must be a PyObject of #{pytype}"
     end
   end

data/lib/pycall/types.rb

@@ -2,8 +2,8 @@ module PyCall
   module Types
     def self.pyisinstance(pyobj, pytype)
       check_pyobject(pyobj)
-      pyobj_ptr = pyobj # TODO: fix after introducing PyObject class
-      LibPython.PyObject_IsInstance(pyobj_ptr, pytype) == 1
+      pytype = PyObject.new(pytype.to_ptr) if pytype.kind_of?(PyTypeObject)
+      LibPython.PyObject_IsInstance(pyobj, pytype) == 1
     end
 
     class << self

data/lib/pycall/utils.rb

@@ -33,6 +33,11 @@ module PyCall
       @type ||= PyCall.eval('type')
       @type.(pyobj)
     end
+
+    def format_traceback(pyobj)
+      @format_tb ||= import_module('traceback').format_tb
+      @format_tb.(pyobj)
+    end
   end
 
   extend Utils

data/lib/pycall/version.rb

@@ -1,3 +1,3 @@
 module PyCall
-  VERSION = "0.1.0.alpha.20170224b"
+  VERSION = "0.1.0.alpha.20170226"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha.20170224b
+  version: 0.1.0.alpha.20170226
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -96,6 +96,7 @@ files:
 - lib/pycall/eval.rb
 - lib/pycall/import.rb
 - lib/pycall/init.rb
+- lib/pycall/iruby_helper.rb
 - lib/pycall/libpython.rb
 - lib/pycall/list.rb
 - lib/pycall/pyerror.rb