lex-apollo 0.4.27 → 0.4.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85cccff520bb34332f705695f5193cd55e01bb94fb680bf0a51ad81a04ec3112
-  data.tar.gz: b3370806ab160e71f3f213fb4401a6a45aa650778a29574b1cc553a9ad34d167
+  metadata.gz: d25745968940593d7d1ac3fba3f1ccd1b5d7ce553cca28c1a1fdfa4d3104af11
+  data.tar.gz: 96ecdae2a460625d95cbe0e4605f2c60778d035ea3c3f93e19d6560df0a40e70
 SHA512:
-  metadata.gz: d45dd95922afbff6cf87391eca84b658359fc3b329f80cfd9404054e2e5fc7cff5b398d2b065f407ab9bff3141ba87b9f3d30e0c980e6c4625231edbf591bc18
-  data.tar.gz: 47183b00644bae505cd55c1abad707c5c86d901a38472d186bb5601eb3ec4fa0d2452715a667b3f7ebd0081d00ccb3fc3d6d6fabab61e7d146fdb2890deca7f2
+  metadata.gz: c788a0ab4bd58e70ef2be2b7be88101bcccf4880fecd0ee4b8cd7a1be05cbe9b9e157c99fc7f5724a62a4d6fcdacf6278e8c902368fcc60324d966b204698b48
+  data.tar.gz: 1a51dc48ec715adc969325e82f1c7bd81e23b35f716c0ee6c3ded05a9d38eb0b57261121892658fb8715a969f7ab22f1a06664af17aa990dc0e708272229039e

data/lib/legion/extensions/apollo/runners/knowledge.rb

@@ -85,10 +85,10 @@ module Legion
           def handle_ingest(content: nil, content_type: nil, tags: [], source_agent: 'unknown', # rubocop:disable Metrics/ParameterLists
                             source_provider: nil, source_channel: nil, knowledge_domain: nil,
                             submitted_by: nil, submitted_from: nil, content_hash: nil, context: {},
-                            skip: false, access_scope: 'global', identity_principal_id: nil,
-                            identity_id: nil, identity_canonical_name: nil, **)
+                            skip: false, access_scope: 'global', **)
             return { status: :skipped } if skip
 
+            identity = resolve_process_identity
             content = normalize_text_input(content)
             content_type = normalize_content_type(content_type.nil? ? :observation : content_type)
             log.debug("Apollo Knowledge.handle_ingest content_length=#{content.length} content_type=#{content_type} tags=#{Array(tags).size} source_agent=#{source_agent} source_channel=#{source_channel || 'nil'}") # rubocop:disable Layout/LineLength
@@ -97,7 +97,7 @@ module Legion
 
             hash = content_hash || (defined?(Helpers::Writeback) ? Helpers::Writeback.content_hash(content) : nil)
             existing = active_duplicate_for_hash(hash, access_scope:          access_scope,
-                                                       identity_principal_id: identity_principal_id)
+                                                       identity_principal_id: identity[:principal_id])
             if existing
               log.info("Apollo Knowledge.handle_ingest deduped entry_id=#{existing.id} source_agent=#{source_agent}")
               return { success: true, entry_id: existing.id, deduped: true }
@@ -109,9 +109,9 @@ module Legion
                                        source_provider: source_provider, source_channel: source_channel,
                                        submitted_by: submitted_by, submitted_from: submitted_from,
                                        access_scope: access_scope,
-                                       identity_principal_id: identity_principal_id,
-                                       identity_id: identity_id,
-                                       identity_canonical_name: identity_canonical_name)
+                                       identity_principal_id: identity[:principal_id],
+                                       identity_id: identity[:identity_id],
+                                       identity_canonical_name: identity[:canonical_name])
 
             corroborated, existing_id = find_corroboration(
               embedding, content_type_sym, metadata[:source_agent], metadata[:source_channel]
@@ -148,6 +148,7 @@ module Legion
                            requesting_principal_id: nil, **)
             return { success: false, error: 'apollo_data_not_available' } unless Helpers::DataModels.apollo_entry_available?
 
+            requesting_principal_id = resolve_requesting_principal_id(requesting_principal_id)
             entry_model = Helpers::DataModels.apollo_entry
             query = normalize_text_input(query)
             status_defaulted = status.equal?(UNSET)
@@ -273,6 +274,7 @@ module Legion
 
             return { success: false, error: 'apollo_data_not_available' } unless Helpers::DataModels.apollo_entry_available?
 
