cpee-instantiation 1.0.18 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 025e4ba070e685921b00e57887d8f979a3d6434b74b16efbaa6adb310534a7d7
-  data.tar.gz: 9a84e081c68f000c4519054a116b9caa93ce5f7f1920dd88f993478ef1f86a01
+  metadata.gz: 2b92cd471892d3eef55e68e3684b33cdeab451ca7844cc381a220fe10dd62e7a
+  data.tar.gz: bb7ac9554eb9226c37c77937da6f32afe9b21187db9bef9a2b8460c90b03d086
 SHA512:
-  metadata.gz: d1d447f2bbc430412f369f267ff3b1078d299e65f3613b5a1b40e79b8964ec864ccb8690c8db19bf329a970b5fda8951cfb569b91dd9d2caf442d1d8b7ede905
-  data.tar.gz: '0692514bb3af3b5162d0d7b8d1f97fecc1a1ff04556f5e78cf282f035829e7e307b00636e5b43aeac1a2f6f5d55cf188286144bbabf7b20e37d1093695706648'
+  metadata.gz: ea47cf96378fbd39c8661a7c1e5054d193a662deac7626e80777ebedbf8eb41520a17c734167581d9257946073cf6cc8b1d3efde4f1b895fff51d44c9768cbbe
+  data.tar.gz: fcf4c3d6c298531f2cad59d75b4144cd618d17597f32bde9f52ae88959a120ce3d3c2873495a30cb76771b1554ca33fdf0c06bd0c10fa2863f37933b6ce61547

data/README.md

@@ -4,7 +4,7 @@ To install the instatiation service go to the commandline
 
 ```bash
  gem install cpee-instantiation
- cpee-instantiation instantiation
+ cpee-instantiation new instantiation
  cd instantiation
  ./instantiation start
 ```

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.18"
+  s.version          = "1.0.24"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 0.99'
+  s.add_runtime_dependency 'riddl', '~> 1.0'
   s.add_runtime_dependency 'json', '~> 2.1'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'

data/lib/cpee-instantiation/instantiation.rb

@@ -1,21 +1,22 @@
 # This file is part of CPEE-INSTANTIATION.
 #
 # CPEE-INSTANTIATION is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option) any
-# later version.
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
 #
 # CPEE-INSTANTIATION is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+# for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# CPEE-INSTANTIATION (file LICENSE in the main directory).  If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with CPEE-INSTANTIATION (file LICENSE in the main directory).  If not,
+# see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 require 'cpee/value_helper'
+require 'cpee/redis'
 require 'xml/smart'
 require 'riddl/server'
 require 'securerandom'
@@ -24,6 +25,8 @@ require 'uri'
 require 'redis'
 require 'json'
 
+require_relative 'utils'
+
 module CPEE
   module Instantiation
 
@@ -38,7 +41,12 @@ module CPEE
               ele.first.text = CPEE::ValueHelper::generate(v)
             else
               ele = tdoc.find("/*/prop:#{what}")
-              ele.first.add(k,CPEE::ValueHelper::generate(v)) if ele.any?
+              ele = if ele.any?
+                ele.first
+              else
+                tdoc.root.add("prop:#{what}")
+              end
+              ele.add(k,CPEE::ValueHelper::generate(v))
             end
           end
         end
@@ -283,15 +291,18 @@ module CPEE
       end
     end  #}}}
 
-    class InstantiateXML < Riddl::Implementation #{{{
+class InstantiateXML < Riddl::Implementation #{{{
       include Helpers
 
       def response
+        puts "InstantiateXML response method called: #{@a[1]}",
         cpee     = @h['X_CPEE'] || @a[0]
         behavior = @a[1] ? 'fork_ready' : @p[0].value
         data     = @a[1] ? 0 : 1
         selfurl  = @a[2]
         cblist   = @a[3]
+        puts "Received data: #{@p}"
+        puts "p[data]: #{@p[data]}"
         tdoc = if @p[data].additional =~ /base64/
           Base64.decode64(@p[data].value.read)
         else
@@ -316,6 +327,7 @@ module CPEE
           if @p[0].value =~ /^wait/
             @headers << Riddl::Header.new('CPEE-CALLBACK','true')
           end
+          @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
           Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
       end
@@ -400,33 +412,54 @@ module CPEE
           ]
         end
       end
-    end #}}}
+
+end #}}}
 
     def self::implementation(opts)
       opts[:cpee]       ||= 'http://localhost:9298/'
-      opts[:redis_path] ||= '/tmp/redis.sock'
-      opts[:redis_db]   ||= 14
       opts[:self]       ||= "http#{opts[:secure] ? 's' : ''}://#{opts[:host]}:#{opts[:port]}/"
-      opts[:cblist]       = Redis.new(path: opts[:redis_path], db: opts[:redis_db])
+
+      opts[:watchdog_frequency]         ||= 7
+      opts[:watchdog_start_off]         ||= false
+
+      ### set redis_cmd to nil if you want to do global
+      ### at least redis_path or redis_url and redis_db have to be set if you do global
+      opts[:redis_path]                 ||= 'redis.sock' # use e.g. /tmp/redis.sock for global stuff. Look it up in your redis config
+      opts[:redis_db]                   ||= 0
+      ### optional redis stuff
+      opts[:redis_url]                  ||= nil
+      opts[:redis_cmd]                  ||= 'redis-server --port 0 --unixsocket #redis_path# --unixsocketperm 600 --pidfile #redis_pid# --dir #redis_db_dir# --dbfilename #redis_db_name# --databases 1 --save 900 1 --save 300 10 --save 60 10000 --rdbcompression yes --daemonize yes'
+      opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
+      opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
+
+      CPEE::redis_connect opts, 'Instantiation'
+
       Proc.new do
+        parallel do
+          CPEE::Instantiation::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
+          EM.add_periodic_timer(opts[:watchdog_frequency]) do ### start services
+            CPEE::Instantiation::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
+          end
+        end
+
         on resource do
           run InstantiateXML, opts[:cpee], true if post 'xmlsimple'
           on resource 'xml' do
             run InstantiateXML, opts[:cpee], false if post 'xml'
           end
           on resource 'url' do
-            run InstantiateUrl, opts[:cpee], opts[:self], opts[:cblist], false if post 'url'
-            run InstantiateUrl, opts[:cpee], opts[:self], opts[:cblist], true  if post 'url_info'
+            run InstantiateUrl, opts[:cpee], opts[:self], opts[:redis], false if post 'url'
+            run InstantiateUrl, opts[:cpee], opts[:self], opts[:redis], true  if post 'url_info'
           end
           on resource 'git' do
-            run InstantiateGit, opts[:cpee], opts[:self], opts[:cblist] if post 'git'
+            run InstantiateGit, opts[:cpee], opts[:self], opts[:redis] if post 'git'
           end
           on resource 'instance' do
-            run HandleInstance, opts[:cpee], opts[:self], opts[:cblist] if post 'instance'
+            run HandleInstance, opts[:cpee], opts[:self], opts[:redis] if post 'instance'
           end
           on resource 'callback' do
             on resource do
-              run ContinueTask, opts[:cpee], opts[:cblist] if post
+              run ContinueTask, opts[:cpee], opts[:redis] if post
             end
           end
         end

data/lib/cpee-instantiation/instantiation.xml

@@ -1,3 +1,21 @@
+<!--
+  This file is part of CPEE-INSTANTIATION.
+
+  CPEE-INSTANTIATION is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  CPEE-INSTANTIATION is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+  for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with CPEE-INSTANTIATION (file LICENSE in the main directory).  If not,
+  see <http://www.gnu.org/licenses/>.
+-->
+
 <description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
   <message name="xmlsimple">
     <parameter name="xml" mimetype="*/xml"/>

