llmemory 0.2.2 → 0.2.4

data/lib/llmemory/vector_store/openai_embeddings.rb

@@ -4,6 +4,7 @@ require "faraday"
 require "json"
 require "digest"
 require_relative "base"
+require_relative "../llm/usage"
 
 module Llmemory
   module VectorStore
@@ -11,11 +12,14 @@ module Llmemory
       DEFAULT_MODEL = "text-embedding-3-small"
       DEFAULT_DIMS = 1536
 
+      attr_reader :last_usage
+
       def initialize(api_key: nil, model: nil)
         @api_key = api_key || Llmemory.configuration.llm_api_key
         @model = model || DEFAULT_MODEL
         @cache = {}
         @cache_order = []
+        @last_usage = Llmemory::LLM::Usage.zero
       end
 
       def embed(text)
@@ -23,7 +27,10 @@ module Llmemory
 
         if Llmemory.configuration.embedding_cache_enabled
           key = cache_key(text)
-          return @cache[key].dup if @cache.key?(key)
+          if @cache.key?(key)
+            @last_usage = Llmemory::LLM::Usage.zero
+            return @cache[key].dup
+          end
         end
 
         result = fetch_embedding(text)
@@ -55,7 +62,8 @@ module Llmemory
 
       def fetch_embedding(text)
         result = nil
-        Llmemory::Instrumentation.instrument(:llm_embed, provider: :openai, model: @model, text_chars: text.to_s.length) do
+        payload = { provider: :openai, model: @model, text_chars: text.to_s.length }
+        Llmemory::Instrumentation.instrument(:llm_embed, payload) do
           response = connection.post("embeddings") do |req|
             req.headers["Authorization"] = "Bearer #{@api_key}"
             req.headers["Content-Type"] = "application/json"
@@ -63,11 +71,24 @@ module Llmemory
           end
           raise Llmemory::LLMError, "OpenAI Embeddings API error: #{response.body}" unless response.success?
           body = response.body.is_a?(Hash) ? response.body : JSON.parse(response.body.to_s)
+          @last_usage = parse_embed_usage(body["usage"])
+          payload.merge!(
+            input_tokens: @last_usage.input_tokens,
+            output_tokens: @last_usage.output_tokens,
+            total_tokens: @last_usage.total_tokens
+          )
           result = body.dig("data", 0, "embedding")&.map(&:to_f) || Array.new(DEFAULT_DIMS, 0.0)
         end
         result
       end
 
+      def parse_embed_usage(raw)
+        return Llmemory::LLM::Usage.zero unless raw.is_a?(Hash)
+
+        total = raw["total_tokens"] || raw[:total_tokens] || 0
+        Llmemory::LLM::Usage.new(input_tokens: 0, output_tokens: 0, total_tokens: total)
+      end
+
       def connection
         @connection ||= Faraday.new(url: "https://api.openai.com/v1") do |f|
           f.request :json

data/lib/llmemory/vector_store.rb

@@ -10,14 +10,15 @@ module Llmemory
     # from config (:active_record persists in llmemory_embeddings; otherwise
     # in-process). `source_type` namespaces persisted embeddings so different
     # memory types (edges, episodes, skills) never collide in the shared table.
-    def self.build(source_type: "edge")
+    def self.build(source_type: "edge", cipher: nil)
+      resolved_cipher = cipher || Llmemory.build_cipher
       embeddings = OpenAIEmbeddings.new
       store_type = (Llmemory.configuration.long_term_store || :memory).to_s.to_sym
       if store_type == :active_record || store_type == :activerecord
         require_relative "vector_store/active_record_store"
-        ActiveRecordStore.new(embedding_provider: embeddings, source_type: source_type)
+        ActiveRecordStore.new(embedding_provider: embeddings, source_type: source_type, cipher: resolved_cipher)
       else
-        MemoryStore.new(embedding_provider: embeddings)
+        MemoryStore.new(embedding_provider: embeddings, cipher: resolved_cipher)
       end
     end
   end

data/lib/llmemory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Llmemory
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/lib/llmemory.rb

@@ -26,3 +26,5 @@ module Llmemory
   class StoreError < Error; end
   class LLMError < Error; end
 end
+
+require_relative "llmemory/crypto/cipher"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llmemory
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - llmemory
@@ -162,6 +162,8 @@ files:
 - lib/llmemory/cli/commands/users.rb
 - lib/llmemory/cli/commands/working.rb
 - lib/llmemory/configuration.rb
+- lib/llmemory/crypto/cipher.rb
+- lib/llmemory/crypto/field_helpers.rb
 - lib/llmemory/dashboard.rb
 - lib/llmemory/dashboard/engine.rb
 - lib/llmemory/extractors.rb
@@ -173,6 +175,11 @@ files:
 - lib/llmemory/llm/anthropic.rb
 - lib/llmemory/llm/base.rb
 - lib/llmemory/llm/openai.rb
+- lib/llmemory/llm/response.rb
+- lib/llmemory/llm/tracking_client.rb
+- lib/llmemory/llm/usage.rb
+- lib/llmemory/llm/usage_ledger.rb
+- lib/llmemory/llm/usage_recorder.rb
 - lib/llmemory/long_term.rb
 - lib/llmemory/long_term/episodic.rb
 - lib/llmemory/long_term/episodic/episode.rb