chore(python): Knowledge renaming

Author: SanjoDeundiak

examples/004/images/main/Dockerfile

@@ -1,3 +1,3 @@
-FROM ghcr.io/build-trust/ockam-python:latest
+FROM ghcr.io/build-trust/ockam-python:688513d3c
 COPY . .
 ENTRYPOINT ["python", "main.py"]

examples/005/images/main/Dockerfile

@@ -1,3 +1,3 @@
-FROM ghcr.io/build-trust/ockam-python:latest
+FROM ghcr.io/build-trust/ockam-python:688513d3c
 COPY . .
 ENTRYPOINT ["python", "main.py"]

examples/014/images/main/Dockerfile

@@ -1,3 +1,3 @@
-FROM ghcr.io/build-trust/ockam-python:b0f73e7d1
+FROM ghcr.io/build-trust/ockam-python:688513d3c
 COPY . .
 ENTRYPOINT ["python", "main.py"]

implementations/python/examples/13.py

@@ -1,13 +1,14 @@
-from ockam import Agent, Model, Node, SearchableKnowledge
+from ockam import Agent, Model, Node, Knowledge
 
 """
     This example shows how a model can be enriched with knowledge coming from inlined documents.
 """
 
 
 async def main(node):
-    restaurants = SearchableKnowledge(
+    restaurants = Knowledge(
         "restaurants",
+        searchable=True,
         model=Model("ollama/nomic-embed-text"),
         max_knowledge_size=4096,
     )

implementations/python/examples/14.py

@@ -1,13 +1,14 @@
-from ockam import Agent, Model, Node, SearchableKnowledge
+from ockam import Agent, Model, Node, Knowledge
 
 """
     This example shows how a model can be enriched with knowledge coming from documents retrieved online.
 """
 
 
 async def main(node):
-    ockam_documentation = SearchableKnowledge(
+    ockam_documentation = Knowledge(
         "ockam_documentation",
+        searchable=True,
         model=Model("ollama/nomic-embed-text"),
         max_knowledge_size=4096,
     )

implementations/python/python/ockam/__init__.py

@@ -15,6 +15,7 @@
     TextPiece,
     SearchHit,
     SearchResults,
+    Knowledge,
     UnsearchableKnowledge,
     SearchableKnowledge,
     InMemory,
@@ -85,6 +86,7 @@
     # from .squads
     "Squad",
     # from .knowledge
+    "Knowledge",
     "RemoteManager",
     "Node",
     "Tool",

implementations/python/python/ockam/knowledge/__init__.py

@@ -9,6 +9,7 @@
 from .database import Database
 from .extractors import TextExtractor
 from .chunkers import Chunker, NaiveChunker
+from .knowledge import Knowledge
 
 __all__ = [
     "Database",
@@ -19,6 +20,7 @@
     "NoopKnowledge",
     "Mem0Knowledge",
     "SearchableKnowledge",
+    "Knowledge",
     "SearchHit",
     "SearchResults",
     "SearchableKnowledge",

implementations/python/python/ockam/knowledge/knowledge.py

@@ -0,0 +1,60 @@
+from typing import Optional
+
+
+from .protocol import KnowledgeProvider, Storage
+from .searchable import SearchableKnowledge
+from .unsearchable import UnsearchableKnowledge
+from ..models.model import Model
+from .chunkers.naive import NaiveChunker
+from .chunkers import Chunker
+from .extractors import TextExtractor
+from .in_memory import InMemory
+
+
+class Knowledge(KnowledgeProvider):
+    def __init__(
+        self,
+        name: str,
+        searchable=False,
+        # shared
+        storage: Storage = InMemory(),
+        text_extractor: TextExtractor = None,
+        max_knowledge_size: int = 4096,
+        # searchable-specific
+        model: Model = None,
+        chunker: Chunker = NaiveChunker(),
+        max_results: int = 10,
+        max_distance: float = 0.2,
+        # unsearchable-specific
+        document_name: Optional[str] = None,
+    ):
+        self.searchable = searchable
+
+        if self.searchable:
+            self.knowledge = SearchableKnowledge(
+                name,
+                storage=storage,
+                text_extractor=text_extractor,
+                max_knowledge_size=max_knowledge_size,
+                model=model,
+                chunker=chunker,
+                max_results=max_results,
+                max_distance=max_distance,
+            )
+        else:
+            self.knowledge = UnsearchableKnowledge(
+                name,
+                storage=storage,
+                text_extractor=text_extractor,
+                max_knowledge_size=max_knowledge_size,
+                document_name=document_name,
+            )
+
+    async def add_document(self, document_name: str, document_url: str, content_type: Optional[str] = None):
+        return await self.knowledge.add_document(document_name, document_url, content_type)
+
+    async def add_text(self, document_name: str, text: str, content_type: Optional[str] = None):
+        return await self.knowledge.add_text(document_name, text, content_type)
+
+    async def search_knowledge(self, scope: Optional[str], conversation: Optional[str], query: str) -> Optional[str]:
+        return await self.knowledge.search_knowledge(scope, conversation, query)

implementations/python/python/ockam/knowledge/unsearchable.py

@@ -58,7 +58,7 @@ async def add_document(self, document_name: str, document_url: str, content_type
             whole_document,
         )
 
-    async def add_text(self, document_name: str, text: str):
+    async def add_text(self, document_name: str, text: str, content_type: Optional[str] = None):
         await self.storage.store_document(
             self.name,
             document_name,