rule_engine_client 0.1.9 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb8d1d41bc3a3349d3833e43067ea0a88d6a86987099df2f2cb44c035b805a8
-  data.tar.gz: 4e63551f1046d994e701bc252915ba67b607bc25e0b1ccc0272e7c5baa47e433
+  metadata.gz: d27373373d63062d4e321ae93cc1fdaf9bc73a40f146abe7aece2cb83f3e2be5
+  data.tar.gz: f00cdf230eaafba55cf74e6d0879c689bd4bbdd3e70f106ea8d14361d49f74ce
 SHA512:
-  metadata.gz: 745d7961b437e8778116261b8d44f5fb464e16adc795d210ce5b96237619c661abf309c2710b4229b33f87491192d740aab74145ac81e6156b8c0ff8df783bb0
-  data.tar.gz: 24d66a7ba9655df2a4f37d282e0695ab58f478096b555f7a26352a72a0fd0f065563bedd56d893b7ed9e35e4254143794ade498a1bbfa7bfc61f127a50c718fc
+  metadata.gz: d2b034aa852ffc8d54b227cd48fd00ddecdb05ede88cc79f41671b1ef39dfe0478d7d5f59f2d24d7a7193d6211109bcea581a577751259c3a0b9237655a979bb
+  data.tar.gz: 54e3c4104a48073c822ba807c4e53743f388da0e2496a1534a006d0b0c0682d10cdf99903dd305717f33f319afeafc4a31f1e52c00ed4db4cc5dbe7b6f01f17b

data/lib/rule_engine_client.rb

@@ -10,42 +10,54 @@ class RuleEngineClient
     @verbose = verbose
     @logger = Logger.new($stdout)
     @request_timeout_in_s = request_timeout_in_s
-    log("rule engine '#{server}' client is initialized")
+    log("'#{server}' client is initialized")
   end
 
   def evaluate(engine, params, mode = 'production')
     url = URI.parse("#{@server}/run?e=#{engine}&m=#{mode}")
-    log("Will send post request: #{url}")
-    begin
-      Timeout.timeout(@request_timeout_in_s) do
-        @result = create_request(url, 'post', params)
-        respone = response_builder
-        log("respone #{respone}")
-        respone
-      end
-    rescue Timeout::Error
-      log('HTTP Gatway timeout!')
-      @time_out = true
-      response_builder
-    end
+    log("params #{params}")
+    params = params_mapper(params, engine)
+    @result = create_request(url, 'POST', params)
+    response = response_builder
+    log("response #{response}")
+    response
   end
 
-  def engine_exists?(engine)
+  def engine_exists(engine)
     log("checking if engine (#{engine}) exists")
-    url = URI.parse("#{@server}/engine/export?e=#{engine}")
-    log("Will send get request: #{url}")
-    begin
-      Timeout.timeout(@request_timeout_in_s) do
-        response = create_request(url, 'get')
-        engine_exists = response.code == '200'
-        log_message = engine_exists ? "engine #{engine} exists" : "engine #{engine} not found"
-        log(log_message)
-        engine_exists
+    response = export_engine(engine)
+    response['body'] = {
+      'exists' => !response['body'].empty?
+    }
+    response
+  end
+
+  def get_engine_models(engine)
+    log("get engine (#{engine}) models")
+    response = export_engine(engine)
+    models = response['body']['model']
+    log("models #{models}")
+    models
+  end
+
+  def params_mapper(params, engine)
+    models = get_engine_models(engine)
+    models_keys = models.keys
+    params_keys = params.keys
+    params_keys.each do |key|
+      if models_keys.include? key
+        props = models[key]['properties'].map do |prop|
+          prop['name']
+        end
+        params[key].keys.each do |el|
+          params[key].delete(el) unless props.include? el
+        end
+      else
+        params.delete(key)
       end
-    rescue Timeout::Error
-      log('HTTP Gateway timeout!')
-      false
     end
+    log("filtered params #{params}")
+    params
   end
 
   private
@@ -70,7 +82,7 @@ class RuleEngineClient
 
   def response_builder
     if @time_out
-      errors = ['HTTP Gatway timeout!']
+      errors = ['HTTP Gateway timeout!']
       body = {}
       code = 504
     elsif @result.code == '502'
@@ -91,16 +103,30 @@ class RuleEngineClient
   end
 
   def create_request(url, request_type, params = {})
-    http = Net::HTTP.new(url.host, url.port)
-    http.use_ssl = true if url.instance_of? URI::HTTPS
-    if request_type == 'GET'
-      request = Net::HTTP::Get.new(url.request_uri)
-    else
-      request = Net::HTTP::Post.new(url.request_uri)
-      request.body = params.to_json
-      log("request body created #{request.body} ")
+    Timeout.timeout(@request_timeout_in_s) do
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = true if url.instance_of? URI::HTTPS
+      if request_type == 'GET'
+        log("Will send get request: #{url}")
+        request = Net::HTTP::Get.new(url.request_uri)
+      else
+        log("Will send post request: #{url}")
+        request = Net::HTTP::Post.new(url.request_uri)
+        request.body = params.to_json
+        log("request body created #{request.body} ")
+      end
+      request['Content-Type'] = 'application/json'
+      request['Accept'] = 'application/json'
+      http.request(request)
     end
-    request['Content-Type'] = 'application/json'
-    http.request(request)
+  rescue Timeout::Error
+    log('HTTP Gateway timeout!')
+    @time_out = true
+  end
+
+  def export_engine(engine)
+    url = URI.parse("#{@server}/engine/export?e=#{engine}")
+    @result = create_request(url, 'GET')
+    response_builder
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rule_engine_client
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.12
 platform: ruby
 authors:
 - Areej Nour
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies: []
 description: integration with rule server
 email: