deepstack 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02929889eabbeeb8b76cd2f588cef7452ef0bb6dd3687fad749105e6956191e9'
-  data.tar.gz: 2625f0bc5aac522d23461530dda2e581718c4f967c053db13c13ff0dcaa46f92
+  metadata.gz: 6d3a74d72c68a1aef4f04d6b3a04d67cb26c89daf0bdfa1ba85a1cbfd904bd76
+  data.tar.gz: 2cc1bfddab42ebbc72ef9e1a90c35cc577e5a46e0db8d3900c42bc24dd15af64
 SHA512:
-  metadata.gz: fd37e76b9ad0fd30ddcc8a995fe2267d01f056cb3aa3a1d134b6335d91b6b300f61ce9929ab6b2e183ead1036135d2854a53858306395caadfaca7f2baf083d2
-  data.tar.gz: 275bba97d88a57d51de45a0ae2be230df5d2a8c749324ea748cd2a16c9e45de9c8f6c44d0d61fd860985400093e1caec636f1905bfbcab680631b39087bfbffa
+  metadata.gz: b12be0063b456923b065db6d9ae277aa30a32bc2a4e1c895a646b039d4770bd36dd296effc788cb7ace506be23dd64a836d11e77210184eb278b0b82ddda1818
+  data.tar.gz: ed627f25f85c15551b0758e9d87ea002f0cb95efdec5a6c31a92dd9a11936fc7bdddf51a570e61ebffc5995ce869c17d703df277421578428c187f7a724d64d5

data/lib/deep_stack/deep_stack.rb

@@ -20,15 +20,27 @@ class DeepStack
   #
   # @param [String] base_url the url to DeepStack's server:port
   # @param [String] api_key an optional API-KEY to use when connecting to DeepStack
-  # @param [String] admin_key an optional ADMIN-KEY to use when connecting to DeepStack
+  # @param [String] api_key an optional API-KEY to use when connecting to DeepStack
+  # @param [Integer] verify_mode sets the flags for server the certification verification at
+  #                  beginning of SSL/TLS session.
+  #                  +OpenSSL::SSL::VERIFY_NONE+ or +OpenSSL::SSL::VERIFY_PEER+ are acceptable.
   #
   # @example
   #   DeepStack.new('http://127.0.0.1:5000')
   #
-  def initialize(base_url, api_key: nil, admin_key: nil)
+  #   # Using API KEY:
+  #   DeepStack.new('http://127.0.0.1:5000', api_key: 'secret', admin_key: 'supersecret')
+  #
+  #   # Connect to SSL with a self-signed certificate
+  #   DeepStack.new('https://localhost:443', verify_mode: OpenSSL::SSL::VERIFY_NONE)
+  #
+  def initialize(base_url, api_key: nil, admin_key: nil, verify_mode: nil)
     @base_url = base_url
     @auth = { api_key: api_key, admin_key: admin_key }.select { |_k, v| v } # remove nil values
-    @http_mutex = Mutex.new
+    uri = URI(base_url)
+    http_options = {}
+    http_options[:verify_mode] = verify_mode if verify_mode
+    @http = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.instance_of?(URI::HTTPS), **http_options)
   end
 
   #
@@ -60,9 +72,7 @@ class DeepStack
   # Close the HTTP connection to DeepStack server
   #
   def close
-    @http_mutex.synchronize do
-      @http.finish if @http&.started?
-    end
+    @http.finish if @http&.started?
   end
 
   private
@@ -79,11 +89,8 @@ class DeepStack
     form_data = combine_images_and_args(images.flatten, **args)
     req = Net::HTTP::Post.new(uri)
     req.set_form(form_data, 'multipart/form-data')
-    @http_mutex.synchronize do
-      @http ||= Net::HTTP.start(uri.hostname, uri.port)
-      @http.start unless @http.started?
-      @http.request(req)
-    end
+    @http.start unless @http.started?
+    @http.request(req)
   end
 
   def combine_images_and_args(*images, **args)

data/lib/deep_stack/scene.rb

@@ -4,14 +4,15 @@ class DeepStack
   # Scene Recognition
   module Scene
     #
-    # Return
+    # Call the scene recognition API to classify an image into one of the supported scenes.
     #
     # @param [Object] image binary data or a File object
     # @param [Hash] options additional fields for DeepStack, e.g. min_confidence: 0.5
     #
-    # @return [Hash] if successful, DeepStack result hash {'label' => 'scene', 'confidence' => 2.2}
+    # @return [Hash] if successful, DeepStack result hash +{'label' => 'scene', 'confidence' => 2.2}+
     #
     # @return [nil] if error
+    #
     def identify_scene(image, **options)
       target = 'vision/scene'
       api_post(target, image, **options)

data/lib/deep_stack/version.rb

@@ -5,5 +5,5 @@
 #
 class DeepStack
   # @return [String] Version of DeepStack helper libraries
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deepstack
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jimmy Tanagra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: