openai-assistant 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eeb3d8b4d984070b698e6dbaf0cc49da89e42e44f765b2fc7327f36e2cfb012
-  data.tar.gz: 4779ca985f33430bf684077e80dcaa4cf4faa11f3d836a996c760c42c6c6998f
+  metadata.gz: 30d997127785423573776d064b5a0096f121df245af1c56511be53563b342505
+  data.tar.gz: 166a91a99f0caf0f5b08c9de791531c9f16c9493d2ffa1395db11237c982f620
 SHA512:
-  metadata.gz: 173ba5925ce44d502ca2957488d04fcd42d69dc2a4fa5bed56525966abff7728f39ef131c76fa3030e1801f43c68ddbee994bb83a403281c0d34fa8dae1e0e5a
-  data.tar.gz: 65cacb1f2f1a1de42f577d0c914df1029f4873ea8d4b1300e26aa7803adf8662889f552986100eae93e0652468d13e24de066b601159a3742ca178b003e8f32a
+  metadata.gz: c5f306812242afaac48bd3da55e0280a36877238052ebdd5e75942d68bdf68cdbfc9a81d1c0ebeb2b9d8abd4b10644bdfaef37b1b22ba8580a5a00222a597693
+  data.tar.gz: 8aa5092ad31e0372595baf420020f8d953a500dce327cab67c9344221c7aceca230d4150ef11637304f8558eebcd7d32506ceb533a7de1f7e7647dd5c53dac96

data/lib/http/http.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "json"
+
+module Http
+  # An http client
+  class Client
+    def call_post(_url, req_body, headers)
+      http = Net::HTTP.new(_url.host, _url.port)
+      http.use_ssl = true
+      request = Net::HTTP::Post.new(_url.path, headers)
+      request.body = req_body unless req_body.nil?
+      http.request(request)
+    end
+
+    def call_delete(_url, headers)
+      http = Net::HTTP.new(_url.host, _url.port)
+      http.use_ssl = true
+      request = Net::HTTP::Delete.new(_url.path, headers)
+      http.request(request)
+    end
+
+    def call_get(_url, headers)
+      http = Net::HTTP.new(_url.host, _url.port)
+      http.use_ssl = true
+      request = Net::HTTP::Get.new(_url.path, headers)
+      http.request(request)
+    end
+  end
+end

data/lib/openai/assistant/version.rb

@@ -2,6 +2,6 @@
 
 module Openai
   class Assistant < Openai::Base
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/openai/assistant.rb

@@ -3,6 +3,7 @@
 require_relative "assistant/version"
 require_relative "assistant_obj"
 require_relative "base"
+require_relative "../http/http"
 require "json"
 require "net/http"
 require "uri"
@@ -24,7 +25,6 @@ module Openai
     # @param instructions [String] The system instructions that the assistant uses.
     # @return [Openai::AssistantObj] A new response object of assistant.
     def create_assistant(model, instructions)
-      puts default_headers
       url = URI.parse(@openai_url)
       req_body = {
         "instructions": instructions,
@@ -32,9 +32,11 @@ module Openai
         "tools": [{ "type": "code_interpreter" }],
         "model": model
       }.to_json
-      response = call_post(url, req_body)
-      return response["error"]["code"] unless response["error"].nil?
-
+      response = @http_client.call_post(url, req_body, default_headers)
+      unless response.code == "200"
+        parsed = JSON.parse(response.body)
+        return parsed["error"]["code"]
+      end
       parse_assistant_object(JSON.parse(response.body))
     end
 
@@ -43,9 +45,11 @@ module Openai
     def retrieve_assistant(assistant_id)
       url = "#{@openai_url}/#{assistant_id}"
       uri = URI(url)
-      response = call_post(uri, nil)
-      return response["error"]["code"] unless response["error"].nil?
-
+      response = @http_client.call_get(uri, default_headers)
+      unless response.code == "200"
+        parsed = JSON.parse(response.body)
+        return parsed["error"]["code"]
+      end
       parse_assistant_object(JSON.parse(response.body))
     end
 
@@ -54,10 +58,9 @@ module Openai
     def delete_assistant(assistant_id)
       url = "#{@openai_url}/#{assistant_id}"
       uri = URI(url)
-      response = call_post(uri, nil)
-      return response["error"]["code"] unless response["error"].nil?
-
+      response = @http_client.call_delete(uri, default_headers)
       parsed = JSON.parse(response.body)
+      return parsed["error"]["code"] unless response.code == "200"
 
       parsed["deleted"]
     end
@@ -66,17 +69,18 @@ module Openai
     def list_assistant
       url = @openai_url
       uri = URI(url)
-      response = call_get(uri)
-      return response["error"]["code"] unless response["error"].nil?
-
+      response = @http_client.call_get(uri, default_headers)
       parsed = JSON.parse(response.body)
+      return parsed["error"]["code"] unless response.code == "200"
+
       assistants = []
       parsed["data"].each do |ast|
         assistants << parse_assistant_object(ast)
       end
     end
 
-    # @return private
+    private
+
     def parse_assistant_object(data)
       Openai::AssistantObj.new(
         id: data["id"],
@@ -99,28 +103,5 @@ module Openai
         "Content-Type": "application/json"
       }
     end
-
-    def call_post(url, req_body)
-      uri = URI(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      request = Net::HTTP::Post.new(uri.path, default_headers)
-      request.body = req_body
-      response = http.request(request)
-      parsed = JSON.parse(response.body)
-      return parsed["error"]["code"] unless response.code == "200"
-
-      parsed
-    end
-
-    def call_get(url)
-      uri = URI(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      request = Net::HTTP::Get.new(uri.path, default_headers)
-      response = http.request(request)
-      parsed = JSON.parse(response.body)
-      return parsed["error"]["code"] unless response.code == "200"
-
-      parsed
-    end
   end
 end

data/lib/openai/base.rb

@@ -1,16 +1,20 @@
 # frozen_string_literal: true
 
+require_relative "../http/http"
+
 module Openai
   # Base class of openai
   class Base
     @openai_api_key = nil
     @openai_url = nil
+    @http_client = nil
 
     def initialize(api_key = "")
       @openai_api_key = api_key
       # hard the host because if the official docs change the host, maybe it will change another
       # we need to update this gem for any change
       @openai_url = "https://api.openai.com/v1/assistants"
+      @http_client = Http::Client.new
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openai-assistant
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - duonghds
@@ -38,6 +38,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/http/http.rb
 - lib/openai/assistant.rb
 - lib/openai/assistant/version.rb
 - lib/openai/assistant_obj.rb