unageanu-jiji 1.1.4 → 1.2.1

data/lib/jiji/process_manager.rb

@@ -10,27 +10,37 @@ module JIJI
 
     def initialize( registry )
       @registry = registry
+      @executor = registry.back_test_process_executor
       @rmt = @registry.rmt_process
       @back_tests = {}
-
-      @mutex = Mutex.new
-      @running = nil # 実行中のテスト
-      @waiting = [] # 待機中のテスト
+      @logger = registry.server_logger
 
       # 既存のバックテスト一覧を読み込む
       Dir.glob( "#{registry.process_dir}/*" ) {|d|
         next unless File.directory? d
-        next unless File.exist? "#{d}/props.yaml"
-        id = File.basename(d)
-        next if id == "rmt"
-        @back_tests[id] = @registry.backtest_process(id, nil )
+        next unless File.exist? "#{d}/#{JIJI::ProcessInfo::PROPERTY_FILE}"
+        begin
+          id = File.basename(d)
+          next if id == "rmt"
+          info = @registry.process_info( id )
+          process = @registry.process_info(id)
+          process.load # 保存しておいた設定情報をロード
+          @back_tests[id] = process
+        rescue
+          @logger.error $!
+        end
       }
     end
 
     # RMTプロセスをスタートする
     def start
       if @conf.get([:collector,:collect], true )
-        @rmt.start
+        begin
+          @rmt.load_agents( true )
+          @rmt.start
+        rescue
+          @rmt.logger.error $!
+        end
       end
     end
 
@@ -39,18 +49,7 @@ module JIJI
       @stoped = true
       @registry.operator( "rmt", false, nil).stop
       @rmt.stop
-      @mutex.synchronize {
-        @waiting.each {|i| 
-          i.collector.listeners.delete(self)
-          i.stop 
-        }
-        @waiting.clear
-        if @running != nil
-          @running.collector.listeners.delete(self)
-          @running.stop
-          @running = nil
-        end
-      }
+      @executor.stop
     end
 
     # バックテストプロセスを列挙する
@@ -65,27 +64,38 @@ module JIJI
       unless id == "rmt" || @back_tests.key?(id)
         raise UserError.new( JIJI::ERROR_NOT_FOUND, "process not found")
       end
-      id == "rmt" ? @rmt : @back_tests[id]
-    end
-
-     # プロセスの設定を更新する。
-     def set( process_id, setting )
-        p = get( process_id );
-        setting.each_pair {|k,v|
-          case k
-            when "name"
-              p["name"] = v
-            when "trade_enable"
-              p["trade_enable"] = v if process_id == "rmt" # バックテストの変更は許可しない。
-            when "agents"
-              p["agents"] = v
-          end
-        }
-      end
+      id == "rmt" ? @rmt.info : @back_tests[id]
+    end
+
+    # プロセスの設定を更新する。
+    def set( process_id, setting )
+      p = get( process_id )
+      failed = {}
+      setting.each_pair {|k,v|
+        case k
+          when "trade_enable"
+            # バックテストの変更は許可しない。
+            unless  process_id == "rmt"
+              raise UserError.new( JIJI::ERROR_ILLEGAL_ARGUMENTS, "illegal id.id=#{process_id}" )
+            end
+            value = ( v == "true" || v == true )
+            @rmt.trade_enable = value
+            @rmt.info["trade_enable"] = value
+          when "agents"
+            p = get( process_id )
+            if ( process_id == "rmt" )
+              failed = @rmt.set_agents(v)
+            else
+              failed = @executor.set_agents(process_id, v)
+            end
+            p["agents"] = create_success_agent_setting( p["agents"], v, failed )
+        end
+      }
+      failed
+    end
 
     # バックテストプロセスを新規に作成する
     def create_back_test( name, memo, start_date, end_date, agent_properties )
-
       id = UUIDTools::UUID.random_create().to_s
 
       # プロパティを記録
@@ -99,56 +109,29 @@ module JIJI
         "agents"=>agent_properties,
         "state"=>:WAITING
       }
