unageanu-jiji 1.1.4 → 1.2.1

data/lib/jiji/service/agent_service.rb

@@ -14,14 +14,15 @@ module JIJI
       include JIJI::AgentUtil
 
       # ファイルの一覧を取得する
-      def list_files( type=:agent )
-        @agent_registry.files( type.to_sym )
+      def list_files( path )
+        check_path path
+        @dao.list( path )
       end
 
       # ファイルの内容を取得する
-      def get_file( file_name, type=:agent )
-        check_filename( file_name )
-        @agent_registry.get_file( file_name, type.to_sym )
+      def get_file( path )
+        check_path path
+        @dao.get( path )
       end
 
 
@@ -30,32 +31,141 @@ module JIJI
         @agent_registry.inject([]) {|list,name|
           next unless name =~ /([^@]+)@([^@]+)/
           list << {
-            "class_name"=>$1,
-            "file_name"=>$2,
-            "properties"=>@agent_registry.get_property_infos(name),
-            "description"=>@agent_registry.get_description(name)
+            :class_name=>$1,
+            :file_name=>$2,
+            :properties=>@agent_registry.get_property_infos(name),
+            :description=>@agent_registry.get_description(name)
           }
           list
         }
       end
 
       # ファイルを追加/更新する
-      def put_file( file_name, body, type=:agent )
-        check_filename( file_name )
-        @agent_registry.add_file( file_name, body, type.to_sym )
+      def put_file( path, body )
+        check_path path
+        @dao.put( path, body )
+        @agent_registry.load( path )
+        :success
+      end
+
+      # ファイルを追加する
+      def add_file( path, body )
+        check_path path
+        @dao.add( path, body )
+        @agent_registry.load( path )
+        :success
       end
 
       # ファイルを削除する
-      def delete_files( file_names, type=:agent )
-        file_names.each {|fn|
-          check_filename( fn )
+      def remove( paths )
+        result = {:success=>{},:failed=>{}}
+        targets = {}
+        paths.each {|path|
+          begin
+            check_path path
+            # agents, sharedは削除できない
+            if path =~ /^(#{@agent_dir}|#{@shared_lib_dir})$/
+              raise JIJI::UserError.new( ERROR_ILLEGAL_NAME, "illegal path. path=#{path}" )
+            end
+            targets[path] =  @dao.directory?(path) \
+              ? targets[path] = @dao.list( path, true ).map{|item| item[:path]} \
+              : [path]
+          rescue Exception
+            result[:failed][path] = mk_error_info(path,$!)
+          end
+        }
+        targets.each_pair {|path, files|
+          begin
+            @dao.delete( path )
+            result[:success][path] = {:path=>path}
+          rescue Exception
+            result[:failed][path] = mk_error_info(path,$!)
+            next
+          end
+          begin
+            files.each {|f|
+              @agent_registry.unload(f)
+            }
+          rescue Exception
+            #ロードで発生したエラーはログ出力のみして握る
+            server_logger.error $!
+          end
+        }
+        result
+      end
+
+      # ファイルを移動する
+      def move( files, to  )
+        check_path to
+        result = {:success=>{},:failed=>{}}
+        targets = {}
+        files.each {|path|
+          begin
+            check_path path
+            targets[path] =  @dao.directory?(path) \
+              ? targets[path] = @dao.list( path, true ).map{|item| item[:path]} \
+              : [path]
+          rescue Exception
+            result[:failed][path] = mk_error_info(path,$!)
+          end
         }
-        file_names.each {|fn|
-          @agent_registry.remove_file( fn, type.to_sym )
+        targets.each_pair {|path,files|
+          begin
+            @dao.move( from, to )
+            result[:success][path] = {:path=>path}
+          rescue Exception
+            result[:failed][path] = mk_error_info(path,$!)
+            next
+          end
+          begin
+            files.each {|f|
+              @agent_registry.unload(f)
+            }
+            @dao.list( "#{to}/#{File.basename(from)}", true ) {|f|
+              @agent_registry.load(f)
+            }
+          rescue Exception
+            #ロードで発生したエラーはログ出力のみして握る
+            server_logger.error $!
+          end
         }
+        result
+      end
+
+
+      # ファイルを移動する
+      def rename( path, new_name )
+        check_path path
+        # agents, sharedはリネームできない
+        if path =~ /^(#{@agent_dir}|#{@shared_lib_dir})$/
+          raise JIJI::UserError.new( ERROR_ILLEGAL_NAME, "illegal path. path=#{path}" )
+        end
+        new_path = "#{File.dirname(path)}/#{new_name}"
+        files = @dao.directory?(path) ? @dao.list( path, true ).reject{|item| 
+          item[:type] == :directory 
+        }.map {|item|
+          item[:path]
+        } : [path]
+        @dao.rename( path, new_path )
+        begin
+          files.each {|f|
+            server_logger.info f
+            @agent_registry.unload(f)
+            @agent_registry.load( f.sub( path, new_path ))
+          }
+        rescue Exception
+          #ロードで発生したエラーはログ出力のみして握る
+          server_logger.error $!
+        end
         :success
       end
 
+      # フォルダを作成する
+      def mkcol( path  )
+        check_path path
+        @dao.mkcol( path )
+        :success
+      end
 
       # プロセスに登録されているエージェントの一覧を得る
       def list_agent( process_id )
@@ -64,39 +174,18 @@ module JIJI
           p.agent_manager.collect.map! {|entry|
             props = entry[1].agent.properties
             {
-              "name"=>entry[0],
-              "properties"=>entry[1].agent.property_infos.map! {|info|
+              :name=>entry[0],
+              :properties=>entry[1].agent.property_infos.map! {|info|
                 prop = props.find() {|e| e[0] == info.id.to_s }
-                { "id"=>info.id.to_s, "info"=>info, "value"=> prop ? prop[1] : nil }
+                { :id=>info.id.to_s, :info=>info, :value=> prop ? prop[1] : nil }
               },
-              "description"=>entry[1].agent.description,
-              "active"=>entry[1].active
+              :description=>entry[1].agent.description,
+              :active=>entry[1].active
             }
           }
         }
       end
 
-      # プロセスにエージェントを追加する
-      def add_agent( process_id, name, class_name, properties )
-        p = process_manager.get( process_id )
-        agent = agent_registry.create( class_name, properties )
-        p.agent_manager.add( name, agent )
-        :success
-      end
-
-      # プロセスのエージェントを削除する
-      def remove_agent( process_id, name )
-        p = process_manager.get( process_id )
-        p.agent_manager.remove( name )
-        :success
-      end
-
-#      # エージェントのプロパティを更新する
-#      def set_agent_properties( process_id, name, properties )
-#        p = process_manager.get( process_id )
-#        p.agent_manager.get( name ).properties = properties
-#      end
-
       # プロセスのエージェントを一時的に無効化する
       def off( process_id, name )
         p = process_manager.get( process_id )
@@ -116,14 +205,24 @@ module JIJI
       end
       attr :agent_registry, true
       attr :process_manager, true
-
+      attr :agent_dir, true
+      attr :shared_lib_dir, true
+      attr :dao, true
+      attr :server_logger, true
     private
-      def check_filename( file_name )
-        unless file_name =~ VALID_FILE_NAME
-          raise JIJI::UserError.new( ERROR_ILLEGAL_NAME, "illegal file name. name=#{file_name}" )
+      def check_path(path)
+        unless path =~ /^(#{@agent_dir}|#{@shared_lib_dir})(\/.*)?/
+          raise JIJI::UserError.new( ERROR_ILLEGAL_NAME, "illegal path. path=#{path}" )
         end
       end
-      VALID_FILE_NAME = /^[A-Za-z0-9_\*\+\-\#\"\'\!\~\(\)\[\]\?\.]+\.rb$/
+
+      def mk_error_info( path, error )
+        return {
+          :path=>path,
+          :code=>error.respond_to?(:code) ? error.code : "",
+          :msg=>error.to_s
+        }
+      end
 
     end
 

data/lib/jiji/service/output_service.rb

@@ -4,17 +4,17 @@ module JIJI
 
       # 指定範囲の出力データを取得する。
       def list_datas( process_id, names, scale, start_time, end_time )
-        p = process_manager.get( process_id )
+        map = output_manager.get_process_map( process_id )
         list = {}
         names.each {|n|
 	        buff = []
-          outputs = p.outputs[n[0]]
+          outputs = map[n[0]]
 	        next unless outputs
           outputs.get(n[1]).each( scale,
             Time.at(start_time), Time.at(end_time) ) {|data|
 	          buff << data
 	        }
-          list[n[0]] = {} if !list[n[0]]
+          list[n[0]] ||= {}
           list[n[0]][n[1]] = buff
         }
         return list
@@ -22,23 +22,37 @@ module JIJI
 
       # プロセスの出力一覧を取得する
       def list_outputs( process_id )
-        p = process_manager.get( process_id )
-        return p.outputs.inject({}) {|buff,item|
-          buff[item[0]] = item[1].inject({}) {|r,v|
-            r[v[0]] = v[1].options
-            r
+        buff = {}
+        rmt_process = nil
+        rmt_process = process_manager.get( process_id )  if ( process_id == "rmt" )
+        output_manager.each( process_id ) {|outputs|
+          buff[outputs.agent_id] = {
+            "agent_id"=>outputs.agent_id,
+            "agent_name"=>outputs.agent_name,
+            "outputs"=>outputs.inject({}) {|r,v|
+              r[v[0]] = v[1].options
+              r
+            },
+            "alive"=> process_id == "rmt" && 
+              is_live_agent( rmt_process["agents"], outputs.agent_id )
           }
-          buff
         }
+        buff
+      end
+
+      # プロセスの出力を削除する
+      def delete_output( process_id, agent_id )
+        output_manager.delete( process_id, agent_id )
+        :success
       end
 
       # アウトプットのプロパティを設定
-      def set_properties( process_id, name, properties )
-        p = process_manager.get( process_id )
-        outputs = p.outputs[name[0]]
-        raise UserError.new( JIJI::ERROR_NOT_FOUND, "output not found. name=#{name[0]}") unless outputs
-        out = outputs.get(name[1])
-        raise UserError.new( JIJI::ERROR_NOT_FOUND, "output not found. name=#{name[0]}:#{name[1]}") unless out
+      def set_properties( process_id, agent_id, output_name, properties )
+        outputs = output_manager.get( process_id, agent_id )
+        unless outputs.exist? output_name
+          raise UserError.new( JIJI::ERROR_NOT_FOUND, "output not found. name=#{agent_id}:#{output_name}")
+        end
+        out = outputs.get(output_name)
         out.set_properties( properties )
         return :success
       end
@@ -47,15 +61,21 @@ module JIJI
       def get_log( process_id )
         process_manager.get( process_id ) # プロセスの存在確認
         file = "#{@process_dir}/#{process_id}/log.txt" # TODO 古いものも連結するか? サイズが大きくなってしまうので微妙。
-        if ( File.exist?( file ) ) 
+        if ( File.exist?( file ) )
           return IO.read( file )
         else
           return ""
         end
       end
-      
+
       attr :process_dir, true
       attr :process_manager, true
+      attr :output_manager, true
+    private
+      def is_live_agent( agents, agent_id )
+        return false if !agents
+        return agents.find {|i| i["id"] == agent_id }  != nil
+      end
 	  end
 
   end

data/lib/jiji/service/process_service.rb

@@ -22,7 +22,6 @@ module JIJI
       # プロセスの設定を更新する。
       def set( process_id, setting )
         @process_manager.set( process_id, setting )
-        :success
       end
 
 
@@ -54,7 +53,6 @@ module JIJI
       # テストを再実行する
       def restart( process_id, agent_properties )
         @process_manager.restart_test(process_id, agent_properties)
-        :success
       end
 
       attr :process_manager, true
@@ -68,11 +66,11 @@ module JIJI
             "end_date"=>process["end_date"],
             "create_date"=>process["create_date"],
             "trade_enable"=>process["trade_enable"],
-            "state"=>process.state,
-            "progress"=>process.progress,
+            "state"=>process["state"],
+            "progress"=>process.progress
           }
       end
 	  end
-  
+
   end
 end

data/lib/jiji/service/trade_result_service.rb

@@ -4,11 +4,10 @@ module JIJI
       
       # 指定範囲のトレード結果を取得する。
       def list( process_id, scale, start_time, end_time )
-        p = process_manager.get( process_id )
-        dao = p.agent_manager.trade_result_dao
+        dao = registry.trade_result_dao(process_id)
         result = dao.list_positions( scale, start_time ? Time.at(start_time) : nil, end_time ? Time.at(end_time) : nil )
         # 現在進行中の建て玉はoperatorから取得する
-        op = p.agent_manager.operator
+        op = (process_id == "rmt") ? registry.rmt_process.agent_manager.operator : nil
         return result.map {|e|
           op && op.positions.key?(e[0]) ? op.positions[e[0]].values : e[1] 
         }
@@ -16,8 +15,7 @@ module JIJI
       
       # 指定範囲の損益を取得する。
       def list_profit_or_loss( process_id, scale, start_time, end_time )
-        p = process_manager.get( process_id )
-        dao = p.agent_manager.trade_result_dao
+        dao = registry.trade_result_dao(process_id)
         buff = []
         dao.each( scale, start_time ? Time.at(start_time) : nil, end_time ? Time.at(end_time) : nil ) {|data|
           buff << data
@@ -26,6 +24,7 @@ module JIJI
       end
       
       attr :process_manager, true
+      attr :registry, true
 	  end
     
   end

data/lib/jiji/util/file_lock.rb

@@ -13,7 +13,7 @@ class FileLock
     File.open( @lockfile, "r" ) { |f|
       f.flock(File::LOCK_SH)
       begin
-        return block.call(f)
+        block.call(f)
       ensure
         f.flock(File::LOCK_UN)
       end
@@ -26,7 +26,7 @@ class FileLock
     File.open( @lockfile, "w" ) { |f|
       f.flock(File::LOCK_EX)
       begin
-        return block.call(f)
+        block.call(f)
       ensure
         f.flock(File::LOCK_UN)
       end
@@ -48,7 +48,7 @@ class DirLock
     File.open( @lockfile, "r" ) { |f|
       f.flock(File::LOCK_SH)
       begin
-        return block.call
+        block.call
       ensure
         f.flock(File::LOCK_UN)
       end
@@ -62,7 +62,7 @@ class DirLock
     File.open( @lockfile, "w" ) { |f|
       f.flock(File::LOCK_EX)
       begin
-        return block.call
+        block.call
       ensure
         f.flock(File::LOCK_UN)
       end

data/lib/jiji/util/include_proxy.rb

@@ -0,0 +1,17 @@
+class Module
+  #プロキシモジュールをincludeする。
+  def include_proxy( mod )
+    include mod
+    class << self 
+      def const_missing(id)
+        self.included_modules.each {|m|
+          begin
+            return m.const_get(id)
+          rescue NameError
+          end
+        }
+        raise NameError.new
+      end
+    end
+  end
+end

data/lib/jiji/util/json_broker.rb

@@ -40,10 +40,12 @@ class Broker
       args       = json["params"]
 
       result = @service.send( method.to_sym, *args )
-      return '[{"error":null, "result":' << result.to_json << "}]"
-    rescue
-      error =  $!.to_s + " : " + $!.backtrace.join("\n")
-      return '[{"error":' << error.to_json << ', "result":null}]'
+      return '[{"error":null, "detail":null,"result":' << result.to_json << "}]"
+    rescue Exception
+      error =  $!.to_s.gsub(/'/, "")
+      detail = $!.respond_to?(:detail) ? $!.detail : {}
+      detail[:backtrace] =  $!.backtrace.join("\n").gsub(/'/, "")
+      return '[{"error":' << error.to_json << ', "detail":' + detail.to_json + ', "result":null}]'
     end
   end
 end

data/lib/jiji/util/util.rb

@@ -34,7 +34,7 @@ module JIJI
     end
     # base64でエンコードした文字列をデコードする
     def decode( str )
-      str.gsub(/_/, "/").unpack('m')
+      str.gsub(/_/, "/").unpack('m')[0]
     end
     
     # モデルオブジェクトの基底モジュール

data/swf/chart/fx/chart/Chart.as

@@ -112,6 +112,7 @@ package fx.chart {
         } );
         ExternalInterface.addCallback("setGraphVisible", this.setGraphVisible );
         ExternalInterface.addCallback("setGraphColors", this.setGraphColors );
+        ExternalInterface.addCallback("removeGraph", this.removeGraph );
     }
     /**
      * グラフを初期化する
@@ -156,5 +157,11 @@ package fx.chart {
     private function setGraphColors( name:Array, colors:Array  ):void {
         this.graphManager.setGraphColors( name, colors );
     }
+    /**
+     * グラフの表示/非表示を設定
+     */
+    private function removeGraph( agentId:String  ):void {
+        this.graphManager.removeGraph( agentId );
+    }
   }
 }

data/swf/chart/fx/chart/ui/graph/GraphManager.as

@@ -45,7 +45,8 @@ package fx.chart.ui.graph {
         // グラフ一覧を作成
         for ( var graph:* in model.graphs ) {
             infos[graph] = {};
-            var x:* = model.graphs[graph];
+            var x:* = model.graphs[graph]["outputs"];
+            x ||= {};
             for ( var g:* in x ) {
               infos[graph][g] = new GraphInfo( x[g], null,  model, ctrl, rc );
             }
@@ -106,7 +107,19 @@ package fx.chart.ui.graph {
             target.setColors( colors ); 
             target.draw(); // グラフを再描画
         }
-      }
+    }
+    
+    /**
+     * グラフを削除する
+     */
+    public function removeGraph( agentId:String ):void {
+        // レイヤーを非表示。
+        if ( infos && infos[agentId]  ) {
+            for ( var j:* in infos[agentId] ) {
+              off( [agentId, j] );
+            }
+        }
+    }
     
     /**
      * グラフデータを再取得して更新する。

data/test/ProcessTest/agents/foo.rb

@@ -0,0 +1,10 @@
+
+class TestAgent < JIJI::PeriodicallyAgent
+  attr :x, true
+  attr :y, true
+end
+
+class TestAgent2 < JIJI::PeriodicallyAgent
+  attr :x, true
+  attr :y, true
+end

data/test/ProcessTest/conf/configuration.yaml

@@ -0,0 +1,3 @@
+---
+:securities:
+  :type: "mock"

data/test/agent/agent_tests.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/ruby
+
+require 'rubygems'
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+require 'agent/test_AgentManager'
+require 'agent/test_AgentRegistry'
+require 'agent/test_PeriodicallyAgent'
+require 'agent/test_Permitter'

data/test/agent/test_AgentManager.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
-$: << "../../lib"
-$: << "../"
+$: << "../lib"
 
 require 'rubygems'
 require 'runit/testcase'
@@ -13,7 +12,10 @@ require 'jiji/agent/permitter'
 require 'jiji/agent/util'
 require 'jiji/configuration'
 require 'jiji/collector'
+require 'jiji/output'
+require 'jiji/output_manager'
 require 'jiji/dao/trade_result_dao'
+require 'jiji/dao/file_system_dao'
 require 'fileutils'
 require 'test_utils'
 require 'logger'
@@ -28,15 +30,24 @@ class AgentManagerTest <  RUNIT::TestCase
     @dir = File.dirname(__FILE__) + "/agents"
     FileUtils.mkdir_p @dir
 
-    @registry = JIJI::AgentRegistry.new( "#{@dir}/agents", "#{@dir}/sharedLib" )
-    @registry.conf = CONF
+    @dao =  JIJI::Dao::FileSystemDao.new( @dir )
+    @dao.mkcol "agents"
+    @dao.mkcol "shared"
 
     @permitter = JIJI::Permitter.new( 5, 0 )
     logger = Logger.new STDOUT
     logger = @permitter.proxy( logger, [/^(info|debug|warn|error|fatal)$/] )
-    
+
+    @registry = JIJI::AgentRegistry.new( "agents", "shared" )
+    @registry.conf = CONF
+    @registry.file_dao = @dao
+    @registry.server_logger = logger
+
     @registry_mock = Object.new
     class << @registry_mock
+      def output_dir( id )
+        "#{@dir}/#{id}/out"
+      end
       def output( agent_name, dir )
         output = JIJI::Output.new( agent_name, "#{@dir}/#{dir}/out" )
         output = @permitter.proxy( output, [/^(get|each|put|<<)$/], [/^get$/] )
@@ -52,16 +63,16 @@ class AgentManagerTest <  RUNIT::TestCase
     operator = JIJI::Operator.new( trade_result_dao )
     operator.conf = CONF
     operator = @permitter.proxy( operator, [/^(sell|buy|commit)$/],[/^(sell|buy)$/])
-    
+
     @m = JIJI::AgentManager.new( "test_agentManager", @registry, logger)
     @m.operator = operator
     @m.conf = CONF
     @m.trade_result_dao = trade_result_dao
-    @m.registry = @registry_mock
+    @m.output_manager = JIJI::OutputManager.new(@registry_mock)
   end
 
   def teardown
-    @permitter.close
+    @permitter.close if @permitter
     FileUtils.rm_rf @dir
   end
 
@@ -79,7 +90,8 @@ class AgentManagerTest <  RUNIT::TestCase
         attr :log, true
       end
     AGENT_STR
-    @registry.add_file( "foo.rb", str )
+    @dao.put( "agents/foo.rb", str )
+    @registry.load( "agents/foo.rb" )
 
     agent1 = @registry.create( "Foo@foo.rb" )
     agent2 = @registry.create( "Foo@foo.rb" )
@@ -222,7 +234,8 @@ class AgentManagerTest <  RUNIT::TestCase
         attr :log, true
       end
     AGENT_STR
-    @registry.add_file( "foo.rb", str )
+    @dao.put( "agents/foo.rb", str )
+    @registry.load( "agents/foo.rb" )
 
     agent = @registry.create( "Foo@foo.rb" )
     @m.add( "test", agent )
@@ -241,8 +254,11 @@ class AgentManagerTest <  RUNIT::TestCase
 
   # 循環参照のテスト
   def test_recursive
-    @registry.add_file( "AgentServiceTest_1.rb", BODY_O1 )
-    @registry.add_file( "AgentServiceTest_2.rb", BODY_O2 )
+    @dao.put( "agents/AgentServiceTest_1.rb", BODY_O1 )
+    @registry.load( "agents/AgentServiceTest_1.rb" )
+    @dao.put( "agents/AgentServiceTest_2.rb", BODY_O2 )
+    @registry.load( "agents/AgentServiceTest_2.rb" )
+
     @m.each {|a|}
     @registry.inject([]) {|list,name|
       list << {