gpt-function 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdeb301d12f6247b694accec4654d4d65bab0ca071cb4bf7ae73631bf540bc56
-  data.tar.gz: dd5cb067931ac6411a545641b96f40ef81d929bd1d388cfe93808d5c76b6e2ec
+  metadata.gz: 61133cf0bb081bfcc03dc1e0b2a69bbc7f043c7dc6fd9c5e56d0d9734c975575
+  data.tar.gz: b153cad22540e8b2ad46293c8dffc1aa63b27d48f87a60cb46a9d6cc869abc5d
 SHA512:
-  metadata.gz: 665474c59064f7ae3401b0fea4e8ca562cfa2e91ff285523bbcdff9b367480f2d137b619b15d30c396df92a07c506bd73ed121bd8c54292d301785957486aa37
-  data.tar.gz: f1072362a33e579c4f52eda7b8abbadc3970807eaca91c5aa39010ca130c3e935a9ee5194b207a8c4de8b11c2079a68bbc3675d63ddeb74d811f9c2de7c33aac
+  metadata.gz: 69fed6886b79e1b3e0034d3de36273b0bddc6b1ff59bb03067b737621ee85030ad334ceea48d72b9173025661f92f3f05d396d921720a4ee45a9f74dc7e9da50
+  data.tar.gz: f375fa50fc60c54663e8c488385541caa711ee97cae76495c885b734ce826fe79dc703d13f3594e54a7d44371be6e1f7458990a527b1095fe562a7195b011df4

data/README.md

@@ -4,11 +4,6 @@
 
 你可以確保每次呼叫 GPT 函數時，接近 100% 都會得到相同的結果。
 
-目前能夠使用的模型有：
-
-- gpt-4-1106-preview
-- gpt-3.5-turbo-1106
-
 
 ## Installation
 
@@ -99,20 +94,31 @@ end
 Batch Storage 整合 Active Record 的範例：
 
 ```ruby
-class Model < ApplicationRecord
+class BatchStatus < ApplicationRecord
   class << self
     def enqueue(hash)
-      create!(hash)
+      model = BatchStatus.new
+      model.batch_id = hash[:id]
+      model.status = hash[:status]
+      model.request_counts_completed = hash[:request_counts_completed]
+      model.request_counts_failed = hash[:request_counts_failed]
+      model.request_counts_total = hash[:request_counts_total]
+      model.metadata = hash[:metadata]
+      model.payload = hash
+      model.save
       true
     end
 
     def dequeue
-      first&.destroy
+      model = first
+      model.destroy
+      model.payload
     end
   end
 end
 
-GptFunction.configure(api_key: '...', model: 'gpt-4o-mini', batch_storage: Model)
+
+GptFunction.configure(api_key: '...', model: 'gpt-4o-mini', batch_storage: BatchStatus)
 ```
 
 ## License

data/lib/gpt_function/batch.rb

@@ -28,8 +28,7 @@ class GptFunction
     attr_reader :request_counts_completed
     attr_reader :request_counts_failed
 
-    attr_reader :metadata_customer_id
-    attr_reader :metadata_batch_description
+    attr_reader :metadata
 
     def initialize(hash)
       @id = hash["id"]
@@ -55,8 +54,7 @@ class GptFunction
       @request_counts_completed = hash.dig("request_counts", "completed")
       @request_counts_failed = hash.dig("request_counts", "failed")
 
-      @metadata_customer_id = hash.dig("metadata", "customer_id")
-      @metadata_batch_description = hash.dig("metadata", "batch_description")
+      @metadata = hash.dig("metadata")
     end
 
     def to_hash
@@ -82,8 +80,7 @@ class GptFunction
         request_counts_total: request_counts_total,
         request_counts_completed: request_counts_completed,
         request_counts_failed: request_counts_failed,
-        metadata_customer_id: metadata_customer_id,
-        metadata_batch_description: metadata_batch_description,
+        metadata: metadata
       }
     end
 
@@ -105,6 +102,11 @@ class GptFunction
       @output_file ||= File.from_id(output_file_id)
     end
 
+    def error_file
+      return nil if error_file_id.nil?
+      @error_file ||= File.from_id(error_file_id)
+    end
+
     def input_jsonl
       @input_jsonl ||= input_file&.jsonl || []
     end
@@ -170,6 +172,10 @@ class GptFunction
       ["failed", "completed", "expired", "cancelled"].include? status
     end
 
+    def auto_delete
+      metadata&.dig("auto_delete") || false
+    end
+
     class << self
       def list(limit: 20, after: nil)
         # 創建批次請求
@@ -189,7 +195,7 @@ class GptFunction
         end
       end
 
-      def create(requests)
+      def create(requests, metadata: nil)
         requests = requests.each_with_index.map do |request, index|
           {
             custom_id: "request-#{index + 1}",
@@ -206,11 +212,13 @@ class GptFunction
         uri = URI('https://api.openai.com/v1/batches')
         request = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
         request['Authorization'] = "Bearer #{GptFunction.api_key}"
-        request.body = {
+        body = {
           input_file_id: file.id,
           endpoint: '/v1/chat/completions',
           completion_window: '24h'
-        }.to_json
+        }
+        body[:metadata] = metadata unless metadata.nil?
+        request.body = body.to_json
 
         response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(request)
@@ -288,7 +296,13 @@ class GptFunction
           yield batch
 
           # 如果 batch 還未處理完成，將批次請求重新加入 Storage
-          batch.enqueue unless batch.is_processed
+          if batch.is_processed && auto_delete
+            batch&.input_file&.delete rescue nil
+            batch&.output_file&.delete rescue nil
+            batch&.error_file&.delete rescue nil
+          else
+            batch.enqueue
+          end
         end
 
         true

data/lib/gpt_function/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class GptFunction
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpt-function
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - etrex kuo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-03 00:00:00.000000000 Z
+date: 2024-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv