summarize-meeting 1.3.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b12c6dac816079ec5c3aa2f879d93fdc4fea0616843f6cdcea02d3241bdc2a
-  data.tar.gz: eb3e9cc35d30922b759417100178d59c3be48dab84c50a44aac31726d6b8829b
+  metadata.gz: a1f1e203f7328efbedef8a044434bb8377aac4d8cdf5a3ffc61d903d6155b211
+  data.tar.gz: 4b93b413a93e5f2d6cbe1d46c842889a559f32682e19b4b1611115e2b928b5fe
 SHA512:
-  metadata.gz: bc52213e5468d899182b0b3d73e234112677db442b9dc664062d6c67be44039d4dac142b9ca83c51fbfba47fb4d5505a70b98714497978ad3504bc93c59b9d78
-  data.tar.gz: aa917214ef057c71739aa136bdd823d74caccb7f3c2490bbc262d6f1ef9abf1a84340d240c69465571513423e530bfdddef5a49851d7cd805b37250506f70b17
+  metadata.gz: 77a9c6ecd2f9fc14c949cc5fab380981d1016ba363332c2c1bc55d2e01433acaeaa9fa3caf5eaee9c17488255da2bfb1ec33487fc624f34dcb5f4da1a97def03
+  data.tar.gz: 2cde7420a3e4b5628eaae774ca6c29ca6b5be1409dd42c87ab1bd216ad749557e92b68264059fdc50fe92ec4bd8fbd921b69dc0d156d2f38493916b5e19b0c70

data/lib/summarize-meeting/ai.rb

@@ -1,56 +1,155 @@
+# frozen_string_literal: true
+
+require "openai"
+
 module SummarizeMeeting
   module Ai
-    class OpenAiError < StandardError; end
-    MAX_TOTAL_TOKENS = 4096
-    WORDS_PER_TOKEN = 0.75
+    module OpenAIException; end
+    class OpenAIError < StandardError
+      include OpenAIException
+    end
+    class OpenAiResponseFailure < OpenAIError; end
+    class OpenAiNoResponseError < OpenAIError; end
+    class OpenAiRetryableError < OpenAIError; end
+    extend self
 
-    @@access_token = ENV["OPENAI_KEY"]
-    @@organization_id = ENV["OPENAI_ORG"]
+    MAX_TOTAL_TOKENS = 8000
+    WORDS_PER_TOKEN = 0.75
 
-    def self.client
+    def client
       @client ||= new_client(access_token: access_token, organization_id: organization_id)
     end
 
-    def self.new_client(access_token:, organization_id:)
+    def new_client(access_token:, organization_id:)
       OpenAI::Client.new(access_token: access_token, organization_id: organization_id)
     end
 
-    def self.access_token
-      @@access_token
+    def access_token
+      @access_token ||= ENV.fetch("OPENAI_KEY") do
+        fail KeyError, "Set OPENAI_KEY in the the ENV or set access_token directly"
+      end
     end
 
-    def self.organization_id
-      @@organization_id
+    def organization_id
+      @organization_id ||= ENV.fetch("OPENAI_ORG") do
+        fail KeyError, "Set OPENAI_ORG in the the ENV or set organization_id directly"
+      end
     end
 
-    def self.access_token=(token)
-      @@access_token = token
+    def access_token=(token)
+      @access_token = token
     end
 
-    def self.organization_id=(id)
-      @@organization_id = id
+    def organization_id=(id)
+      @organization_id = id
     end
 
-    def self.calculate_token_word_count(token_count)
+    def calculate_token_word_count(token_count)
       (token_count * WORDS_PER_TOKEN.to_f).ceil
     end
 
-    def self.calculate_word_token_count(word_count)
+    def calculate_word_token_count(word_count)
       (word_count / WORDS_PER_TOKEN.to_f).ceil
     end
 
-    def self.chat(messages, client: self.client)
+    # @raise on response error or no expected response content
+    def chat(messages, client: self.client)
       parameters = {
-        model: "gpt-3.5-turbo",
+        model: "gpt-4",
         messages: messages,
       }
-      response = client.chat(parameters: parameters)
-      content = response.dig("choices", 0, "message", "content")
-      if !content
-        raise OpenAiError, "No response from OpenAI"
+      response = nil
+      begin
+        response = client.chat(parameters: parameters)
+      rescue => exception
+        handle_request_error(exception)
+      else
+        is_failure = !response.success?
+        if is_failure
+          log_response_failure(response)
+          raise OpenAiResponseFailure, "Failed response from OpenAI"
+        else
+          content = response.dig("choices", 0, "message", "content")
+          if !content
+            raise OpenAiNoResponseError, "No response from OpenAI in #{response.body}"
+          else
+            content
+          end
+        end
+      end
+    end
+
+    def notify_error(exception, message, **options)
+      if exception_notifier
+        exception_notifier.call(exception, message, **options)
       else
-        content
+        warn "#{exception.inspect}: #{message}. options=#{options.inspect}"
+      end
+    end
+
+    # responds to call(exception, message, **options)
+    def exception_notifier=(exception_notifier)
+      @exception_notifier = exception_notifier
+    end
+
+    def exception_notifier
+      return @exception_notifier if defined?(@exception_notifier)
+      nil
+    end
+
+    def handle_request_error(exception)
+      is_openai_error =
+        case exception.inspect
+        when /Connection refused/i then true
+        when /Connection reset/i then true
+        when /Connection timed out/i then true
+        when /Could not connect/i then true
+        when /EOFError/i then true
+        when /Errno::ECONNREFUSED/i then true
+        when /Errno::ECONNRESET/i then true
+        when /Net::OpenTimeout/i then true
+        when /Net::ReadTimeout/i then true
+        when /OpenSSL::SSL::SSLError/i then false
+        when /Server is unavailable or does not exist/i then true
+        when /Unable to connect/i then true
+        when /closed stream/i then true
+        when /connect timed out/i then true
+        when /end of file reached/i then true
+        when /execution expired/i then true
+        else false
+        end
+      if is_openai_error
+        exception.extend OpenAIException
+      end
+      raise
+    end
+
+    def log_response_failure(response)
+      response_details = {
+        # https://github.com/jnunemaker/httparty/blob/v0.21.0/lib/httparty/response.rb#L53-L56
+        response: response.to_s,
+      }
+      if response.class.name.match?(/HTTParty::Response/)
+        response_details.merge!(
+          raw_request: response.request.inspect,
+          raw_response: response.response.inspect,
+          response_body: response.body,
+          response_code: response.code,
+          response_headers: response.headers,
+          # marshal_dump_base_64: Base64.encode64(response._dump(1)), # so it can be encoded as JSON
+        )
       end
+      notify_error(
+        nil, # there's no exception object
+        "Logging OpenAI Error",
+        **response_details
+      )
+    rescue => exception
+      notify_error(
+        exception,
+        "Unhandled error in #{name}##{__callee__}",
+        response: response.inspect,
+      )
     end
   end
-end
+end

data/lib/summarize-meeting/version.rb

@@ -1,3 +1,3 @@
 module SummarizeMeeting
-  VERSION = "1.3.2"
-end
+  VERSION = "1.5.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: summarize-meeting
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Sean Devine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: optparse