exa-ai 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52f222b86ee544f2e2bfa756c61e816cd874e8e1ac7d688dcb2bae8e242f712e
-  data.tar.gz: 254fc95859993deabded89ee9019a680dfa04b05b581a669296524d1a8dbc3b5
+  metadata.gz: e5fb7cd2fe000621f282f4eba7b178bc628793fc8232a47664f9a62d6a9d63ed
+  data.tar.gz: c8f6d9cb0272743280d73383629e1db1b68febd787a04f68dd402c1eb7927e7a
 SHA512:
-  metadata.gz: af592dc58ceec4b4da49a069622c7f14c65205fd2349fa89ab35b517d368b565b51581e22d401802df96a3a47404d9717ea9d88bfede54d0c513dd1a0434bb96
-  data.tar.gz: 0b6f2aa5c9494b934d07499218b2a8156c6150c435e8fea9e5b8ec7b765adbbf922193187c07c256ed776aa17bb7284e77fb6c1cdbf82e0e56a3fa79c65071d4
+  metadata.gz: 5c59a5d154df999cfd6e1212d23cfa46507caaa37a026439107ee63e9866e010367d75da4199b7b9873ccf37b8af83176d14420f21ee68499dc00e43ce001425
+  data.tar.gz: fc82c1690affcec1d61bc5df5930819c0c375b33fe0ac3e40d956c1ce5ad6b36cc3b908590b9bbcb14759a3521cad2cc4ef5de494b32705a0a9d2238ddbb0112

data/lib/exa/services/get_contents.rb

@@ -12,14 +12,33 @@ module Exa
         response = @connection.post("/contents", @params)
         body = response.body
 
+        results = body["results"]
+        results = parse_json_summaries(results) if summary_schema?
+
         Resources::ContentsResult.new(
-          results: body["results"],
+          results: results,
           request_id: body["requestId"],
           context: body["context"],
           statuses: body["statuses"],
           cost_dollars: body["costDollars"]
         )
       end
+
+      private
+
+      def summary_schema?
+        @params[:summary].is_a?(Hash) && @params[:summary][:schema]
+      end
+
+      def parse_json_summaries(results)
+        results&.map do |r|
+          if r["summary"].is_a?(String)
+            r.merge("summary" => JSON.parse(r["summary"]))
+          else
+            r
+          end
+        end
+      end
     end
   end
 end

data/lib/exa/services/parameter_converter.rb

@@ -10,10 +10,11 @@ module Exa
       end
 
       def convert(params)
+        consolidated = consolidate_content_params(params)
         converted = {}
         contents = {}
 
-        params.each do |key, value|
+        consolidated.each do |key, value|
           if content_key?(key)
             contents[convert_content_key(key)] = convert_content_value(key, value)
           else
@@ -27,6 +28,37 @@ module Exa
 
       private
 
+      CONTENT_SUB_PARAMS = {
+        text_max_characters: { parent: :text, key: :max_characters },
+        include_html_tags: { parent: :text, key: :include_html_tags },
+        text_verbosity: { parent: :text, key: :verbosity },
+        summary_query: { parent: :summary, key: :query },
+        summary_schema: { parent: :summary, key: :schema },
+        context_max_characters: { parent: :context, key: :max_characters },
+        highlights_max_characters: { parent: :highlights, key: :max_characters },
+        highlights_num_sentences: { parent: :highlights, key: :num_sentences },
+        highlights_per_url: { parent: :highlights, key: :highlights_per_url },
+        highlights_query: { parent: :highlights, key: :query },
+        image_links: { parent: :extras, key: :image_links },
+        links: { parent: :extras, key: :links }
+      }.freeze
+
+      def consolidate_content_params(params)
+        result = {}
+        params.each do |key, value|
+          mapping = CONTENT_SUB_PARAMS[key]
+          if mapping
+            parent = mapping[:parent]
+            result[parent] = {} if result[parent] == true || !result.key?(parent)
+            result[parent] = {} unless result[parent].is_a?(Hash)
+            result[parent][mapping[:key]] = value
+          else
+            result[key] = value
+          end
+        end
+        result
+      end
+
       def convert_key(key)
         case key
         when :start_published_date then :startPublishedDate

data/lib/exa/services/search.rb

@@ -18,8 +18,11 @@ module Exa
         response = @connection.post("/search", ParameterConverter.convert(@params))
         body = response.body
 
+        results = body["results"]
+        results = parse_json_summaries(results) if summary_schema?
+
         Resources::SearchResult.new(
-          results: body["results"],
+          results: results,
           request_id: body["requestId"],
           resolved_search_type: body["resolvedSearchType"],
           search_type: body["searchType"],
@@ -44,6 +47,20 @@ module Exa
 
         raise ArgumentError, "Invalid search type: '#{search_type}'. Must be one of: #{VALID_SEARCH_TYPES.join(', ')}"
       end
+
+      def summary_schema?
+        @params[:summary].is_a?(Hash) && @params[:summary][:schema]
+      end
+
+      def parse_json_summaries(results)
+        results&.map do |r|
+          if r["summary"].is_a?(String)
+            r.merge("summary" => JSON.parse(r["summary"]))
+          else
+            r
+          end
+        end
+      end
     end
   end
 end

data/lib/exa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Exa
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exa-ai
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Benjamin Jackson