Add a package named search

serge-p7v · serge-p7v · commit a71e9768ac6c · 2026-05-07T11:44:14.000+02:00
diff --git a/agents/agents-features/agents-features-longterm-memory-aws/src/jvmMain/kotlin/ai/koog/agents/features/longtermmemory/aws/AgentcoreCompositeSearchStrategy.kt b/agents/agents-features/agents-features-longterm-memory-aws/src/jvmMain/kotlin/ai/koog/agents/features/longtermmemory/aws/AgentcoreCompositeSearchStrategy.kt
@@ -5,7 +5,7 @@ import ai.koog.agents.features.longtermmemory.aws.request.AgentcoreCompositeSear
 import ai.koog.agents.features.longtermmemory.aws.request.AgentcoreListingSearchRequest
 import ai.koog.agents.features.longtermmemory.aws.request.AgentcoreSearchRequest
 import ai.koog.agents.features.longtermmemory.aws.request.AgentcoreSimilaritySearchRequest
-import ai.koog.agents.longtermmemory.retrieval.SearchStrategy
+import ai.koog.agents.longtermmemory.retrieval.search.SearchStrategy
 import ai.koog.rag.base.storage.search.SearchRequest
 
 /**
@@ -18,7 +18,7 @@ import ai.koog.rag.base.storage.search.SearchRequest
  * REFLECTIONS (actor-scoped).
  *
  * The outer query string produced by
- * [ai.koog.agents.longtermmemory.retrieval.SearchQueryProvider] is injected into each
+ * [ai.koog.agents.longtermmemory.retrieval.search.SearchQueryProvider] is injected into each
  * similarity subrequest at [create] time. Listing subrequests do not use the query.
  *
  * Example:
diff --git a/agents/agents-features/agents-features-longterm-memory-aws/src/jvmMain/kotlin/ai/koog/agents/features/longtermmemory/aws/dsl/AgentcoreLongTermMemoryDsl.kt b/agents/agents-features/agents-features-longterm-memory-aws/src/jvmMain/kotlin/ai/koog/agents/features/longtermmemory/aws/dsl/AgentcoreLongTermMemoryDsl.kt
@@ -10,6 +10,7 @@ import ai.koog.agents.features.longtermmemory.aws.augmentation.AgentcorePromptAu
 import ai.koog.agents.longtermmemory.feature.LongTermMemory
 import ai.koog.agents.longtermmemory.retrieval.augmentation.PromptAugmenter
 import ai.koog.agents.longtermmemory.retrieval.augmentation.SystemPromptAugmenter
+import ai.koog.agents.longtermmemory.retrieval.search.SearchStrategy
 import aws.sdk.kotlin.services.bedrockagentcore.BedrockAgentCoreClient
 
 /**
@@ -281,7 +282,7 @@ public class AgentcoreRetrievalBuilder internal constructor(
 
     internal data class Configured(
         val storage: AgentcoreSearchStorage,
-        val searchStrategy: ai.koog.agents.longtermmemory.retrieval.SearchStrategy,
+        val searchStrategy: SearchStrategy,
         val namespace: String?,
         val promptAugmenter: PromptAugmenter,
     )
diff --git a/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/feature/LongTermMemory.kt b/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/feature/LongTermMemory.kt
@@ -16,13 +16,13 @@ import ai.koog.agents.core.feature.pipeline.AIAgentPlannerPipeline
 import ai.koog.agents.longtermmemory.ingestion.IngestionSettings
 import ai.koog.agents.longtermmemory.ingestion.extraction.DocumentExtractor
 import ai.koog.agents.longtermmemory.ingestion.extraction.MessagePassingDocumentExtractor
-import ai.koog.agents.longtermmemory.retrieval.LastUserMessageQueryProvider
 import ai.koog.agents.longtermmemory.retrieval.RetrievalSettings
-import ai.koog.agents.longtermmemory.retrieval.SearchQueryProvider
-import ai.koog.agents.longtermmemory.retrieval.SearchStrategy
-import ai.koog.agents.longtermmemory.retrieval.SimilaritySearchStrategy
 import ai.koog.agents.longtermmemory.retrieval.augmentation.PromptAugmenter
 import ai.koog.agents.longtermmemory.retrieval.augmentation.SystemPromptAugmenter
+import ai.koog.agents.longtermmemory.retrieval.search.LastUserMessageQueryProvider
+import ai.koog.agents.longtermmemory.retrieval.search.SearchQueryProvider
+import ai.koog.agents.longtermmemory.retrieval.search.SearchStrategy
+import ai.koog.agents.longtermmemory.retrieval.search.SimilaritySearchStrategy
 import ai.koog.prompt.dsl.Prompt
 import ai.koog.prompt.message.Message
 import ai.koog.rag.base.TextDocument
diff --git a/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/ingestion/extraction/DocumentExtractor.kt b/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/ingestion/extraction/DocumentExtractor.kt
@@ -2,6 +2,7 @@ package ai.koog.agents.longtermmemory.ingestion.extraction
 
 import ai.koog.prompt.message.Message
 import ai.koog.rag.base.TextDocument
+import kotlin.jvm.JvmStatic
 
 /**
  * Extractor of memory records during message ingestion.
@@ -69,7 +70,7 @@ public fun interface DocumentExtractor {
          *     .build()
          * ```
          */
