interscript 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2088a63470d6a75261e2a774c73cf30b33e06e69b91d679b0eef5d7431197ef0
-  data.tar.gz: fafd8fa34f47f600c1dc0f7d8da2628a264aec9c5387b21bbcf483e9606c915f
+  metadata.gz: 9dd918129c2ea6f94d0bf346869fe9a4baca90e7b59524787ebe5fe58c22a1af
+  data.tar.gz: 7ab737080e82d26da28b631ba46fc75547b8492b250841dc5a8e8527f6b73736
 SHA512:
-  metadata.gz: b9e25faac07f4c517c291a7fd61ab435b70c84e0e9404b6cc4da8196e044e603ed6475d66d20f36d48fb75b8117d454dd1fce61244dafd99f588298fcbd96844
-  data.tar.gz: 95c6a784bcca66f9b05f39260c2dd5a6a4a945f044c955d518d661381eb8de0610be7f7ec029fe923273f6624933f5affd7f825d94b80b838866f35fd7797d15
+  metadata.gz: f47f197ec26a7df2dfd49ecee799c33bb8f78cee4e6453cfc191fd165c9fa8925ebca1612c4305469a5ece2ee904e81d2a6e8d6d49bcd7e5f983d9890ac4ff9e
+  data.tar.gz: c4a3d287564512c48c25069100dbfce537939c339e9289d894cf55d48af25e980f48f744161fd57bc44eb8af345d659ed703da9981cdb99bd819c9c00960c8c7

data/Gemfile

@@ -26,6 +26,10 @@ unless ENV["SKIP_JS"]
   end
 end
 
+group :rababa do
+  gem 'rababa', github: 'interscript/rababa', ref: '70051da'
+end
+
 gem 'pry'
 
 gem 'simplecov', require: false, group: :test

data/Rakefile

@@ -20,7 +20,10 @@ task :compile, [:compiler, :target] do |t, args|
 
   maplist = {}
 
-  Interscript.maps.each do |map|
+  maps = Interscript.maps
+  maps = Interscript.exclude_maps(maps, compiler: compiler, platform: false)
+  
+  maps.each do |map|
     code = compiler.(map).code
     File.write(args[:target] + "/" + map + "." + ext, code)
     maplist[map] = nil
@@ -68,6 +71,7 @@ task :generate_metadata_json do
   require "fileutils"
   require "json"
   require "interscript"
+  require "interscript/compiler/javascript"
 
   FileUtils.rm_rf(file = __dir__+"/metadata.json")
 
@@ -75,6 +79,10 @@ task :generate_metadata_json do
     parsed_map = Interscript.parse(map)
     md = parsed_map.metadata.to_hash
     md["test"] = parsed_map.tests&.data&.first
+    md["skip_js"] = Interscript.exclude_maps([map],
+                      compiler: Interscript::Compiler::Javascript,
+                      platform: false,
+                    ).empty?
     [map, md]
   end.to_h
 

data/interscript.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor"
-  spec.add_dependency "interscript-maps", "~> #{Interscript::VERSION.split('.')[0,2].join(".")}.0"
+  spec.add_dependency "interscript-maps", "~> #{Interscript::VERSION.split('.')[0,2].join(".")}.0a"
   spec.add_dependency "text"
 end

data/lib/interscript.rb

@@ -86,6 +86,56 @@ module Interscript
       end.compact.flatten
     end
 
