openai-assistant 0.7.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96a8f05d752820cc1e3249578c09c2d01be9b1226947b429391c1912384ef13c
-  data.tar.gz: 5e23932e45833891e126511527e6988b14e54c302c5d7fb27cb4e5b10da253ee
+  metadata.gz: 1d903e8d269b7951b68f30be711b1891f4175ae828f0ef57aa52896971604920
+  data.tar.gz: 2b310fe5f7423d00f57760d9a0a48c715b6617bd592d98ad5c04f07fdb76e4e7
 SHA512:
-  metadata.gz: 9c73814b136ebb0a063d3c19b4eec1df87956dd3747ffa85af703cf69af7fec39dac13d76586c66a72aefb80eebfa2e7d89e97b01f0ca6f57a767bd343ab3521
-  data.tar.gz: 141ff54de362fee03d05f7f61c2e20d476d4c1a3ae55373374b369dc266338f53d6368920ed69d83c29925abc9f40a678f2d80890e749b005066daaa7524853b
+  metadata.gz: ab128129583233462bde63adb5ca0dce2799313b362e0c8632d86046803a39c8d57dde423736b34e931b1cf797a0ff539dd19e4deee88f048b6628a8723b3b4b
+  data.tar.gz: cdd30bd9901b70e7c1bc7bb4a749b9e6c37d6450be09e4494f606f3a7f33da8412016f01ba36da43de5c1ce32a8d24beda60e245cd28f93cc1cce2a4532992a8

data/README.md

@@ -1,7 +1,7 @@
-# Openai::Assistant
+# OpenaiAssistant::Assistant
 This project/gem is for Ruby interact with OpenAI Assistant throught rest api.
 
-The client to call is: `Openai::Assistant`
+The client to call is: `OpenaiAssistant::Assistant`
 
 ## Installation
 Install throught RubyGems server by below step:
@@ -14,7 +14,7 @@ Install throught RubyGems server by below step:
 You can direct interact with gem by:
 
 - use the gem `require "openai/assistant"`
-- setup the api key `instance =Openai::Assistant::new(${API_KEY})`
+- setup the api key `instance = OpenaiAssistant::Assistant::new(${API_KEY})`
 - interact with assistant: 
     + `instance.create_assistant(model, instruction)` 
 

data/lib/{openai → openai_assistant}/base.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-require_relative "../http/http"
-
-module Openai
+module OpenaiAssistant
   # 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
+      @http_client = OpenaiAssistant::HTTPClient.new
+    end
+
+    def default_headers
+      {
+        "Authorization": "Bearer #{@openai_api_key}",
+        "OpenAI-Beta": "assistants=v1",
+        "Content-Type": "application/json"
+      }
     end
   end
 end

data/lib/openai_assistant/client.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module OpenaiAssistant
+  module Assistant
+    # An openai assistant client
+    class Client
+      attr_accessor :api_key
+
+      def initialize(api_key)
+        @api_key = api_key
+      end
+
+      def create_assistant(model, instructions)
+        OpenaiAssistant::Assistant::Create.new(@api_key).create_assistant(model, instructions)
+      end
+
+      def retrieve_assistant(assistant_id)
+        OpenaiAssistant::Assistant::Retrieve.new(@api_key).retrieve_assistant(assistant_id)
+      end
+
+      def list_assistant
+        OpenaiAssistant::Assistant::List.new(@api_key).list_assistant
+      end
+
+      def delete_assistant(assistant_id)
+        OpenaiAssistant::Assistant::Delete.new(@api_key).delete_assistant(assistant_id)
+      end
+    end
+  end
+end

data/lib/openai_assistant/clients/assistant/create.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module OpenaiAssistant
+  module Assistant
+    # An openai assistant
+    class Create < Base
+      # @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 [OpenaiAssistant::Mapper::Assistant] A new response object of assistant.
+      def create_assistant(model, instructions)
+        url = URI.parse(@openai_url)
+        req_body = {
+          "instructions": instructions,
+          "name": "assistant",
+          "tools": [{ "type": "code_interpreter" }],
+          "model": model
+        }.to_json
+        response = @http_client.call_post(url, req_body, default_headers)
+        return OpenaiAssistant::ErrorResponse.from_json(response.body) unless response.code == "200"
+
+        OpenaiAssistant::Mapper::Assistant.from_json(JSON.parse(response.body))
+      end
+    end
+  end
+end

data/lib/openai_assistant/clients/assistant/delete.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module OpenaiAssistant
+  module Assistant
+    # An openai assistant
+    class Delete < Base
+      # @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}"
+        uri = URI(url)
+        response = @http_client.call_delete(uri, default_headers)
+        return OpenaiAssistant::ErrorResponse.from_json(response.body) unless response.code == "200"
+
+        true
+      end
+    end
+  end
+end

data/lib/openai_assistant/clients/assistant/list.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OpenaiAssistant
+  module Assistant
+    # An openai assistant
+    class List < Base
+      # @return [Array<OpenaiAssistant::Mapper::Assistant>] List all assistant
+      def list_assistant
+        url = @openai_url
+        uri = URI(url)
+        response = @http_client.call_get(uri, default_headers)
+        return OpenaiAssistant::ErrorResponse.from_json(response.body) unless response.code == "200"
+
+        parsed = JSON.parse(response.body)
+        assistants = []
+        parsed["data"].each do |ast|
+          assistants << OpenaiAssistant::Mapper::Assistant.from_json(ast)
+        end
+      end
+    end
+  end
+end

data/lib/openai_assistant/clients/assistant/retrieve.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module OpenaiAssistant
+  module Assistant
+    # An openai assistant
+    class Retrieve < Base
+      # @param assistant_id [String] The id of assistant after create
+      # @return [OpenaiAssistant::Mapper::OpenaiAssistant] A new response object of assistant.
+      def retrieve_assistant(assistant_id)
+        url = "#{@openai_url}/#{assistant_id}"
+        uri = URI(url)
+        response = @http_client.call_get(uri, default_headers)
+        return OpenaiAssistant::ErrorResponse.from_json(response.body) unless response.code == "200"
+
+        OpenaiAssistant::Mapper::Assistant.from_json(JSON.parse(response.body))
+      end
+    end
+  end
+end

data/lib/{http → openai_assistant/clients/http}/http.rb

@@ -1,29 +1,27 @@
 # frozen_string_literal: true
 
-require "net/http"
-require "json"
-
-module Http
+module OpenaiAssistant
   # An http client
-  class Client
-    def call_post(url, req_body, headers)
+  class HTTPClient
+    # disable_ssl instead of ssl because almost the host is https
+    def call_post(url, req_body, headers, disable_ssl: false)
       http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = true
+      http.use_ssl = disable_ssl ? false : 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)
+    def call_delete(url, headers, disable_ssl: false)
       http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = true
+      http.use_ssl = disable_ssl ? false : true
       request = Net::HTTP::Delete.new(url.path, headers)
       http.request(request)
     end
 
-    def call_get(url, headers)
+    def call_get(url, headers, disable_ssl: false)
       http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = true
+      http.use_ssl = disable_ssl ? false : true
       request = Net::HTTP::Get.new(url.path, headers)
       http.request(request)
     end

data/lib/openai_assistant/error_response.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module OpenaiAssistant
+  # A error response of openai
+  class ErrorResponse
+    # @return [String] error message
+    attr_accessor :message
+    # @return [String] type of error
+    attr_accessor :type
+    # @return [String] parameter that caused the error
+    attr_accessor :param
+    # @return [String] error code of openai
+    attr_accessor :code
+
+    def initialize(**args)
+      args.each do |k, v|
+        instance_variable_set("@#{k}", v) unless v.nil?
+      end
+    end
+
+    def self.from_json(response_body)
+      data = JSON.parse(response_body)["error"]
+      OpenaiAssistant::ErrorResponse.new(
+        message: data["message"],
+        type: data["type"],
+        param: data["param"],
+        code: data["code"]
+      )
+    end
+  end
+end

data/lib/openai_assistant/mappers/assistant.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module OpenaiAssistant
+  # A mapper of assistant
+  module Mapper
+    # A object model struct of assistant
+    class Assistant
+      # @return [String] The identifier, which can be referenced in API endpoints.
+      attr_accessor :id
+      # @return [String] The object type, which is always assistant.
+      attr_accessor :object
+      # @return [Integer] The Unix timestamp (in seconds) for when the assistant was created.
+      attr_accessor :created_at
+      # @return [String] The name of the assistant. The maximum length is 256 characters.
+      attr_accessor :name
+      # @return [String] The description of the assistant. The maximum length is 512 characters.
+      attr_accessor :description
+      # @return [String] ID of the model to use. Use the List models API to see all available models
+      attr_accessor :model
+      # @return [String] The system instructions that the assistant uses. The maximum length is 32768 characters.
+      attr_accessor :instructions
+      # @return [String] A list of tool enabled on the assistant.
+      attr_accessor :tools
+      # @return [String] A list of file IDs attached to this assistant.
+      attr_accessor :file_ids
+      # @return [String] Set of 16 key-value pairs that can be attached to an object.
+      attr_accessor :metadata
+
+      def initialize(**args)
+        args.each do |k, v|
+          instance_variable_set("@#{k}", v) unless v.nil?
+        end
+      end
+
+      def self.from_json(data)
+        OpenaiAssistant::Mapper::Assistant.new(
+          id: data["id"],
+          object: data["object"],
+          created_at: data["created_at"],
+          name: data["name"],
+          description: data["description"],
+          model: data["model"],
+          instructions: data["instructions"],
+          tools: data["tools"],
+          file_ids: data["file_ids"],
+          metadata: data["metadata"]
+        )
+      end
+    end
+  end
+end

data/lib/openai_assistant/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module OpenaiAssistant
+  VERSION = "1.1.0"
+end

data/lib/openai_assistant.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "json"
+require "net/http"
+require "uri"
+require_relative "openai_assistant/clients/http/http"
+require_relative "openai_assistant/mappers/assistant"
+require_relative "openai_assistant/error_response"
+require_relative "openai_assistant/version"
+require_relative "openai_assistant/base"
+require_relative "openai_assistant/client"
+require_relative "openai_assistant/clients/assistant/create"
+require_relative "openai_assistant/clients/assistant/retrieve"
+require_relative "openai_assistant/clients/assistant/delete"
+require_relative "openai_assistant/clients/assistant/list"

data/openai-assistant.gemspec

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "lib/openai/base"
-require_relative "lib/openai/assistant/version"
+require_relative "lib/openai_assistant/base"
+require_relative "lib/openai_assistant/version"
 
 Gem::Specification.new do |spec|
   spec.name = "openai-assistant"
-  spec.version = Openai::Assistant::VERSION
+  spec.version = OpenaiAssistant::VERSION
   spec.authors = ["duonghds"]
   spec.email = ["duong.hoang@employmenthero.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openai-assistant
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.1.0
 platform: ruby
 authors:
 - duonghds
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2023-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,11 +38,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/http/http.rb
-- lib/openai/assistant.rb
-- lib/openai/assistant/version.rb
-- lib/openai/assistant_obj.rb
-- lib/openai/base.rb
+- lib/openai_assistant.rb
+- lib/openai_assistant/base.rb
+- lib/openai_assistant/client.rb
+- lib/openai_assistant/clients/assistant/create.rb
+- lib/openai_assistant/clients/assistant/delete.rb
+- lib/openai_assistant/clients/assistant/list.rb
+- lib/openai_assistant/clients/assistant/retrieve.rb
+- lib/openai_assistant/clients/http/http.rb
+- lib/openai_assistant/error_response.rb
+- lib/openai_assistant/mappers/assistant.rb
+- lib/openai_assistant/version.rb
 - openai-assistant.gemspec
 - sig/openai/assistant.rbs
 homepage: https://rubygems.org/

data/lib/openai/assistant/version.rb

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

data/lib/openai/assistant.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "assistant/version"
-require_relative "assistant_obj"
-require_relative "base"
-require_relative "../http/http"
-require "json"
-require "net/http"
-require "uri"
-
-module Openai
-  # An openai assistant
-  class Assistant < Base
-    # @param api_key [String] The api key of openai\
-    def initialize(api_key = "")
-      super(api_key)
-    end
-
-    # @param api_key [String] The api key of openai
-    def self.setup(api_key = "")
-      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 = URI.parse(@openai_url)
-      req_body = {
-        "instructions": instructions,
-        "name": "assistant",
-        "tools": [{ "type": "code_interpreter" }],
-        "model": model
-      }.to_json
-      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
-
-    # @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}"
-      uri = URI(url)
-      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
-
-    # @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}"
-      uri = URI(url)
-      response = @http_client.call_delete(uri, default_headers)
-      parsed = JSON.parse(response.body)
-      return parsed["error"]["code"] unless response.code == "200"
-
-      parsed["deleted"]
-    end
-
-    # @return [Array<Openai::AssistantObj>] List all assistant
-    def list_assistant
-      url = @openai_url
-      uri = URI(url)
-      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
-
-    private
-
-    def parse_assistant_object(data)
-      Openai::AssistantObj.new(
-        id: data["id"],
-        object: data["object"],
-        created_at: data["created_at"],
-        name: data["name"],
-        description: data["description"],
-        model: data["model"],
-        instructions: data["instructions"],
-        tools: data["tools"],
-        file_ids: data["file_ids"],
-        metadata: data["metadata"]
-      )
-    end
-
-    def default_headers
-      {
-        "Authorization": "Bearer #{@openai_api_key}",
-        "OpenAI-Beta": "assistants=v1",
-        "Content-Type": "application/json"
-      }
-    end
-  end
-end

data/lib/openai/assistant_obj.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Openai
-  # A object model struct of assistant
-  class AssistantObj
-    # @return [String] The identifier, which can be referenced in API endpoints.
-    attr_accessor :id
-    # @return [String] The object type, which is always assistant.
-    attr_accessor :object
-    # @return [Integer] The Unix timestamp (in seconds) for when the assistant was created.
-    attr_accessor :created_at
-    # @return [String] The name of the assistant. The maximum length is 256 characters.
-    attr_accessor :name
-    # @return [String] The description of the assistant. The maximum length is 512 characters.
-    attr_accessor :description
-    # @return [String] ID of the model to use. Use the List models API to see all available models
-    attr_accessor :model
-    # @return [String] The system instructions that the assistant uses. The maximum length is 32768 characters.
-    attr_accessor :instructions
-    # @return [String] A list of tool enabled on the assistant.
-    attr_accessor :tools
-    # @return [String] A list of file IDs attached to this assistant.
-    attr_accessor :file_ids
-    # @return [String] Set of 16 key-value pairs that can be attached to an object.
-    attr_accessor :metadata
-
-    def initialize(**args)
-      args.each do |k, v|
-        instance_variable_set("@#{k}", v) unless v.nil?
-      end
-    end
-  end
-end