-        @kotlin.jvm.JvmStatic
+        @JvmStatic
         public fun builder(): DocumentExtractorBuilder = DocumentExtractorBuilder()
     }
 }
diff --git a/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/RetrievalSettings.kt b/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/RetrievalSettings.kt
@@ -3,6 +3,10 @@ package ai.koog.agents.longtermmemory.retrieval
 import ai.koog.agents.longtermmemory.feature.FailurePolicy
 import ai.koog.agents.longtermmemory.retrieval.augmentation.PromptAugmenter
 import ai.koog.agents.longtermmemory.retrieval.augmentation.SystemPromptAugmenter
+import ai.koog.agents.longtermmemory.retrieval.search.LastUserMessageQueryProvider
+import ai.koog.agents.longtermmemory.retrieval.search.SearchQueryProvider
+import ai.koog.agents.longtermmemory.retrieval.search.SearchStrategy
+import ai.koog.agents.longtermmemory.retrieval.search.SimilaritySearchStrategy
 import ai.koog.rag.base.TextDocument
 import ai.koog.rag.base.storage.SearchStorage
 import ai.koog.rag.base.storage.search.SearchRequest
@@ -12,7 +16,7 @@ import ai.koog.rag.base.storage.search.SearchRequest
  *
  * @param storage The retrieval storage to search for relevant memory records.
  * @param searchQueryProvider The extractor that defines how to derive the search query from the prompt.
- *   Defaults to [LastUserMessageQueryProvider], which uses the last user message content.
+ *   Defaults to [ai.koog.agents.longtermmemory.retrieval.search.LastUserMessageQueryProvider], which uses the last user message content.
  * @param searchStrategy The strategy that defines how to search the retrieval store.
  * @param promptAugmenter The augmenter that defines how retrieved context is inserted into the prompt.
  * @param enableAutomaticRetrieval When `true` (default), retrieval and prompt augmentation happen
diff --git a/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/augmentation/PromptAugmenter.kt b/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/augmentation/PromptAugmenter.kt
@@ -3,6 +3,7 @@ package ai.koog.agents.longtermmemory.retrieval.augmentation
 import ai.koog.prompt.dsl.Prompt
 import ai.koog.rag.base.TextDocument
 import ai.koog.rag.base.storage.search.SearchResult
+import kotlin.jvm.JvmStatic
 
 /**
  * Interface for augmenting prompts with relevant context retrieved from memory.
@@ -50,7 +51,7 @@ public fun interface PromptAugmenter {
          *     .build()
          * ```
          */
-        @kotlin.jvm.JvmStatic
+        @JvmStatic
         public fun builder(): PromptAugmenterBuilder = PromptAugmenterBuilder()
 
         /**
diff --git a/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/search/LastUserMessageQueryProvider.kt b/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/search/LastUserMessageQueryProvider.kt
@@ -1,4 +1,4 @@
-package ai.koog.agents.longtermmemory.retrieval
+package ai.koog.agents.longtermmemory.retrieval.search
 
 import ai.koog.prompt.dsl.Prompt
 import ai.koog.prompt.message.Message
diff --git a/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/search/SearchQueryProvider.kt b/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/search/SearchQueryProvider.kt
@@ -1,4 +1,4 @@
-package ai.koog.agents.longtermmemory.retrieval
+package ai.koog.agents.longtermmemory.retrieval.search
 
 import ai.koog.prompt.dsl.Prompt
 
diff --git a/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/search/SearchStrategy.kt b/agents/agents-features/agents-features-longterm-memory/src/commonMain/kotlin/ai/koog/agents/longtermmemory/retrieval/search/SearchStrategy.kt
@@ -1,7 +1,8 @@
-package ai.koog.agents.longtermmemory.retrieval
+package ai.koog.agents.longtermmemory.retrieval.search
 
 import ai.koog.rag.base.storage.search.SearchRequest
 import ai.koog.rag.base.storage.search.SimilaritySearchRequest
+import kotlin.jvm.JvmStatic
 
 /**
  * Search strategy for creating search requests during prompt augmentation.
@@ -55,7 +56,7 @@ public fun interface SearchStrategy {
          *     .build()
          * ```
          */
-        @kotlin.jvm.JvmStatic
+        @JvmStatic
         public fun builder(): SearchStrategyBuilder = SearchStrategyBuilder()
     }
 }
diff --git a/agents/agents-features/agents-features-longterm-memory/src/jvmTest/java/ai/koog/agents/longtermmemory/feature/LongTermMemoryRetrievalJavaTest.java b/agents/agents-features/agents-features-longterm-memory/src/jvmTest/java/ai/koog/agents/longtermmemory/feature/LongTermMemoryRetrievalJavaTest.java
@@ -2,7 +2,7 @@
 
 import ai.koog.agents.core.agent.AIAgent;
 import ai.koog.agents.longtermmemory.retrieval.RetrievalSettings;
-import ai.koog.agents.longtermmemory.retrieval.SearchStrategy;
+import ai.koog.agents.longtermmemory.retrieval.search.SearchStrategy;
 import ai.koog.agents.longtermmemory.retrieval.augmentation.PromptAugmenter;
 import ai.koog.agents.longtermmemory.storage.InMemoryRecordStorage;
 import ai.koog.agents.testing.tools.MockExecutorBuilder;
diff --git a/agents/agents-features/agents-features-longterm-memory/src/jvmTest/kotlin/ai/koog/agents/longtermmemory/feature/LongTermMemoryRetrievalTest.kt b/agents/agents-features/agents-features-longterm-memory/src/jvmTest/kotlin/ai/koog/agents/longtermmemory/feature/LongTermMemoryRetrievalTest.kt
@@ -10,8 +10,8 @@ import ai.koog.agents.core.tools.ToolDescriptor
 import ai.koog.agents.core.tools.ToolRegistry
 import ai.koog.agents.longtermmemory.ingestion.extraction.MessagePassingDocumentExtractor
 import ai.koog.agents.longtermmemory.model.MemoryRecord
-import ai.koog.agents.longtermmemory.retrieval.SearchStrategy
-import ai.koog.agents.longtermmemory.retrieval.SimilaritySearchStrategy
+import ai.koog.agents.longtermmemory.retrieval.search.SearchStrategy
+import ai.koog.agents.longtermmemory.retrieval.search.SimilaritySearchStrategy
 import ai.koog.agents.longtermmemory.storage.InMemoryRecordStorage
 import ai.koog.prompt.dsl.Prompt
 import ai.koog.prompt.dsl.prompt

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package ai.koog.agents.longtermmemory.ingestion.extraction`
`2`	`2`
`3`	`3`	`import ai.koog.prompt.message.Message`
`4`	`4`	`import ai.koog.rag.base.TextDocument`
	`5`	`+import kotlin.jvm.JvmStatic`
`5`	`6`
`6`	`7`	`/**`
`7`	`8`	`* Extractor of memory records during message ingestion.`
`@@ -69,7 +70,7 @@ public fun interface DocumentExtractor {`
`69`	`70`	`* .build()`
`70`	`71`	* ```
`71`	`72`	`*/`
`72`		`- @kotlin.jvm.JvmStatic`
	`73`	`+ @JvmStatic`
`73`	`74`	`public fun builder(): DocumentExtractorBuilder = DocumentExtractorBuilder()`
`74`	`75`	`}`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package ai.koog.agents.longtermmemory.retrieval`
	`1`	`+package ai.koog.agents.longtermmemory.retrieval.search`
`2`	`2`
`3`	`3`	`import ai.koog.prompt.dsl.Prompt`
`4`	`4`	`import ai.koog.prompt.message.Message`