interactive mode

Author: Christopher Doris

Project.toml

@@ -1,7 +1,7 @@
 name = "PythonCall"
 uuid = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
 authors = ["Christopher Doris <github.com/cjdoris>"]
-version = "0.9.6-DEV"
+version = "0.9.5"
 
 [deps]
 CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
@@ -10,6 +10,7 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"

docs/src/releasenotes.md

@@ -1,6 +1,8 @@
 # Release Notes
 
 ## Unreleased
+* When using JuliaCall from an interactive Python session, Julia is put into interactive
+  mode: `isinteractive()` is true, InteractiveUtils is loaded, and a nicer display is used.
 * Python named tuples can be converted to Julia named tuples.
 * Bug fixes.
 

pysrc/juliacall/__init__.py

@@ -192,12 +192,6 @@ def jlstr(x):
             ENV["JULIA_PYTHONCALL_EXE"] = {}
             Pkg.activate({}, io=devnull)
             import PythonCall
-            # This uses some internals, but Base._start() gets the state more like Julia
-            # is if you call the executable directly, in particular it creates workers when
-            # the --procs argument is given.
-            push!(Core.ARGS, {})
-            Base._start()
-            @eval Base PROGRAM_FILE=""
         catch err
             print(stderr, "ERROR: ")
             showerror(stderr, err, catch_backtrace())
@@ -208,7 +202,6 @@ def jlstr(x):
             jlstr(str(c.pythonapi._handle)),
             jlstr(sys.executable or ''),
             jlstr(project),
-            jlstr(os.path.join(os.path.dirname(__file__), 'init.jl')),
         )
         res = jl_eval(script.encode('utf8'))
         if res is None:

src/PythonCall.jl

@@ -4,7 +4,7 @@ const VERSION = v"0.9.5"
 const ROOT_DIR = dirname(@__DIR__)
 
 using Base: @propagate_inbounds
-using MacroTools, Dates, Tables, Markdown, Serialization, Requires, Pkg
+using MacroTools, Dates, Tables, Markdown, Serialization, Requires, Pkg, REPL
 
 include("utils.jl")
 

src/compat/stdlib.jl

@@ -6,7 +6,33 @@ function init_stdlib()
     pywordsize = @py(jlbool(pysysmodule.maxsize > 2^32)) ? 64 : 32
     pywordsize == Sys.WORD_SIZE || error("Julia is $(Sys.WORD_SIZE)-bit but Python is $(pywordsize)-bit")
 
-    if !C.CTX.is_embedded
+    if C.CTX.is_embedded
+
+        # This uses some internals, but Base._start() gets the state more like Julia
+        # is if you call the executable directly, in particular it creates workers when
+        # the --procs argument is given.
+        push!(Core.ARGS, joinpath(ROOT_DIR, "pysrc", "juliacall", "init.jl"))
+        Base._start()
+        Base.eval(:(PROGRAM_FILE = ""))
+
+        # if Python is interactive, ensure Julia is too
+        if pyhasattr(pysysmodule, "ps1")
+            Base.eval(:(is_interactive = true))
+            REPL = Base.require(Base.PkgId(Base.UUID("3fa0cd96-eef1-5676-8a61-b3b8758bbffb"), "REPL"))
+            # adapted from run_main_repl() in julia/base/client.jl
+            Base.load_InteractiveUtils()
+            term_env = get(ENV, "TERM", Sys.iswindows() ? "" : "dumb")
+            term = REPL.Terminals.TTYTerminal(term_env, stdin, stdout, stderr)
+            if term.term_type == "dumb"
+                repl = REPL.BasicREPL(term)
+            else
+                repl = REPL.LineEditREPL(term, get(stdout, :color, false), true)
+                repl.history_file = false
+            end
+            pushdisplay(REPL.REPLDisplay(repl))
+        end
+
+    else
 
         # set sys.argv
         pysysmodule.argv = pylist([""; ARGS])