-      begin
-        btp = @registry.backtest_process(id, props )
-        @mutex.synchronize {
-          if @running == nil
-            @running = btp
-            @running.collector.listeners << self
-            @running.start
-          else
-            @waiting << btp
-          end
-        }
-      rescue Exception
-        begin
-          btp.stop
-        rescue Exception
-        ensure
-          FileUtils.rm_rf "#{@registry.process_dir}/#{id}"
-        end
-        raise $!
-      end
-
-      @back_tests[id] = btp
-      return {
-       "id"=>id,
-       "name"=>name,
-       "create_date"=>Time.now.to_i
-      }
+      return start_process( id, props )
     end
 
     # バックテストプロセスを再起動する
-    def restart_test( id, agent_properties )
+    def restart_test( id, agent_properties=nil )
       unless id == "rmt" || @back_tests.key?(id)
         raise UserError.new( JIJI::ERROR_NOT_FOUND, "process not found")
       end
       p = get(id)
-      FileUtils.rm_rf back_test_dir(id)
+      new_id = UUIDTools::UUID.random_create().to_s # 別のIDを再割り当てする。
       props = {
-        "id"=>id,
+        "id"=>new_id,
         "name"=>p["name"],
         "memo"=>p["memo"],
-        "create_date"=>p["create_date"],
+        "create_date"=>Time.now.to_i,
         "start_date"=>p["start_date"],
         "end_date"=>p["end_date"],
-        "agent_properties"=>agent_properties
+        "agents"=>agent_properties || p["agents"],
+        "state"=>:WAITING
       }
-      btp = @registry.back_test_process(id, props )
-      btp.start
-
-      @back_tests[id] = btp
-      id
+      result = start_process( new_id, props )
+      delete_back_test( id )
+      return result
     end
 
     # バックテストプロセスを削除する
@@ -157,40 +140,151 @@ module JIJI
       unless id == "rmt" || @back_tests.key?(id)
         raise UserError.new( JIJI::ERROR_NOT_FOUND, "process not found")
       end
