openai-assistant 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c4f3c25796b691c23177c0305accd4d4eb10d13f3d5dd8d5828d6070a7f801
-  data.tar.gz: 22cdf48b820eed695c042ecb9f5892ff8cc05c78547a6d98c95de0a7591c1435
+  metadata.gz: 4eeb3d8b4d984070b698e6dbaf0cc49da89e42e44f765b2fc7327f36e2cfb012
+  data.tar.gz: 4779ca985f33430bf684077e80dcaa4cf4faa11f3d836a996c760c42c6c6998f
 SHA512:
-  metadata.gz: be4e756a8888af5c0b1f0247a6a17bd1e02cbdc636f43f28b84c2a7c91dd1644d981357c8ead3d81b6cb5831f35b220a6e881d8fbefb5aaa36f0349130995ff9
-  data.tar.gz: 25566590081132fb1526f6970a472b2ca348881931e8052270aad14557fa53fb6e3020f56705866ed488dac04947d69bba7c32ea3b99f5eb3c3f355c0fc1f65a
+  metadata.gz: 173ba5925ce44d502ca2957488d04fcd42d69dc2a4fa5bed56525966abff7728f39ef131c76fa3030e1801f43c68ddbee994bb83a403281c0d34fa8dae1e0e5a
+  data.tar.gz: 65cacb1f2f1a1de42f577d0c914df1029f4873ea8d4b1300e26aa7803adf8662889f552986100eae93e0652468d13e24de066b601159a3742ca178b003e8f32a

data/lib/openai/assistant/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Openai
-  class Assistant
-    VERSION = "0.4.0"
+  class Assistant < Openai::Base
+    VERSION = "0.5.0"
   end
 end

data/lib/openai/assistant.rb

@@ -2,94 +2,62 @@
 
 require_relative "assistant/version"
 require_relative "assistant_obj"
+require_relative "base"
 require "json"
 require "net/http"
-require "rest-client"
+require "uri"
+
 module Openai
   # An openai assistant
-  class Assistant
-    @openai_api_key = nil
-    @openai_url = nil
-
-    # @param api_key [String] The api key of openai
+  class Assistant < Base
+    # @param api_key [String] The api key of openai\
     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"
+      super(api_key)
     end
 
     # @param api_key [String] The api key of openai
     def self.setup(api_key = "")
-      @openai_api_key = api_key
-      @openai_url = "https://api.openai.com/v1/assistants"
+      initialize(api_key)
     end
 
     # @param model [String] Select model of the assistant. refer on: https://platform.openai.com/docs/api-reference/models/list.
     # @param instructions [String] The system instructions that the assistant uses.
     # @return [Openai::AssistantObj] A new response object of assistant.
     def create_assistant(model, instructions)
-      url = @openai_url
-      headers = {
-        "Authorization": "Bearer #{@openai_api_key}",
-        "OpenAI-Beta": "assistants=v1",
-        "Content-Type": "application/json"
-      }
+      puts default_headers
+      url = URI.parse(@openai_url)
       req_body = {
         "instructions": instructions,
         "name": "assistant",
         "tools": [{ "type": "code_interpreter" }],
         "model": model
-      }
-      begin
-        resp = RestClient.post(url, req_body.to_json, headers)
-      rescue RestClient::ExceptionWithResponse => e
-        resp = e.response
-      end
-      unless resp.code == 200
-        parsed = JSON.parse(resp.body)
-        return parsed["error"]["code"]
-      end
-      parse_assistant_object(JSON.parse(resp.body))
+      }.to_json
+      response = call_post(url, req_body)
+      return response["error"]["code"] unless response["error"].nil?
+
+      parse_assistant_object(JSON.parse(response.body))
     end
 
     # @param assistant_id [String] The id of assistant after create
     # @return [Openai::AssistantObj] A new response object of assistant.
     def retrieve_assistant(assistant_id)
       url = "#{@openai_url}/#{assistant_id}"
-      headers = {
-        "Authorization": "Bearer #{@openai_api_key}",
-        "OpenAI-Beta": "assistants=v1",
-        "Content-Type": "application/json"
-      }
-      begin
-        resp = RestClient.get(url, headers)
-      rescue RestClient::ExceptionWithResponse => e
-        resp = e.response
-      end
-      unless resp.code == 200
-        parsed = JSON.parse(resp.body)
-        return parsed["error"]["code"]
-      end
-      parse_assistant_object(JSON.parse(resp.body))
+      uri = URI(url)
+      response = call_post(uri, nil)
+      return response["error"]["code"] unless response["error"].nil?
+
+      parse_assistant_object(JSON.parse(response.body))
     end
 
     # @param assistant_id [String] The id of assistant after create
     # @return [String] Message delete the assistant ok or not
     def delete_assistant(assistant_id)
       url = "#{@openai_url}/#{assistant_id}"
-      headers = {
-        "Authorization": "Bearer #{@openai_api_key}",
-        "OpenAI-Beta": "assistants=v1",
-        "Content-Type": "application/json"
-      }
-      begin
-        resp = RestClient.delete(url, headers)
-      rescue RestClient::ExceptionWithResponse => e
-        resp = e.response
-      end
-      parsed = JSON.parse(resp.body)
-      return parsed["error"]["code"] unless resp.code == 200
+      uri = URI(url)
+      response = call_post(uri, nil)
+      return response["error"]["code"] unless response["error"].nil?
+
+      parsed = JSON.parse(response.body)
 
       parsed["deleted"]
     end
@@ -97,19 +65,11 @@ module Openai
     # @return [Array<Openai::AssistantObj>] List all assistant
     def list_assistant
       url = @openai_url
-      headers = {
-        "Authorization": "Bearer #{@openai_api_key}",
-        "OpenAI-Beta": "assistants=v1",
-        "Content-Type": "application/json"
-      }
-      begin
-        resp = RestClient.get(url, headers)
-      rescue RestClient::ExceptionWithResponse => e
-        resp = e.response
-      end
-      parsed = JSON.parse(resp.body)
-      return parsed["error"]["code"] unless resp.code == 200
+      uri = URI(url)
+      response = call_get(uri)
+      return response["error"]["code"] unless response["error"].nil?
 
+      parsed = JSON.parse(response.body)
       assistants = []
       parsed["data"].each do |ast|
         assistants << parse_assistant_object(ast)
@@ -131,5 +91,36 @@ module Openai
         metadata: data["metadata"]
       )
     end
+
+    def default_headers
+      {
+        "Authorization": "Bearer #{@openai_api_key}",
+        "OpenAI-Beta": "assistants=v1",
+        "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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Openai
+  # Base class of openai
+  class Base
+    @openai_api_key = nil
+    @openai_url = 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"
+    end
+  end
+end

data/openai-assistant.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "lib/openai/base"
 require_relative "lib/openai/assistant/version"
 
 Gem::Specification.new do |spec|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openai-assistant
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - duonghds
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -41,6 +41,7 @@ files:
 - lib/openai/assistant.rb
 - lib/openai/assistant/version.rb
 - lib/openai/assistant_obj.rb
+- lib/openai/base.rb
 - openai-assistant.gemspec
 - sig/openai/assistant.rbs
 homepage: https://rubygems.org/