+    def rababa_configs
+      @rababa_configs ||= map_gems.map do |i,v|
+        v["rababa-configs"]
+      end.compact.inject({}) do |a,b|
+        a.merge(b)
+      end
+    end
+
+    # This code is borrowed from Secryst and should end up in Rababa, but for now,
+    # let's keep it here.
+    def rababa_provision(model_name, model_uri)
+      require 'fileutils'
+      require 'open-uri'
+
+      # We provision the environment in the following way:
+      # First, we try the RABABA_DATA environment variable. If that's available,
+      # we use it to store the Rababa data we need. Otherwise, we try the following
+      # paths:
+
+      possible_paths = [
+        "/var/lib/rababa",
+        "/usr/local/share/rababa",
+        "/usr/share/rababa",
+        File.join(Dir.home, ".local/share/rababa")
+      ]
+
+      # We find the first writable path
+
+      write_path = nil
+
+      ([ENV["RABABA_DATA"]] + possible_paths).compact.each do |path|
+        FileUtils.mkdir_p(path)
+        write_path = path unless write_path
+      rescue
+      end
+
+      raise StandardError, "Can't find a writable path for Rababa. Consider setting a RABABA_DATA environment variable" unless write_path
+
+      model_path = "#{write_path}/model-#{model_name}.onnx"
+
+      # Redownload every hour
+      if File.exist?(model_path) && File.mtime(model_path) + 3600 >= Time.now
+        return model_path
+      else
+        data = URI.open(model_uri).read
+        File.write(model_path, data)
+        return model_path
+      end
+    end
+
     def map_aliases
       return @map_aliases if @map_aliases
 
@@ -109,6 +159,22 @@ module Interscript
 
       basename ? imps.map { |j| File.basename(j, ".#{ext}") } : imps
     end
+
+    # Removes the excluded maps for a given compiler and RUBY_PLATFORM.
+    # To be used by tests
+    # and builders. It uses the `skip` directive in interscript-maps.yaml
+    def exclude_maps(maps, compiler:, platform: true)
+      map_gems.each do |i,v|
+        [compiler.name, (Gem::Platform.local.os if platform)].compact.each do |name|
+          skips = v.dig('skip', name) || []
+          skips.each do |skip|
+            skip_re = /#{Regexp.escape(skip).gsub("\\*", ".*?")}/
+            maps = maps.grep_v(skip_re)
+          end
+        end
+      end
+      maps
+    end
   end
 end
 

data/lib/interscript/dsl/document.rb

@@ -37,10 +37,11 @@ class Interscript::DSL::Document
     @node.dep_aliases[dep.name] = dep if dep.name
   end
 
-  def stage(name = :main, &block)
+  def stage(name = :main, dont_reverse: false, &block)
     puts "stage(#{name}) from #{self.inspect}" if $DEBUG
     stage = Interscript::DSL::Stage.new(name, &block)
     stage.node.doc_name = @node.name
+    stage.node.dont_reverse = dont_reverse
     @node.stages[name] = stage.node
   end
 end

data/lib/interscript/dsl/tests.rb

@@ -6,7 +6,7 @@ class Interscript::DSL::Tests
     self.instance_exec(&block)
   end
 
-  def test(from,to)
-    @node << [from, to]
+  def test(from, to, reverse_run: nil)
+    @node << [from, to, reverse_run]
   end
 end

data/lib/interscript/node/document.rb

@@ -1,6 +1,7 @@
 class Interscript::Node::Document
   attr_accessor :metadata, :tests, :name
   attr_accessor :dependencies, :aliases, :stages, :dep_aliases
+  attr_accessor :reversed_from
 
   def initialize
     puts "Interscript::Node::Document.new " if $DEBUG

data/lib/interscript/node/stage.rb

@@ -1,9 +1,10 @@
 class Interscript::Node::Stage < Interscript::Node::Group::Sequential
-  attr_accessor :name, :doc_name
+  attr_accessor :name, :doc_name, :dont_reverse
 
-  def initialize(name = :main, reverse_run: nil, doc_name: nil)
+  def initialize(name = :main, reverse_run: nil, doc_name: nil, dont_reverse: false)
     @name = name
     @doc_name = doc_name
+    @dont_reverse = dont_reverse
     super(reverse_run: reverse_run)
   end
 
@@ -14,6 +15,8 @@ class Interscript::Node::Stage < Interscript::Node::Group::Sequential
   end
 
   def reverse