+            requesting_principal_id = resolve_requesting_principal_id(requesting_principal_id)
             query = normalize_text_input(query)
             log.debug("Apollo Knowledge.retrieve_relevant query_length=#{query.length} limit=#{limit} min_confidence=#{min_confidence} tags=#{Array(tags).size} domain=#{domain || 'nil'}") # rubocop:disable Layout/LineLength
             return { success: true, entries: [], count: 0 } if query.nil? || query.to_s.strip.empty?
@@ -720,6 +722,29 @@ module Legion
             end
           end
 
+          def resolve_process_identity
+            return { principal_id: nil, identity_id: nil, canonical_name: nil } unless defined?(Legion::Identity::Process)
+
+            {
+              principal_id:   Legion::Identity::Process.db_principal_id,
+              identity_id:    Legion::Identity::Process.db_identity_id,
+              canonical_name: Legion::Identity::Process.canonical_name
+            }
+          rescue StandardError => e
+            handle_exception(e, level: :warn, operation: 'apollo.knowledge.resolve_process_identity')
+            { principal_id: nil, identity_id: nil, canonical_name: nil }
+          end
+
+          def resolve_requesting_principal_id(explicit_value)
+            return explicit_value if explicit_value
+            return nil unless defined?(Legion::Identity::Process)
+
+            Legion::Identity::Process.db_principal_id
+          rescue StandardError => e
+            handle_exception(e, level: :warn, operation: 'apollo.knowledge.resolve_requesting_principal_id')
+            nil
+          end
+
           include Legion::Extensions::Helpers::Lex if defined?(Legion::Extensions::Helpers::Lex)
           include Legion::JSON::Helper
           include Legion::Settings::Helper

data/lib/legion/extensions/apollo/version.rb

@@ -3,7 +3,7 @@
 module Legion
   module Extensions
     module Apollo
-      VERSION = '0.4.27'
+      VERSION = '0.4.28'
     end
   end
 end

data/spec/legion/extensions/apollo/runners/knowledge_spec.rb

@@ -371,7 +371,7 @@ RSpec.describe Legion::Extensions::Apollo::Runners::Knowledge do
       end
     end
 
-    context 'identity kwargs persistence' do
+    context 'identity from Legion::Identity::Process' do
       let(:mock_entry_class2) { double('ApolloEntry2') }
       let(:mock_expertise_class2) { double('ApolloExpertise2') }
       let(:mock_access_log_class2) { double('ApolloAccessLog2') }
@@ -390,18 +390,20 @@ RSpec.describe Legion::Extensions::Apollo::Runners::Knowledge do
         allow(host).to receive(:embed_text).and_return(nil)
         allow(host).to receive(:find_corroboration).and_return([false, nil])
         allow(host).to receive(:detect_contradictions).and_return([])
+        stub_const('Legion::Identity::Process', double(
+                                                  db_principal_id: 42,
+                                                  db_identity_id:  7,
+                                                  canonical_name:  'alice'
+                                                ))
       end
 
-      it 'passes identity_principal_id and access_scope through to create_candidate_entry' do
+      it 'derives identity from Legion::Identity::Process and persists it' do
         expect(mock_entry_class2).to receive(:create).with(
-          hash_including(identity_principal_id: 42, access_scope: 'private')
+          hash_including(identity_principal_id: 42, identity_id: 7, identity_canonical_name: 'alice',
+                         access_scope: 'private')
         ).and_return(mock_entry2)
 
-        host.handle_ingest(
-          content: 'test fact', tags: [],
-          identity_principal_id: 42, identity_id: 7, identity_canonical_name: 'alice',
-          access_scope: 'private'
-        )
+        host.handle_ingest(content: 'test fact', tags: [], access_scope: 'private')
       end
 
       it 'defaults access_scope to global when not provided' do
@@ -412,14 +414,14 @@ RSpec.describe Legion::Extensions::Apollo::Runners::Knowledge do
         host.handle_ingest(content: 'test fact', tags: [])
       end
 
-      it 'persists identity_id and identity_canonical_name' do
+      it 'ignores identity kwargs passed by callers' do
         expect(mock_entry_class2).to receive(:create).with(
-          hash_including(identity_id: 7, identity_canonical_name: 'alice')
+          hash_including(identity_principal_id: 42, identity_id: 7, identity_canonical_name: 'alice')
         ).and_return(mock_entry2)
 
         host.handle_ingest(
           content: 'test fact', tags: [],
-          identity_principal_id: 42, identity_id: 7, identity_canonical_name: 'alice',
+          identity_principal_id: 999, identity_id: 888, identity_canonical_name: 'mallory',
           access_scope: 'private'
         )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lex-apollo
 version: !ruby/object:Gem::Version
-  version: 0.4.27
+  version: 0.4.28
 platform: ruby
 authors:
 - Esity