-      @mutex.synchronize {
-        if @running != nil && @running["id"] == id
-          @running.collector.listeners.delete(self)
-          @running.stop 
-          unless @waiting.empty?
-            @running = @waiting.shift
+      @executor.delete(id)
+      @back_tests.delete( id )
+      FileUtils.rm_rf "#{@registry.process_dir}/#{id}"
+    end
+
+    attr :registry, true
+    attr :conf, true
+    attr :executor, true
+    attr :rmt, true
+
+  private
+    # バックテストを開始する
+    def start_process( id, props )
+      info = @registry.process_info( id )
+      info.props = props
+      @executor << info
+      @back_tests[id] = info
+      return {
+       "id"=>id,
+       "name"=>props["name"],
+       "create_date"=>props["create_date"]
+      }
+    end
+
+    #更新に成功したエージェントの設定情報を作成する
+    def create_success_agent_setting( current, new_agents, failed )
+      failed.each {|pair|
+        case pair[1][:operation]
+          #新規作成で失敗したものは除外
+          when :add
+            new_agents = new_agents.reject {|i| i["id"] == pair[0]}
+          #更新、削除で失敗したものは現在の設定をそのままキープする
+          when :update
+            new_agents = new_agents.map {|i| 
+               i["id"] != pair[0] ? i : current.find {|j| j["id"] == pair[0] }
+            }
+          when :remove
+            new_agents << current.find {|j| j["id"] == pair[0] }
+        end
+      }
+      return new_agents
+    end
+  end
+
+  class BackTestProcessExecutor
+
+    def initialize
+      @running = nil
+      @mutex = Mutex.new
+      @waiting = []
+    end
+
+    #実行対象とするプロセスを追加する
+    def <<(info)
+      begin
+        btp = @registry.backtest_process(info )
+        btp.load_agents( false )
+        @mutex.synchronize {
+          if @running == nil
+            @running = btp
             @running.collector.listeners << self
             @running.start
           else
-            @running = nil
+            @waiting << btp
           end
-        else
-          # 待機中であればキューから除外。
-          @waiting = @waiting.reject{|i| i.id == id }
+        }
+      rescue Exception
+        begin
+          btp.stop if btp
+        rescue Exception
+        ensure
+          FileUtils.rm_rf "#{@process_dir}/#{info.process_id}"
+        end
+        raise $!
+      end
+    end
+
+    #全てのプロセスの実行を停止する
+    def stop
+      @mutex.synchronize {
+        @waiting.each {|i|
+          i.collector.listeners.delete(self)
+          i.stop
+        }
+        @waiting.clear
+        if @running != nil
+          @running.collector.listeners.delete(self)
+          @running.stop
+          @running = nil
         end
       }
-      @back_tests.delete( id )
-      FileUtils.rm_rf "#{@registry.process_dir}/#{id}"
     end
 
-    # コレクターの終了通知を受け取る
-    def on_finished( state, now )
+    #プロセスを削除する
+    def delete(id)
       @mutex.synchronize {
-        unless @waiting.empty?
-          @running = @waiting.shift
-          @running.collector.listeners << self
-          @running.start
+        if @running != nil && @running.info.process_id == id
+          #実行中であれば停止して次に
+          @running.collector.listeners.delete(self)
+          @running.stop
+          run_next
         else
-          @running = nil
+          # 待機中であればキューから除外。
+          @waiting = @waiting.reject{|i| i.info.process_id == id }
         end
       }
     end
 
+    #エージエントの設定を更新する
+    def set_agents(id, agents)
+      @mutex.synchronize {
+        p = get(id)
+        p ? p.set_agents(agents) : {}
+      }
+    end
+
+    #idに対応するプロセスがあれば取得する
+    def get(id)
+      if @running != nil && @running.info.process_id == id
+        return @running
+      else
+        return @waiting.find{|p|p.info.process_id == id}
+      end
+    end
+
+    #プロセスの実行終了通知を受け取る
+    def on_finished(state, time)
+      @mutex.synchronize {
+        run_next
+      }
+    end
+
     attr :registry, true
-    attr :conf, true
+
+  private
+    #待ち中のプロセスがあれば実行を開始する。
+    def run_next
+      unless @waiting.empty?
+        @running = @waiting.shift
+        @running.collector.listeners << self
+        @running.start
+      else
+        @running = nil
+      end
+    end
   end
+
 end

data/lib/jiji/registry.rb

@@ -14,7 +14,9 @@ require 'jiji/agent/agent_registry'
 require 'jiji/agent/permitter'
 require 'jiji/agent/util'
 require 'jiji/output'
+require 'jiji/output_manager'
 require 'jiji/operator'
+require "jiji/dao/file_system_dao"
 require "jiji/dao/rate_dao"
 require "jiji/dao/trade_result_dao"
 require 'logger'
@@ -32,6 +34,7 @@ require 'jiji/service/system_service'
 require 'jiji/migration/migrator'
 require 'jiji/migration/migrator1_0_3'
 require 'jiji/migration/migrator1_1_0'
+require 'jiji/migration/migrator1_2_0'
 
 require 'jiji/plugin/plugin_loader'
 require 'jiji/plugin/securities_plugin'
@@ -67,6 +70,24 @@ module JIJI
 	        FileUtils.mkdir_p process_dir
           process_dir
         }
+        # エージェント置き場
+        r.register( :agent_dir ) {
+          agent = r.conf.get([:dir,:agent], "agents")
+          FileUtils.mkdir_p "#{r.base_dir}/#{agent}"
+          agent
+        }
+        r.register( :shared_lib_dir ) {
+          shared_lib = r.conf.get([:dir,:shared_lib], "shared_lib")
+          FileUtils.mkdir_p "#{r.base_dir}/#{shared_lib}"
+          shared_lib
+        }
+        # 出力データ置き場
+        r.register( :output_dir, :model=>:multiton_initialize ) {|c,p,id|
+          dir = "#{r.process_dir}/#{id}/out"
+          FileUtils.mkdir_p dir
+          dir
+        }
+
         # バージョンファイル
         r.register( :version_file ) {
           r.base_dir + "/data_version"
@@ -104,13 +125,21 @@ module JIJI
           FileUtils.mkdir_p dir
           JIJI::Dao::TradeResultDao.new( dir, r.scales )
         }