+    return self if dont_reverse
+
     @reverse ||= begin
       self.class.new(name,
         doc_name: Interscript::Node::Document.reverse_name(doc_name),
@@ -27,11 +30,16 @@ class Interscript::Node::Stage < Interscript::Node::Group::Sequential
   def ==(other)
     super &&
     self.name == other.name &&
-    self.reverse_run == other.reverse_run
+    self.reverse_run == other.reverse_run &&
+    self.dont_reverse == other.dont_reverse
   end
 
   def inspect
-    name = "(#{@name})" if @name != :main
+    args = []
+    args << "#{@name}" if @name != :main
+    args << "dont_reverse: true" if dont_reverse
+    name = ""
+    name = "(#{args.join(", ")})" unless args.empty?
     "stage#{name} {\n#{super}\n}"
   end
 end

data/lib/interscript/node/tests.rb

@@ -9,7 +9,9 @@ class Interscript::Node::Tests < Interscript::Node
   end
 
   def reverse
-    self.class.new(data.map(&:reverse))
+    self.class.new(data.map do |from,to,reverse_run|
+      [to, from, reverse_run == nil ? nil : !reverse_run]
+    end)
   end
 
   def ==(other)

data/lib/interscript/stdlib.rb

@@ -171,7 +171,7 @@ class Interscript::Stdlib
   end
 
   def self.available_functions
-    %i[title_case downcase compose decompose separate unseparate secryst]
+    %i[title_case downcase compose decompose separate unseparate secryst rababa]
   end
 
   def self.reverse_function
@@ -233,5 +233,21 @@ class Interscript::Stdlib
         @secryst_models[model].translate(i)
       end.join("\n")
     end
+
+    def self.rababa(output, config:)
+      require "rababa" rescue nil # Try to load rababa, but don't fail hard if not possible.
+      unless defined? Rababa
+        raise StandardError, "Rababa is not loaded. Please read docs/Usage_with_Rababa.adoc"
+      end
+
+      config_value = Interscript.rababa_configs[config]
+      model_uri = config_value['model']
+      rababa_config = config_value['config']
+      model_path = Interscript.rababa_provision(config, model_uri)
+
+      @rababa_diacritizer ||= Rababa::Diacritizer.new(model_path, rababa_config)
+
+      @rababa_diacritizer.diacritize_text(output)
+    end
   end
 end

data/lib/interscript/version.rb

@@ -1,3 +1,3 @@
 module Interscript
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

data/lib/interscript/visualize/json.rb

@@ -10,6 +10,7 @@ class Interscript::Node::Group
         more << "after: #{rule.after.to_html(map)}" if rule.after
         more << "<nobr>not before:</nobr> #{rule.not_before.to_html(map)}" if rule.not_before
         more << "<nobr>not after:</nobr> #{rule.not_after.to_html(map)}" if rule.not_after
+        more << "<nobr>reverse run:</nobr> #{rule.reverse_run}" unless rule.reverse_run.nil?
         more = more.join(", ")
 
         out << {
@@ -24,11 +25,14 @@ class Interscript::Node::Group
           children: rule.to_visualization_array(map)
         }
       when Interscript::Node::Rule::Funcall
+        more = rule.kwargs.map do |k,v|
+          "#{k.to_s.gsub("_", " ")}: #{v}"
+        end
+        more << "<nobr>reverse run:</nobr> #{rule.reverse_run}" unless rule.reverse_run.nil?
+
         out << {
           type: rule.name.to_s.gsub("_", " ").gsub(/^(.)/, &:upcase),
-          more: rule.kwargs.map do |k,v|
-            "#{k.to_s.gsub("_", " ")}: #{v}"
-          end.join(", ")
+          more: more.join(", ")
         }
       when Interscript::Node::Rule::Run
         if rule.stage.map
@@ -39,10 +43,14 @@ class Interscript::Node::Group
           stage = rule.stage.name
         end
 
+        more = []
+        more << "<nobr>reverse run:</nobr> #{rule.reverse_run}" unless rule.reverse_run.nil?
+
         out << {
           type: "Run",
           doc: doc.name,
-          stage: stage
+          stage: stage,
+          more: more.join(", "),
         }
       else
         out << {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interscript
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0a
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement