omniai 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc27287a50c39e3aab00622ea1e389f2e2da0828e5ec5b01f0e62bf7ec63c58
-  data.tar.gz: 3979a4a92abd12706cc36ff66d4befab252a48a2deb7d5b3db3a81162af41b50
+  metadata.gz: 9ef66e140869ad45643072513852d7ed06439fb6a7fecda4f552ecb34c14ddb1
+  data.tar.gz: 55740c3bdc98c9d83330b1a45b1b83d760b279d388830e83fce8a671f635d26d
 SHA512:
-  metadata.gz: 32f6f70655128b1eb60bcc1add45eb53cd312550a521fd3a7a7663f09f4084809d139ecb2a617464266b12199f590db26bfa240be9c5fb90b6d1e264b1bd57c9
-  data.tar.gz: d7b170ae465c6e72e4faa5fde86a216bd8317205c9c1630753f527424aa9e59b60f6f1dca32fcecd242824485f7fc328368d9fd8bcff92658fdfd078a5d4080f
+  metadata.gz: f335ee44a2460431d3f7bf83991448569f451930102ba1d3714c79af225db08d22467269c1543434a987de2d0f70bbe33faece99c4f291cc67032e7a5121721b
+  data.tar.gz: 33ca9dbf52c1a7af1c60683db4fd31680f4e3230da6c139591c6c62796616767b67109862963d8b1b7b93c6af46143e140471a606b20f0a6457b3f1989c87030

data/lib/omniai/chat/completion.rb

@@ -33,7 +33,17 @@ module OmniAI
 
       # @return [OmniAI::Chat::Usage]
       def usage
-        @usage ||= Usage.new(data: @data['usage']) if @data['usage']
+        return unless @data['usage']
+
+        input_tokens = @data['usage']['input_tokens'] || @data['usage']['prompt_tokens']
+        output_tokens = @data['usage']['output_tokens'] || @data['usage']['completion_tokens']
+        total_tokens = @data['usage']['total_tokens'] || (input_tokens + output_tokens)
+
+        @usage ||= Usage.new(
+          input_tokens:,
+          output_tokens:,
+          total_tokens:
+        )
       end
 
       # @return [Array<OmniAI::Chat::Choice>]

data/lib/omniai/chat/usage.rb

@@ -3,37 +3,31 @@
 module OmniAI
   class Chat
     # A usage returned by the API.
-    class Completion
-      attr_accessor :data
+    class Usage
+      attr_accessor :input_tokens, :output_tokens, :total_tokens
 
-      # @param data [Hash]
-      def initialize(data:)
-        @data = data
+      # @param input_tokens [Integer]
+      # @param output_tokens [Integer]
+      # @param total_tokens [Integer]
+      def initialize(input_tokens:, output_tokens:, total_tokens:)
+        @input_tokens = input_tokens
+        @output_tokens = output_tokens
+        @total_tokens = total_tokens
       end
 
-      # @return [Integer, nil]
+      # @return [Integer]
       def completion_tokens
-        @data['completion_tokens']
+        @output_tokens
       end
 
-      # @return [Integer, nil]
+      # @return [Integer]
       def prompt_tokens
-        @data['prompt_tokens']
+        @input_tokens
       end
 
-      # @return [Integer, nil]
-      def total_tokens
-        @data['total_tokens']
-      end
-
-      # @return [Integer, nil]
-      def input_tokens
-        @data['input_tokens']
-      end
-
-      # @return [Integer, nil]
-      def output_tokens
-        @data['output_tokens']
+      # @return [String]
+      def inspect
+        "#<#{self.class.name} input_tokens=#{input_tokens} output_tokens=#{output_tokens} total_tokens=#{total_tokens}>"
       end
     end
   end

data/lib/omniai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OmniAI
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-15 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser