mumuki-python-runner 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b96184406c101c4a7b9e627936c5b4a06fa263b5a9de6a3e3f78a0a62f78499b
-  data.tar.gz: d6f7a4575bded83c5f11c368c5aefe0a0b2d93bc3678bcf11b213eee03c2a5bf
+  metadata.gz: '039cd7e8daf34032853b80ad08223b1af629432395e1036d0c141bcd2a81cb4c'
+  data.tar.gz: eb45b266b689d2d13a18d54a1815a6d2f1b5d255c0dea700f67a17b5a34a5b40
 SHA512:
-  metadata.gz: 42aeb75b306a206b0d70dbbfee375b687871db2d16f392bdd47c0ce9f7010f79968608542fc0d2e94747dc45600d2736f720784f9ae6a120f8a9bb1cae1b41fa
-  data.tar.gz: 222ba1f7dd0b7096e79eb5723bc08c05af42bbdbc77696d6660a724cf110312b3678ca95114bde71fc71046525e41790f166972bdc9314e29801d3ed4c5c29ae
+  metadata.gz: a154c8202c04203bfd5a577d2a70d407ebfd98f24a3050fc524f97bbcb60c724f6944fd613911869160418590a80acf9abdf0aef3dd5b3a7e41904e752cb41f7
+  data.tar.gz: b609e0a9fa6624bb99e1e3b5a2db1ed63d5c131af554feee56e488eb6da67fcfb41abe607a8d2ada3ef0dbd38cfd583be8503388bcb1c658408cf64281b26dbc

data/lib/base/query_hook.rb

@@ -7,6 +7,10 @@ class BasePythonQueryHook < Mumukit::Templates::FileHook
   end
 
   def compile_file_content(req)
+    "#{compile_file_header(req)}\n#{compile_query(req.query)}"
+  end
+
+  def compile_file_header(req)
     <<python
 # -*- coding: UTF-8 -*-
 import string, sys, os
@@ -16,19 +20,30 @@ import string, sys, os
 sys.stdout = open(os.devnull, 'w')
 #{compile_cookie(req.cookie)}
 sys.stdout = sys.__stdout__
-#{build_query req.query}
 python
   end
 
-  def build_query(query)
-    if query.match /print *(\(| ).*|^[a-zA-Z_]\w*\s*=.*|^raise\b/
+  def compile_query(query, output_prefix = "=> ")
+    if query.match /print *(\(| ).*|^[a-zA-Z_]\w*\s*=[^=].*|^raise\b/
       query
     else
-      "print(string.Template(\"=> $result\").substitute(result = #{query}))"
+      <<~python
+        __mumuki_error__ = None
+        try:
+          __mumuki_args__ = {'mumuki_query_result': eval("""#{query.gsub('"', '\"')}""")}
+          print(string.Template(\"#{output_prefix}\${mumuki_query_result}\").safe_substitute(**__mumuki_args__))
+        except SyntaxError as e:
+          __mumuki_error__ = SyntaxError(e.msg, ('<console>', e.lineno, e.offset, e.text))
+        if __mumuki_error__:
+          print(__mumuki_error__.text)
+          print(" "*(__mumuki_error__.offset - 1) + "^")
+          print('SyntheticMumukiSyntaxError: SyntaxError: ' + str(__mumuki_error__))
+          exit(1)
+      python
     end
   end
 
-  def build_state(cookie)
+  def compile_state(cookie)
     (cookie||[]).map do |statement|
     <<~python
     try:
@@ -40,7 +55,7 @@ python
   end
 
   def compile_cookie(cookie)
-    build_state(cookie).join("\n")
+    compile_state(cookie).join("\n")
   end
 
   def error_patterns
@@ -50,7 +65,7 @@ python
   end
 
   def syntax_error_regexp
-    /\A  File .*\n(?m)(?=.*(SyntaxError|IndentationError))/
+    /(SyntheticMumukiSyntaxError: )|(\A  File .*\n(?m)(?=.*(SyntaxError|IndentationError)))/
   end
 end
 

data/lib/base/test_hook.rb

@@ -17,8 +17,8 @@ import unittest
 import xmlrunner
 import sys
 
-#{request.content}
 #{request.extra}
+#{request.content}
 #{test_class(request.test)}
 
 unittest.main(

data/lib/base/version.rb

@@ -1,3 +1,4 @@
+
 module BasePythonVersionHook
-  VERSION = '1.5.0'
+  VERSION = '1.7.0'
 end

data/lib/python2/expectations_hook.rb

@@ -3,3 +3,5 @@ class Python2ExpectationsHook < BasePythonExpectationsHook
     'Python2'
   end
 end
+
+PythonExpectationsHook = Python2ExpectationsHook

data/lib/python2_runner.rb

@@ -4,7 +4,10 @@ def reload_python2_runner!
   Mumukit.runner_name = 'python'
   Mumukit.configure do |config|
     config.docker_image = 'mumuki/mumuki-python2-worker:0.1'
+    # comment type should be Mumukit::Directives::CommentType::Ruby, but it is
+    # Mumukit::Directives::CommentType::Cpp for backward compatibility
     config.stateful = true
+    config.structured = true
   end
 end
 

data/lib/python3/try_hook.rb

@@ -0,0 +1,48 @@
+class Python3TryHook < Mumukit::Templates::TryHook
+  isolated true
+  attr_reader :query_hook
+
+  def initialize(config = nil)
+    super config
+    @query_hook = Python3QueryHook.new
+  end
+
+  def compile_file_content(r)
+    <<python
+#{query_hook.compile_file_header(r)}
+print("#{query_separator}");
+#{query_hook.compile_query(r.query, '')}
+print("#{goal_separator}");
+#{query_hook.compile_query(r.goal.indifferent_get(:query) || 'None', '')}
+python
+  end
+
+  delegate :tempfile_extension, to: :query_hook
+  delegate :command_line, to: :query_hook
+
+  def query_separator
+    '!!!MUMUKI-QUERY-START!!!'
+  end
+
+  def goal_separator
+    '!!!MUMUKI-GOAL-START!!!'
+  end
+
+  def to_structured_results(_file, result, status)
+    /#{query_separator}
+?(.*)
+#{goal_separator}
+?(.*)
+/m =~ result
+
+    {
+        query: to_query_result($1, status),
+        goal: $2,
+        status: status
+    }
+  end
+
+  def to_query_result(result, status)
+    { result: result, status: status }
+  end
+end

data/lib/python3_runner.rb

@@ -4,6 +4,8 @@ def reload_python3_runner!
   Mumukit.runner_name = 'python3'
   Mumukit.configure do |config|
     config.docker_image = 'mumuki/mumuki-python3-worker:0.1'
+    config.comment_type = Mumukit::Directives::CommentType::Ruby
+    config.structured = true
     config.stateful = true
   end
 end
@@ -14,5 +16,6 @@ reload_python3_runner!
 require_relative './python3/version'
 require_relative './python3/test_hook'
 require_relative './python3/query_hook'
+require_relative './python3/try_hook'
 require_relative './python3/expectations_hook'
 require_relative './python3/metadata_hook'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-python-runner
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,7 @@ files:
 - lib/python3/metadata_hook.rb
 - lib/python3/query_hook.rb
 - lib/python3/test_hook.rb
+- lib/python3/try_hook.rb
 - lib/python3/version.rb
 - lib/python3_runner.rb
 - lib/python_runner.rb
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Python Runner for Mumuki