deepstack 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf4cf801a5a99ff308e5afc06ed19dac86d8348388c519880770d482fd1bb0b
-  data.tar.gz: de77bacb1bd1ffb46c4dff277ab16e1195ef423f005ad98394b49cab6e248fa3
+  metadata.gz: be874725c205c1b4c704649e99506f362fc711eeff315d9616deb112f7caecd5
+  data.tar.gz: f3a54bde1b2d8a533e9af9c58154a9004c7133f3e383d8e612a91d6052187fe1
 SHA512:
-  metadata.gz: 6836c3bc1e6dc367542c4bd9e3e089ddf2cf3a7e612d6230dfabf3f3a38a4651965eead00bba50dd5916e5a9d8fcc44c624f3743b17165fbda24cff8c9ea7ec8
-  data.tar.gz: 5f5c98987f6fae82a67ef8fa57a557aa300bd22da6108a8575eabe6e3ac8d1f301f57caad1f86b533629b503d53db4bb40e101ff630abddce1b2659637e2b177
+  metadata.gz: 9c7d7c9f0abe1465489936961e9cc297c1e9961b2e6afe6b2612fea975b5b0cc0c24a95748fd6fe14e5b45e480d15a27237ad5e5b01d4f84a8617258a659fcc1
+  data.tar.gz: d4d9f966dd440a3cd3031c3ba64b029d0f94b427945d64b77cd23aea3f1a900de2fea85a2f24ddd49fca8c1c821c7e3c6b7c63a9e120fc38e481ed1452ec388b

data/lib/deep_stack/custom_model.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class DeepStack
+  # Custom Model
+  module CustomModel
+    #
+    # Return predictions using a custom model
+    #
+    # @param [String] model custom model name
+    # @param [Object] image binary data or a File object
+    # @param [Hash] options additional fields for DeepStack, e.g. min_confidence: 0.5
+    #
+    # @return [Array] if successful, an array of DeepStack predictions
+    #
+    # @return [nil] if error
+    #
+    def custom_model(model, image, **options)
+      target = "vision/custom/#{model}"
+      api_post(target, image, **options)&.dig('predictions')
+    end
+    # @deprecated Use {custom_model} instead
+    alias custom_inference custom_model
+  end
+end

data/lib/deep_stack/deep_stack.rb

@@ -5,7 +5,7 @@ require 'json'
 require_relative 'face'
 require_relative 'detection'
 require_relative 'scene'
-require_relative 'custom'
+require_relative 'custom_model'
 require_relative 'version'
 
 # DeepStack API
@@ -13,7 +13,7 @@ class DeepStack
   include DeepStack::Face
   include DeepStack::Detection
   include DeepStack::Scene
-  include DeepStack::Custom
+  include DeepStack::CustomModel
 
   #
   # Create a deepstack object connected to the given URL
@@ -61,8 +61,7 @@ class DeepStack
   #
   def close
     @http_mutex.synchronize do
-      @http&.finish
-      @http = nil
+      @http.finish if @http&.started?
     end
   end
 
@@ -82,6 +81,7 @@ class DeepStack
     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
   end

data/lib/deep_stack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deepstack
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jimmy Tanagra
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/deep_stack/custom.rb
+- lib/deep_stack/custom_model.rb
 - lib/deep_stack/deep_stack.rb
 - lib/deep_stack/detection.rb
 - lib/deep_stack/face.rb

data/lib/deep_stack/custom.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-class DeepStack
-  # Custom Model
-  module Custom
-    #
-    # Register a custom inference method for convenience.
-    # The custom method is called "identify_<modelname>"
-    # Example:
-    #   deepstack.register_custom_model('license_plate')
-    #   deepstack.identify_license_plate(image)
-    #
-    # @param [Array] models a list of one or more custom model names to register
-    #
-    # @return [<Type>] <description>
-    #
-    def self.register_model(*models)
-      models.flatten.each do |model|
-        method_name = 'identify_'.concat model.gsub(/-+/, '_') # convert - to _
-        define_method(method_name) do |image, **options|
-          custom_inference(model, image, options)
-        end
-      end
-    end
-
-    #
-    # Return predictions using a custom model
-    #
-    # @param [String] model custom model name
-    # @param [Object] image binary data or a File object
-    # @param [Hash] options additional fields for DeepStack, e.g. min_confidence: 0.5
-    #
-    # @return [Array] if successful, an array of DeepStack predictions
-    #
-    # @return [nil] if error
-    #
-    def custom_inference(model, image, **options)
-      target = "vision/custom/#{model}"
-      api_post(target, image, options)&.dig('predictions')
-    end
-  end
-end