-
-        # アウトプット
-        r.register( :output, :model=>:multiton_initialize ) {|c,p,id,agent_name|
-          dir = "#{r.process_dir}/#{id}/out"
+        r.register( :agent_file_dao ) {
+          dir = "#{r.base_dir}/#{r.conf.get([:dir,:agent], "agents")}"
+          sdir = "#{r.base_dir}/#{r.conf.get([:dir,:shared_lib], "shared_lib")}"
           FileUtils.mkdir_p dir
+          FileUtils.mkdir_p sdir
+          JIJI::Dao::FileSystemDao.new( r.base_dir )
+        }
 
-          c = JIJI::Output.new(agent_name, dir, r.scales)
+        # アウトプット
+        r.register( :output_manager ) {
+          JIJI::OutputManager.new(r)
+        }
+        r.register( :output, :model=>:multiton_initialize ) {|c,p,id,agent_id|
+          dir = r.output_dir(id)
+          c = JIJI::Output.new(agent_id, dir, r.scales)
           r.permitter.proxy( c, [/^(get|put|<<)$/], [/^get$/] )
         }
 
@@ -128,7 +157,7 @@ module JIJI
         r.register( :agent_manager, :model=>:multiton_initialize ) {|c,p,id,failsafe|
           c = JIJI::AgentManager.new( id, r.agent_registry, r.process_logger(id), failsafe )
           c.operator = r.operator(id, false, nil) # 作成段階では常に取引は行なわない。
-          c.registry = r
+          c.output_manager = r.output_manager
           c.conf = r.conf
           c.trade_result_dao = r.trade_result_dao(id)
           c
@@ -139,19 +168,17 @@ module JIJI
 
         # エージェントレジストリ
         r.register( :agent_registry ) {
-          dir = "#{r.base_dir}/#{r.conf.get([:dir,:agent], "agents")}"
-          sdir = "#{r.base_dir}/#{r.conf.get([:dir,:shared_lib], "shared_lib")}"
-          FileUtils.mkdir_p dir
-          FileUtils.mkdir_p sdir
-          c = JIJI::AgentRegistry.new( dir, sdir )
+          c = JIJI::AgentRegistry.new( r.agent_dir, r.shared_lib_dir )
           c.conf = r.conf
+          c.server_logger = r.server_logger
+          c.file_dao = r.agent_file_dao
           c.load_all
           c
         }
 
         # オペレーター
         r.register( :operator, :model=>:multiton_initialize ) {|c,p,id,trade_enable,money|
-          c = JIJI::RmtOperator.new(r.securities_plugin_manager.selected, 
+          c = JIJI::RmtOperator.new(r.securities_plugin_manager.selected,
               r.process_logger(id), r.trade_result_dao(id), trade_enable, money)
           c.conf = r.conf
           r.permitter.proxy( c, [/^(sell|buy|commit)$/], [/^(sell|buy)$/])
@@ -177,18 +204,52 @@ module JIJI
 
         # RMTプロセス
         r.register( :rmt_process ) {
-          c = JIJI::Process.new("rmt", r.process_dir, r.agent_manager("rmt",true), r.process_logger("rmt"), nil, r, true)
+          id = "rmt"
+          info = r.process_info( id )
+          if info.data_exist?
+            info.load
+          else
+            now = Time.now.to_i
+            info.props = {
+              "id"=>id,
+              "name"=>"",
+              "memo"=>"",
+              "create_date"=>now,
+              "start_date"=>now,
+              "end_date"=>now,
+              "agents"=>{},
+              "state"=>:WAITING,
+              "trade_enable"=>false
+            }
+          end
+          c = JIJI::Process.new( info )
+          c.agent_manager =  r.agent_manager(id,true)
+          c.trade_enable = ( info["trade_enable"] == true )
+          c.logger = r.process_logger(id)
           c.observer_manager = r.rmt_observer_manager
           c.collector = r.rmt_collector
           c
         }
         # バックテストプロセス
-        r.register( :backtest_process, :model=>:multiton_initialize ) {|c,p,id, props|
+        r.register( :backtest_process, :model=>:prototype ) {|c,p,info|
           # 既存のバックテストを読み込む場合、プロパティはnil
-          c = JIJI::Process.new(id, r.process_dir, r.agent_manager(id,false), r.process_logger(id), props, r, false)
+          id = info.process_id
+          c = JIJI::Process.new(info)
+          c.agent_manager =  r.agent_manager(id,false)
+          c.trade_enable = false
+          info["trade_enable"] = false
+          c.logger = r.process_logger(id)
           c.observer_manager = r.backtest_observer_manager(id)
           c.collector = r.backtest_collector(id,
-            Time.at( c["start_date"]), Time.at( c["end_date"]))
+            Time.at( info["start_date"]), Time.at( info["end_date"]))
+          c
+        }
+        r.register( :process_info, :model=>:prototype ) {|c,p,id|
+          JIJI::ProcessInfo.new(id, r.process_dir)
+        }
+        r.register( :back_test_process_executor ) {
+          c = JIJI::BackTestProcessExecutor.new
+          c.registry = r
           c
         }
 
@@ -209,7 +270,11 @@ module JIJI
         r.register( :agent_service ) {
           c = JIJI::Service::AgentService.new
           c.agent_registry = r.agent_registry
+          c.dao = r.agent_file_dao
           c.process_manager = r.process_manager
+          c.agent_dir = r.agent_dir
+          c.shared_lib_dir = r.shared_lib_dir
+          c.server_logger = r.server_logger
           c
         }
         r.register( :rate_service ) {
@@ -220,12 +285,14 @@ module JIJI
         r.register( :trade_result_service ) {
           c = JIJI::Service::TradeResultService.new
           c.process_manager = r.process_manager
+          c.registry = r
           c
         }
         r.register( :output_service ) {
           c = JIJI::Service::OutputService.new
           c.process_manager = r.process_manager
           c.process_dir = r.process_dir
+          c.output_manager = r.output_manager
           c
         }
         r.register( :process_service ) {
@@ -238,7 +305,7 @@ module JIJI
           c.server = r.server
           c
         }
-        
+
         # データ移行
         r.register( :migrator ) {
           c = JIJI::Migration::Migrator.new
@@ -247,11 +314,12 @@ module JIJI
           c.version_file = r.version_file
           c.migrators = [
             { :version=>Gem::Version.new( "1.0.3" ), :migrator=>JIJI::Migration::Migrator1_0_3.new},
-            { :version=>Gem::Version.new( "1.1.0" ), :migrator=>JIJI::Migration::Migrator1_1_0.new}
+            { :version=>Gem::Version.new( "1.1.0" ), :migrator=>JIJI::Migration::Migrator1_1_0.new},
+            { :version=>Gem::Version.new( "1.2.0" ), :migrator=>JIJI::Migration::Migrator1_2_0.new}
           ]
           c
         }
-        
+
         # プラグイン
         r.register( :plugin_loader ) {
           c = JIJI::Plugin::Loader.new

data/lib/jiji/server.rb

@@ -26,6 +26,7 @@ module JIJI
         param[:ServerType] = WEBrick::Daemon
       rescue Exception
       end
+      param[:MimeTypes] = WEBrick::HTTPUtils::DefaultMimeTypes.merge({"js"=>"application/javascript"})
       
       param[:Logger] = registry[:server_logger]  
       param[:DocumentRoot] = File.expand_path( "#{__FILE__}/../../../html" )