gemini_cache 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba751abef4a7f8f6f6c856d782c9e43dfcc27cfb64e6d69a6b6b095522fba338
-  data.tar.gz: 5dbef856507a550b7b739a5d972991ab822f36ca0aafef4bd5576df3b920c9c6
+  metadata.gz: ae4847ce3abf808c2779601462af28a47989301593355a8a39977a5df495f322
+  data.tar.gz: 71e72d0e2750d6b530d407f97a7490c65b6acbf342ad10803916b4b24d418b71
 SHA512:
-  metadata.gz: 032fc3e2f78e791b55d82a63c15094eb325f5778ac4232dfb088e38b99bbd2402f9381ed79c12e03051768a2d488719f6be786cc815dd927927320942f2e8800
-  data.tar.gz: 31944aa6d6cbe592fd98909b465a1521b2049772d9436d09ad1663c9088473e7aae954ad7e224e4393670ca7d4cb7791295adff9be40a0b1536ecb5ab3b3f3cb
+  metadata.gz: 8ab29a93e9555626f6d1eecb189351b5d62b28805e0e90e0ba9c29cb9e5bcf8698f72dadb0621ffbf196503d186a2c341b45c387bc25f940d055bb110455ff78
+  data.tar.gz: 50a917b60662ecd5bc1cef90c0a633febfcfbe294c297525d397f60863dfaa29977e43c0743c9f717452fa7d45ce5fe2da8f11f3816d0f65fa5e06f6632675ff

data/lib/gemini_cache/item_extender.rb

@@ -0,0 +1,46 @@
+module ItemExtender
+  def delete = GeminiCache.delete(name: self['name'])
+
+  def ttl=(new_ttl)
+    GeminiCache.update(name: self['name'], content: { ttl: "#{new_ttl}s" })
+    GeminiCache.get_by_name(name: self['name'])
+  end
+
+  def generate_content(contents:, generation_config: nil)
+    conn = Faraday.new(
+      url: 'https://generativelanguage.googleapis.com',
+      headers: { 'Content-Type' => 'application/json' }
+    ) do |f|
+      f.options.timeout = 300        # timeout em segundos para a requisição completa
+      f.options.open_timeout = 300   # timeout em segundos para abrir a conexão
+    end
+
+    body = {
+      cached_content: self['name'],
+      contents:
+    }
+
+    body[:generation_config] = generation_config if !generation_config.nil?
+
+    response = conn.post("/v1beta/models/#{self['model'].split('/').last}:generateContent") do |req|
+      req.params['key'] = ENV.fetch('GEMINI_API_KEY')
+      req.body = body.to_json
+    end
+    
+    if response.status == 200
+      resp = JSON.parse(response.body)
+      def resp.content = dig('candidates', 0, 'content', 'parts', 0, 'text')
+      return resp
+    end
+
+    raise "Erro ao gerar conteúdo: #{response.body}"
+  rescue Faraday::Error => e
+    raise "Erro na requisição: #{e.message}"
+  end
+    
+  def single_prompt(prompt:, generation_config: :accurate_mode)
+    # accurate_mode: less creative, more accurate
+    generation_config = { temperature: 0, topP: 0, topK: 1 } if generation_config.eql?(:accurate_mode)
+    generate_content(contents: [{ parts: [{ text: prompt }], role: 'user' }], generation_config:).content
+  end      
+end

data/lib/gemini_cache.rb

@@ -2,19 +2,22 @@ require 'faraday'
 require 'open-uri'
 require 'nokogiri'
 require 'json'
+require 'base64'
+
+require 'gemini_cache/item_extender'
 
 module GeminiCache
-  def self.read_local_file(file_path) = Base64.strict_encode64(File.read(file_path))
-  def self.read_remote_file(file_url) = Base64.strict_encode64(URI.open(file_url).read)
-  def self.read_html(url, default_remover: true)
+  def self.read_local_file(path:, mime_type:) = { inline_data: { mime_type:, data: Base64.strict_encode64(File.read(path)) } } 
+  def self.read_remote_file(url:, mime_type:) = { inline_data: { mime_type:, data: Base64.strict_encode64(URI.open(url).read) } } 
+  def self.read_html(url:, default_remover: true)
     doc = Nokogiri::HTML(URI.open(url))
     %w[script style].each { |element| doc.css(element).each(&:remove) } if default_remover
 
     doc
   end
 
-  def self.create(parts:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 600)
-    raise "Cache name already exist: '#{display_name}'" if GeminiCache.get(display_name:)
+  def self.create(parts:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 300)
+    raise "Cache name already exist: '#{display_name}'" if GeminiCache.get_by_display_name(display_name:)
 
     content = {
       model: "models/#{model}",
@@ -33,41 +36,32 @@ module GeminiCache
       req.body = content
     end
   
-    return get(name: JSON.parse(response.body)['name']) if response.status == 200
+    return get_by_name(name: JSON.parse(response.body)['name']) if response.status == 200
   
     raise "Erro ao criar cache: #{response.status} - #{response.body}"
   rescue Faraday::Error => e
     raise "Erro na requisição: #{e.message}"
   end
 
-  def self.get(name: nil, display_name: nil)
-    raise 'Nome do cache ou display name é obrigatório' if name.nil? && display_name.nil?
-    raise 'Nome do cache e display name não podem ser informados juntos' if !name.nil? && !display_name.nil?
-    
-    return GeminiCache.list.find { |item| item['name'].eql? name } if !name.nil?
-    return GeminiCache.list.find { |item| item['displayName'].eql? display_name } if !display_name.nil?
-  end
-
-  def self.create_from_text(text:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 600)
+  def self.create_from_text(text:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 300)
     GeminiCache.create(parts: [{ text: }], display_name:, model:, ttl:)
   end
 
-  def self.create_from_webpage(url:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 600)
-    GeminiCache.create(parts: [{ text: GeminiCache.read_html(url).inner_text }], display_name:, model:, ttl:)
+  def self.create_from_webpage(url:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 300)
+    create_from_text(text: GeminiCache.read_html(url:).inner_text, display_name:, model:, ttl:)
   end
 
-  def self.create_from_local_file(file_path:, mime_type:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 600)
-    parts = [{ inline_data: { mime_type:, data: GeminiCache.read_local_file(file_path) } }]
+  def self.create_from_local_file(path:, mime_type:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 300)
+    GeminiCache.create(parts: GeminiCache.read_local_file(path:, mime_type:), display_name:, model:, ttl:)
+  end
 
-    GeminiCache.create(parts:, display_name:, model:, ttl:)
+  def self.create_from_remote_file(url:, mime_type:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 300)
+    GeminiCache.create(parts: GeminiCache.read_remote_file(url:, mime_type:), display_name:, model:, ttl:)
   end
 
-  def self.create_from_remote_file(file_url:, mime_type:, display_name:, model: 'gemini-1.5-flash-8b', ttl: 600)
-    parts = [{ inline_data: { mime_type:, data: GeminiCache.read_remote_file(file_url) } }]
+  def self.get_by_name(name: nil) = GeminiCache.list.find { |item| item['name'].eql? name }
+  def self.get_by_display_name(display_name: nil) = GeminiCache.list.find { |item| item['displayName'].eql? display_name }
 
-    GeminiCache.create(parts:, display_name:, model:, ttl:)
-  end
-  
   def self.list
     conn = Faraday.new(
       url: 'https://generativelanguage.googleapis.com',
@@ -80,51 +74,7 @@ module GeminiCache
     
     return [] if JSON.parse(response.body).empty?
 
-    JSON.parse(response.body)['cachedContents'].map do |item|
-      def item.delete = GeminiCache.delete(name: self['name'])
-      def item.set_ttl(ttl = 120) = GeminiCache.update(name: self['name'], content: { ttl: "#{ttl}s" })
-
-      def item.generate_content(contents:, generation_config: nil)
-        conn = Faraday.new(
-          url: 'https://generativelanguage.googleapis.com',
-          headers: { 'Content-Type' => 'application/json' }
-        ) do |f|
-          f.options.timeout = 300        # timeout em segundos para a requisição completa
-          f.options.open_timeout = 300   # timeout em segundos para abrir a conexão
-        end
-
-        body = {
-          cached_content: self['name'],
-          contents:
-        }
-
-        body[:generation_config] = generation_config if !generation_config.nil?
-
-        response = conn.post("/v1beta/models/#{self['model'].split('/').last}:generateContent") do |req|
-          req.params['key'] = ENV.fetch('GEMINI_API_KEY')
-          req.body = body.to_json
-        end
-        
-        if response.status == 200
-          resp = JSON.parse(response.body)
-          def resp.content = dig('candidates', 0, 'content', 'parts', 0, 'text')
-          return resp
-        end
-
-        raise "Erro ao gerar conteúdo: #{response.body}"
-      rescue Faraday::Error => e
-        raise "Erro na requisição: #{e.message}"
-      end
-      
-      def item.single_prompt(prompt:, generation_config: :accurate_mode)
-        # accurate_mode: less creative, more accurate
-        generation_config = { temperature: 0, topP: 0, topK: 1 } if generation_config.eql?(:accurate_mode)
-
-        generate_content(contents: [{ parts: [{ text: prompt }], role: 'user' }], generation_config:).content
-      end
-
-      item
-    end
+    JSON.parse(response.body)['cachedContents'].map { |item| item.extend(ItemExtender) }
 
   rescue Faraday::Error => e
     raise "Erro na requisição: #{e.message}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemini_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Gedean Dias
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Ruby's Gemini Context Caching wrapper
 email: gedean.dias@gmail.com
 executables: []
@@ -31,6 +59,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/gemini_cache.rb
+- lib/gemini_cache/item_extender.rb
 homepage: https://github.com/gedean/gemini_cache
 licenses:
 - MIT