data/lib/cpee-instantiation/utils.rb

@@ -0,0 +1,52 @@
+# This file is part of CPEE-INSTANTIATION
+#
+# CPEE-INSTANTIATION is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# CPEE-INSTANTIATION is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with CPEE-INSTANTIATION (file LICENSE in the main directory). If not, see
+# <http://www.gnu.org/licenses/>.
+
+module CPEE
+  module Instantiation
+
+    def self::watch_services(watchdog_start_off,url,path,db)
+      return if watchdog_start_off
+      EM.defer do
+        Dir[File.join(__dir__,'routing','*.rb')].each do |s|
+          s = s.sub(/\.rb$/,'')
+          pid = (File.read(s + '.pid').to_i rescue nil)
+          cmd = if url.nil?
+            "-p \"#{path}\" -d #{db} restart"
+          else
+            "-u \"#{url}\" -d #{db} restart"
+          end
+          if (pid.nil? || !(Process.kill(0, pid) rescue false)) && !File.exist?(s + '.lock')
+            system "#{s}.rb " + cmd + " 1>/dev/null 2>&1"
+            puts "➡ Service #{File.basename(s)} (-v #{cmd}) started ..."
+          end
+        end
+      end
+    end
+
+    def self::cleanup_services(watchdog_start_off)
+      return if watchdog_start_off
+      Dir[File.join(__dir__,'routing','*.rb')].each do |s|
+        s = s.sub(/\.rb$/,'')
+        pid = (File.read(s + '.pid').to_i rescue nil)
+        if !pid.nil? || (Process.kill(0, pid) rescue false)
+          system "#{s}.rb stop 1>/dev/null 2>&1"
+          puts "➡ Service #{File.basename(s,'.rb')} stopped ..."
+        end
+      end
+    end
+
+  end
+end

data/server/instantiation

@@ -1,4 +1,21 @@
 #!/usr/bin/ruby
+#
+# This file is part of CPEE-INSTANTIATION.
+#
+# CPEE-INSTANTIATION is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# CPEE-INSTANTIATION is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE-INSTANTIATION (file LICENSE in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
 require 'rubygems'
 require 'cpee-instantiation/instantiation'
 

data/tools/cpee-instantiation

@@ -1,4 +1,21 @@
 #!/usr/bin/ruby
+#
+# This file is part of CPEE-INSTANTIATION.
+#
+# CPEE-INSTANTIATION is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# CPEE-INSTANTIATION is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE-INSTANTIATION (file LICENSE in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
 curpath = __dir__
 require 'rubygems'
 require 'optparse'
@@ -26,24 +43,28 @@ end
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
   opt.summary_width = 15
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [DIR]\n"
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] new DIR\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
-  opt.on(wrap("[DIR]             scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
+  opt.on(wrap("[new DIR]         scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
   opt.parse!
 }
-if (ARGV.length != 1)
+if (ARGV.length <  2) ||
+   (ARGV.length == 2  && !(%w(new).include?(ARGV[0]))) ||
+   (ARGV.length >  2)
   puts ARGV.options
   exit
-else
-  p1 = ARGV[0]
 end
+command = ARGV[0]
+p1      = ARGV[1]
 
-insta = "#{curpath}/../server/"
-if !File.exist?(p1)
-  FileUtils.cp_r(insta,p1)
-else
-  FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
-  puts 'Directory already exists, updating ...'
+if command == 'new'
+  insta = "#{curpath}/../server/"
+  if !File.exist?(p1)
+    FileUtils.cp_r(insta,p1)
+  else
+    FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
+    puts 'Directory already exists, updating ...'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.24
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +88,7 @@ files:
 - cpee-instantiation.gemspec
 - lib/cpee-instantiation/instantiation.rb
 - lib/cpee-instantiation/instantiation.xml
+- lib/cpee-instantiation/utils.rb
 - server/instantiation
 - tools/cpee-instantiation
 homepage: http://cpee.org/
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)